diff options
Diffstat (limited to 'java')
744 files changed, 1018 insertions, 9905 deletions
diff --git a/java/.idea/modules.xml b/java/.idea/modules.xml index 7f95f1b2e70..e325d960a82 100644 --- a/java/.idea/modules.xml +++ b/java/.idea/modules.xml @@ -2,6 +2,16 @@ <project version="4"> <component name="ProjectModuleManager"> <modules> + <module fileurl="file://$PROJECT_DIR$/src/Freeze/Freeze.iml" filepath="$PROJECT_DIR$/src/Freeze/Freeze.iml" /> + <module fileurl="file://$PROJECT_DIR$/src/Glacier2/Glacier2.iml" filepath="$PROJECT_DIR$/src/Glacier2/Glacier2.iml" /> + <module fileurl="file://$PROJECT_DIR$/src/Ice/Ice.iml" filepath="$PROJECT_DIR$/src/Ice/Ice.iml" /> + <module fileurl="file://$PROJECT_DIR$/src/IceBox/IceBox.iml" filepath="$PROJECT_DIR$/src/IceBox/IceBox.iml" /> + <module fileurl="file://$PROJECT_DIR$/src/IceDiscovery/IceDiscovery.iml" filepath="$PROJECT_DIR$/src/IceDiscovery/IceDiscovery.iml" /> + <module fileurl="file://$PROJECT_DIR$/src/IceGrid/IceGrid.iml" filepath="$PROJECT_DIR$/src/IceGrid/IceGrid.iml" /> + <module fileurl="file://$PROJECT_DIR$/src/IceGridGUI/IceGridGUI.iml" filepath="$PROJECT_DIR$/src/IceGridGUI/IceGridGUI.iml" /> + <module fileurl="file://$PROJECT_DIR$/src/IcePatch2/IcePatch2.iml" filepath="$PROJECT_DIR$/src/IcePatch2/IcePatch2.iml" /> + <module fileurl="file://$PROJECT_DIR$/src/IceStorm/IceStorm.iml" filepath="$PROJECT_DIR$/src/IceStorm/IceStorm.iml" /> + <module fileurl="file://$PROJECT_DIR$/src/ant/ant.iml" filepath="$PROJECT_DIR$/src/ant/ant.iml" /> <module fileurl="file://$PROJECT_DIR$/buildSrc/buildSrc.iml" filepath="$PROJECT_DIR$/buildSrc/buildSrc.iml" /> <module fileurl="file://$PROJECT_DIR$/demo/Database/library/demo_Database_library.iml" filepath="$PROJECT_DIR$/demo/Database/library/demo_Database_library.iml" /> <module fileurl="file://$PROJECT_DIR$/demo/Freeze/bench/demo_Freeze_bench.iml" filepath="$PROJECT_DIR$/demo/Freeze/bench/demo_Freeze_bench.iml" /> diff --git a/java/.settings/org.eclipse.jdt.core.prefs b/java/.settings/org.eclipse.jdt.core.prefs index 70bace9fcb0..60617a4080a 100644 --- a/java/.settings/org.eclipse.jdt.core.prefs +++ b/java/.settings/org.eclipse.jdt.core.prefs @@ -5,7 +5,16 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -14,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled @@ -87,6 +97,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/java/allTests.py b/java/allTests.py index 84e5a748b6d..701f4554fd9 100755 --- a/java/allTests.py +++ b/java/allTests.py @@ -25,66 +25,66 @@ import TestUtil # List of all basic tests. # tests = [ - ("Slice/generation", ["once"]), - ("Slice/keyword", ["once"]), - ("Slice/macros", ["once"]), - ("Slice/structure", ["once"]), - ("IceUtil/inputUtil", ["once"]), - ("IceUtil/fileLock", ["once"]), - ("Ice/proxy", ["core"]), - ("Ice/operations", ["core"]), - ("Ice/seqMapping", ["core"]), - ("Ice/exceptions", ["core"]), - ("Ice/ami", ["core"]), - ("Ice/info", ["core", "noipv6", "nocompress", "nosocks"]), - ("Ice/inheritance", ["core"]), - ("Ice/facets", ["core"]), - ("Ice/objects", ["core"]), - ("Ice/binding", ["core"]), - ("Ice/faultTolerance", ["core"]), - ("Ice/location", ["core"]), - ("Ice/adapterDeactivation", ["core"]), - ("Ice/slicing/exceptions", ["core"]), - ("Ice/slicing/objects", ["core"]), - ("Ice/custom", ["core"]), - ("Ice/checksum", ["core"]), - ("Ice/dispatcher", ["core"]), - ("Ice/interrupt", ["core"]), - ("Ice/packagemd", ["core"]), - ("Ice/stream", ["core"]), - ("Ice/hold", ["core"]), - ("Ice/retry", ["core"]), - ("Ice/timeout", ["core", "nocompress"]), - ("Ice/acm", ["core"]), - ("Ice/background", ["core", "nosocks"]), - ("Ice/servantLocator", ["core"]), - ("Ice/interceptor", ["core"]), - ("Ice/udp", ["core"]), - ("Ice/serialize", ["core"]), - ("Ice/defaultServant", ["core"]), - ("Ice/defaultValue", ["core"]), - ("Ice/threadPoolPriority", ["core"]), - ("Ice/classLoader", ["core"]), - ("Ice/invoke", ["core"]), - ("Ice/properties", ["once"]), - ("Ice/plugin", ["core"]), - ("Ice/hash", ["once"]), - ("Ice/optional", ["once"]), - ("Ice/admin", ["core"]), - ("Ice/metrics", ["core", "nossl", "nows", "noipv6", "nocompress", "nosocks"]), - ("Ice/enums", ["once"]), - ("Ice/networkProxy", ["core", "noipv6", "nosocks"]), - ("IceBox/admin", ["core", "noipv6", "nomx"]), - ("IceBox/configuration", ["core", "noipv6", "nomx"]), - ("Freeze/dbmap", ["once"]), - ("Freeze/complex", ["once"]), - ("Freeze/evictor", ["core"]), - ("Freeze/fileLock", ["once"]), - ("Glacier2/router", ["service"]), - ("Glacier2/sessionHelper", ["service", "nossl", "nows", "noipv6"]), - ("IceDiscovery/simple", ["service"]), - ("IceGrid/simple", ["service"]), - ("IceSSL/configuration", ["once"]) + ("src/main/java/test/Slice/generation", ["once"]), + ("src/main/java/test/Slice/keyword", ["once"]), + ("src/main/java/test/Slice/macros", ["once"]), + ("src/main/java/test/Slice/structure", ["once"]), + ("src/main/java/test/IceUtil/inputUtil", ["once"]), + ("src/main/java/test/IceUtil/fileLock", ["once"]), + ("src/main/java/test/Ice/proxy", ["core"]), + ("src/main/java/test/Ice/operations", ["core"]), + ("src/main/java/test/Ice/seqMapping", ["core"]), + ("src/main/java/test/Ice/exceptions", ["core"]), + ("src/main/java/test/Ice/ami", ["core"]), + ("src/main/java/test/Ice/info", ["core", "noipv6", "nocompress", "nosocks"]), + ("src/main/java/test/Ice/inheritance", ["core"]), + ("src/main/java/test/Ice/facets", ["core"]), + ("src/main/java/test/Ice/objects", ["core"]), + ("src/main/java/test/Ice/binding", ["core"]), + ("src/main/java/test/Ice/faultTolerance", ["core"]), + ("src/main/java/test/Ice/location", ["core"]), + ("src/main/java/test/Ice/adapterDeactivation", ["core"]), + ("src/main/java/test/Ice/slicing/exceptions", ["core"]), + ("src/main/java/test/Ice/slicing/objects", ["core"]), + ("src/main/java/test/Ice/custom", ["core"]), + ("src/main/java/test/Ice/checksum", ["core"]), + ("src/main/java/test/Ice/dispatcher", ["core"]), + ("src/main/java/test/Ice/interrupt", ["core"]), + ("src/main/java/test/Ice/packagemd", ["core"]), + ("src/main/java/test/Ice/stream", ["core"]), + ("src/main/java/test/Ice/hold", ["core"]), + ("src/main/java/test/Ice/retry", ["core"]), + ("src/main/java/test/Ice/timeout", ["core", "nocompress"]), + ("src/main/java/test/Ice/acm", ["core"]), + ("src/main/java/test/Ice/background", ["core", "nosocks"]), + ("src/main/java/test/Ice/servantLocator", ["core"]), + ("src/main/java/test/Ice/interceptor", ["core"]), + ("src/main/java/test/Ice/udp", ["core"]), + ("src/main/java/test/Ice/serialize", ["core"]), + ("src/main/java/test/Ice/defaultServant", ["core"]), + ("src/main/java/test/Ice/defaultValue", ["core"]), + ("src/main/java/test/Ice/threadPoolPriority", ["core"]), + ("src/main/java/test/Ice/classLoader", ["core"]), + ("src/main/java/test/Ice/invoke", ["core"]), + ("src/main/java/test/Ice/properties", ["once"]), + ("src/main/java/test/Ice/plugin", ["core"]), + ("src/main/java/test/Ice/hash", ["once"]), + ("src/main/java/test/Ice/optional", ["once"]), + ("src/main/java/test/Ice/admin", ["core"]), + ("src/main/java/test/Ice/metrics", ["core", "nossl", "nows", "noipv6", "nocompress", "nosocks"]), + ("src/main/java/test/Ice/enums", ["once"]), + ("src/main/java/test/Ice/networkProxy", ["core", "noipv6", "nosocks"]), + ("src/main/java/test/IceBox/admin", ["core", "noipv6", "nomx"]), + ("src/main/java/test/IceBox/configuration", ["core", "noipv6", "nomx"]), + ("src/main/java/test/Freeze/dbmap", ["once"]), + ("src/main/java/test/Freeze/complex", ["once"]), + ("src/main/java/test/Freeze/evictor", ["core"]), + ("src/main/java/test/Freeze/fileLock", ["once"]), + ("src/main/java/test/Glacier2/router", ["service"]), + ("src/main/java/test/Glacier2/sessionHelper", ["service", "nossl", "nows", "noipv6"]), + ("src/main/java/test/IceDiscovery/simple", ["service"]), + ("src/main/java/test/IceGrid/simple", ["service"]), + ("src/main/java/test/IceSSL/configuration", ["once"]) ] if __name__ == "__main__": diff --git a/java/build.gradle b/java/build.gradle index 642abef4c23..6f7d578fc58 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -34,7 +34,7 @@ apply from: "$rootProject.projectDir/demo/IceGrid/build.gradle" apply from: "$rootProject.projectDir/demo/book/build.gradle" // -// Used to build the gradle wrapper to automatically download and install +// Used to build the gradle wrapper to automatically download and install // the version of gradle needed to build Ice. // //task wrapper(type: Wrapper) { diff --git a/java/buildSrc/src/main/groovy/com/zeroc/gradle/plugins/slice/SlicePlugin.groovy b/java/buildSrc/src/main/groovy/com/zeroc/gradle/plugins/slice/SlicePlugin.groovy index 2a2c0aee6c8..43a760bcb5d 100644 --- a/java/buildSrc/src/main/groovy/com/zeroc/gradle/plugins/slice/SlicePlugin.groovy +++ b/java/buildSrc/src/main/groovy/com/zeroc/gradle/plugins/slice/SlicePlugin.groovy @@ -12,22 +12,45 @@ package com.zeroc.gradle.plugins.slice; import org.gradle.api.NamedDomainObjectContainer import org.gradle.api.Plugin import org.gradle.api.Project +import org.gradle.api.UnknownTaskException class SlicePlugin implements Plugin<Project> { void apply(Project project) { - project.task('generateSliceTask', type: SliceTask) { - group = "Slice" - } + project.task('generateSliceTask', type: SliceTask) { + group = "Slice" + } // Create and install the extension object. project.extensions.create("slice", SliceExtension, project.container(Java)) project.extensions.slice.extensions.create("freezej", FreezejExtension, - project.container(Dict), project.container(Index)) + project.container(Dict), project.container(Index)) project.slice.output = project.file("${project.buildDir}/generated-src") - project.getTasks().getByName("compileJava").dependsOn('generateSliceTask'); - project.sourceSets.main.java.srcDir project.slice.output + try { + project.getTasks().getByName("compileJava").dependsOn('generateSliceTask'); + project.sourceSets.main.java.srcDir project.slice.output + } catch(UnknownTaskException ex) { + // Using an exception to add android support isn't very nice + // but I couldn't find another way to find out whether a task + // exists. + // + // Android support. + // + // WORKAROUND + // + // This is a horrible hack, but necessary to work with the android plugin. + // The problem is that the compileDebugJava task isn't available at this point, + // and using project.getGradle().projectsEvaluated({ to add the dependency on the + // compileDebugJava/compileReleaseJava task doesn't work in android studio as of + // 0.8.9. + try { + project.getTasks().getByName("preBuild").dependsOn('generateSliceTask'); + // This doesn't work either. + //project.sourceSets.main.java.srcDir project.slice.output + } catch(UnknownTaskException ex2) { + } + } } } diff --git a/java/demo/Database/library/build.gradle b/java/demo/Database/library/build.gradle index d132ef1de4f..6ed199b97ca 100644 --- a/java/demo/Database/library/build.gradle +++ b/java/demo/Database/library/build.gradle @@ -28,8 +28,8 @@ jar.enabled = false if (distJarDir == null) { dependencies { - compile project(':src/Ice') - compile project(':src/Glacier2') + compile project(':Ice') + compile project(':Glacier2') } } else { dependencies { diff --git a/java/demo/Database/library/demo_Database_library.iml b/java/demo/Database/library/demo_Database_library.iml index 5d55e1b1264..71531cd00d4 100644 --- a/java/demo/Database/library/demo_Database_library.iml +++ b/java/demo/Database/library/demo_Database_library.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="Glacier2" exported="" /> </component> </module> diff --git a/java/demo/Freeze/bench/build.gradle b/java/demo/Freeze/bench/build.gradle index a42208f3de7..9c89fbcad5f 100644 --- a/java/demo/Freeze/bench/build.gradle +++ b/java/demo/Freeze/bench/build.gradle @@ -85,8 +85,8 @@ jar.enabled = false if (distJarDir == null) { dependencies { - compile project(':src/Ice') - compile project(':src/Freeze') + compile project(':Ice') + compile project(':Freeze') } } else { dependencies { diff --git a/java/demo/Freeze/bench/demo_Freeze_bench.iml b/java/demo/Freeze/bench/demo_Freeze_bench.iml index a7138566392..a281b56a23b 100644 --- a/java/demo/Freeze/bench/demo_Freeze_bench.iml +++ b/java/demo/Freeze/bench/demo_Freeze_bench.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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_Freeze" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="Freeze" exported="" /> </component> </module> diff --git a/java/demo/Freeze/casino/build.gradle b/java/demo/Freeze/casino/build.gradle index 6a317fdf965..7d5b85d6e16 100644 --- a/java/demo/Freeze/casino/build.gradle +++ b/java/demo/Freeze/casino/build.gradle @@ -25,8 +25,8 @@ sourceSets { if (distJarDir == null) { dependencies { - compile project(':src/Ice') - compile project(':src/Freeze') + compile project(':Ice') + compile project(':Freeze') } } else { dependencies { diff --git a/java/demo/Freeze/casino/demo_Freeze_casino.iml b/java/demo/Freeze/casino/demo_Freeze_casino.iml index 0c35a13dfd6..2c984dfa420 100644 --- a/java/demo/Freeze/casino/demo_Freeze_casino.iml +++ b/java/demo/Freeze/casino/demo_Freeze_casino.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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_Freeze" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="Freeze" exported="" /> </component> </module> diff --git a/java/demo/Freeze/library/build.gradle b/java/demo/Freeze/library/build.gradle index e81589dbdd8..6aef1e24bb8 100644 --- a/java/demo/Freeze/library/build.gradle +++ b/java/demo/Freeze/library/build.gradle @@ -37,8 +37,8 @@ sourceSets { if (distJarDir == null) { dependencies { - compile project(':src/Ice') - compile project(':src/Freeze') + compile project(':Ice') + compile project(':Freeze') } } else { dependencies { diff --git a/java/demo/Freeze/library/demo_Freeze_library.iml b/java/demo/Freeze/library/demo_Freeze_library.iml index 0c35a13dfd6..2c984dfa420 100644 --- a/java/demo/Freeze/library/demo_Freeze_library.iml +++ b/java/demo/Freeze/library/demo_Freeze_library.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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_Freeze" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="Freeze" exported="" /> </component> </module> diff --git a/java/demo/Freeze/phonebook/build.gradle b/java/demo/Freeze/phonebook/build.gradle index 8ce140a4e87..516eecf17af 100644 --- a/java/demo/Freeze/phonebook/build.gradle +++ b/java/demo/Freeze/phonebook/build.gradle @@ -38,8 +38,8 @@ sourceSets { if (distJarDir == null) { dependencies { - compile project(':src/Ice') - compile project(':src/Freeze') + compile project(':Ice') + compile project(':Freeze') } } else { dependencies { diff --git a/java/demo/Freeze/phonebook/demo_Freeze_phonebook.iml b/java/demo/Freeze/phonebook/demo_Freeze_phonebook.iml index 97fcb33e05b..7b4ceef2a5d 100644 --- a/java/demo/Freeze/phonebook/demo_Freeze_phonebook.iml +++ b/java/demo/Freeze/phonebook/demo_Freeze_phonebook.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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_Freeze" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="Freeze" exported="" /> </component> </module> diff --git a/java/demo/Freeze/transform/build.gradle b/java/demo/Freeze/transform/build.gradle index 6a7bf419828..23d2f45ea22 100644 --- a/java/demo/Freeze/transform/build.gradle +++ b/java/demo/Freeze/transform/build.gradle @@ -46,8 +46,8 @@ sourceSets { if (distJarDir == null) { dependencies { - compile project(':src/Ice') - compile project(':src/Freeze') + compile project(':Ice') + compile project(':Freeze') } } else { dependencies { diff --git a/java/demo/Freeze/transform/demo_Freeze_transform.iml b/java/demo/Freeze/transform/demo_Freeze_transform.iml index 36977a664dd..e32f5e3b556 100644 --- a/java/demo/Freeze/transform/demo_Freeze_transform.iml +++ b/java/demo/Freeze/transform/demo_Freeze_transform.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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_Freeze" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="Freeze" exported="" /> </component> </module> diff --git a/java/demo/Glacier2/build.gradle b/java/demo/Glacier2/build.gradle index 0e5fff5e1a3..3f99d2a3bfc 100644 --- a/java/demo/Glacier2/build.gradle +++ b/java/demo/Glacier2/build.gradle @@ -28,8 +28,8 @@ if (distJarDir == null) { dependencies { - compile project(':src/Ice') - compile project(':src/Glacier2') + compile project(':Ice') + compile project(':Glacier2') } } else { dependencies { diff --git a/java/demo/Glacier2/callback/demo_Glacier2_callback.iml b/java/demo/Glacier2/callback/demo_Glacier2_callback.iml index 5d55e1b1264..71531cd00d4 100644 --- a/java/demo/Glacier2/callback/demo_Glacier2_callback.iml +++ b/java/demo/Glacier2/callback/demo_Glacier2_callback.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="Glacier2" exported="" /> </component> </module> diff --git a/java/demo/Glacier2/chat/demo_Glacier2_chat.iml b/java/demo/Glacier2/chat/demo_Glacier2_chat.iml index 04a47651434..7601ab48bbe 100644 --- a/java/demo/Glacier2/chat/demo_Glacier2_chat.iml +++ b/java/demo/Glacier2/chat/demo_Glacier2_chat.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="Glacier2" exported="" /> </component> </module> diff --git a/java/demo/Glacier2/voip/demo_Glacier2_voip.iml b/java/demo/Glacier2/voip/demo_Glacier2_voip.iml index 89463e0c11e..a56c9b28d63 100644 --- a/java/demo/Glacier2/voip/demo_Glacier2_voip.iml +++ b/java/demo/Glacier2/voip/demo_Glacier2_voip.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="Glacier2" exported="" /> </component> </module> diff --git a/java/demo/Ice/applet/demo_Ice_applet.iml b/java/demo/Ice/applet/demo_Ice_applet.iml index c796653f616..6891f1c161b 100644 --- a/java/demo/Ice/applet/demo_Ice_applet.iml +++ b/java/demo/Ice/applet/demo_Ice_applet.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/async/demo_Ice_async.iml b/java/demo/Ice/async/demo_Ice_async.iml index 991ecf32f02..74998b470d1 100644 --- a/java/demo/Ice/async/demo_Ice_async.iml +++ b/java/demo/Ice/async/demo_Ice_async.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/bidir/demo_Ice_bidir.iml b/java/demo/Ice/bidir/demo_Ice_bidir.iml index c796653f616..6891f1c161b 100644 --- a/java/demo/Ice/bidir/demo_Ice_bidir.iml +++ b/java/demo/Ice/bidir/demo_Ice_bidir.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/build.gradle b/java/demo/Ice/build.gradle index 866fecea69f..d36f2ebbe27 100644 --- a/java/demo/Ice/build.gradle +++ b/java/demo/Ice/build.gradle @@ -31,7 +31,7 @@ if (distJarDir == null) { dependencies { - compile project(':src/Ice') + compile project(':Ice') } } else { dependencies { diff --git a/java/demo/Ice/callback/demo_Ice_callback.iml b/java/demo/Ice/callback/demo_Ice_callback.iml index 099a2459f78..b6dce281ba2 100644 --- a/java/demo/Ice/callback/demo_Ice_callback.iml +++ b/java/demo/Ice/callback/demo_Ice_callback.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/context/demo_Ice_context.iml b/java/demo/Ice/context/demo_Ice_context.iml index 991ecf32f02..74998b470d1 100644 --- a/java/demo/Ice/context/demo_Ice_context.iml +++ b/java/demo/Ice/context/demo_Ice_context.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/hello/demo_Ice_hello.iml b/java/demo/Ice/hello/demo_Ice_hello.iml index 6699bfc35e1..0ccc1ded761 100644 --- a/java/demo/Ice/hello/demo_Ice_hello.iml +++ b/java/demo/Ice/hello/demo_Ice_hello.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/interrupt/demo_Ice_interrupt.iml b/java/demo/Ice/interrupt/demo_Ice_interrupt.iml index c796653f616..6891f1c161b 100644 --- a/java/demo/Ice/interrupt/demo_Ice_interrupt.iml +++ b/java/demo/Ice/interrupt/demo_Ice_interrupt.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/invoke/demo_Ice_invoke.iml b/java/demo/Ice/invoke/demo_Ice_invoke.iml index 6699bfc35e1..0ccc1ded761 100644 --- a/java/demo/Ice/invoke/demo_Ice_invoke.iml +++ b/java/demo/Ice/invoke/demo_Ice_invoke.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/latency/demo_Ice_latency.iml b/java/demo/Ice/latency/demo_Ice_latency.iml index 8a8ab37b470..62526e8b31d 100644 --- a/java/demo/Ice/latency/demo_Ice_latency.iml +++ b/java/demo/Ice/latency/demo_Ice_latency.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/minimal/demo_Ice_minimal.iml b/java/demo/Ice/minimal/demo_Ice_minimal.iml index 099a2459f78..b6dce281ba2 100644 --- a/java/demo/Ice/minimal/demo_Ice_minimal.iml +++ b/java/demo/Ice/minimal/demo_Ice_minimal.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/multicast/demo_Ice_multicast.iml b/java/demo/Ice/multicast/demo_Ice_multicast.iml index 099a2459f78..b6dce281ba2 100644 --- a/java/demo/Ice/multicast/demo_Ice_multicast.iml +++ b/java/demo/Ice/multicast/demo_Ice_multicast.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/nested/demo_Ice_nested.iml b/java/demo/Ice/nested/demo_Ice_nested.iml index 3106b404a90..5e03c3e6c62 100644 --- a/java/demo/Ice/nested/demo_Ice_nested.iml +++ b/java/demo/Ice/nested/demo_Ice_nested.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/optional/demo_Ice_optional.iml b/java/demo/Ice/optional/demo_Ice_optional.iml index 8a8ab37b470..62526e8b31d 100644 --- a/java/demo/Ice/optional/demo_Ice_optional.iml +++ b/java/demo/Ice/optional/demo_Ice_optional.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/plugin/demo_Ice_plugin.iml b/java/demo/Ice/plugin/demo_Ice_plugin.iml index 8a8ab37b470..62526e8b31d 100644 --- a/java/demo/Ice/plugin/demo_Ice_plugin.iml +++ b/java/demo/Ice/plugin/demo_Ice_plugin.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/properties/demo_Ice_properties.iml b/java/demo/Ice/properties/demo_Ice_properties.iml index 099a2459f78..b6dce281ba2 100644 --- a/java/demo/Ice/properties/demo_Ice_properties.iml +++ b/java/demo/Ice/properties/demo_Ice_properties.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/serialize/demo_Ice_serialize.iml b/java/demo/Ice/serialize/demo_Ice_serialize.iml index 3106b404a90..5e03c3e6c62 100644 --- a/java/demo/Ice/serialize/demo_Ice_serialize.iml +++ b/java/demo/Ice/serialize/demo_Ice_serialize.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/session/demo_Ice_session.iml b/java/demo/Ice/session/demo_Ice_session.iml index 991ecf32f02..74998b470d1 100644 --- a/java/demo/Ice/session/demo_Ice_session.iml +++ b/java/demo/Ice/session/demo_Ice_session.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/swing/demo_Ice_swing.iml b/java/demo/Ice/swing/demo_Ice_swing.iml index 8a8ab37b470..62526e8b31d 100644 --- a/java/demo/Ice/swing/demo_Ice_swing.iml +++ b/java/demo/Ice/swing/demo_Ice_swing.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/throughput/demo_Ice_throughput.iml b/java/demo/Ice/throughput/demo_Ice_throughput.iml index 8a8ab37b470..62526e8b31d 100644 --- a/java/demo/Ice/throughput/demo_Ice_throughput.iml +++ b/java/demo/Ice/throughput/demo_Ice_throughput.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/Ice/value/demo_Ice_value.iml b/java/demo/Ice/value/demo_Ice_value.iml index 3106b404a90..5e03c3e6c62 100644 --- a/java/demo/Ice/value/demo_Ice_value.iml +++ b/java/demo/Ice/value/demo_Ice_value.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/IceBox/build.gradle b/java/demo/IceBox/build.gradle index 165c448ad88..c19786d69ed 100644 --- a/java/demo/IceBox/build.gradle +++ b/java/demo/IceBox/build.gradle @@ -19,8 +19,8 @@ if (distJarDir == null) { dependencies { - compile project(':src/Ice') - compile project(':src/IceBox') + compile project(':Ice') + compile project(':IceBox') } } else { dependencies { diff --git a/java/demo/IceBox/hello/demo_IceBox_hello.iml b/java/demo/IceBox/hello/demo_IceBox_hello.iml index cb647765a25..f5c7d5459b7 100644 --- a/java/demo/IceBox/hello/demo_IceBox_hello.iml +++ b/java/demo/IceBox/hello/demo_IceBox_hello.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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_IceBox" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="IceBox" exported="" /> </component> </module> diff --git a/java/demo/IceDiscovery/build.gradle b/java/demo/IceDiscovery/build.gradle index c8a95d34dc4..5379de35950 100644 --- a/java/demo/IceDiscovery/build.gradle +++ b/java/demo/IceDiscovery/build.gradle @@ -19,8 +19,8 @@ if (distJarDir == null) { dependencies { - compile project(':src/Ice') - compile project(':src/IceDiscovery') + compile project(':Ice') + compile project(':IceDiscovery') } } else { dependencies { diff --git a/java/demo/IceDiscovery/hello/demo_IceDiscovery_hello.iml b/java/demo/IceDiscovery/hello/demo_IceDiscovery_hello.iml index 1af3b6da6a2..95a68bb04c0 100644 --- a/java/demo/IceDiscovery/hello/demo_IceDiscovery_hello.iml +++ b/java/demo/IceDiscovery/hello/demo_IceDiscovery_hello.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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_IceDiscovery" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="IceDiscovery" exported="" /> </component> </module> diff --git a/java/demo/IceDiscovery/replication/demo_IceDiscovery_replication.iml b/java/demo/IceDiscovery/replication/demo_IceDiscovery_replication.iml index d347b8cc304..2d2124000dc 100644 --- a/java/demo/IceDiscovery/replication/demo_IceDiscovery_replication.iml +++ b/java/demo/IceDiscovery/replication/demo_IceDiscovery_replication.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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_IceDiscovery" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="IceDiscovery" exported="" /> </component> </module> diff --git a/java/demo/IceGrid/build.gradle b/java/demo/IceGrid/build.gradle index a5e9e79c682..e92c5f5e5ac 100644 --- a/java/demo/IceGrid/build.gradle +++ b/java/demo/IceGrid/build.gradle @@ -19,9 +19,9 @@ if (distJarDir == null) { dependencies { - compile project(':src/Ice') - compile project(':src/IceBox') - compile project(':src/IceGrid') + compile project(':Ice') + compile project(':IceBox') + compile project(':IceGrid') } } else { dependencies { diff --git a/java/demo/IceGrid/icebox/demo_IceGrid_icebox.iml b/java/demo/IceGrid/icebox/demo_IceGrid_icebox.iml index 97eac524115..eae55654a27 100644 --- a/java/demo/IceGrid/icebox/demo_IceGrid_icebox.iml +++ b/java/demo/IceGrid/icebox/demo_IceGrid_icebox.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,15 +12,14 @@ <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_IceBox" exported="" /> - <orderEntry type="module" module-name="src_IceGrid" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="IceBox" exported="" /> + <orderEntry type="module" module-name="IceGrid" exported="" /> </component> </module> diff --git a/java/demo/IceGrid/simple/demo_IceGrid_simple.iml b/java/demo/IceGrid/simple/demo_IceGrid_simple.iml index d1e6c7f7d86..845a54e50c5 100644 --- a/java/demo/IceGrid/simple/demo_IceGrid_simple.iml +++ b/java/demo/IceGrid/simple/demo_IceGrid_simple.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,15 +12,14 @@ <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_IceBox" exported="" /> - <orderEntry type="module" module-name="src_IceGrid" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="IceBox" exported="" /> + <orderEntry type="module" module-name="IceGrid" exported="" /> </component> </module> diff --git a/java/demo/IceStorm/build.gradle b/java/demo/IceStorm/build.gradle index 4c3df44b529..eee551563b6 100644 --- a/java/demo/IceStorm/build.gradle +++ b/java/demo/IceStorm/build.gradle @@ -19,8 +19,8 @@ if (distJarDir == null) { dependencies { - compile project(':src/Ice') - compile project(':src/IceStorm') + compile project(':Ice') + compile project(':IceStorm') } } else { dependencies { diff --git a/java/demo/IceStorm/clock/demo_IceStorm_clock.iml b/java/demo/IceStorm/clock/demo_IceStorm_clock.iml index 30116d29b38..5dc7d385a8f 100644 --- a/java/demo/IceStorm/clock/demo_IceStorm_clock.iml +++ b/java/demo/IceStorm/clock/demo_IceStorm_clock.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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_IceStorm" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="IceStorm" exported="" /> </component> </module> diff --git a/java/demo/android/README b/java/demo/android/README deleted file mode 100644 index 55957553c5c..00000000000 --- a/java/demo/android/README +++ /dev/null @@ -1,16 +0,0 @@ -Demos in this directory: - -- chat - - An Android client for the ZeroC chat application. - -- hello - - An Android client that shows how to invoke ordinary (twoway) - and oneway operations, as well as how to use datagrams, secure - invocations, and batched invocations. - -- library - - An Android front-end for remotely querying and manipulating a - relational database implemented using JDBC. diff --git a/java/demo/android/chat/.gitignore b/java/demo/android/chat/.gitignore deleted file mode 100644 index 264dd4dfe2f..00000000000 --- a/java/demo/android/chat/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -generated/* -bin/* diff --git a/java/demo/android/chat/.settings/com.zeroc.Slice2JavaPlugin.prefs b/java/demo/android/chat/.settings/com.zeroc.Slice2JavaPlugin.prefs deleted file mode 100644 index 0c6a888f333..00000000000 --- a/java/demo/android/chat/.settings/com.zeroc.Slice2JavaPlugin.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Jan 31 23:00:39 CET 2012 -eclipse.preferences.version=1 -iceIncludes=true -includes=slice -jars=Ice.jar;Glacier2.jar -tie=true diff --git a/java/demo/android/chat/.settings/org.eclipse.jdt.core.prefs b/java/demo/android/chat/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 99368a6726b..00000000000 --- a/java/demo/android/chat/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,258 +0,0 @@ -#Mon Dec 08 10:55:23 NST 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=52 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=21 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=8 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/java/demo/android/chat/.settings/org.eclipse.jdt.ui.prefs b/java/demo/android/chat/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 105531e5df9..00000000000 --- a/java/demo/android/chat/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Fri Nov 07 11:00:57 NST 2008 -eclipse.preferences.version=1 -formatter_profile=_ZeroC -formatter_settings_version=11 diff --git a/java/demo/android/chat/AndroidManifest.xml b/java/demo/android/chat/AndroidManifest.xml deleted file mode 100644 index 53fbc095066..00000000000 --- a/java/demo/android/chat/AndroidManifest.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.zeroc.chat" - android:versionCode="1" - android:versionName="1.0.0"> - <uses-permission android:name="android.permission.INTERNET"></uses-permission> - <!-- - http://developer.android.com/guide/topics/manifest/uses-sdk-element.html - --> - <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/> - <application android:icon="@drawable/icon" android:label="@string/app_name" android:allowBackup="false"> - <activity android:label="@string/app_name" android:name=".ChatActivity" android:exported="false"> - <intent-filter> - <action android:name="android.intent.action.RUN"/> - <category android:name="android.intent.category.DEFAULT"/> - </intent-filter> - </activity> - <activity android:label="@string/app_name" android:name=".LoginActivity"> - <intent-filter> - <action android:name="android.intent.action.MAIN"></action> - <category android:name="android.intent.category.LAUNCHER"></category> - </intent-filter> - </activity> - <activity android:name=".UserViewActivity" android:label="@string/users_name"></activity> - <service android:permission="android.permission.INTERNET" android:enabled="true" - android:name=".service.ChatService" android:exported="false"></service> - </application> -</manifest> diff --git a/java/demo/android/chat/README b/java/demo/android/chat/README deleted file mode 100644 index 50aa5ebc2ff..00000000000 --- a/java/demo/android/chat/README +++ /dev/null @@ -1,36 +0,0 @@ -This directory contains an Eclipse project for the chat client. - -The chat client provides Android devices with native access to our -sample chat system. This client demonstrates several useful techniques -that are instructive for Android developers: - - * Issuing asynchronous Ice invocations to maintain a responsive user - interface - * Using Glacier2 and bidirectional connections to receive "push - notifications" from a remote server - * Proper separation of UI and application logic - -By default the client uses "demo.zeroc.com" as its server, which -refers to the public chat server hosted by ZeroC. For more information -about the chat system, or to download the source code for the chat -system so that you can run your own server, please visit the link -below: - - http://www.zeroc.com/chat/index.html - -Please refer to the release notes for instructions on configuring -your environment to use Ice in an Android project. - - -SSL Certificates ----------------- - -This demo is configured by default to use ZeroC's public chat server. - -If you want to test the Android client with a local chat server, you -will need to modify the Glacier2 configuration to use the SSL -certificates that are included in this distribution. - -The simplest solution is to update the IceSSL.DefaultDir property in -the Chat Demo configuration file for Glacier2 to point to the certs -directory of this distribution. diff --git a/java/demo/android/chat/gen/com/zeroc/chat/BuildConfig.java b/java/demo/android/chat/gen/com/zeroc/chat/BuildConfig.java deleted file mode 100644 index 9b48653a649..00000000000 --- a/java/demo/android/chat/gen/com/zeroc/chat/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package com.zeroc.chat; - -public final class BuildConfig { - public final static boolean DEBUG = true; -}
\ No newline at end of file diff --git a/java/demo/android/chat/gen/com/zeroc/chat/R.java b/java/demo/android/chat/gen/com/zeroc/chat/R.java deleted file mode 100644 index f405f5050cc..00000000000 --- a/java/demo/android/chat/gen/com/zeroc/chat/R.java +++ /dev/null @@ -1,42 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package com.zeroc.chat; - -public final class R { - public static final class attr { - } - public static final class drawable { - public static final int icon=0x7f020000; - public static final int stat_notify=0x7f020001; - } - public static final class id { - public static final int hostname=0x7f060002; - public static final int list=0x7f060000; - public static final int login=0x7f060006; - public static final int password=0x7f060004; - public static final int secure=0x7f060005; - public static final int text=0x7f060001; - public static final int username=0x7f060003; - } - public static final class layout { - public static final int chat=0x7f030000; - public static final int login=0x7f030001; - public static final int main=0x7f030002; - public static final int user=0x7f030003; - } - public static final class raw { - public static final int client=0x7f040000; - } - public static final class string { - public static final int app_name=0x7f050001; - public static final int hello=0x7f050000; - public static final int menu_logout=0x7f050004; - public static final int menu_users=0x7f050003; - public static final int users_name=0x7f050002; - } -} diff --git a/java/demo/android/chat/project.properties b/java/demo/android/chat/project.properties deleted file mode 100644 index b7c2081d560..00000000000 --- a/java/demo/android/chat/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-10 diff --git a/java/demo/android/chat/res/drawable/icon.png b/java/demo/android/chat/res/drawable/icon.png Binary files differdeleted file mode 100644 index 75024841d32..00000000000 --- a/java/demo/android/chat/res/drawable/icon.png +++ /dev/null diff --git a/java/demo/android/chat/res/drawable/stat_notify.png b/java/demo/android/chat/res/drawable/stat_notify.png Binary files differdeleted file mode 100644 index 37f7c0d543b..00000000000 --- a/java/demo/android/chat/res/drawable/stat_notify.png +++ /dev/null diff --git a/java/demo/android/chat/res/layout/chat.xml b/java/demo/android/chat/res/layout/chat.xml deleted file mode 100644 index 2c10dec1308..00000000000 --- a/java/demo/android/chat/res/layout/chat.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="5dip" - > - - <ListView android:id="@+id/list" - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:stackFromBottom="true" - android:transcriptMode="normal"/> - - <EditText - android:id ="@+id/text" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - /> - -</LinearLayout> diff --git a/java/demo/android/chat/res/layout/login.xml b/java/demo/android/chat/res/layout/login.xml deleted file mode 100644 index 078a4da1448..00000000000 --- a/java/demo/android/chat/res/layout/login.xml +++ /dev/null @@ -1,123 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="5dip" - > - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="25" - android:text="Chat Server" - /> - - <EditText - android:id ="@+id/hostname" - android:hint="hostname" - android:text="10.0.2.2" - android:layout_width="0dip" - android:layout_weight="75" - android:layout_height="wrap_content" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="25" - android:text="Username" - /> - - <EditText - android:id ="@+id/username" - android:hint="username" - android:text="" - android:layout_width="0dip" - android:layout_weight="75" - android:layout_height="wrap_content" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="25" - android:text="Password" - /> - - <EditText - android:id ="@+id/password" - android:hint="password" - android:text="" - android:layout_width="0dip" - android:layout_weight="75" - android:layout_height="wrap_content" - android:password="true"/> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="25" - android:text="SSL" - /> - - <CheckBox - android:id="@+id/secure" - android:layout_width="0dip" - android:layout_weight="75" - android:layout_height="wrap_content" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingTop="5dip" - android:paddingBottom="5dip" - android:gravity="center_horizontal"> - - <Button - android:id="@+id/login" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="Login" - /> - - </LinearLayout> -</LinearLayout> diff --git a/java/demo/android/chat/res/layout/main.xml b/java/demo/android/chat/res/layout/main.xml deleted file mode 100644 index 1fb4479c217..00000000000 --- a/java/demo/android/chat/res/layout/main.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - > -<TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/hello" - /> -</LinearLayout> diff --git a/java/demo/android/chat/res/layout/user.xml b/java/demo/android/chat/res/layout/user.xml deleted file mode 100644 index 30790a86eeb..00000000000 --- a/java/demo/android/chat/res/layout/user.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - > - - <ListView android:id="@+id/list" - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" - /> -</LinearLayout> diff --git a/java/demo/android/chat/res/raw/client.bks b/java/demo/android/chat/res/raw/client.bks Binary files differdeleted file mode 100644 index 538d360fac0..00000000000 --- a/java/demo/android/chat/res/raw/client.bks +++ /dev/null diff --git a/java/demo/android/chat/res/values/strings.xml b/java/demo/android/chat/res/values/strings.xml deleted file mode 100644 index 8db8daeb568..00000000000 --- a/java/demo/android/chat/res/values/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <string name="hello">Hello World, Chat</string> - <string name="app_name">Chat</string> - <string name="users_name">Users</string> - <string name="menu_users">Show Users</string> - <string name="menu_logout">Logout</string> -</resources> diff --git a/java/demo/android/chat/slice/Chat.ice b/java/demo/android/chat/slice/Chat.ice deleted file mode 100644 index d33fabb4a34..00000000000 --- a/java/demo/android/chat/slice/Chat.ice +++ /dev/null @@ -1,38 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -/** - * - * The Chat module defines types shared by definitions from - * ChatSession.ice and PollingChat.ice. - * - **/ -module Chat -{ - -/** - * - * The InvalidMessageException is raised when a user sends an invalid - * message to the server. A message is considered invalid if the - * message size exceeds the maximum message size. - * - **/ -exception InvalidMessageException -{ - /** - * - * The reason why the message was rejected by the server. - * - **/ - string reason; -}; - -}; diff --git a/java/demo/android/chat/slice/ChatSession.ice b/java/demo/android/chat/slice/ChatSession.ice deleted file mode 100644 index ac16869f2f0..00000000000 --- a/java/demo/android/chat/slice/ChatSession.ice +++ /dev/null @@ -1,122 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -#include <Ice/BuiltinSequences.ice> -#include <Glacier2/Session.ice> -#include <Chat.ice> - -module Chat -{ - -/** - * - * The ChatRoomCallback interface is the interface that clients implement - * as their callback object. - * - * The server calls operations of this interface to communicate - * with connected clients. - * - **/ -interface ChatRoomCallback -{ - /** - * - * The server invokes this operation when the client sets the callback - * for a session. This provides the client with the initial list of users - * currently in the chat room. - * - * @param users The names of users currently in the chat room. - * - **/ - void init(Ice::StringSeq users); - - /** - * - * The server invokes this operation to deliver a message - * that was sent to the chat room. - * - * @param name The name of the user that send the message. - * - * @param message The contents of the message. - * - * @param timestamp The time at which the message was sent. - * - **/ - void send(long timestamp, string name, string message); - - /** - * - * The server invokes this operation when a user joins - * the chat room. - * - * @param name The name of the user that joined the chat room. - * - * @param timestamp The time at which the user joined the chat room. - * - **/ - void join(long timestamp, string name); - - /** - * - * The servers invokes this operation when a user leaves - * the chat room. - * - * @param name The name of the user that left the chat room. - * - * @param timestamp The time at which the user left the chat room. - * - **/ - void leave(long timestamp, string name); -}; - -/** - * - * A ChatSession is a custom Glacier2::Session for clients that use - * Glacier2 and support callbacks (C++, Java, and .NET clients). - * - * @see Glacier2::Session - * - **/ -interface ChatSession extends Glacier2::Session -{ - /** - * - * The setCallback operation is called by clients to set the - * callback used to receive notification of activity in the - * room. Clients receive notifications as soon as they call this - * operation (before setCallback returns). - * - * The first callback made by the server is a call to - * ChatRoomCallback::init, which delivers the current list of - * users to the client. - * - * @param cb The callback the server uses to deliver notifications. - * - * @see ChatRoomCallback - * - **/ - void setCallback(ChatRoomCallback* cb); - - /** - * - * Send a message to the chat room. - * - * @param message The message to be sent. - * - * @return The time at which the message is sent. - * - * @throws InvalidMessageException should the message be invalid. - * - **/ - long send(string message) throws InvalidMessageException; -}; - -}; diff --git a/java/demo/android/chat/src/com/zeroc/chat/ChatActivity.java b/java/demo/android/chat/src/com/zeroc/chat/ChatActivity.java deleted file mode 100644 index 348c95647cc..00000000000 --- a/java/demo/android/chat/src/com/zeroc/chat/ChatActivity.java +++ /dev/null @@ -1,208 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.chat; - -import java.util.LinkedList; -import java.util.List; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.Intent; -import android.os.Bundle; -import android.view.KeyEvent; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.View.OnKeyListener; -import android.widget.ArrayAdapter; -import android.widget.EditText; -import android.widget.ListView; - -import com.zeroc.chat.service.ChatRoomListener; - -public class ChatActivity extends SessionActivity -{ - private static final int DIALOG_MESSAGE_TOO_LONG = 2; - - private static final int USERS_ID = Menu.FIRST; - private static final int LOGOUT_ID = Menu.FIRST + 1; - private static final int MAX_MESSAGE_SIZE = 1024; - - private EditText _text; - private ArrayAdapter<String> _adapter; - private LinkedList<String> _strings = new LinkedList<String>(); - final private ChatRoomListener _listener = new ChatRoomListener() - { - public void init(final List<String> users) - { - _strings.clear(); - _adapter.notifyDataSetChanged(); - } - - public void join(long timestamp, String name) - { - add(ChatUtils.formatTimestamp(timestamp) + " - <system-message> - " + name + " joined."); - } - - public void leave(long timestamp, String name) - { - add(ChatUtils.formatTimestamp(timestamp) + " - " + "<system-message> - " + name + " left."); - } - - public void send(long timestamp, String name, final String message) - { - add(ChatUtils.formatTimestamp(timestamp) + " - <" + name + "> " + ChatUtils.unstripHtml(message)); - } - - public void error() - { - showDialog(DIALOG_FATAL); - } - - public void inactivity() - { - showDialog(DIALOG_FATAL); - } - - private void add(final String msg) - { - _strings.add(msg); - if(_strings.size() > 200) // AppSession.MAX_MESSAGES) - { - _strings.removeFirst(); - } - _adapter.notifyDataSetChanged(); - } - }; - - @Override - ChatRoomListener getChatRoomListener() - { - return _listener; - } - - @Override - boolean replayEvents() - { - return true; - } - - // Hook the back key to logout the session. - @Override - public boolean onKeyDown(int keyCode, KeyEvent event) - { - if(keyCode == KeyEvent.KEYCODE_BACK) - { - _service.logout(); - finish(); - return true; - } - return false; - } - - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.chat); - - _text = (EditText)findViewById(R.id.text); - - ListView transcript = (ListView)findViewById(R.id.list); - _adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, _strings); - transcript.setAdapter(_adapter); - - _text.setOnClickListener(new OnClickListener() - { - public void onClick(View v) - { - sendText(); - } - }); - _text.setOnKeyListener(new OnKeyListener() - { - public boolean onKey(View v, int keyCode, KeyEvent event) - { - if(event.getAction() == KeyEvent.ACTION_DOWN) - { - switch (keyCode) - { - case KeyEvent.KEYCODE_DPAD_CENTER: - case KeyEvent.KEYCODE_ENTER: - sendText(); - return true; - } - } - return false; - } - }); - _text.requestFocus(); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) - { - boolean result = super.onCreateOptionsMenu(menu); - menu.add(0, USERS_ID, 0, R.string.menu_users); - menu.add(0, LOGOUT_ID, 0, R.string.menu_logout); - return result; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) - { - switch (item.getItemId()) - { - case USERS_ID: - startActivity(new Intent(ChatActivity.this, UserViewActivity.class)); - return true; - - case LOGOUT_ID: - _service.logout(); - finish(); - return true; - } - - return super.onOptionsItemSelected(item); - } - - @Override - protected Dialog onCreateDialog(final int id) - { - if(id == DIALOG_MESSAGE_TOO_LONG) - { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Error"); - builder.setMessage("Message length exceeded, maximum length is " + MAX_MESSAGE_SIZE + " characters."); - return builder.create(); - } - - return super.onCreateDialog(id); - } - - private void sendText() - { - String t = _text.getText().toString().trim(); - if(t.length() == 0) - { - return; - } - if(t.length() > MAX_MESSAGE_SIZE) - { - showDialog(DIALOG_MESSAGE_TOO_LONG); - return; - } - _text.setText(""); - - _service.send(t); - } -} diff --git a/java/demo/android/chat/src/com/zeroc/chat/ChatUtils.java b/java/demo/android/chat/src/com/zeroc/chat/ChatUtils.java deleted file mode 100644 index 1734a886be9..00000000000 --- a/java/demo/android/chat/src/com/zeroc/chat/ChatUtils.java +++ /dev/null @@ -1,52 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.chat; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.TimeZone; - -public class ChatUtils -{ - // - // This function unescapes HTML entities in the data string - // and return the unescaped string. - // - public static String unstripHtml(String data) - { - data = data.replace(""", "\""); - data = data.replace("'", "'"); - data = data.replace("<", "<"); - data = data.replace(">", ">"); - data = data.replace("&", "&"); - return data; - } - - public static String formatTimestamp(long timestamp) - { - DateFormat dtf = new SimpleDateFormat("HH:mm:ss"); - dtf.setTimeZone(TimeZone.getDefault()); - return dtf.format(new Date(timestamp)); - } - - public static String formatUsername(String in) - { - try - { - in = in.substring(0, 1).toUpperCase() + in.substring(1, in.length()).toLowerCase(); - } - catch(IndexOutOfBoundsException ex) - { - } - return in; - } -}; - diff --git a/java/demo/android/chat/src/com/zeroc/chat/LoginActivity.java b/java/demo/android/chat/src/com/zeroc/chat/LoginActivity.java deleted file mode 100644 index d52fd1fcf99..00000000000 --- a/java/demo/android/chat/src/com/zeroc/chat/LoginActivity.java +++ /dev/null @@ -1,313 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.chat; - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.ComponentName; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.ServiceConnection; -import android.content.SharedPreferences; -import android.os.Bundle; -import android.os.IBinder; -import android.text.Editable; -import android.text.TextWatcher; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.EditText; -import android.os.Build.VERSION; - -import com.zeroc.chat.service.ChatService; -import com.zeroc.chat.service.Service; -import com.zeroc.chat.service.SessionListener; - -public class LoginActivity extends Activity -{ - private static final int DIALOG_ERROR = 1; - private static final int DIALOG_CONFIRM = 2; - private static final int DIALOG_INVALID_HOST = 3; - - private static final String DEFAULT_HOST = "demo.zeroc.com"; - private static final boolean DEFAULT_SECURE = false; - private static final String HOSTNAME_KEY = "host"; - private static final String USERNAME_KEY = "username"; - private static final String PASSWORD_KEY = "password"; - private static final String SECURE_KEY = "secure"; - - private Button _login; - private EditText _hostname; - private EditText _username; - private EditText _password; - private CheckBox _secure; - private SharedPreferences _prefs; - - private boolean _loginInProgress = false; - private Service _service; - private Intent _chatServiceIntent; - - private SessionListener _listener = new SessionListener() - { - public void onLoginInProgress() - { - _loginInProgress = true; - setLoginState(); - } - - public void onConnectConfirm() - { - showDialog(DIALOG_CONFIRM); - } - - public void onLogin() - { - startActivity(new Intent(LoginActivity.this, ChatActivity.class)); - } - - public void onLoginError() - { - setLoginState(); - showDialog(DIALOG_ERROR); - } - }; - - final private ServiceConnection _connection = new ServiceConnection() - { - public void onServiceConnected(ComponentName name, IBinder service) - { - // This is called when the connection with the service has been - // established, giving us the service object we can use to - // interact with the service. Because we have bound to a explicit - // service that we know is running in our own process, we can - // cast its IBinder to a concrete class and directly access it. - setLoginState(); - - _service = ((com.zeroc.chat.service.ChatService.LocalBinder)service).getService(); - _service.setSessionListener(_listener); - } - - public void onServiceDisconnected(ComponentName name) - { - } - }; - - private void setLoginState() - { - if(_loginInProgress) - { - _login.setEnabled(false); - } - else - { - String host = _hostname.getText().toString().trim(); - String username = _username.getText().toString().trim(); - _login.setEnabled(host.length() > 0 && username.length() > 0); - } - } - - private void login() - { - final String hostname = _hostname.getText().toString().trim(); - final String username = _username.getText().toString().trim(); - final String password = _password.getText().toString().trim(); - final boolean secure = _secure.isChecked(); - - // We don't want to save obviously bogus hostnames in the application - // preferences. These two regexp validates that the hostname is well - // formed. - // Note that this regexp doesn't handle IPv6 addresses. - final String hostre = "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\\-]*[A-Za-z0-9])$"; - final String ipre = "^([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"; - if(!hostname.matches(hostre) && !hostname.matches(ipre)) - { - showDialog(DIALOG_INVALID_HOST); - return; - } - - // Update preferences. - SharedPreferences.Editor edit = _prefs.edit(); - if(!_prefs.getString(HOSTNAME_KEY, DEFAULT_HOST).equals(hostname)) - { - edit.putString(HOSTNAME_KEY, hostname); - } - if(!_prefs.getString(USERNAME_KEY, "").equals(username)) - { - edit.putString(USERNAME_KEY, username); - } - if(!_prefs.getString(PASSWORD_KEY, "").equals(password)) - { - edit.putString(PASSWORD_KEY, password); - } - if(_prefs.getBoolean(SECURE_KEY, DEFAULT_SECURE) != secure) - { - edit.putBoolean(SECURE_KEY, secure); - } - edit.commit(); - - _login.setEnabled(false); - - // Kick off the login process. The activity is notified of changes - // in the login process through calls to the SessionListener. - _service.login(hostname, username, password, secure); - } - - @Override - protected void onResume() - { - super.onResume(); - - bindService(_chatServiceIntent, _connection, BIND_AUTO_CREATE); - } - - @Override - public void onStop() - { - super.onStop(); - unbindService(_connection); - - if(_service != null) - { - _service.setSessionListener(null); - _service = null; - } - } - - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.login); - - if(VERSION.SDK_INT == 8) // android.os.Build.VERSION_CODES.FROYO (8) - { - // - // Workaround for a bug in Android 2.2 (Froyo). - // - // See http://code.google.com/p/android/issues/detail?id=9431 - // - java.lang.System.setProperty("java.net.preferIPv4Stack", "true"); - java.lang.System.setProperty("java.net.preferIPv6Addresses", "false"); - } - - _login = (Button)findViewById(R.id.login); - _login.setOnClickListener(new android.view.View.OnClickListener() - { - public void onClick(android.view.View v) - { - login(); - } - }); - _login.setEnabled(false); - - _hostname = (EditText)findViewById(R.id.hostname); - _hostname.addTextChangedListener(new TextWatcher() - { - public void afterTextChanged(Editable s) - { - setLoginState(); - } - - public void beforeTextChanged(CharSequence s, int start, int count, int after) - { - } - - public void onTextChanged(CharSequence s, int start, int count, int after) - { - } - }); - - _username = (EditText)findViewById(R.id.username); - _username.addTextChangedListener(new TextWatcher() - { - public void afterTextChanged(Editable s) - { - setLoginState(); - } - - public void beforeTextChanged(CharSequence s, int start, int count, int after) - { - } - - public void onTextChanged(CharSequence s, int start, int count, int after) - { - } - }); - _password = (EditText)findViewById(R.id.password); - - _secure = (CheckBox)findViewById(R.id.secure); - _secure.setEnabled(VERSION.SDK_INT >= 8); // android.os.Build.VERSION_CODES.FROYO (8) - - _prefs = getPreferences(MODE_PRIVATE); - - if(savedInstanceState == null) - { - _hostname.setText(_prefs.getString(HOSTNAME_KEY, DEFAULT_HOST)); - _username.setText(_prefs.getString(USERNAME_KEY, "")); - _password.setText(_prefs.getString(PASSWORD_KEY, "")); - _secure.setChecked(_prefs.getBoolean(SECURE_KEY, DEFAULT_SECURE)); - } - - // Start the ChatService. - _chatServiceIntent = new Intent(LoginActivity.this, ChatService.class); - startService(_chatServiceIntent); - } - - @Override - protected Dialog onCreateDialog(int id) - { - switch (id) - { - case DIALOG_ERROR: - { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Error"); - builder.setMessage(""); // Details provided in onPrepareDialog - builder.setPositiveButton("Ok", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - _loginInProgress = false; - setLoginState(); - } - }); - return builder.create(); - } - - case DIALOG_INVALID_HOST: - { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Error"); - builder.setMessage("The hostname is invalid."); - builder.setPositiveButton("Ok", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - } - }); - return builder.create(); - } - - } - - return null; - } - - @Override - protected void onPrepareDialog(int id, Dialog dialog) - { - super.onPrepareDialog(id, dialog); - if(id == DIALOG_ERROR) - { - AlertDialog alert = (AlertDialog)dialog; - alert.setMessage(_service.getLoginError()); - } - } -} diff --git a/java/demo/android/chat/src/com/zeroc/chat/SessionActivity.java b/java/demo/android/chat/src/com/zeroc/chat/SessionActivity.java deleted file mode 100644 index dd669f69b57..00000000000 --- a/java/demo/android/chat/src/com/zeroc/chat/SessionActivity.java +++ /dev/null @@ -1,117 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.chat; - -import com.zeroc.chat.service.ChatRoomListener; -import com.zeroc.chat.service.ChatService; -import com.zeroc.chat.service.NoSessionException; -import com.zeroc.chat.service.Service; - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.ComponentName; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.ServiceConnection; -import android.os.IBinder; - -// Base of any activities that use the chat session. -public abstract class SessionActivity extends Activity -{ - protected static final int DIALOG_FATAL = 1; - protected Service _service; - - abstract ChatRoomListener getChatRoomListener(); - abstract boolean replayEvents(); - - final private ServiceConnection _connection = new ServiceConnection() - { - public void onServiceConnected(ComponentName name, IBinder service) - { - // This is called when the connection with the service has been - // established, giving us the service object we can use to - // interact with the service. Because we have bound to a explicit - // service that we know is running in our own process, we can - // cast its IBinder to a concrete class and directly access it. - _service = ((com.zeroc.chat.service.ChatService.LocalBinder)service).getService(); - try - { - String hostname = _service.addChatRoomListener(getChatRoomListener(), replayEvents()); - setTitle(hostname); - } - catch(NoSessionException e) - { - finish(); - } - } - - public void onServiceDisconnected(ComponentName name) - { - } - }; - - @Override - public void onResume() - { - super.onResume(); - bindService(new Intent(SessionActivity.this, ChatService.class), _connection, BIND_AUTO_CREATE); - } - - @Override - public void onStop() - { - super.onStop(); - unbindService(_connection); - if(_service != null) - { - _service.removeChatRoomListener(getChatRoomListener()); - _service = null; - } - } - - @Override - protected Dialog onCreateDialog(final int id) - { - switch(id) - { - case DIALOG_FATAL: - { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Error"); - builder.setMessage(""); // Details provided in onPrepareDialog - builder.setCancelable(false); - builder.setPositiveButton("Ok", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - _service.logout(); - finish(); - } - }); - return builder.create(); - } - - } - - return null; - } - - @Override - protected void onPrepareDialog(int id, Dialog dialog) - { - super.onPrepareDialog(id, dialog); - if(id == DIALOG_FATAL) - { - AlertDialog alert = (AlertDialog)dialog; - alert.setMessage(_service.getSessionError()); - } - } -} diff --git a/java/demo/android/chat/src/com/zeroc/chat/UserViewActivity.java b/java/demo/android/chat/src/com/zeroc/chat/UserViewActivity.java deleted file mode 100644 index b4bea76b5a3..00000000000 --- a/java/demo/android/chat/src/com/zeroc/chat/UserViewActivity.java +++ /dev/null @@ -1,81 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.chat; - -import java.util.ArrayList; -import java.util.List; - -import android.os.Bundle; -import android.widget.ArrayAdapter; -import android.widget.ListView; - -import com.zeroc.chat.service.ChatRoomListener; - -public class UserViewActivity extends SessionActivity -{ - private List<String> _users = new ArrayList<String>(); - private ArrayAdapter<String> _adapter; - - private ChatRoomListener _listener = new ChatRoomListener() - { - public void init(final List<String> users) - { - _users.clear(); - _users.addAll(users); - _adapter.notifyDataSetChanged(); - } - - public void join(long timestamp, final String name) - { - _adapter.add(name); - } - - public void leave(long timestamp, final String name) - { - _adapter.remove(name); - } - - public void send(long timestamp, String name, String message) - { - } - - public void error() - { - showDialog(DIALOG_FATAL); - } - - public void inactivity() - { - showDialog(DIALOG_FATAL); - } - }; - - ChatRoomListener getChatRoomListener() - { - return _listener; - } - - boolean replayEvents() - { - return false; - } - - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.user); - - ListView userList = (ListView)findViewById(R.id.list); - _adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, _users); - userList.setAdapter(_adapter); - } -} diff --git a/java/demo/android/chat/src/com/zeroc/chat/service/AppSession.java b/java/demo/android/chat/src/com/zeroc/chat/service/AppSession.java deleted file mode 100644 index 28bf2e16d04..00000000000 --- a/java/demo/android/chat/src/com/zeroc/chat/service/AppSession.java +++ /dev/null @@ -1,392 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.chat.service; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.UUID; - -import com.zeroc.chat.R; - -import android.content.res.Resources; -import android.os.Handler; - -public class AppSession -{ - private Ice.Communicator _communicator; - private Chat.ChatSessionPrx _session; - private List<ChatRoomListener> _listeners = new LinkedList<ChatRoomListener>(); - private LinkedList<ChatEventReplay> _replay = new LinkedList<ChatEventReplay>(); - private List<String> _users = new LinkedList<String>(); - - static final int MAX_MESSAGES = 200; - private static final int INACTIVITY_TIMEOUT = 5 * 60 * 1000; // 5 Minutes - - private boolean _destroyed = false; - private long _lastSend; - private long _refreshTimeout; - private Glacier2.RouterPrx _router; - private Handler _handler; - private String _hostname; - private String _error; - - public AppSession(Resources resources, Handler handler, String hostname, String username, - String password, boolean secure) - throws Glacier2.CannotCreateSessionException, Glacier2.PermissionDeniedException - { - _handler = handler; - - Ice.InitializationData initData = new Ice.InitializationData(); - - initData.properties = Ice.Util.createProperties(); - initData.properties.setProperty("Ice.ACM.Client", "0"); - initData.properties.setProperty("Ice.RetryIntervals", "-1"); - initData.properties.setProperty("Ice.Trace.Network", "0"); - initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory"); - initData.properties.setProperty("Ice.InitPlugins", "0"); - initData.properties.setProperty("IceSSL.TruststoreType", "BKS"); - initData.properties.setProperty("IceSSL.Password", "password"); - - _communicator = Ice.Util.initialize(initData); - _hostname = hostname; - - String s; - if(secure) - { - java.io.InputStream certStream; - certStream = resources.openRawResource(R.raw.client); - - IceSSL.Plugin plugin = (IceSSL.Plugin)_communicator.getPluginManager().getPlugin("IceSSL"); - plugin.setTruststoreStream(certStream); - _communicator.getPluginManager().initializePlugins(); - s = "Glacier2/router:ssl -p 4064 -h " + hostname + " -t 10000"; - } - else - { - s = "Glacier2/router:tcp -p 4502 -h " + hostname + " -t 10000"; - } - - Ice.ObjectPrx proxy = _communicator.stringToProxy(s); - Ice.RouterPrx r = Ice.RouterPrxHelper.uncheckedCast(proxy); - - _communicator.setDefaultRouter(r); - - _router = Glacier2.RouterPrxHelper.checkedCast(r); - Glacier2.SessionPrx glacier2session = _router.createSession(username, password); - _session = Chat.ChatSessionPrxHelper.uncheckedCast(glacier2session); - - Ice.ObjectAdapter adapter = _communicator.createObjectAdapterWithRouter("ChatDemo.Client", _router); - - Ice.Identity callbackId = new Ice.Identity(); - callbackId.name = UUID.randomUUID().toString(); - callbackId.category = _router.getCategoryForClient(); - - Ice.ObjectPrx cb = adapter.add(new ChatCallbackI(), callbackId); - _session.setCallback(Chat.ChatRoomCallbackPrxHelper.uncheckedCast(cb)); - - adapter.activate(); - _lastSend = System.currentTimeMillis(); - - _refreshTimeout = (_router.getSessionTimeout() * 1000) / 2; - } - - synchronized public long getRefreshTimeout() - { - return _refreshTimeout; - } - - synchronized public void destroy() - { - if(_destroyed) - { - return; - } - _destroyed = true; - - _session = null; - new Thread(new Runnable() - { - public void run() - { - try - { - _router.destroySession(); - } - catch(Exception ex) - { - } - - try - { - _communicator.destroy(); - } - catch(Ice.LocalException e) - { - } - _communicator = null; - } - }).start(); - } - - synchronized public String getError() - { - return _error; - } - - // This method is only called by the UI thread. - synchronized public void send(String t) - { - if(_destroyed) - { - return; - } - - _lastSend = System.currentTimeMillis(); - Chat.Callback_ChatSession_send cb = new Chat.Callback_ChatSession_send() - { - @Override - public void exception(Ice.LocalException ex) - { - destroyWithError(ex.toString()); - } - - @Override - public void exception(Ice.UserException ex) - { - destroyWithError(ex.toString()); - } - - @Override - public void response(long ret) - { - } - }; - _session.begin_send(t, cb); - } - - // This method is only called by the UI thread. - public synchronized String addChatRoomListener(ChatRoomListener cb, boolean replay) - { - _listeners.add(cb); - cb.init(_users); - - if(replay) - { - // Replay the entire state. - for(ChatEventReplay r : _replay) - { - r.replay(cb); - } - } - - if(_error != null) - { - cb.error(); - } - - return _hostname; - } - - // This method is only called by the UI thread. - synchronized public void removeChatRoomListener(ChatRoomListener cb) - { - _listeners.remove(cb); - } - - // Returns false if the session has been destroyed, true otherwise. - synchronized public boolean refresh() - { - if(_destroyed) - { - return false; - } - - // If the user has not sent a message in the INACTIVITY_TIMEOUT interval - // then drop the session. - if(System.currentTimeMillis() - _lastSend > INACTIVITY_TIMEOUT) - { - destroy(); - _error = "The session was dropped due to inactivity."; - - final List<ChatRoomListener> copy = new ArrayList<ChatRoomListener>(_listeners); - _handler.post(new Runnable() - { - public void run() - { - for(ChatRoomListener listener : copy) - { - listener.inactivity(); - } - } - }); - return false; - } - - try - { - _session.begin_ice_ping(new Ice.Callback_Object_ice_ping() - { - @Override - public void response() - { - } - - @Override - public void exception(final Ice.LocalException ex) - { - destroyWithError(ex.toString()); - } - }); - } - catch(Ice.LocalException e) - { - destroyWithError(e.toString()); - return false; - } - - return true; - } - - private interface ChatEventReplay - { - public void replay(ChatRoomListener cb); - } - - private class ChatCallbackI extends Chat._ChatRoomCallbackDisp - { - synchronized public void init(String[] users, Ice.Current current) - { - final List<String> u = Arrays.asList(users); - _users.clear(); - _users.addAll(u); - - // No replay event for init. - final List<ChatRoomListener> copy = new ArrayList<ChatRoomListener>(_listeners); - _handler.post(new Runnable() - { - public void run() - { - for(ChatRoomListener listener : copy) - { - listener.init(u); - } - } - }); - } - - synchronized public void join(final long timestamp, final String name, Ice.Current current) - { - _replay.add(new ChatEventReplay() - { - public void replay(ChatRoomListener cb) - { - cb.join(timestamp, name); - } - }); - if(_replay.size() > MAX_MESSAGES) - { - _replay.removeFirst(); - } - - _users.add(name); - - final List<ChatRoomListener> copy = new ArrayList<ChatRoomListener>(_listeners); - _handler.post(new Runnable() - { - public void run() - { - for(ChatRoomListener listener : copy) - { - listener.join(timestamp, name); - } - } - }); - } - - synchronized public void leave(final long timestamp, final String name, Ice.Current current) - { - _replay.add(new ChatEventReplay() - { - public void replay(ChatRoomListener cb) - { - cb.leave(timestamp, name); - } - }); - if(_replay.size() > MAX_MESSAGES) - { - _replay.removeFirst(); - } - - _users.remove(name); - - final List<ChatRoomListener> copy = new ArrayList<ChatRoomListener>(_listeners); - _handler.post(new Runnable() - { - public void run() - { - for(ChatRoomListener listener : copy) - { - listener.leave(timestamp, name); - } - } - }); - } - - synchronized public void send(final long timestamp, final String name, final String message, Ice.Current current) - { - _replay.add(new ChatEventReplay() - { - public void replay(ChatRoomListener cb) - { - cb.send(timestamp, name, message); - } - }); - if(_replay.size() > MAX_MESSAGES) - { - _replay.removeFirst(); - } - - final List<ChatRoomListener> copy = new ArrayList<ChatRoomListener>(_listeners); - _handler.post(new Runnable() - { - public void run() - { - for(ChatRoomListener listener : copy) - { - listener.send(timestamp, name, message); - } - } - }); - } - - public static final long serialVersionUID = 1; - } - - // Any exception destroys the session. - synchronized private void destroyWithError(final String msg) - { - destroy(); - _error = msg; - - final List<ChatRoomListener> copy = new ArrayList<ChatRoomListener>(_listeners); - _handler.post(new Runnable() - { - public void run() - { - for(ChatRoomListener listener : copy) - { - listener.error(); - } - } - }); - } -} diff --git a/java/demo/android/chat/src/com/zeroc/chat/service/ChatRoomListener.java b/java/demo/android/chat/src/com/zeroc/chat/service/ChatRoomListener.java deleted file mode 100644 index c9582fcd303..00000000000 --- a/java/demo/android/chat/src/com/zeroc/chat/service/ChatRoomListener.java +++ /dev/null @@ -1,72 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** -package com.zeroc.chat.service; - -public interface ChatRoomListener -{ - /** - * - * Called when the listener is attached to the chat session. - * This provides the client with the initial list of users - * currently in the chat room. - * - * @param users The names of users currently in the chat room. - * - **/ - void init(java.util.List<String> users); - - /** - * - * Called when a new user joins the chat room. - * - * @param name The name of the user that joined the chat room. - * - * @param timestamp The time at which the user joined the chat room. - * - **/ - void join(long timestamp, String name); - - /** - * - * Called when a user leaves the chat room. - * - * @param name The name of the user that joined the chat room. - * - * @param timestamp The time at which the user joined the chat room. - * - **/ - void leave(long timestamp, String name); - /** - * - * Called when a user sends a message. - * - * @param name The name of the user that send the message. - * - * @param message The contents of the message. - * - * @param timestamp The time at which the message was sent. - * - **/ - void send(long timestamp, String name, String message); - - /** - * - * Called upon an error when communicating with the chat room. Once this - * method is called the chat session has been destroyed. - * - */ - void error(); - - /** - * - * Called if the chat room has been inactive for too long. Once this - * method is called the chat session has been destroyed. - */ - void inactivity(); -} diff --git a/java/demo/android/chat/src/com/zeroc/chat/service/ChatService.java b/java/demo/android/chat/src/com/zeroc/chat/service/ChatService.java deleted file mode 100644 index 1b3f238c12e..00000000000 --- a/java/demo/android/chat/src/com/zeroc/chat/service/ChatService.java +++ /dev/null @@ -1,271 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** -package com.zeroc.chat.service; - -import android.app.AlarmManager; -import android.app.Notification; -import android.app.NotificationManager; -import android.app.PendingIntent; -import android.app.Service; -import android.content.Intent; -import android.os.Binder; -import android.os.Handler; -import android.os.IBinder; -import android.os.SystemClock; - -import com.zeroc.chat.ChatActivity; -import com.zeroc.chat.R; - -public class ChatService extends Service implements com.zeroc.chat.service.Service -{ - private static final int CHATACTIVE_NOTIFICATION = 0; - private static final String REFRESH_EXTRA = "refresh"; - private AppSession _session = null; - private boolean _confirmConnectionInProgress = false; - private SessionListener _listener; - private boolean _loginInProgress; - private Handler _handler; - private String _loginError; - - public class LocalBinder extends Binder - { - public com.zeroc.chat.service.Service getService() - { - return ChatService.this; - } - } - - @Override - public IBinder onBind(Intent intent) - { - return new LocalBinder(); - } - - @Override - public void onCreate() - { - super.onCreate(); - _handler = new Handler(); - } - - @Override - public void onDestroy() - { - super.onDestroy(); - logout(); - } - - @Override - synchronized public void onStart(Intent intent, int startId) - { - // Find out if we were started by the alarm manager - // to refresh the current session. - if(intent.hasExtra(REFRESH_EXTRA)) - { - // If there is no associated session, or the refresh failed then - // mark the session as destroyed. - if(_session == null || !_session.refresh()) - { - sessionDestroyed(); - } - } - } - - // Called only from the UI thread. - synchronized public boolean setSessionListener(SessionListener cb) - { - _listener = cb; - if(_listener == null) - { - return false; - } - if(_loginInProgress) - { - if(_confirmConnectionInProgress) - { - _listener.onConnectConfirm(); - } - else - { - _listener.onLoginInProgress(); - } - } - else if(_session != null) - { - _listener.onLogin(); - } - else if(_loginError != null) - { - _listener.onLoginError(); - } - return _loginInProgress; - } - - synchronized public void logout() - { - if(_session != null) - { - _session.destroy(); - _session = null; - - sessionDestroyed(); - } - } - - synchronized public void login(final String hostname, final String username, final String password, - final boolean secure) - { - assert _session == null; - assert !_loginInProgress; - - _loginError = null; - _loginInProgress = true; - - new Thread(new Runnable() - { - public void run() - { - try - { - loginComplete(new AppSession(getResources(), _handler, hostname, username, password, secure), hostname); - } - catch(final Glacier2.CannotCreateSessionException ex) - { - ex.printStackTrace(); - postLoginFailure(String.format("Session creation failed: %s", ex.toString())); - } - catch(final Glacier2.PermissionDeniedException ex) - { - ex.printStackTrace(); - postLoginFailure(String.format("Login failed: %s", ex.toString())); - } - catch(final Ice.LocalException ex) - { - ex.printStackTrace(); - postLoginFailure(String.format("Login failed: %s", ex.toString())); - } - finally - { - synchronized(ChatService.this) - { - _loginInProgress = false; - } - } - } - }).start(); - } - - synchronized public String addChatRoomListener(ChatRoomListener listener, boolean replay) throws NoSessionException - { - if(_session == null) - { - throw new NoSessionException(); - } - return _session.addChatRoomListener(listener, replay); - } - - synchronized public void removeChatRoomListener(ChatRoomListener listener) - { - if(_session != null) - { - _session.removeChatRoomListener(listener); - } - } - - synchronized public void send(String message) - { - if(_session != null) - { - _session.send(message); - } - } - - synchronized public String getLoginError() - { - return _loginError; - } - - synchronized public String getSessionError() - { - return _session.getError(); - } - - synchronized private void postLoginFailure(final String loginError) - { - _loginError = loginError; - if(_listener != null) - { - final SessionListener listener = _listener; - _handler.post(new Runnable() - { - public void run() - { - listener.onLoginError(); - } - }); - } - } - - synchronized private void loginComplete(AppSession session, String hostname) - { - _session = session; - - // Set up an alarm to refresh the session. - Intent intent = new Intent(ChatService.this, ChatService.class); - intent.putExtra(REFRESH_EXTRA, true); - PendingIntent sender = PendingIntent.getService(ChatService.this, 0, intent, 0); - - long refreshTimeout = _session.getRefreshTimeout(); - - long firstTime = SystemClock.elapsedRealtime() + refreshTimeout; - - AlarmManager am = (AlarmManager)getSystemService(ALARM_SERVICE); - am.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, firstTime, refreshTimeout, sender); - - // Display a notification that the user is logged in. - Notification notification = new Notification(R.drawable.stat_notify, "Logged In", System.currentTimeMillis()); - PendingIntent contentIntent = PendingIntent.getActivity(this, 0, new Intent(this, ChatActivity.class), 0); - notification.setLatestEventInfo(this, "Chat Demo", "You are logged into " + hostname, contentIntent); - NotificationManager n = (NotificationManager)getSystemService(NOTIFICATION_SERVICE); - n.notify(CHATACTIVE_NOTIFICATION, notification); - - if(_listener != null) - { - final SessionListener listener = _listener; - - _handler.post(new Runnable() - { - public void run() - { - listener.onLogin(); - } - }); - } - } - - private void cancelRefreshTimer() - { - Intent intent = new Intent(ChatService.this, ChatService.class); - intent.putExtra(REFRESH_EXTRA, true); - PendingIntent sender = PendingIntent.getService(ChatService.this, 0, intent, 0); - - // And cancel the alarm. - AlarmManager am = (AlarmManager)getSystemService(ALARM_SERVICE); - am.cancel(sender); - } - - private void sessionDestroyed() - { - cancelRefreshTimer(); - NotificationManager n = (NotificationManager)getSystemService(NOTIFICATION_SERVICE); - // Cancel the notification -- we use the same ID that we had used to - // start it - n.cancel(CHATACTIVE_NOTIFICATION); - } -} diff --git a/java/demo/android/chat/src/com/zeroc/chat/service/NoSessionException.java b/java/demo/android/chat/src/com/zeroc/chat/service/NoSessionException.java deleted file mode 100644 index 8b46e5dab06..00000000000 --- a/java/demo/android/chat/src/com/zeroc/chat/service/NoSessionException.java +++ /dev/null @@ -1,16 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.chat.service; - -public class NoSessionException extends Exception -{ - private static final long serialVersionUID = -3888249827517322820L; -} - diff --git a/java/demo/android/chat/src/com/zeroc/chat/service/Service.java b/java/demo/android/chat/src/com/zeroc/chat/service/Service.java deleted file mode 100644 index 558f3b9484a..00000000000 --- a/java/demo/android/chat/src/com/zeroc/chat/service/Service.java +++ /dev/null @@ -1,105 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.chat.service; - -public interface Service -{ - /** - * - * Set a new session listener. - * - * @param listener - * The new session listener. - * - * @return true if a login is already in progress, false otherwise. - * - */ - boolean setSessionListener(SessionListener listener); - - /** - * - * Establish a session with the chat server. - * - * @param hostname - * The chat server host. - * - * @param username - * The username. - * - * @param password - * The password. - * - * @param secure - * True if a secure session should be established, false - * otherwise. - * - */ - void login(String hostname, String username, String password, boolean secure); - - /** - * - * Get the last login failure error message. - * - * @return The last login error. - * - */ - String getLoginError(); - - /** - * - * Called to logout from the current session. - * - */ - void logout(); - - /** - * - * Add a chat room listener. - * - * @param listener - * The listener. - * - * @param replay - * True if all received events should be replayed. - * - * @return The name of the host of the session. - * - * @throws NoSessionException - * if there is no established session. - * - */ - String addChatRoomListener(ChatRoomListener listener, boolean replay) throws NoSessionException; - - /** - * - * Remove a chat room listener. - * - * @param listener - * The listener. - * - */ - void removeChatRoomListener(ChatRoomListener listener); - - /** - * - * Send a message to the chat room. - * - */ - void send(String message); - - /** - * - * Get the last session error message. - * - * @return The last session error. - * - */ - String getSessionError(); -} diff --git a/java/demo/android/chat/src/com/zeroc/chat/service/SessionListener.java b/java/demo/android/chat/src/com/zeroc/chat/service/SessionListener.java deleted file mode 100644 index 08a6a5460dc..00000000000 --- a/java/demo/android/chat/src/com/zeroc/chat/service/SessionListener.java +++ /dev/null @@ -1,29 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** -package com.zeroc.chat.service; - -public interface SessionListener -{ - /** Called when a login is in progress. */ - void onLoginInProgress(); - - /** Called when a new session has been established. */ - void onLogin(); - - /** Called to confirm a connection to a server. */ - void onConnectConfirm(); - - /** - * Called if the establishment of a session failed. - * - * @param ex - * The error. - */ - void onLoginError(); -} diff --git a/java/demo/android/hello/.gitignore b/java/demo/android/hello/.gitignore deleted file mode 100644 index 264dd4dfe2f..00000000000 --- a/java/demo/android/hello/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -generated/* -bin/* diff --git a/java/demo/android/hello/.settings/com.zeroc.Slice2JavaPlugin.prefs b/java/demo/android/hello/.settings/com.zeroc.Slice2JavaPlugin.prefs deleted file mode 100644 index cedd679aad3..00000000000 --- a/java/demo/android/hello/.settings/com.zeroc.Slice2JavaPlugin.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Thu Dec 18 13:31:38 NST 2008 -eclipse.preferences.version=1 -jars= diff --git a/java/demo/android/hello/.settings/org.eclipse.jdt.core.prefs b/java/demo/android/hello/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index cbdf72437c9..00000000000 --- a/java/demo/android/hello/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,261 +0,0 @@ -#Mon Dec 08 10:55:23 NST 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=52 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=21 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=8 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/java/demo/android/hello/.settings/org.eclipse.jdt.ui.prefs b/java/demo/android/hello/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index a8c1409f4c5..00000000000 --- a/java/demo/android/hello/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Wed Oct 29 12:19:00 NDT 2008 -eclipse.preferences.version=1 -formatter_profile=_ZeroC -formatter_settings_version=11 -org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">// **********************************************************************\n//\n// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\n//\n// This copy of Ice is licensed to you under the terms described in the\n// ICE_LICENSE file included in this distribution.\n//\n// **********************************************************************</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/java/demo/android/hello/AndroidManifest.xml b/java/demo/android/hello/AndroidManifest.xml deleted file mode 100644 index e60fa33d40b..00000000000 --- a/java/demo/android/hello/AndroidManifest.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.zeroc.hello" - android:versionCode="1" - android:versionName="1.0.0"> - <uses-permission android:name="android.permission.INTERNET"></uses-permission> - <!-- - http://developer.android.com/guide/topics/manifest/uses-sdk-element.html - --> - <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/> - <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="HelloApp" - android:allowBackup="false"> - <activity android:name=".HelloWorld" android:label="@string/app_name"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> -</manifest> diff --git a/java/demo/android/hello/README b/java/demo/android/hello/README deleted file mode 100644 index 171da763198..00000000000 --- a/java/demo/android/hello/README +++ /dev/null @@ -1,9 +0,0 @@ -This directory contains an Eclipse project for the hello client. - -The hello client is the Android equivalent of our command-line demo -of the same name. In order to use this client, you must run a hello -server and enter the server's address in the client's "Hostname" -field. You can use a server from your Ice installation. - -Please refer to the release notes for instructions on configuring -your environment to use Ice in an Android project. diff --git a/java/demo/android/hello/gen/com/zeroc/hello/BuildConfig.java b/java/demo/android/hello/gen/com/zeroc/hello/BuildConfig.java deleted file mode 100644 index 492b4921bba..00000000000 --- a/java/demo/android/hello/gen/com/zeroc/hello/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package com.zeroc.hello; - -public final class BuildConfig { - public final static boolean DEBUG = true; -}
\ No newline at end of file diff --git a/java/demo/android/hello/gen/com/zeroc/hello/R.java b/java/demo/android/hello/gen/com/zeroc/hello/R.java deleted file mode 100644 index 964369ace61..00000000000 --- a/java/demo/android/hello/gen/com/zeroc/hello/R.java +++ /dev/null @@ -1,39 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package com.zeroc.hello; - -public final class R { - public static final class attr { - } - public static final class drawable { - public static final int icon=0x7f020000; - } - public static final class id { - public static final int activity=0x7f060009; - public static final int delay=0x7f060004; - public static final int delayView=0x7f060005; - public static final int flush=0x7f060008; - public static final int hostname=0x7f060000; - public static final int mode=0x7f060001; - public static final int sayHello=0x7f060006; - public static final int shutdown=0x7f060007; - public static final int status=0x7f06000a; - public static final int timeout=0x7f060002; - public static final int timeoutView=0x7f060003; - } - public static final class layout { - public static final int main=0x7f030000; - } - public static final class raw { - public static final int client=0x7f040000; - } - public static final class string { - public static final int app_name=0x7f050001; - public static final int hello=0x7f050000; - } -} diff --git a/java/demo/android/hello/project.properties b/java/demo/android/hello/project.properties deleted file mode 100644 index b7c2081d560..00000000000 --- a/java/demo/android/hello/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-10 diff --git a/java/demo/android/hello/res/drawable/icon.png b/java/demo/android/hello/res/drawable/icon.png Binary files differdeleted file mode 100644 index 75024841d32..00000000000 --- a/java/demo/android/hello/res/drawable/icon.png +++ /dev/null diff --git a/java/demo/android/hello/res/layout-land/main.xml b/java/demo/android/hello/res/layout-land/main.xml deleted file mode 100644 index 9fe2f5a868e..00000000000 --- a/java/demo/android/hello/res/layout-land/main.xml +++ /dev/null @@ -1,172 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:padding="5dip" - xmlns:android="http://schemas.android.com/apk/res/android"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="30" - android:text="Hostname" - /> - - <EditText - android:id ="@+id/hostname" - android:hint="hostname" - android:text="10.0.2.2" - android:layout_width="0dip" - android:layout_weight="75" - android:layout_height="wrap_content" - /> - - <TextView - android:layout_width="0dip" - android:layout_weight="30" - android:layout_height="wrap_content" - android:text="Mode" - android:paddingLeft="5dip" - android:layout_gravity="center_vertical" - /> - - <Spinner - android:id="@+id/mode" - android:layout_width="0dip" - android:layout_weight="75" - android:layout_height="wrap_content" - android:drawSelectorOnTop="false"/> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="30" - android:layout_gravity="center_vertical" - android:text="Timeout" - /> - - <SeekBar - android:id="@+id/timeout" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="60" - android:max="9900" /> - - <TextView - android:id="@+id/timeoutView" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="15" - android:layout_gravity="center_vertical" - android:paddingLeft="5dip" - android:text="0.0" - /> - - <TextView - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="30" - android:layout_gravity="center_vertical" - android:paddingLeft="5dip" - android:text="Delay" - /> - - <SeekBar - android:id="@+id/delay" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="60" - android:max="9900"/> - - <TextView - android:id="@+id/delayView" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="15" - android:layout_gravity="center_vertical" - android:paddingLeft="5dip" - android:text="0.0" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginTop="20dip" - android:gravity="center"> - - <Button - android:id="@+id/sayHello" - android:text="Hello World!" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - /> - - <Button - android:id="@+id/shutdown" - android:text="Shutdown" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - /> - - <Button - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:id="@+id/flush" - android:text="Flush" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_marginTop="20dip" - android:orientation="horizontal"> - - <LinearLayout - android:layout_width="0dip" - android:layout_weight="25" - android:layout_height="fill_parent" - > - - <ProgressBar - android:id="@+id/activity" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_gravity="center" - android:layout_marginLeft="15dip" - /> - </LinearLayout> - - <TextView - android:id="@+id/status" - android:layout_gravity="center_vertical" - android:layout_width="0dip" - android:layout_weight="75" - android:layout_height="wrap_content" - android:text="" - /> - - </LinearLayout> - -</LinearLayout> diff --git a/java/demo/android/hello/res/layout/main.xml b/java/demo/android/hello/res/layout/main.xml deleted file mode 100644 index d6b5c741320..00000000000 --- a/java/demo/android/hello/res/layout/main.xml +++ /dev/null @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:padding="5dip" - xmlns:android="http://schemas.android.com/apk/res/android"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="25" - android:text="Hostname" - /> - - <EditText - android:id ="@+id/hostname" - android:hint="hostname" - android:text="10.0.2.2" - android:layout_width="0dip" - android:layout_weight="75" - android:layout_height="wrap_content" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_width="0dip" - android:layout_weight="25" - android:layout_height="wrap_content" - android:text="Mode" - android:layout_gravity="center_vertical" - /> - - <Spinner - android:id="@+id/mode" - android:layout_width="0dip" - android:layout_weight="75" - android:layout_height="wrap_content" - android:drawSelectorOnTop="false"/> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="25" - android:layout_gravity="center_vertical" - android:text="Timeout" - /> - - <SeekBar - android:id="@+id/timeout" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="65" - android:max="9900" - /> - - <TextView - android:id="@+id/timeoutView" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="10" - android:layout_gravity="center_vertical" - android:paddingLeft="5dip" - android:text="0.0" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="25" - android:layout_gravity="center_vertical" - android:text="Delay" - /> - - <SeekBar - android:id="@+id/delay" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="65" - android:max="9900"/> - - <TextView - android:id="@+id/delayView" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="10" - android:layout_gravity="center_vertical" - android:paddingLeft="5dip" - android:text="0.0" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginTop="20dip" - android:gravity="center"> - - <Button - android:id="@+id/sayHello" - android:text="Hello World!" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - /> - - <Button - android:id="@+id/shutdown" - android:text="Shutdown" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - /> - - <Button - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:id="@+id/flush" - android:text="Flush" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_marginTop="20dip" - android:orientation="horizontal"> - - <LinearLayout - android:layout_width="0dip" - android:layout_weight="25" - android:layout_height="fill_parent" - > - - <ProgressBar - android:id="@+id/activity" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_gravity="center" - android:layout_marginLeft="15dip" - /> - </LinearLayout> - - <TextView - android:id="@+id/status" - android:layout_gravity="center_vertical" - android:layout_width="0dip" - android:layout_weight="75" - android:layout_height="wrap_content" - android:text="" - /> - - </LinearLayout> - -</LinearLayout> diff --git a/java/demo/android/hello/res/raw/client.bks b/java/demo/android/hello/res/raw/client.bks Binary files differdeleted file mode 100644 index 538d360fac0..00000000000 --- a/java/demo/android/hello/res/raw/client.bks +++ /dev/null diff --git a/java/demo/android/hello/res/values/strings.xml b/java/demo/android/hello/res/values/strings.xml deleted file mode 100644 index 2274e543e9f..00000000000 --- a/java/demo/android/hello/res/values/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <string name="hello">Hello World, HelloWorld</string> - <string name="app_name">Hello World</string> -</resources> diff --git a/java/demo/android/hello/slice/Hello.ice b/java/demo/android/hello/slice/Hello.ice deleted file mode 100644 index 3e548e149a1..00000000000 --- a/java/demo/android/hello/slice/Hello.ice +++ /dev/null @@ -1,21 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -module Demo -{ - -interface Hello -{ - idempotent void sayHello(int delay); - void shutdown(); -}; - -}; diff --git a/java/demo/android/hello/src/com/zeroc/hello/.gitignore b/java/demo/android/hello/src/com/zeroc/hello/.gitignore deleted file mode 100644 index 48c0296968b..00000000000 --- a/java/demo/android/hello/src/com/zeroc/hello/.gitignore +++ /dev/null @@ -1 +0,0 @@ -R.java diff --git a/java/demo/android/hello/src/com/zeroc/hello/HelloApp.java b/java/demo/android/hello/src/com/zeroc/hello/HelloApp.java deleted file mode 100644 index 8923e84f28b..00000000000 --- a/java/demo/android/hello/src/com/zeroc/hello/HelloApp.java +++ /dev/null @@ -1,157 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.hello; - -import android.app.Application; -import android.os.Build.VERSION; - -public class HelloApp extends Application -{ - interface CommunicatorCallback - { - void onWait(); - void onCreate(Ice.Communicator communicator); - void onError(Ice.LocalException ex); - } - - /** Called when the application is starting, before any other application objects have been created. */ - @Override - public void onCreate() - { - super.onCreate(); - - if(VERSION.SDK_INT == 8) // android.os.Build.VERSION_CODES.FROYO (8) - { - // - // Workaround for a bug in Android 2.2 (Froyo). - // - // See http://code.google.com/p/android/issues/detail?id=9431 - // - java.lang.System.setProperty("java.net.preferIPv4Stack", "true"); - java.lang.System.setProperty("java.net.preferIPv6Addresses", "false"); - } - - // SSL initialization can take some time. To avoid blocking the - // calling thread, we perform the initialization in a separate thread. - new Thread(new Runnable() - { - public void run() - { - initializeCommunicator(); - } - }).start(); - } - - /** Called when the application is stopping. */ - @Override - public void onTerminate() - { - super.onTerminate(); - if(_communicator != null) - { - try - { - _communicator.destroy(); - } - catch(Ice.LocalException ex) - { - } - } - } - - public void - setCommunicatorCallback(CommunicatorCallback cb) - { - if(_initialized) - { - if(_ex != null) - { - cb.onError(_ex); - } - else - { - cb.onCreate(_communicator); - } - } - else - { - _cb = cb; - _cb.onWait(); - } - } - - private void initializeCommunicator() - { - try - { - Ice.Communicator communicator; - Ice.InitializationData initData = new Ice.InitializationData(); - initData.properties = Ice.Util.createProperties(); - initData.properties.setProperty("Ice.Trace.Network", "3"); - - // - // Only configure IceSSL if we are using Froyo or later. - // - if(VERSION.SDK_INT >= 8) // android.os.Build.VERSION_CODES.FROYO (8) - { - initData.properties.setProperty("IceSSL.Trace.Security", "3"); - initData.properties.setProperty("IceSSL.KeystoreType", "BKS"); - initData.properties.setProperty("IceSSL.TruststoreType", "BKS"); - initData.properties.setProperty("IceSSL.Password", "password"); - initData.properties.setProperty("Ice.InitPlugins", "0"); - initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory"); - } - - communicator = Ice.Util.initialize(initData); - - if(VERSION.SDK_INT >= 8) // android.os.Build.VERSION_CODES.FROYO (8) - { - IceSSL.Plugin plugin = (IceSSL.Plugin)communicator.getPluginManager().getPlugin("IceSSL"); - // - // Be sure to pass the same input stream to the SSL plug-in for - // both the keystore and the truststore. This makes startup a - // little faster since the plugin will not initialize - // two keystores. - // - java.io.InputStream certs = getResources().openRawResource(R.raw.client); - plugin.setKeystoreStream(certs); - plugin.setTruststoreStream(certs); - communicator.getPluginManager().initializePlugins(); - } - - synchronized(this) - { - _communicator = communicator; - if(_cb != null) - { - _cb.onCreate(_communicator); - } - _initialized = true; - } - } - catch(Ice.LocalException ex) - { - synchronized(this) - { - if(_cb != null) - { - _cb.onError(ex); - } - _ex = ex; - _initialized = true; - } - } - } - - private Ice.Communicator _communicator; - private boolean _initialized; - private Ice.LocalException _ex; - private CommunicatorCallback _cb; -} diff --git a/java/demo/android/hello/src/com/zeroc/hello/HelloWorld.java b/java/demo/android/hello/src/com/zeroc/hello/HelloWorld.java deleted file mode 100644 index 491e7692dda..00000000000 --- a/java/demo/android/hello/src/com/zeroc/hello/HelloWorld.java +++ /dev/null @@ -1,612 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.hello; - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.ProgressDialog; -import android.content.DialogInterface; -import android.content.SharedPreferences; -import android.os.Bundle; -import android.text.Editable; -import android.text.TextWatcher; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.AdapterView; -import android.widget.ArrayAdapter; -import android.widget.Button; -import android.widget.EditText; -import android.widget.ProgressBar; -import android.widget.SeekBar; -import android.widget.Spinner; -import android.widget.TextView; -import android.widget.SeekBar.OnSeekBarChangeListener; - -public class HelloWorld extends Activity -{ - enum DeliveryMode - { - TWOWAY, - TWOWAY_SECURE, - ONEWAY, - ONEWAY_BATCH, - ONEWAY_SECURE, - ONEWAY_SECURE_BATCH, - DATAGRAM, - DATAGRAM_BATCH; - - Ice.ObjectPrx apply(Ice.ObjectPrx prx) - { - switch (this) - { - case TWOWAY: - prx = prx.ice_twoway(); - break; - case TWOWAY_SECURE: - prx = prx.ice_twoway().ice_secure(true); - break; - case ONEWAY: - prx = prx.ice_oneway(); - break; - case ONEWAY_BATCH: - prx = prx.ice_batchOneway(); - break; - case ONEWAY_SECURE: - prx = prx.ice_oneway().ice_secure(true); - break; - case ONEWAY_SECURE_BATCH: - prx = prx.ice_batchOneway().ice_secure(true); - break; - case DATAGRAM: - prx = prx.ice_datagram(); - break; - case DATAGRAM_BATCH: - prx = prx.ice_batchDatagram(); - break; - } - return prx; - } - - public boolean isBatch() - { - return this == ONEWAY_BATCH || this == DATAGRAM_BATCH || this == ONEWAY_SECURE_BATCH; - } - } - - private Demo.HelloPrx createProxy() - { - String host = _hostname.getText().toString().trim(); - assert (host.length() > 0); - // Change the preferences if necessary. - if(!_prefs.getString(HOSTNAME_KEY, DEFAULT_HOST).equals(host)) - { - SharedPreferences.Editor edit = _prefs.edit(); - edit.putString(HOSTNAME_KEY, host); - edit.commit(); - } - - String s = "hello:tcp -h " + host + " -p 10000:ssl -h " + host + " -p 10001:udp -h " + host + " -p 10000"; - Ice.ObjectPrx prx = _communicator.stringToProxy(s); - prx = _deliveryMode.apply(prx); - int timeout = _timeout.getProgress(); - if(timeout != 0) - { - prx = prx.ice_timeout(timeout); - } - return Demo.HelloPrxHelper.uncheckedCast(prx); - } - - class SayHelloI extends Demo.Callback_Hello_sayHello - { - private boolean _response = false; - - @Override - synchronized public void exception(final Ice.LocalException ex) - { - assert (!_response); - _response = true; - - runOnUiThread(new Runnable() - { - public void run() - { - handleException(ex); - } - }); - } - - @Override - synchronized public void sent(boolean sentSynchronously) - { - if(_response) - { - return; - } - runOnUiThread(new Runnable() - { - public void run() - { - if(isFinishing()) - { - return; - } - - if(_deliveryMode == DeliveryMode.TWOWAY || _deliveryMode == DeliveryMode.TWOWAY_SECURE) - { - _status.setText("Waiting for response"); - } - else - { - _status.setText("Ready"); - _activity.setVisibility(View.INVISIBLE); - } - } - }); - } - - @Override - synchronized public void response() - { - assert (!_response); - _response = true; - runOnUiThread(new Runnable() - { - public void run() - { - if(isFinishing()) - { - return; - } - - _activity.setVisibility(View.INVISIBLE); - _status.setText("Ready"); - } - }); - } - } - - private void sayHello() - { - Demo.HelloPrx hello = createProxy(); - try - { - if(!_deliveryMode.isBatch()) - { - Ice.AsyncResult r = hello.begin_sayHello(_delay.getProgress(), new SayHelloI()); - if(r.sentSynchronously()) - { - if(_deliveryMode == DeliveryMode.TWOWAY || _deliveryMode == DeliveryMode.TWOWAY_SECURE) - { - _activity.setVisibility(View.VISIBLE); - _status.setText("Waiting for response"); - } - } - else - { - _activity.setVisibility(View.VISIBLE); - _status.setText("Sending request"); - } - } - else - { - _flushButton.setEnabled(true); - hello.sayHello(_delay.getProgress()); - _status.setText("Queued hello request"); - } - } - catch(Ice.LocalException ex) - { - handleException(ex); - } - } - - private void handleException(Ice.LocalException ex) - { - if(isFinishing()) - { - return; - } - - _status.setText("Ready"); - _activity.setVisibility(View.INVISIBLE); - - _lastError = ex.toString(); - showDialog(DIALOG_ERROR); - ex.printStackTrace(); - } - - private void shutdown() - { - Demo.HelloPrx hello = createProxy(); - try - { - if(!_deliveryMode.isBatch()) - { - hello.begin_shutdown(new Demo.Callback_Hello_shutdown() - { - @Override - public void exception(final Ice.LocalException ex) - { - runOnUiThread(new Runnable() - { - public void run() - { - handleException(ex); - } - }); - } - - @Override - public void response() - { - runOnUiThread(new Runnable() - { - public void run() - { - if(isFinishing()) - { - return; - } - - _activity.setVisibility(View.INVISIBLE); - _status.setText("Ready"); - } - }); - } - }); - if(_deliveryMode == DeliveryMode.TWOWAY || _deliveryMode == DeliveryMode.TWOWAY_SECURE) - { - _activity.setVisibility(View.VISIBLE); - _status.setText("Waiting for response"); - } - } - else - { - _flushButton.setEnabled(true); - hello.shutdown(); - _status.setText("Queued shutdown request"); - } - } - catch(Ice.LocalException ex) - { - handleException(ex); - } - } - - private void flush() - { - new Thread(new Runnable() - { - public void run() - { - try - { - _communicator.flushBatchRequests(); - } - catch(final Ice.LocalException ex) - { - runOnUiThread(new Runnable() - { - public void run() - { - handleException(ex); - } - }); - } - } - }).start(); - - _flushButton.setEnabled(false); - _status.setText("Flushed batch requests"); - } - - private void changeDeliveryMode(long id) - { - switch ((int)id) - { - case 0: - _deliveryMode = DeliveryMode.TWOWAY; - break; - case 1: - _deliveryMode = DeliveryMode.TWOWAY_SECURE; - break; - case 2: - _deliveryMode = DeliveryMode.ONEWAY; - break; - case 3: - _deliveryMode = DeliveryMode.ONEWAY_BATCH; - break; - case 4: - _deliveryMode = DeliveryMode.ONEWAY_SECURE; - break; - case 5: - _deliveryMode = DeliveryMode.ONEWAY_SECURE_BATCH; - break; - case 6: - _deliveryMode = DeliveryMode.DATAGRAM; - break; - case 7: - _deliveryMode = DeliveryMode.DATAGRAM_BATCH; - break; - } - } - - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.main); - - _sayHelloButton = (Button)findViewById(R.id.sayHello); - _sayHelloButton.setOnClickListener(new OnClickListener() - { - public void onClick(android.view.View v) - { - sayHello(); - } - }); - _shutdownButton = (Button)findViewById(R.id.shutdown); - _shutdownButton.setOnClickListener(new OnClickListener() - { - public void onClick(android.view.View v) - { - shutdown(); - } - }); - - _hostname = (EditText)findViewById(R.id.hostname); - _hostname.addTextChangedListener(new TextWatcher() - { - public void afterTextChanged(Editable s) - { - String host = _hostname.getText().toString().trim(); - if(host.length() == 0) - { - _sayHelloButton.setEnabled(false); - _shutdownButton.setEnabled(false); - } - else - { - _sayHelloButton.setEnabled(true); - _shutdownButton.setEnabled(true); - } - } - - public void beforeTextChanged(CharSequence s, int start, int count, int after) - { - } - - public void onTextChanged(CharSequence s, int start, int count, int after) - { - } - }); - - _flushButton = (Button)findViewById(R.id.flush); - _flushButton.setOnClickListener(new OnClickListener() - { - public void onClick(View v) - { - flush(); - } - }); - - Spinner mode = (Spinner)findViewById(R.id.mode); - ArrayAdapter<String> modeAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, - new String[] { "Twoway", "Twoway Secure", "Oneway", "Oneway Batch", "Oneway Secure", - "Oneway Secure Batch", "Datagram", "Datagram Batch" }); - mode.setAdapter(modeAdapter); - mode.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener() - { - public void onItemSelected(AdapterView<?> parent, View view, int position, long id) - { - changeDeliveryMode(id); - } - - - public void onNothingSelected(AdapterView<?> arg0) - { - } - }); - if(savedInstanceState == null) - { - mode.setSelection(0); - } - changeDeliveryMode(mode.getSelectedItemId()); - - final TextView delayView = (TextView)findViewById(R.id.delayView); - _delay = (SeekBar)findViewById(R.id.delay); - _delay.setOnSeekBarChangeListener(new OnSeekBarChangeListener() - { - public void onProgressChanged(SeekBar seekBar, int progress, boolean fromThumb) - { - delayView.setText(String.format("%.1f", progress / 1000.0)); - } - - public void onStartTrackingTouch(SeekBar seekBar) - { - } - - public void onStopTrackingTouch(SeekBar seekBar) - { - } - }); - // BUGFIX: Android doesn't save/restore SeekBar state. - if(savedInstanceState != null) - { - _delay.setProgress(savedInstanceState.getInt(BUNDLE_KEY_DELAY)); - } - - final TextView timeoutView = (TextView)findViewById(R.id.timeoutView); - _timeout = (SeekBar)findViewById(R.id.timeout); - _timeout.setOnSeekBarChangeListener(new OnSeekBarChangeListener() - { - public void onProgressChanged(SeekBar seekBar, int progress, boolean fromThumb) - { - timeoutView.setText(String.format("%.1f", progress / 1000.0)); - } - - public void onStartTrackingTouch(SeekBar seekBar) - { - } - - public void onStopTrackingTouch(SeekBar seekBar) - { - } - }); - // BUGFIX: Android doesn't save/restore SeekBar state. - if(savedInstanceState != null) - { - _timeout.setProgress(savedInstanceState.getInt(BUNDLE_KEY_TIMEOUT)); - } - - _activity = (ProgressBar)findViewById(R.id.activity); - _activity.setVisibility(View.INVISIBLE); - - _status = (TextView)findViewById(R.id.status); - - // Setup the defaults. - _prefs = getPreferences(MODE_PRIVATE); - if(savedInstanceState == null) - { - _hostname.setText(_prefs.getString(HOSTNAME_KEY, DEFAULT_HOST)); - _flushButton.setEnabled(false); - } - else - { - _flushButton.setEnabled(savedInstanceState.getBoolean(BUNDLE_KEY_FLUSH_ENABLED)); - _lastError = savedInstanceState.getString(BUNDLE_KEY_LAST_ERROR); - } - - HelloApp app = (HelloApp)getApplication(); - app.setCommunicatorCallback(new HelloApp.CommunicatorCallback() - { - private boolean dismiss = false; - - public void onCreate(final Ice.Communicator communicator) - { - runOnUiThread(new Runnable() - { - public void run() - { - if(dismiss) - { - dismissDialog(DIALOG_INITIALIZING); - } - _status.setText("Ready"); - _communicator = communicator; - } - }); - } - - public void onError(final Ice.LocalException ex) - { - runOnUiThread(new Runnable() - { - public void run() - { - if(dismiss) - { - dismissDialog(DIALOG_INITIALIZING); - } - _lastError = ex.toString(); - showDialog(DIALOG_FATAL); - - } - }); - } - - public void onWait() - { - // Show the initializing dialog. - dismiss = true; - showDialog(DIALOG_INITIALIZING); - } - }); - } - - @Override - protected void onSaveInstanceState(Bundle outState) - { - super.onSaveInstanceState(outState); - // BUGFIX: The SeekBar doesn't save/restore state automatically. - outState.putInt(BUNDLE_KEY_DELAY, _delay.getProgress()); - outState.putInt(BUNDLE_KEY_TIMEOUT, _timeout.getProgress()); - outState.putBoolean(BUNDLE_KEY_FLUSH_ENABLED, _flushButton.isEnabled()); - outState.putString(BUNDLE_KEY_LAST_ERROR, _lastError); - } - - @Override - protected Dialog onCreateDialog(int id) - { - switch (id) - { - case DIALOG_INITIALIZING: - { - ProgressDialog dialog = new ProgressDialog(this); - dialog.setTitle("Initializing"); - dialog.setMessage("Please wait while loading..."); - dialog.setIndeterminate(true); - dialog.setCancelable(false); - return dialog; - } - - case DIALOG_ERROR: - case DIALOG_FATAL: - { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Error"); - builder.setMessage(_lastError); - if(id == DIALOG_FATAL) - { - builder.setPositiveButton("Ok", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - finish(); - } - }); - } - return builder.create(); - } - - } - - return null; - } - - private static final int DIALOG_INITIALIZING = 1; - private static final int DIALOG_ERROR = 2; - private static final int DIALOG_FATAL = 3; - - private static final String DEFAULT_HOST = "10.0.2.2"; - private static final String HOSTNAME_KEY = "host"; - - private static final String BUNDLE_KEY_TIMEOUT = "zeroc:timeout"; - private static final String BUNDLE_KEY_DELAY = "zeroc:delay"; - private static final String BUNDLE_KEY_FLUSH_ENABLED = "zeroc:flush"; - private static final String BUNDLE_KEY_LAST_ERROR = "zeroc:lastError"; - - private Ice.Communicator _communicator = null; - private DeliveryMode _deliveryMode; - - private Button _sayHelloButton; - private Button _shutdownButton; - private EditText _hostname; - private TextView _status; - private SeekBar _delay; - private SeekBar _timeout; - private ProgressBar _activity; - private SharedPreferences _prefs; - private Button _flushButton; - - private String _lastError = ""; -} diff --git a/java/demo/android/library/.gitignore b/java/demo/android/library/.gitignore deleted file mode 100644 index 264dd4dfe2f..00000000000 --- a/java/demo/android/library/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -generated/* -bin/* diff --git a/java/demo/android/library/.settings/com.zeroc.Slice2JavaPlugin.prefs b/java/demo/android/library/.settings/com.zeroc.Slice2JavaPlugin.prefs deleted file mode 100644 index aba5e84f30d..00000000000 --- a/java/demo/android/library/.settings/com.zeroc.Slice2JavaPlugin.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jan 31 22:56:19 CET 2012 -eclipse.preferences.version=1 -iceIncludes=true -jars=Ice.jar;Glacier2.jar diff --git a/java/demo/android/library/.settings/org.eclipse.jdt.core.prefs b/java/demo/android/library/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 99368a6726b..00000000000 --- a/java/demo/android/library/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,258 +0,0 @@ -#Mon Dec 08 10:55:23 NST 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=52 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=21 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=8 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/java/demo/android/library/.settings/org.eclipse.jdt.ui.prefs b/java/demo/android/library/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 015d86b1892..00000000000 --- a/java/demo/android/library/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Wed Nov 12 16:43:05 NST 2008 -eclipse.preferences.version=1 -formatter_profile=_ZeroC -formatter_settings_version=11 -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/> diff --git a/java/demo/android/library/AndroidManifest.xml b/java/demo/android/library/AndroidManifest.xml deleted file mode 100644 index 4444596eb87..00000000000 --- a/java/demo/android/library/AndroidManifest.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.zeroc.library" - android:versionCode="1" - android:versionName="1.0.0"> - <uses-permission android:name="android.permission.INTERNET"></uses-permission> - <!-- - http://developer.android.com/guide/topics/manifest/uses-sdk-element.html - --> - <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/> - <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="LibraryApp" - android:allowBackup="false"> - <activity android:name=".LoginActivity" android:label="@string/app_name"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - <activity android:name="LibraryActivity"></activity> -<activity android:name="EditActivity"></activity> -<activity android:name="ViewActivity"></activity> -</application> -</manifest> diff --git a/java/demo/android/library/README b/java/demo/android/library/README deleted file mode 100644 index 7046d5af689..00000000000 --- a/java/demo/android/library/README +++ /dev/null @@ -1,14 +0,0 @@ -This directory contains an Eclipse project for the library client. - -The library client is an example of an Android front-end for an -enterprise-style application. It allows you to query and manipulate -a library of books by issuing Ice invocations to a remote server -implemented using JDBC and a SQL database. - -Like the chat client, this program defaults to a ZeroC-hosted server -on "demo2.zeroc.com". If you prefer, you can run your own library -server; the Java source code for this server can be found in the -Database/library subdirectory. - -Please refer to the release notes for instructions on configuring -your environment to use Ice in an Android project. diff --git a/java/demo/android/library/gen/com/zeroc/library/BuildConfig.java b/java/demo/android/library/gen/com/zeroc/library/BuildConfig.java deleted file mode 100644 index 463af063ded..00000000000 --- a/java/demo/android/library/gen/com/zeroc/library/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package com.zeroc.library; - -public final class BuildConfig { - public final static boolean DEBUG = true; -}
\ No newline at end of file diff --git a/java/demo/android/library/gen/com/zeroc/library/R.java b/java/demo/android/library/gen/com/zeroc/library/R.java deleted file mode 100644 index e2c8567cfa1..00000000000 --- a/java/demo/android/library/gen/com/zeroc/library/R.java +++ /dev/null @@ -1,62 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package com.zeroc.library; - -public final class R { - public static final class attr { - } - public static final class drawable { - public static final int icon=0x7f020000; - } - public static final class id { - public static final int addAuthor=0x7f060005; - public static final int author=0x7f060000; - public static final int authorsList=0x7f060004; - public static final int content=0x7f060014; - public static final int delete=0x7f060001; - public static final int discardButton=0x7f060007; - public static final int glacier2=0x7f06000e; - public static final int hostname=0x7f06000d; - public static final int isbn=0x7f060002; - public static final int list=0x7f06000c; - public static final int login=0x7f060010; - public static final int no_match=0x7f06000b; - public static final int rent=0x7f060013; - public static final int rentedBy=0x7f060012; - public static final int renter=0x7f060011; - public static final int saveButton=0x7f060006; - public static final int search=0x7f06000a; - public static final int searchType=0x7f060009; - public static final int secure=0x7f06000f; - public static final int text=0x7f060008; - public static final int title=0x7f060003; - } - public static final class layout { - public static final int author=0x7f030000; - public static final int authorview=0x7f030001; - public static final int edit=0x7f030002; - public static final int library=0x7f030003; - public static final int login=0x7f030004; - public static final int rentername=0x7f030005; - public static final int view=0x7f030006; - public static final int viewitem=0x7f030007; - } - public static final class raw { - public static final int client=0x7f040000; - } - public static final class string { - public static final int app_name=0x7f050001; - public static final int hello=0x7f050000; - public static final int menu_add=0x7f050006; - public static final int menu_delete=0x7f050005; - public static final int menu_discard=0x7f050003; - public static final int menu_edit=0x7f050004; - public static final int menu_logout=0x7f050007; - public static final int menu_save=0x7f050002; - } -} diff --git a/java/demo/android/library/project.properties b/java/demo/android/library/project.properties deleted file mode 100644 index b7c2081d560..00000000000 --- a/java/demo/android/library/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-10 diff --git a/java/demo/android/library/res/drawable/icon.png b/java/demo/android/library/res/drawable/icon.png Binary files differdeleted file mode 100644 index 75024841d32..00000000000 --- a/java/demo/android/library/res/drawable/icon.png +++ /dev/null diff --git a/java/demo/android/library/res/layout/author.xml b/java/demo/android/library/res/layout/author.xml deleted file mode 100644 index fd3675d6f5a..00000000000 --- a/java/demo/android/library/res/layout/author.xml +++ /dev/null @@ -1,28 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:padding="0dip" - android:gravity="center_vertical" - android:baselineAligned="false" - > - - <EditText android:id="@+id/author" - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="wrap_content" - android:layout_marginRight="4dip" - android:gravity="center_vertical" - android:singleLine="true" - android:capitalize="words" - android:text="title" - /> - <Button android:id="@+id/delete" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:singleLine="true" - android:capitalize="words" - android:text="X" - /> -</LinearLayout> diff --git a/java/demo/android/library/res/layout/authorview.xml b/java/demo/android/library/res/layout/authorview.xml deleted file mode 100644 index d9127936571..00000000000 --- a/java/demo/android/library/res/layout/authorview.xml +++ /dev/null @@ -1,12 +0,0 @@ - <TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/author" - android:paddingLeft="8dip" - android:layout_width="fill_parent" - android:layout_height="38dip" - android:layout_marginRight="4dip" - android:gravity="bottom" - android:singleLine="true" - android:capitalize="words" - android:text="author name" - /> diff --git a/java/demo/android/library/res/layout/edit.xml b/java/demo/android/library/res/layout/edit.xml deleted file mode 100644 index db04b600aaa..00000000000 --- a/java/demo/android/library/res/layout/edit.xml +++ /dev/null @@ -1,173 +0,0 @@ -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:scrollbarStyle="insideInset" - android:fillViewport="true"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:textColor="?android:attr/textColorSecondary" - android:textStyle="bold" - android:textSize="14sp" - android:paddingLeft="8dip" - android:text="ISBN" - /> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - /> - - </LinearLayout> - - <EditText android:id="@+id/isbn" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginRight="4dip" - android:gravity="center_vertical" - android:singleLine="true" - android:capitalize="words" - android:text="isbn" - /> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:textColor="?android:attr/textColorSecondary" - android:textStyle="bold" - android:textSize="14sp" - android:paddingLeft="8dip" - android:text="Title" - /> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - /> - - </LinearLayout> - - <EditText android:id="@+id/title" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginRight="4dip" - android:gravity="center_vertical" - android:singleLine="true" - android:capitalize="words" - android:text="title" - /> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:textColor="?android:attr/textColorSecondary" - android:textStyle="bold" - android:textSize="14sp" - android:paddingLeft="8dip" - android:text="Authors" - /> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:orientation="vertical" - > - - <!-- The edit items --> - <LinearLayout android:id="@+id/authorsList" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - > - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - /> - <Button android:id="@+id/addAuthor" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:text="Add Author" - /> - </LinearLayout> - - </LinearLayout> - - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:layout_marginTop="1dip" - android:background="@android:drawable/bottom_bar" - > - <Button android:id="@+id/saveButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentLeft="true" - android:text="Save" - android:minWidth="120dip" - android:minHeight="48dip" - /> - - <Button android:id="@+id/discardButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:text="Discard" - android:minWidth="120dip" - android:minHeight="48dip" - /> - </RelativeLayout> - - </LinearLayout> - -</ScrollView> diff --git a/java/demo/android/library/res/layout/library.xml b/java/demo/android/library/res/layout/library.xml deleted file mode 100644 index de80a6a3bb1..00000000000 --- a/java/demo/android/library/res/layout/library.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="5dip" - > - - <EditText - android:id ="@+id/text" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:imeOptions="actionSearch" - /> - - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - > - - <Spinner android:id ="@+id/searchType" - android:layout_width="0dip" - android:layout_weight="60" - android:layout_height="wrap_content" - /> - - <Button android:id ="@+id/search" - android:text="Search" - android:layout_width="0dip" - android:layout_weight="40" - android:layout_height="wrap_content" - /> - </LinearLayout> - <TextView - android:id="@+id/no_match" - android:paddingTop="10dip" - android:paddingBottom="0dip" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center" - android:textSize="20sp" - android:text="No matches found" - android:visibility="gone" - /> - - <ListView android:id="@+id/list" - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" - /> -</LinearLayout> diff --git a/java/demo/android/library/res/layout/login.xml b/java/demo/android/library/res/layout/login.xml deleted file mode 100644 index 3277675c2b7..00000000000 --- a/java/demo/android/library/res/layout/login.xml +++ /dev/null @@ -1,96 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="5dip" - > - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="30" - android:text="Library Server" - /> - - <EditText - android:id ="@+id/hostname" - android:hint="hostname" - android:text="10.0.2.2" - android:layout_width="0dip" - android:layout_weight="70" - android:layout_height="wrap_content" - android:singleLine="true"/> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="30" - android:text="Glacier2" - /> - - <CheckBox - android:id="@+id/glacier2" - android:layout_width="0dip" - android:layout_weight="70" - android:layout_height="wrap_content" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="30" - android:text="SSL" - /> - - <CheckBox - android:id="@+id/secure" - android:layout_width="0dip" - android:layout_weight="70" - android:layout_height="wrap_content" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingTop="5dip" - android:paddingBottom="5dip" - android:gravity="center_horizontal"> - - <Button - android:id="@+id/login" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="Login" - /> - - </LinearLayout> -</LinearLayout> diff --git a/java/demo/android/library/res/layout/rentername.xml b/java/demo/android/library/res/layout/rentername.xml deleted file mode 100644 index b251a9dd9a3..00000000000 --- a/java/demo/android/library/res/layout/rentername.xml +++ /dev/null @@ -1,26 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:text="Renter Name:" - android:gravity="left" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <EditText - android:id="@+id/renter" - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:scrollHorizontally="true" - android:autoText="false" - android:capitalize="words" - android:gravity="fill_horizontal" - android:textAppearance="?android:attr/textAppearanceMedium" android:singleLine="true"/> -</LinearLayout> diff --git a/java/demo/android/library/res/layout/view.xml b/java/demo/android/library/res/layout/view.xml deleted file mode 100644 index cb68ab3eb97..00000000000 --- a/java/demo/android/library/res/layout/view.xml +++ /dev/null @@ -1,203 +0,0 @@ -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:scrollbarStyle="insideInset" - android:fillViewport="true"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:textColor="?android:attr/textColorSecondary" - android:textStyle="bold" - android:textSize="14sp" - android:paddingLeft="8dip" - android:text="ISBN" - /> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" - android:padding="0dip" - android:gravity="center_vertical" - android:baselineAligned="false" - > - <TextView - android:id="@+id/isbn" - android:paddingLeft="8dip" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginRight="4dip" - android:gravity="center_vertical" - android:singleLine="true" - android:capitalize="words" - android:text="isbn" - /> - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:textColor="?android:attr/textColorSecondary" - android:textStyle="bold" - android:textSize="14sp" - android:paddingLeft="8dip" - android:text="Title" - /> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - /> - - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" - android:padding="0dip" - android:gravity="center_vertical" - android:baselineAligned="false" - > - <TextView - android:id="@+id/title" - android:paddingLeft="8dip" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginRight="4dip" - android:gravity="center_vertical" - android:singleLine="true" - android:capitalize="words" - android:text="title" - /> - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:textColor="?android:attr/textColorSecondary" - android:textStyle="bold" - android:textSize="14sp" - android:paddingLeft="8dip" - android:text="Authors" - /> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - /> - - </LinearLayout> - - - <!-- The edit items --> - <LinearLayout android:id="@+id/authorsList" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - > - <View - android:layout_width="fill_parent" - android:layout_height="26dip" - /> - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:textColor="?android:attr/textColorSecondary" - android:textStyle="bold" - android:textSize="14sp" - android:paddingLeft="8dip" - android:text="Rented By" - /> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - /> - - </LinearLayout> - - <TextView - android:id="@+id/rentedBy" - android:paddingLeft="8dip" - android:layout_width="fill_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:layout_marginRight="4dip" - android:gravity="center_vertical" - android:singleLine="true" - android:capitalize="words" - android:text="rented by" - /> - - <Button - android:id="@+id/rent" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="Rent book" - /> - - </LinearLayout> - -</ScrollView> diff --git a/java/demo/android/library/res/layout/viewitem.xml b/java/demo/android/library/res/layout/viewitem.xml deleted file mode 100644 index 0a141ec8e64..00000000000 --- a/java/demo/android/library/res/layout/viewitem.xml +++ /dev/null @@ -1,22 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:padding="0dip" - > - - <TextView android:id="@+id/title" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="Title" - android:textStyle="bold" - android:paddingBottom="5dip" - android:textSize="18dip"/> - - <TextView android:id="@+id/content" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="Content" - /> - -</LinearLayout> diff --git a/java/demo/android/library/res/raw/client.bks b/java/demo/android/library/res/raw/client.bks Binary files differdeleted file mode 100644 index 538d360fac0..00000000000 --- a/java/demo/android/library/res/raw/client.bks +++ /dev/null diff --git a/java/demo/android/library/res/values/strings.xml b/java/demo/android/library/res/values/strings.xml deleted file mode 100644 index b8d8bf514ab..00000000000 --- a/java/demo/android/library/res/values/strings.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <string name="hello">Hello World, LoginActivity</string> - <string name="app_name">Library</string> - <string name="menu_save">Save</string> - <string name="menu_discard">Discard changes</string> - <string name="menu_edit">Edit</string> - <string name="menu_delete">Delete book</string> - <string name="menu_add">Add</string> - <string name="menu_logout">Logout</string> -</resources> diff --git a/java/demo/android/library/slice/Glacier2Session.ice b/java/demo/android/library/slice/Glacier2Session.ice deleted file mode 100644 index b35b7771713..00000000000 --- a/java/demo/android/library/slice/Glacier2Session.ice +++ /dev/null @@ -1,47 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -#include <Glacier2/Session.ice> - -module Demo -{ - -/* Forward declaration. */ -interface Library; - -/** - * - * The session object. This is used to retrieve a per-session library - * on behalf of the client. If the session is not refreshed on a - * periodic basis, it will be automatically destroyed. - * - */ -interface Glacier2Session extends Glacier2::Session -{ - /** - * - * Get the library object. - * - * @return A proxy for the new library. - * - **/ - Library* getLibrary(); - - /** - * - * Refresh a session. If a session is not refreshed on a regular - * basis by the client, it will be automatically destroyed. - * - **/ - idempotent void refresh(); -}; - -}; diff --git a/java/demo/android/library/slice/Library.ice b/java/demo/android/library/slice/Library.ice deleted file mode 100644 index 895dc761928..00000000000 --- a/java/demo/android/library/slice/Library.ice +++ /dev/null @@ -1,285 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -#include <Ice/BuiltinSequences.ice> - -module Demo -{ - -/** - * - * This local exception is used internally if a java.sql.SQLException - * is raised. - * - **/ -local exception JDBCException -{ -}; - -/** - * - * This exception is raised if the book already exists. - * - **/ -exception BookExistsException -{ -}; - -/** - * - * This exception is raised if a book has already been rented. - * - **/ -exception BookRentedException -{ - string renter; -}; - -/** - * - * This exception is raised if a customer name is invalid. - * - **/ -exception InvalidCustomerException -{ -}; - -/** - * - * This exception is raised if the book has not been rented. - * - **/ -exception BookNotRentedException -{ -}; - -/** Forward declaration for the interface Book. */ -interface Book; - -/** - * - * A description of a book. - * - **/ -struct BookDescription -{ - /** The ISBN number of the book. */ - string isbn; - - /** The title of the book. */ - string title; - - /** The authors of the book. */ - ["java:type:java.util.LinkedList<String>:java.util.List<String>"] Ice::StringSeq authors; - - /** The customer name of the renter. */ - string rentedBy; - - /** A proxy to the associated book. */ - Book* proxy; -}; - -/** A sequence of book descriptions. */ -["java:type:java.util.LinkedList<BookDescription>:java.util.List<BookDescription>"] -sequence<BookDescription> BookDescriptionSeq; - -/** - * - * This interface represents a book. - * - **/ -interface Book -{ - /** - * - * Get a description of the book. - * - * @return The book description. - * - **/ - idempotent BookDescription describe(); - - /** - * - * Set the title of a book. - * - * @param title The book title. - * - **/ - void setTitle(string title); - - /** - * - * Set the book authors. - * - * @param authors The book authors. - * - **/ - void setAuthors(["java:type:java.util.LinkedList<String>:java.util.List<String>"] Ice::StringSeq authors); - - /** - * - * Rent the book to the specified customer. - * - * @param customer The customer. - * - * @throws BookRentedException Raised if the book has already been - * rented. - * - * @throws InvalidCustomerException Raised if the customer is invalid. - * - **/ - void rentBook(string name) - throws InvalidCustomerException, BookRentedException; - - /** - * - * Get the renter. - * - * @return The current rental customer. - * - * @throws BookNotRentedException Raised if the book is not - * currently rented. - * - **/ - idempotent string getRenter() - throws BookNotRentedException; - - /** - * - * Return the book. - * - * @throws BookNotRentedException Raised if the book is not - * currently rented. - * - **/ - void returnBook() - throws BookNotRentedException; - - /** - * - * Destroy the book. - * - **/ - void destroy(); -}; - -/** - * - * Interface to get query results. - * - **/ -interface BookQueryResult -{ - /** - * - * Get more query results. - * - * @param n The maximum number of results to return. - * - * @param destroyed There are no more results, and the query has - * been destroyed. - * - * @returns A sequence of up to n results. - * - **/ - BookDescriptionSeq next(int n, out bool destroyed); - - /** - * - * Destroy the query result. - * - **/ - void destroy(); -}; - -/** - * - * An interface to the library. - * - **/ -interface Library -{ - /** - * - * Query based on isbn number. The query is a partial match at the - * start of the isbn number. - * - * @param isbn The ISBN number. - * - * @param n The number of rows to retrieve in the initial request. - - * @param first The first set of results, up to n results. - * - * @param nrows The total number of rows. - * - * @param result The remainder of the results. If there are no - * further results, a null proxy is returned. - * - **/ - void queryByIsbn(string isbn, int n, out BookDescriptionSeq first, out int nrows, out BookQueryResult* result); - - /** - * - * Query based on the author name. The query is a partial match of - * the author's name. - * - * @param author The authors name. - * - * @param n The number of rows to retrieve in the initial request. - - * @param first The first set of results, up to n results. - * - * @param nrows The total number of rows. - * - * @param result The remainder of the results. If there are no - * further results, a null proxy is returned. - * - **/ - void queryByAuthor(string author, int n, out BookDescriptionSeq first, out int nrows, out BookQueryResult* result); - - /** - * - * Query based on the book title. The query is a partial match of - * the book title. - * - * @param author The authors name. - * - * @param n The number of rows to retrieve in the initial request. - - * @param first The first set of results, up to n results. - * - * @param nrows The total number of rows. - * - * @param result The remainder of the results. If there are no - * further results, a null proxy is returned. - * - **/ - void queryByTitle(string title, int n, out BookDescriptionSeq first, out int nrows, out BookQueryResult* result); - - /** - * - * Create a book with the given description. - * - * @param description The book description. - * - * @return A proxy for the new book. - * - * @throws BookExistsException Raised if a book with the same ISBN - * number already exists. - * - **/ - Book* createBook(string isbn, string title, - ["java:type:java.util.LinkedList<String>:java.util.List<String>"] Ice::StringSeq authors) - throws BookExistsException; -}; - -}; diff --git a/java/demo/android/library/slice/Session.ice b/java/demo/android/library/slice/Session.ice deleted file mode 100644 index 93010c217ee..00000000000 --- a/java/demo/android/library/slice/Session.ice +++ /dev/null @@ -1,79 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -module Demo -{ - -/* Forward declaration. */ -interface Library; - -/** - * - * The session object. This is used to retrieve a per-session library - * on behalf of the client. If the session is not refreshed on a - * periodic basis, it will be automatically destroyed. - * - */ -interface Session -{ - /** - * - * Get the library object. - * - * @return A proxy for the new library. - * - **/ - Library* getLibrary(); - - /** - * - * Refresh a session. If a session is not refreshed on a regular - * basis by the client, it will be automatically destroyed. - * - **/ - idempotent void refresh(); - - /** - * - * Destroy the session. - * - **/ - void destroy(); -}; - -/** - * - * Interface to create new sessions. - * - **/ -interface SessionFactory -{ - /** - * - * Create a session. - * - * @return A proxy to the session. - * - **/ - Session* create(); - - /** - * - * Get the value of the session timeout. Sessions are destroyed - * if they see no activity for this period of time. - * - * @return The timeout (in seconds). - * - **/ - ["nonmutating", "cpp:const"] idempotent long getSessionTimeout(); -}; - -}; diff --git a/java/demo/android/library/src/com/zeroc/library/EditActivity.java b/java/demo/android/library/src/com/zeroc/library/EditActivity.java deleted file mode 100644 index 2063c4cc477..00000000000 --- a/java/demo/android/library/src/com/zeroc/library/EditActivity.java +++ /dev/null @@ -1,291 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.library; - -import java.util.ArrayList; -import java.util.List; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.DialogInterface; -import android.os.Bundle; -import android.text.Editable; -import android.text.TextWatcher; -import android.view.KeyEvent; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; -import android.widget.EditText; -import android.widget.LinearLayout; - -import com.zeroc.library.controller.QueryController; -import com.zeroc.library.controller.QueryModel; - -public class EditActivity extends SessionActivity -{ - private static final int DIALOG_DISCARD = DIALOG_NEXT; - - private static final int SAVE_ID = Menu.FIRST; - private static final int DISCARD_ID = Menu.FIRST + 1; - - private Demo.BookDescription _desc; - - private List<View> _authorEntries = new ArrayList<View>(); - private EditText _isbn; - private EditText _title; - private LinearLayout _authorsLayout; - private LayoutInflater _inflater; - private Button _save; - - private void addAuthorView(String author) - { - final View authorView = _inflater.inflate(R.layout.author, _authorsLayout, false); - EditText auth = (EditText)authorView.findViewById(R.id.author); - auth.setText(author); - _authorsLayout.addView(authorView, _authorsLayout.getChildCount()-2); - _authorEntries.add(authorView); - - Button delete = (Button)authorView.findViewById(R.id.delete); - delete.setOnClickListener(new OnClickListener() - { - public void onClick(View v) - { - _authorsLayout.removeView(authorView); - _authorEntries.remove(authorView); - } - }); - } - - private void updateBookDescription() - { - _isbn.setText(_desc.isbn); - _isbn.setEnabled(_desc.proxy == null); - - _title.setText(_desc.title); - - for(String author : _desc.authors) - { - addAuthorView(author); - } - setSaveState(); - } - - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.edit); - _authorsLayout = (LinearLayout)findViewById(R.id.authorsList); - - _isbn = (EditText)findViewById(R.id.isbn); - _isbn.addTextChangedListener(new TextWatcher() - { - public void afterTextChanged(Editable s) - { - setSaveState(); - } - - public void beforeTextChanged(CharSequence s, int start, int count, int after) - { - } - - public void onTextChanged(CharSequence s, int start, int count, int after) - { - } - }); - - _title = (EditText)findViewById(R.id.title); - - _inflater = getLayoutInflater(); - - Button addAuthor = (Button)findViewById(R.id.addAuthor); - addAuthor.setOnClickListener(new OnClickListener() - { - public void onClick(View v) - { - addAuthorView(""); - } - }); - - _save = (Button)findViewById(R.id.saveButton); - _save.setOnClickListener(new OnClickListener() - { - public void onClick(View v) - { - save(); - } - }); - Button discard = (Button)findViewById(R.id.discardButton); - discard.setOnClickListener(new OnClickListener() - { - public void onClick(View v) - { - showDialog(DIALOG_DISCARD); - } - }); - } - - protected void setSaveState() - { - String isbn = _isbn.getText().toString().trim(); - if(_desc.proxy == null && isbn.length() == 0) - { - _save.setEnabled(false); - } - else - { - _save.setEnabled(true); - } - } - - @Override - public void onResume() - { - super.onResume(); - _queryController.setListener(new QueryController.Listener() - { - public void onDataChange(QueryModel data, boolean saved) - { - if(saved) - { - finish(); - } - else - { - _desc = data.currentBook; - updateBookDescription(); - } - } - - public void onError() - { - showDialog(DIALOG_ERROR); - } - }); - } - - @Override - public boolean onPrepareOptionsMenu(Menu menu) - { - MenuItem saveItem = menu.findItem(SAVE_ID); - saveItem.setEnabled(_save.isEnabled()); - return true; - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) - { - boolean result = super.onCreateOptionsMenu(menu); - menu.add(0, SAVE_ID, 0, R.string.menu_save); - menu.add(0, DISCARD_ID, 0, R.string.menu_discard); - return result; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) - { - switch (item.getItemId()) - { - case SAVE_ID: - save(); - return true; - - case DISCARD_ID: - showDialog(DIALOG_DISCARD); - return true; - } - - return super.onOptionsItemSelected(item); - } - - // Hook the back key to save the item, if necessary. - @Override - public boolean onKeyDown(int keyCode, KeyEvent event) - { - if(keyCode == KeyEvent.KEYCODE_BACK) - { - if(_save.isEnabled()) - { - save(); - } - else - { - finish(); - } - return true; - } - return false; - } - - private void save() - { - List<String> authors = new ArrayList<String>(); - - for(View authorView : _authorEntries) - { - EditText auth = (EditText)authorView.findViewById(R.id.author); - String a = auth.getText().toString().trim(); - if(a.length() > 0) - { - authors.add(a); - } - } - _desc.authors = authors; - _desc.title = _title.getText().toString().trim(); - _desc.isbn = _isbn.getText().toString().trim(); - - if(!_queryController.saveBook(_desc)) - { - finish(); - } - } - - @Override - protected Dialog onCreateDialog(final int id) - { - Dialog d = super.onCreateDialog(id); - if(d != null) - { - return d; - } - - switch(id) - { - case DIALOG_DISCARD: - { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Discard changes"); - builder.setMessage("Your changes will be discarded."); - builder.setPositiveButton("OK", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - setResult(RESULT_CANCELED); - finish(); - } - }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - } - }); - return builder.create(); - } - } - - return null; - } - -} diff --git a/java/demo/android/library/src/com/zeroc/library/LibraryActivity.java b/java/demo/android/library/src/com/zeroc/library/LibraryActivity.java deleted file mode 100644 index 7b97f73475e..00000000000 --- a/java/demo/android/library/src/com/zeroc/library/LibraryActivity.java +++ /dev/null @@ -1,281 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.library; - -import android.content.Intent; -import android.os.Bundle; -import android.os.Handler; -import android.text.Editable; -import android.text.TextWatcher; -import android.view.KeyEvent; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.view.ViewGroup; -import android.view.inputmethod.EditorInfo; -import android.widget.AdapterView; -import android.widget.ArrayAdapter; -import android.widget.BaseAdapter; -import android.widget.Button; -import android.widget.EditText; -import android.widget.ListView; -import android.widget.Spinner; -import android.widget.TextView; -import android.widget.AdapterView.OnItemClickListener; - -import com.zeroc.library.controller.QueryController; -import com.zeroc.library.controller.QueryModel; - -public class LibraryActivity extends SessionActivity -{ - private static final int ADD_ID = Menu.FIRST; - private static final int LOGOUT_ID = Menu.FIRST + 1; - - private Button _search; - private Spinner _searchType; - private EditText _text; - private ListView _searchTable; - - private QueryModel _querydata; - - private LayoutInflater _inflater; - - class LibraryListAdapter extends BaseAdapter - { - public int getCount() - { - if(_querydata == null) - { - return 0; - } - return _querydata.nrows; - } - - public Object getItem(int position) - { - assert _querydata != null; - return _querydata.books.get(position); - } - - public long getItemId(int position) - { - return 0; - } - - public View getView(int position, View convertView, ViewGroup parent) - { - assert _querydata != null; - TextView text; - - // The use of the inflater ensures that the list contains a - // well styled text view. - if(convertView == null) - { - text = (TextView)_inflater.inflate(android.R.layout.simple_list_item_1, parent, false); - } - else - { - text = (TextView)convertView; - } - if(position > _querydata.books.size() - 1) - { - _queryController.getMore(position); - text.setText("<loading>"); - } - else - { - text.setText(_querydata.books.get(position).title); - } - return text; - } - }; - - private LibraryListAdapter _adapter; - - private QueryController.Listener _queryListener = new QueryController.Listener() - { - public void onDataChange(QueryModel data, boolean saved) - { - _querydata = data; - _adapter.notifyDataSetChanged(); - _search.setEnabled(true); - } - - public void onError() - { - showDialog(DIALOG_ERROR); - } - }; - - // Hook the back key to logout the session. - @Override - public boolean onKeyDown(int keyCode, KeyEvent event) - { - if(keyCode == KeyEvent.KEYCODE_BACK) - { - logout(); - return true; - } - return false; - } - - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.library); - - _text = (EditText)findViewById(R.id.text); - _text.addTextChangedListener(new TextWatcher() - { - public void afterTextChanged(Editable s) - { - setSearchState(); - } - - public void beforeTextChanged(CharSequence s, int start, int count, int after) - { - } - - public void onTextChanged(CharSequence s, int start, int count, int after) - { - } - }); - _text.setOnEditorActionListener(new EditText.OnEditorActionListener() - { - - @Override - public boolean onEditorAction(TextView v, int actionId, KeyEvent event) - { - if (actionId == EditorInfo.IME_ACTION_SEARCH) - { - _search.performClick(); - _search.setPressed(true); - new Handler().postDelayed(new Runnable() - { - @Override - public void run() - { - _search.setPressed(false); - } - }, 100); - return true; - } - return false; - } - - }); - - _search = (Button)findViewById(R.id.search); - _search.setOnClickListener(new android.view.View.OnClickListener() - { - public void onClick(android.view.View v) - { - _searchTable.setEmptyView(findViewById(R.id.no_match)); - String queryString = _text.getText().toString().trim(); - // If there is no query, we're done. - if(queryString.length() == 0) - { - return; - } - - QueryController.QueryType type = null; - switch (_searchType.getSelectedItemPosition()) - { - case 0: // ISBN - type = QueryController.QueryType.ISBN; - break; - case 1: // Author - type = QueryController.QueryType.AUTHOR; - break; - case 2: // Title - type = QueryController.QueryType.TITLE; - break; - } - // This immediately calls back on the _callback object with an - // empty dataset which clears the current query list. - _search.setEnabled(false); - _queryController = _sessionController.createQuery(_queryListener, type, queryString); - } - }); - - _inflater = getLayoutInflater(); - - _searchType = (Spinner)findViewById(R.id.searchType); - ArrayAdapter<String> modeAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, - new String[] { "ISBN", "Author", "Title" }); - _searchType.setAdapter(modeAdapter); - _adapter = new LibraryListAdapter(); - - _searchTable = (ListView)findViewById(R.id.list); - _searchTable.setEmptyView(null); - _searchTable.setAdapter(_adapter); - _searchTable.setOnItemClickListener(new OnItemClickListener() - { - public void onItemClick(AdapterView<?> parent, View view, int position, long id) - { - // setCurrentBook returns false if the data for the current row - // hasn't loaded yet. - if(_queryController.setCurrentBook(position)) - { - startActivity(new Intent(LibraryActivity.this, ViewActivity.class)); - } - } - }); - } - - @Override - public void onResume() - { - super.onResume(); - _queryController.setListener(_queryListener); - } - - protected void setSearchState() - { - _search.setEnabled(_text.getText().toString().trim().length() > 0); - } - - private void logout() - { - LibraryApp app = (LibraryApp)getApplication(); - app.logout(); - finish(); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) - { - boolean result = super.onCreateOptionsMenu(menu); - menu.add(0, ADD_ID, 0, R.string.menu_add); - menu.add(0, LOGOUT_ID, 0, R.string.menu_logout); - return result; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) - { - switch (item.getItemId()) - { - case ADD_ID: - _queryController.setCurrentBook(QueryController.NEW_BOOK); - startActivity(new Intent(LibraryActivity.this, EditActivity.class)); - return true; - - case LOGOUT_ID: - logout(); - return true; - } - - return super.onOptionsItemSelected(item); - } -} diff --git a/java/demo/android/library/src/com/zeroc/library/LibraryApp.java b/java/demo/android/library/src/com/zeroc/library/LibraryApp.java deleted file mode 100644 index d833db13d9a..00000000000 --- a/java/demo/android/library/src/com/zeroc/library/LibraryApp.java +++ /dev/null @@ -1,87 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.library; - -import com.zeroc.library.controller.LoginController; -import com.zeroc.library.controller.SessionController; -import com.zeroc.library.controller.LoginController.Listener; - -import android.app.Application; - -public class LibraryApp extends Application -{ - private LoginController _loginController; - private SessionController _sessionController; - - @Override - public void onCreate() - { - } - - @Override - public void onTerminate() - { - if(_loginController != null) - { - _loginController.destroy(); - _loginController = null; - } - - if(_sessionController != null) - { - _sessionController.destroy(); - _sessionController = null; - } - } - - public void loggedIn(SessionController sessionController) - { - assert _sessionController == null && _loginController != null; - _sessionController = sessionController; - - _loginController.destroy(); - _loginController = null; - } - - public void logout() - { - if(_sessionController != null) - { - _sessionController.destroy(); - _sessionController = null; - } - } - - public LoginController login(String hostname, boolean secure, boolean glacier2, Listener listener) - { - assert _loginController == null && _sessionController == null; - _loginController = new LoginController(getResources(), hostname, secure, glacier2, listener); - return _loginController; - } - - public void loginFailure() - { - if(_loginController != null) - { - _loginController.destroy(); - _loginController = null; - } - } - - public SessionController getSessionController() - { - return _sessionController; - } - - public LoginController getLoginController() - { - return _loginController; - } -} diff --git a/java/demo/android/library/src/com/zeroc/library/LoginActivity.java b/java/demo/android/library/src/com/zeroc/library/LoginActivity.java deleted file mode 100644 index fea2265b217..00000000000 --- a/java/demo/android/library/src/com/zeroc/library/LoginActivity.java +++ /dev/null @@ -1,265 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.library; - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.SharedPreferences; -import android.os.Build.VERSION; -import android.os.Bundle; -import android.text.Editable; -import android.text.TextWatcher; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.EditText; - -import com.zeroc.library.controller.LoginController; -import com.zeroc.library.controller.SessionController; - -public class LoginActivity extends Activity -{ - private static final String DEFAULT_HOST = "demo2.zeroc.com"; - private static final boolean DEFAULT_SECURE = false; - private static final boolean DEFAULT_GLACIER2 = false; - private static final String HOSTNAME_KEY = "host"; - private static final String SECURE_KEY = "secure"; - private static final String GLACIER2_KEY = "glacier2"; - - private static final int DIALOG_ERROR = 1; - private static final int DIALOG_INVALID_HOST = 2; - - private Button _login; - private EditText _hostname; - private CheckBox _glacier2; - private CheckBox _secure; - private SharedPreferences _prefs; - private LoginController _loginController; - private boolean _loginInProgress = false; - - private LoginController.Listener _listener = new LoginController.Listener() - { - public void onLoginInProgress() - { - _loginInProgress = true; - setLoginState(); - } - - public void onLogin(SessionController sessionController) - { - if(isFinishing()) - { - return; - } - - LibraryApp app = (LibraryApp)getApplication(); - app.loggedIn(sessionController); - startActivity(new Intent(LoginActivity.this, LibraryActivity.class)); - } - - public void onLoginError() - { - _loginInProgress = false; - setLoginState(); - - showDialog(DIALOG_ERROR); - } - }; - - private void setLoginState() - { - if(_loginInProgress) - { - _login.setEnabled(false); - } - else - { - String host = _hostname.getText().toString().trim(); - _login.setEnabled(host.length() > 0); - } - } - - private void login() - { - final String hostname = _hostname.getText().toString().trim(); - final boolean secure = _secure.isChecked(); - final boolean glacier2 = _glacier2.isChecked(); - - // We don't want to save obviously bogus hostnames in the application - // preferences. These two regexp validates that the hostname is well - // formed. - // Note that this regexp doesn't handle IPv6 addresses. - final String hostre = "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\\-]*[A-Za-z0-9])$"; - final String ipre = "^([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"; - if(!hostname.matches(hostre) && !hostname.matches(ipre)) - { - showDialog(DIALOG_INVALID_HOST); - return; - } - - // Update preferences. - SharedPreferences.Editor edit = _prefs.edit(); - if(!_prefs.getString(HOSTNAME_KEY, DEFAULT_HOST).equals(hostname)) - { - edit.putString(HOSTNAME_KEY, hostname); - } - if(_prefs.getBoolean(SECURE_KEY, DEFAULT_SECURE) != secure) - { - edit.putBoolean(SECURE_KEY, secure); - } - if(_prefs.getBoolean(GLACIER2_KEY, DEFAULT_GLACIER2) != glacier2) - { - edit.putBoolean(GLACIER2_KEY, glacier2); - } - - edit.commit(); - - LibraryApp app = (LibraryApp)getApplication(); - _loginController = app.login(hostname, secure, glacier2, _listener); - } - - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.login); - - if(VERSION.SDK_INT == 8) // android.os.Build.VERSION_CODES.FROYO (8) - { - // - // Workaround for a bug in Android 2.2 (Froyo). - // - // See http://code.google.com/p/android/issues/detail?id=9431 - // - java.lang.System.setProperty("java.net.preferIPv4Stack", "true"); - java.lang.System.setProperty("java.net.preferIPv6Addresses", "false"); - } - - _login = (Button) findViewById(R.id.login); - _login.setOnClickListener(new android.view.View.OnClickListener() - { - public void onClick(android.view.View v) - { - login(); - } - }); - _hostname = (EditText) findViewById(R.id.hostname); - _hostname.addTextChangedListener(new TextWatcher() - { - public void afterTextChanged(Editable s) - { - setLoginState(); - } - - public void beforeTextChanged(CharSequence s, int start, int count, int after) - { - } - - public void onTextChanged(CharSequence s, int start, int count, int after) - { - } - }); - - _secure = (android.widget.CheckBox) findViewById(R.id.secure); - _secure.setEnabled(VERSION.SDK_INT >= 8); // android.os.Build.VERSION_CODES.FROYO (8) - - _glacier2 = (android.widget.CheckBox) findViewById(R.id.glacier2); - - _prefs = getPreferences(MODE_PRIVATE); - - _prefs = getPreferences(MODE_PRIVATE); - if(savedInstanceState == null) - { - _hostname.setText(_prefs.getString(HOSTNAME_KEY, DEFAULT_HOST)); - _secure.setChecked(_prefs.getBoolean(SECURE_KEY, DEFAULT_SECURE)); - _glacier2.setChecked(_prefs.getBoolean(GLACIER2_KEY, DEFAULT_GLACIER2)); - } - } - - @Override - protected void onResume() - { - super.onResume(); - LibraryApp app = (LibraryApp)getApplication(); - _loginInProgress = false; - _loginController = app.getLoginController(); - if(_loginController != null) - { - _loginController.setLoginListener(_listener); - } - else - { - setLoginState(); - } - } - - @Override - protected void onStop() - { - super.onStop(); - if(_loginController != null) - { - _loginController.setLoginListener(null); - _loginController = null; - } - } - - @Override - protected Dialog onCreateDialog(int id) - { - switch(id) - { - case DIALOG_ERROR: - { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Error"); - builder.setMessage(""); // The message is filled in onPrepareDialog. - builder.setCancelable(false); - builder.setPositiveButton("Ok", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - // Clean up the login controller upon login failure. - if(_loginController != null) - { - LibraryApp app = (LibraryApp)getApplication(); - app.loginFailure(); - } - } - }); - return builder.create(); - } - - case DIALOG_INVALID_HOST: - { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Error"); - builder.setMessage("The hostname is invalid"); - return builder.create(); - } - } - - return null; - } - - @Override - protected void onPrepareDialog(int id, Dialog dialog) - { - super.onPrepareDialog(id, dialog); - if(id == DIALOG_ERROR) - { - AlertDialog alert = (AlertDialog)dialog; - alert.setMessage(_loginController.getLoginError()); - } - } -} diff --git a/java/demo/android/library/src/com/zeroc/library/SessionActivity.java b/java/demo/android/library/src/com/zeroc/library/SessionActivity.java deleted file mode 100644 index 8a7f9dac01f..00000000000 --- a/java/demo/android/library/src/com/zeroc/library/SessionActivity.java +++ /dev/null @@ -1,107 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.library; - -import com.zeroc.library.controller.QueryController; -import com.zeroc.library.controller.SessionController; - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.DialogInterface; - -// The base class of any activity created after a session has been established. -public class SessionActivity extends Activity -{ - protected static final int DIALOG_ERROR = 0; - protected static final int DIALOG_FATAL = 1; - protected static final int DIALOG_NEXT = 2; - - protected SessionController _sessionController; - protected QueryController _queryController; - - @Override - public void onResume() - { - super.onResume(); - - LibraryApp app = (LibraryApp)getApplication(); - _sessionController = app.getSessionController(); - if(_sessionController == null) - { - finish(); - return; - } - - _sessionController.setSessionListener(new SessionController.Listener() - { - public void onDestroy() - { - showDialog(DIALOG_FATAL); - } - }); - - _queryController = _sessionController.getCurrentQuery(); - } - - @Override - protected Dialog onCreateDialog(final int id) - { - switch (id) - { - case DIALOG_ERROR: - { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Error"); - builder.setMessage(""); // Filled in onPrepareDialog. - builder.setCancelable(false); - builder.setPositiveButton("Ok", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - _queryController.clearLastError(); - } - }); - return builder.create(); - } - - case DIALOG_FATAL: - { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Error"); - builder.setMessage("The session was lost. Please login again."); - builder.setCancelable(false); - builder.setPositiveButton("Ok", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - LibraryApp app = (LibraryApp)getApplication(); - app.logout(); - finish(); - } - }); - return builder.create(); - } - } - - return null; - } - - @Override - protected void onPrepareDialog(int id, Dialog dialog) - { - super.onPrepareDialog(id, dialog); - if(id == DIALOG_ERROR) - { - AlertDialog alert = (AlertDialog)dialog; - alert.setMessage(_queryController.getLastError()); - } - } -} diff --git a/java/demo/android/library/src/com/zeroc/library/ViewActivity.java b/java/demo/android/library/src/com/zeroc/library/ViewActivity.java deleted file mode 100644 index 62422da8023..00000000000 --- a/java/demo/android/library/src/com/zeroc/library/ViewActivity.java +++ /dev/null @@ -1,229 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.library; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.DialogInterface; -import android.content.Intent; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; -import android.widget.EditText; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.zeroc.library.controller.QueryController; -import com.zeroc.library.controller.QueryModel; - -public class ViewActivity extends SessionActivity -{ - private static final int EDIT_ID = Menu.FIRST; - private static final int DELETE_ID = Menu.FIRST + 1; - - public static final int BOOK_DELETED = RESULT_FIRST_USER; - public static final int BOOK_CHANGED = RESULT_FIRST_USER+1; - - private static final int DIALOG_DELETE = DIALOG_NEXT; - private static final int DIALOG_RENT_BOOK = DIALOG_NEXT+1; - - private Demo.BookDescription _desc; - private TextView _isbn; - private TextView _title; - private LinearLayout _authorsLayout; - private LayoutInflater _inflater; - private TextView _rentedBy; - private Button _rent; - - private void updateBookDescription() - { - // Update the fields. - _isbn.setText(_desc.isbn); - _title.setText(_desc.title); - // Remove all the authors. - _authorsLayout.removeViews(0, _authorsLayout.getChildCount()-1); - // Add them back. - for(String author : _desc.authors) - { - TextView auth = (TextView)_inflater.inflate(R.layout.authorview, _authorsLayout, false); - auth.setText(author); - _authorsLayout.addView(auth, _authorsLayout.getChildCount()-1); - } - - _rent.setEnabled(true); - if(_desc.rentedBy.length() == 0) - { - _rentedBy.setVisibility(View.GONE); - _rent.setText("Rent Book"); - } - else - { - _rentedBy.setVisibility(View.VISIBLE); - _rentedBy.setText(_desc.rentedBy); - _rent.setText("Return Book"); - } - } - - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.view); - - _authorsLayout = (LinearLayout)findViewById(R.id.authorsList); - _isbn = (TextView)findViewById(R.id.isbn); - _title = (TextView)findViewById(R.id.title); - _rentedBy = (TextView)findViewById(R.id.rentedBy); - - // This button is a toggle. If the book is returned, the book is - // returned. Otherwise, the book is rented. - _rent = (Button)findViewById(R.id.rent); - _rent.setOnClickListener(new OnClickListener() - { - public void onClick(View v) - { - if(_desc.rentedBy.length() == 0) - { - showDialog(DIALOG_RENT_BOOK); - } - else - { - _rent.setEnabled(false); - _queryController.returnBook(); - } - } - }); - - _inflater = getLayoutInflater(); - } - - @Override - public void onResume() - { - super.onResume(); - _queryController.setListener(new QueryController.Listener() - { - public void onDataChange(QueryModel data, boolean saved) - { - _rent.setEnabled(true); - _desc = data.currentBook; - if(_desc == null) - { - finish(); - } - else - { - updateBookDescription(); - } - } - - public void onError() - { - _rent.setEnabled(true); - showDialog(DIALOG_ERROR); - } - }); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) - { - boolean result = super.onCreateOptionsMenu(menu); - menu.add(0, EDIT_ID, 0, R.string.menu_edit); - menu.add(0, DELETE_ID, 0, R.string.menu_delete); - return result; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) - { - switch (item.getItemId()) - { - case EDIT_ID: - startActivity(new Intent(this, EditActivity.class)); - return true; - - case DELETE_ID: - showDialog(DIALOG_DELETE); - return true; - } - - return super.onOptionsItemSelected(item); - } - - @Override - protected Dialog onCreateDialog(final int id) - { - Dialog d = super.onCreateDialog(id); - if(d != null) - { - return d; - } - switch (id) - { - case DIALOG_DELETE: - { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Delete"); - builder.setMessage("This book will be deleted."); - builder.setPositiveButton("OK", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - _queryController.deleteBook(); - } - }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - } - }); - return builder.create(); - } - - case DIALOG_RENT_BOOK: - { - // This example shows how to add a custom layout to an AlertDialog - LayoutInflater factory = LayoutInflater.from(this); - final View entryView = factory.inflate(R.layout.rentername, null); - final EditText renter = (EditText)entryView.findViewById(R.id.renter); - AlertDialog.Builder builder = new AlertDialog.Builder(ViewActivity.this); - builder.setTitle("Enter Renter"); - builder.setView(entryView); - builder.setPositiveButton("OK", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - final String r = renter.getText().toString().trim(); - if(r.length() > 0) - { - _rent.setEnabled(false); - _queryController.rentBook(r); - } - } - }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - } - }); - return builder.create(); - } - } - return null; - } -} diff --git a/java/demo/android/library/src/com/zeroc/library/controller/LoginController.java b/java/demo/android/library/src/com/zeroc/library/controller/LoginController.java deleted file mode 100644 index a2bc3e304ea..00000000000 --- a/java/demo/android/library/src/com/zeroc/library/controller/LoginController.java +++ /dev/null @@ -1,296 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.library.controller; - -import com.zeroc.library.R; - -import android.content.res.Resources; -import android.os.Handler; - -public class LoginController -{ - public interface Listener - { - void onLoginInProgress(); - void onLogin(SessionController controller); - void onLoginError(); - } - - private boolean _destroyed = false; - private Handler _handler; - private Ice.Communicator _communicator; - private String _loginError; - private Listener _loginListener; - private SessionController _sessionController; - - synchronized private void postLoginFailure(final String loginError) - { - _loginError = loginError; - if(_loginListener != null) - { - final Listener listener = _loginListener; - _handler.post(new Runnable() - { - public void run() - { - listener.onLoginError(); - } - }); - } - } - - public LoginController(Resources resources, final String hostname, final boolean secure, final boolean glacier2, - Listener listener) - { - _handler = new Handler(); - _loginListener = listener; - _loginListener.onLoginInProgress(); - - Ice.InitializationData initData = new Ice.InitializationData(); - - initData.properties = Ice.Util.createProperties(); - initData.properties.setProperty("Ice.ACM.Client", "0"); - initData.properties.setProperty("Ice.RetryIntervals", "-1"); - initData.properties.setProperty("Ice.Trace.Network", "0"); - - if(secure) - { - initData.properties.setProperty("IceSSL.Trace.Security", "0"); - initData.properties.setProperty("IceSSL.TruststoreType", "BKS"); - initData.properties.setProperty("IceSSL.Password", "password"); - initData.properties.setProperty("Ice.InitPlugins", "0"); - initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory"); - java.io.InputStream certStream; - certStream = resources.openRawResource(R.raw.client); - _communicator = Ice.Util.initialize(initData); - - IceSSL.Plugin plugin = (IceSSL.Plugin)_communicator.getPluginManager().getPlugin("IceSSL"); - plugin.setTruststoreStream(certStream); - _communicator.getPluginManager().initializePlugins(); - } - else - { - _communicator = Ice.Util.initialize(initData); - } - - new Thread(new Runnable() - { - public void run() - { - try - { - long refreshTimeout; - SessionAdapter session = null; - - if(glacier2) - { - StringBuilder s = new StringBuilder(); - s.append("DemoGlacier2/router:"); - s.append(secure ? "ssl " : "tcp"); - s.append(" -p "); - s.append(secure ? "4064" : "4063"); - s.append(" -h "); - s.append(hostname); - s.append(" -t 10000"); - - Ice.ObjectPrx proxy = _communicator.stringToProxy(s.toString()); - Ice.RouterPrx r = Ice.RouterPrxHelper.uncheckedCast(proxy); - - _communicator.setDefaultRouter(r); - - final Glacier2.RouterPrx router = Glacier2.RouterPrxHelper.checkedCast(r); - if(router == null) - { - postLoginFailure("Glacier2 proxy is invalid."); - return; - } - Glacier2.SessionPrx glacier2session = router.createSession("dummy", "none"); - - final Demo.Glacier2SessionPrx sess = Demo.Glacier2SessionPrxHelper - .uncheckedCast(glacier2session); - final Demo.LibraryPrx library = sess.getLibrary(); - refreshTimeout = (router.getSessionTimeout() * 1000) / 2; - session = new SessionAdapter() - { - public void destroy() - { - try - { - router.destroySession(); - } - catch(Glacier2.SessionNotExistException e) - { - } - } - - public void refresh() - { - sess.refresh(); - } - - public Demo.LibraryPrx getLibrary() - { - return library; - } - }; - } - else - { - StringBuilder s = new StringBuilder(); - s.append("SessionFactory:"); - s.append(secure ? "ssl " : "tcp"); - s.append(" -p "); - s.append(secure ? "10001" : "10000"); - s.append(" -h "); - s.append(hostname); - s.append(" -t 10000"); - Ice.ObjectPrx proxy = _communicator.stringToProxy(s.toString()); - Demo.SessionFactoryPrx factory = Demo.SessionFactoryPrxHelper.checkedCast(proxy); - if(factory == null) - { - postLoginFailure("SessionFactory proxy is invalid."); - return; - } - - final Demo.SessionPrx sess = factory.create(); - final Demo.LibraryPrx library = sess.getLibrary(); - refreshTimeout = (factory.getSessionTimeout() * 1000) / 2; - session = new SessionAdapter() - { - public void destroy() - { - sess.destroy(); - } - - public void refresh() - { - sess.refresh(); - } - - public Demo.LibraryPrx getLibrary() - { - return library; - } - }; - } - - synchronized(LoginController.this) - { - if(_destroyed) - { - // Here the app was terminated while session - // establishment was in progress. - try - { - session.destroy(); - } - catch(Exception e) - { - } - - try - { - _communicator.destroy(); - } - catch(Exception e) - { - } - return; - } - - _sessionController = new SessionController(_handler, _communicator, session, refreshTimeout); - if(_loginListener != null) - { - final Listener listener = _loginListener; - _handler.post(new Runnable() - { - public void run() - { - listener.onLogin(_sessionController); - } - }); - } - } - } - catch(final Glacier2.CannotCreateSessionException ex) - { - ex.printStackTrace(); - postLoginFailure(String.format("Session creation failed: %s", ex.reason)); - } - catch(Glacier2.PermissionDeniedException ex) - { - ex.printStackTrace(); - postLoginFailure(String.format("Login failed: %s", ex.reason)); - } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - postLoginFailure(String.format("Login failed: %s", ex.toString())); - } - } - }).start(); - } - - synchronized public void destroy() - { - if(_destroyed) - { - return; - } - _destroyed = true; - // - // There are three cases: - // - // 1. A session has been created. In this case the communicator is owned - // by the session controller. - // - // 2. The session creation failed. In this case _loginError is non-null. - // Destroy the communicator. - // - // 3. The session creation is in progress. In which case, things will be - // cleaned up once the session establishment is complete. - // - if(_sessionController == null && _loginError != null) - { - try - { - _communicator.destroy(); - } - catch(Exception e) - { - } - } - } - - synchronized public String getLoginError() - { - return _loginError; - } - - synchronized public void setLoginListener(Listener listener) - { - _loginListener = listener; - if(listener != null) - { - if(_loginError != null) - { - listener.onLoginError(); - } - else if(_sessionController == null) - { - listener.onLoginInProgress(); - } - else - { - listener.onLogin(_sessionController); - } - } - } -} diff --git a/java/demo/android/library/src/com/zeroc/library/controller/QueryController.java b/java/demo/android/library/src/com/zeroc/library/controller/QueryController.java deleted file mode 100644 index 1467426cb52..00000000000 --- a/java/demo/android/library/src/com/zeroc/library/controller/QueryController.java +++ /dev/null @@ -1,461 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.library.controller; - -import java.util.ArrayList; -import java.util.List; - -import android.os.Handler; - -public class QueryController -{ - public interface Listener - { - void onDataChange(QueryModel data, boolean saved); - void onError(); - } - - public static final int NO_BOOK = -1; - public static final int NEW_BOOK = -2; - - public enum QueryType - { - ISBN, TITLE, AUTHOR - } - - private ArrayList<Demo.BookDescription> _books = new ArrayList<Demo.BookDescription>(); - private int _nrows = 0; - private int _rowsQueried = 0; - private Demo.BookQueryResultPrx _query = null; - private Listener _listener; - private Handler _handler; - private Demo.LibraryPrx _library; - private int _currentBook = NO_BOOK; - private String _lastError; - - synchronized protected void postDataChanged(final boolean saved) - { - if(_listener != null) - { - _handler.post(new Runnable() - { - public void run() - { - _listener.onDataChange(getQueryModel(), saved); - } - }); - } - } - - synchronized protected void postError(final String string) - { - _lastError = string; - if(_listener != null) - { - _handler.post(new Runnable() - { - public void run() - { - _listener.onError(); - } - }); - } - } - - synchronized private void queryResponse(List<Demo.BookDescription> first, int nrows, Demo.BookQueryResultPrx result) - { - _books.clear(); - _nrows = nrows; - _books.addAll(first); - _query = result; - if(_listener != null) - { - postDataChanged(false); - } - } - - synchronized private QueryModel getQueryModel() - { - QueryModel data = new QueryModel(); - data.books = new ArrayList<Demo.BookDescription>(); - for(Demo.BookDescription book : _books) - { - data.books.add((Demo.BookDescription)book.clone()); - } - data.nrows = _nrows; - if(_currentBook == NEW_BOOK) - { - data.currentBook = new Demo.BookDescription(); - data.currentBook.proxy = null; - data.currentBook.isbn = ""; - data.currentBook.title = ""; - data.currentBook.rentedBy = ""; - data.currentBook.authors = new ArrayList<String>(); - } - else if(_currentBook != NO_BOOK) - { - data.currentBook = (Demo.BookDescription)_books.get(_currentBook).clone(); - } - return data; - } - - // An empty query - QueryController(Handler handler, Demo.LibraryPrx library) - { - _handler = handler; - _library = library; - } - - QueryController(Handler handler, Demo.LibraryPrx library, final Listener listener, final QueryType _type, final String _queryString) - { - _handler = handler; - _listener = listener; - _library = library; - - // Send the initial data change notification. - _listener.onDataChange(getQueryModel(), false); - _rowsQueried = 10; - - if(_type == QueryType.ISBN) - { - Demo.Callback_Library_queryByIsbn cb = new Demo.Callback_Library_queryByIsbn() - { - @Override - public void exception(Ice.LocalException ex) - { - postError(ex.toString()); - } - - @Override - public void response(List<Demo.BookDescription> first, int nrows, Demo.BookQueryResultPrx result) - { - queryResponse(first, nrows, result); - } - }; - - _library.begin_queryByIsbn(_queryString, 10, cb); - } - else if(_type == QueryType.AUTHOR) - { - Demo.Callback_Library_queryByAuthor cb = new Demo.Callback_Library_queryByAuthor() - { - @Override - public void exception(Ice.LocalException ex) - { - postError(ex.toString()); - } - - @Override - public void response(List<Demo.BookDescription> first, int nrows, Demo.BookQueryResultPrx result) - { - queryResponse(first, nrows, result); - } - }; - - _library.begin_queryByAuthor(_queryString, 10, cb); - } - else - { - Demo.Callback_Library_queryByTitle cb = new Demo.Callback_Library_queryByTitle() - { - @Override - public void exception(Ice.LocalException ex) - { - postError(ex.toString()); - } - - @Override - public void response(List<Demo.BookDescription> first, int nrows, Demo.BookQueryResultPrx result) - { - queryResponse(first, nrows, result); - } - }; - _library.begin_queryByTitle(_queryString, 10, cb); - } - } - - protected void destroy() - { - if(_query != null) - { - _query.begin_destroy(new Demo.Callback_BookQueryResult_destroy() - { - @Override - public void exception(Ice.LocalException ex) - { - } - - @Override - public void response() - { - } - }); - _query = null; - } - } - - synchronized public void setListener(Listener cb) - { - _listener = cb; - _listener.onDataChange(getQueryModel(), false); - if(_lastError != null) - { - _listener.onError(); - } - } - - synchronized public String getLastError() - { - return _lastError; - } - - synchronized public void clearLastError() - { - _lastError = null; - } - - synchronized public void getMore(int position) - { - assert position < _nrows; - if(position < _rowsQueried) - { - return; - } - - Demo.Callback_BookQueryResult_next cb = new Demo.Callback_BookQueryResult_next() - { - @Override - public void exception(Ice.LocalException ex) - { - postError(ex.toString()); - } - - @Override - public void response(final List<Demo.BookDescription> ret, final boolean destroyed) - { - synchronized(QueryController.this) - { - _books.addAll(ret); - postDataChanged(false); - } - } - }; - _query.begin_next(10, cb); - _rowsQueried += 10; - } - - synchronized public boolean setCurrentBook(int row) - { - if(row < _books.size()) - { - _currentBook = row; - return true; - } - return false; - } - - synchronized public void returnBook() - { - assert _currentBook != NO_BOOK; - final Demo.BookDescription desc = _books.get(_currentBook); - Demo.Callback_Book_returnBook returnBookCB = new Demo.Callback_Book_returnBook() - { - @Override - public void exception(Ice.LocalException ex) - { - postError(ex.toString()); - } - - @Override - public void exception(Ice.UserException ex) - { - final String error; - if(ex instanceof Demo.BookNotRentedException) - { - error = "The book is no longer rented."; - - desc.rentedBy = ""; - postDataChanged(false); - } - else - { - error = "An error occurred: " + ex.toString(); - } - postError(error); - } - - @Override - public void response() - { - synchronized(QueryController.this) - { - desc.rentedBy = ""; - postDataChanged(false); - } - } - }; - desc.proxy.begin_returnBook(returnBookCB); - } - - synchronized public void rentBook(final String r) - { - assert _currentBook != NO_BOOK; - final Demo.BookDescription desc = _books.get(_currentBook); - Demo.Callback_Book_rentBook rentBookCB = new Demo.Callback_Book_rentBook() - { - @Override - public void exception(final Ice.LocalException ex) - { - postError(ex.toString()); - } - - @Override - public void exception(Ice.UserException ex) - { - final String error; - if(ex instanceof Demo.InvalidCustomerException) - { - error = "The customer name is invalid."; - } - else if(ex instanceof Demo.BookRentedException) - { - error = "That book is already rented."; - - Demo.BookRentedException bre = (Demo.BookRentedException)ex; - desc.rentedBy = bre.renter; - postDataChanged(false); - } - else - { - error = "An error occurred: " + ex.toString(); - } - postError(error); - } - - @Override - public void response() - { - synchronized(QueryController.this) - { - desc.rentedBy = r; - postDataChanged(false); - } - } - }; - desc.proxy.begin_rentBook(r, rentBookCB); - } - - synchronized public void deleteBook() - { - assert _currentBook != NO_BOOK; - final Demo.BookDescription desc = _books.get(_currentBook); - desc.proxy.begin_destroy(new Demo.Callback_Book_destroy() - { - @Override - public void exception(Ice.LocalException ex) - { - postError(ex.toString()); - } - - @Override - public void response() - { - synchronized(QueryController.this) - { - _books.remove(_currentBook); - _currentBook = NO_BOOK; - --_nrows; - postDataChanged(false); - } - } - }); - } - - synchronized public boolean saveBook(final Demo.BookDescription newDesc) - { - assert _currentBook != NO_BOOK; - if(_currentBook == NEW_BOOK) - { - _library.begin_createBook(newDesc.isbn, newDesc.title, newDesc.authors, - new Demo.Callback_Library_createBook() - { - @Override - public void exception(Ice.LocalException ex) - { - postError(ex.toString()); - } - - @Override - public void exception(Ice.UserException ex) - { - if(ex instanceof Demo.BookExistsException) - { - postError("That ISBN is already in the library."); - } - else - { - postError("Unknown error: " + ex.toString()); - } - } - - @Override - public void response(Demo.BookPrx ret) - { - synchronized(QueryController.this) - { - _currentBook = NO_BOOK; - postDataChanged(true); - } - } - - }); - - return true; - } - - final Demo.BookDescription desc = _books.get(_currentBook); - - final boolean saveTitle = !newDesc.title.equals(desc.title); - final boolean saveAuthors = !newDesc.authors.equals(desc.authors); - - // If nothing changed we're done. - if(!saveTitle && !saveAuthors) - { - return false; - } - - Runnable r = new Runnable() - { - public void run() - { - try - { - if(saveTitle) - { - desc.proxy.setTitle(newDesc.title); - desc.title = newDesc.title; - } - if(saveAuthors) - { - desc.proxy.setAuthors(newDesc.authors); - desc.authors = newDesc.authors; - } - postDataChanged(true); - } - catch(Ice.LocalException ex) - { - postError(ex.toString()); - } - } - }; - new Thread(r).start(); - return true; - } -} diff --git a/java/demo/android/library/src/com/zeroc/library/controller/QueryModel.java b/java/demo/android/library/src/com/zeroc/library/controller/QueryModel.java deleted file mode 100644 index 6dd2e817b3c..00000000000 --- a/java/demo/android/library/src/com/zeroc/library/controller/QueryModel.java +++ /dev/null @@ -1,19 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.library.controller; - -import java.util.List; - -public class QueryModel -{ - public List<Demo.BookDescription> books; - public int nrows; - public Demo.BookDescription currentBook; -} diff --git a/java/demo/android/library/src/com/zeroc/library/controller/SessionAdapter.java b/java/demo/android/library/src/com/zeroc/library/controller/SessionAdapter.java deleted file mode 100644 index c863220e9b0..00000000000 --- a/java/demo/android/library/src/com/zeroc/library/controller/SessionAdapter.java +++ /dev/null @@ -1,17 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.library.controller; - -interface SessionAdapter -{ - void destroy(); - void refresh(); - Demo.LibraryPrx getLibrary(); -} diff --git a/java/demo/android/library/src/com/zeroc/library/controller/SessionController.java b/java/demo/android/library/src/com/zeroc/library/controller/SessionController.java deleted file mode 100644 index 95c4217567b..00000000000 --- a/java/demo/android/library/src/com/zeroc/library/controller/SessionController.java +++ /dev/null @@ -1,171 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.library.controller; - -import android.os.Handler; - -public class SessionController -{ - public interface Listener - { - void onDestroy(); - } - - private Handler _handler; - private Ice.Communicator _communicator; - private QueryController _queryController; - private Listener _sessionListener; - private boolean _fatal = false; - private boolean _destroyed = false; - - private SessionAdapter _session; - - class SessionRefreshThread extends Thread - { - SessionRefreshThread(long timeout) - { - _timeout = timeout; // seconds. - } - - synchronized public void - run() - { - while(!_terminated) - { - // check idle. - try - { - wait(_timeout); - } - catch(InterruptedException e) - { - } - if(!_terminated) - { - try - { - _session.refresh(); - } - catch(Ice.LocalException ex) - { - postSessionDestroyed(); - _terminated = true; - } - } - } - } - - synchronized private void - terminate() - { - _terminated = true; - notify(); - } - - final private long _timeout; - private boolean _terminated = false; - } - private SessionRefreshThread _refresh; - - synchronized private void postSessionDestroyed() - { - _fatal = true; - if(_sessionListener != null) - { - final Listener listener = _sessionListener; - _handler.post(new Runnable() - { - public void run() - { - listener.onDestroy(); - } - }); - } - } - - SessionController(Handler handler, Ice.Communicator communicator, SessionAdapter session, long refreshTimeout) - { - _communicator = communicator; - _session = session; - _handler = handler; - - _refresh = new SessionRefreshThread(refreshTimeout); - _refresh.start(); - - _queryController = new QueryController(_handler, _session.getLibrary()); - } - - synchronized public void destroy() - { - if(_destroyed) - { - return; - } - _destroyed = true; - - new Thread(new Runnable() - { - public void run() - { - _queryController.destroy(); - - _refresh.terminate(); - while(_refresh.isAlive()) - { - try - { - _refresh.join(); - } - catch(InterruptedException e) - { - } - } - - try - { - _session.destroy(); - } - catch(Exception e) - { - } - - try - { - _communicator.destroy(); - } - catch(Exception e) - { - } - } - }).start(); - } - - synchronized public void setSessionListener(Listener listener) - { - _sessionListener = listener; - if(_fatal) - { - listener.onDestroy(); - } - } - - synchronized public QueryController createQuery(QueryController.Listener listener, QueryController.QueryType t, - String q) - { - _queryController.destroy(); - _queryController = new QueryController(_handler, _session.getLibrary(), listener, t, q); - return _queryController; - } - - synchronized public QueryController getCurrentQuery() - { - return _queryController; - } -} diff --git a/java/demo/book/build.gradle b/java/demo/book/build.gradle index 6654d64998e..d540ad0f19a 100644 --- a/java/demo/book/build.gradle +++ b/java/demo/book/build.gradle @@ -28,7 +28,7 @@ if (distJarDir == null) { dependencies { - compile project(':src/Ice') + compile project(':Ice') } } else { dependencies { @@ -39,7 +39,7 @@ if(name == "evictor_filesystem") { if (distJarDir == null) { dependencies { - compile project(':src/Freeze') + compile project(':Freeze') } } else { dependencies { diff --git a/java/demo/book/evictor_filesystem/demo_book_evictor_filesystem.iml b/java/demo/book/evictor_filesystem/demo_book_evictor_filesystem.iml index 36977a664dd..e32f5e3b556 100644 --- a/java/demo/book/evictor_filesystem/demo_book_evictor_filesystem.iml +++ b/java/demo/book/evictor_filesystem/demo_book_evictor_filesystem.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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_Freeze" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="Freeze" exported="" /> </component> </module> diff --git a/java/demo/book/lifecycle/demo_book_lifecycle.iml b/java/demo/book/lifecycle/demo_book_lifecycle.iml index c796653f616..6891f1c161b 100644 --- a/java/demo/book/lifecycle/demo_book_lifecycle.iml +++ b/java/demo/book/lifecycle/demo_book_lifecycle.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/book/map_filesystem/build.gradle b/java/demo/book/map_filesystem/build.gradle index c979dac3b4f..2406cdb70f0 100644 --- a/java/demo/book/map_filesystem/build.gradle +++ b/java/demo/book/map_filesystem/build.gradle @@ -47,8 +47,8 @@ jar.enabled = false if (distJarDir == null) { dependencies { - compile project(':src/Ice') - compile project(':src/Freeze') + compile project(':Ice') + compile project(':Freeze') } } else { dependencies { diff --git a/java/demo/book/map_filesystem/demo_book_map_filesystem.iml b/java/demo/book/map_filesystem/demo_book_map_filesystem.iml index bfd5aabd997..93543e73196 100644 --- a/java/demo/book/map_filesystem/demo_book_map_filesystem.iml +++ b/java/demo/book/map_filesystem/demo_book_map_filesystem.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,14 +12,13 @@ <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_Freeze" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="Freeze" exported="" /> </component> </module> diff --git a/java/demo/book/printer/demo_book_printer.iml b/java/demo/book/printer/demo_book_printer.iml index c796653f616..6891f1c161b 100644 --- a/java/demo/book/printer/demo_book_printer.iml +++ b/java/demo/book/printer/demo_book_printer.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/demo/book/simple_filesystem/demo_book_simple_filesystem.iml b/java/demo/book/simple_filesystem/demo_book_simple_filesystem.iml index 6699bfc35e1..0ccc1ded761 100644 --- a/java/demo/book/simple_filesystem/demo_book_simple_filesystem.iml +++ b/java/demo/book/simple_filesystem/demo_book_simple_filesystem.iml @@ -1,7 +1,7 @@ <?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 url="file://$MODULE_DIR$/build/classes" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -12,13 +12,12 @@ <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="Ice" exported="" /> </component> </module> diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle index 6538959e686..6032ba69aa1 100644 --- a/java/gradle/ice.gradle +++ b/java/gradle/ice.gradle @@ -11,8 +11,12 @@ apply plugin: 'slice' ext.generatedDir = "$project.buildDir/generated" -compileJava { - options.debug = debug +try { + compileJava { + options.debug = debug + } +} catch(MissingMethodException ex) { + // For Android builds: thrown if compileJava isn't available. } // Determine the name of the Slice-to-Java translator diff --git a/java/settings.gradle b/java/settings.gradle index 1032c7134a9..933d2802832 100644 --- a/java/settings.gradle +++ b/java/settings.gradle @@ -8,16 +8,28 @@ // ********************************************************************** // Main source -include 'src/ant' -include 'src/Ice' -include 'src/IceDiscovery' -include 'src/Freeze' -include 'src/IceBox' -include 'src/Glacier2' -include 'src/IcePatch2' -include 'src/IceStorm' -include 'src/IceGrid' -include 'src/IceGridGUI' +include ':Ice' +project(':Ice').projectDir = new File('src/Ice') +include ':IceDiscovery' +project(':IceDiscovery').projectDir = new File('src/IceDiscovery') +include ':Freeze' +project(':Freeze').projectDir = new File('src/Freeze') +include ':IceBox' +project(':IceBox').projectDir = new File('src/IceBox') +include ':Glacier2' +project(':Glacier2').projectDir = new File('src/Glacier2') +include ':IcePatch2' +project(':IcePatch2').projectDir = new File('src/IcePatch2') +include ':IceStorm' +project(':IceStorm').projectDir = new File('src/IceStorm') +include ':IceGrid' +project(':IceGrid').projectDir = new File('src/IceGrid') +include ':IceGridGUI' +project(':IceGridGUI').projectDir = new File('src/IceGridGUI') + + +include ':ant' +project(':ant').projectDir = new File('src/ant') // Tests include 'test' diff --git a/java/src/Freeze/build.gradle b/java/src/Freeze/build.gradle index b4a55532468..eb271d9c1f4 100644 --- a/java/src/Freeze/build.gradle +++ b/java/src/Freeze/build.gradle @@ -1,3 +1,15 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + slice { java { include = ["${sliceDir}"] @@ -27,7 +39,7 @@ slice { } dependencies { - compile project(':src/Ice') + compile project(':Ice') compile "com.sleepycat:db:${dbVersion}" } diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle index 2b41717dd7e..98a1c7352d3 100644 --- a/java/src/Glacier2/build.gradle +++ b/java/src/Glacier2/build.gradle @@ -1,8 +1,23 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + slice { java { - include = ["${sliceDir}"] - args = "--ice --tie --checksum Glacier2.SliceChecksums" - files = fileTree(dir: "$sliceDir/Glacier2", includes:['*.ice'], excludes:["*F.ice"]) + set1 { + include = ["${sliceDir}"] + args = "--ice --tie --checksum Glacier2.SliceChecksums" + files = fileTree(dir: "${sliceDir}/Glacier2", includes:['*.ice'], excludes:["*F.ice"]) + } } } @@ -12,7 +27,7 @@ idea.module { } dependencies { - compile project(':src/Ice') + compile project(':Ice') } def jarName = "Glacier2${versionSuffix}.jar" diff --git a/java/src/Ice/build.gradle b/java/src/Ice/build.gradle index 222a933ecc2..a4c096d393e 100644 --- a/java/src/Ice/build.gradle +++ b/java/src/Ice/build.gradle @@ -1,3 +1,15 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + slice { java { stream { diff --git a/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java b/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java index 4e187728281..55acdf29696 100644 --- a/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java @@ -402,6 +402,7 @@ public final class IncomingConnectionFactory extends EventHandler implements Ice new Ice.ConnectionI(_adapter.getCommunicator(), _instance, null, _transceiver, null, _endpoint, _adapter); connection.startAndWait(); + _connections.add(connection); } else diff --git a/java/src/Ice/src/main/java/IceInternal/Instance.java b/java/src/Ice/src/main/java/IceInternal/Instance.java index 94a74a959ee..46af349027c 100644 --- a/java/src/Ice/src/main/java/IceInternal/Instance.java +++ b/java/src/Ice/src/main/java/IceInternal/Instance.java @@ -70,7 +70,11 @@ public final class Instance Timer(Ice.Properties props, String threadName) { super(1, Util.createThreadFactory(props, threadName)); // Single thread executor - setRemoveOnCancelPolicy(true); + if(!Util.isAndroid()) + { + // This API doesn't exist on Android up to API level 20. + setRemoveOnCancelPolicy(true); + } setExecuteExistingDelayedTasksAfterShutdownPolicy(false); _observerHelper = new ThreadObserverHelper(threadName); } @@ -942,7 +946,11 @@ public final class Instance _retryQueue = new RetryQueue(this); - if(_initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0) + // + // If Ice.ThreadInterruptSafe is set or we're running on Android all + // IO is done on the background thread. + // + if(_initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0 || Util.isAndroid()) { _queueExecutor = new QueueExecutor(_initData.properties, Util.createThreadName(_initData.properties, "Ice.BackgroundIO")); diff --git a/java/src/Ice/src/main/java/IceInternal/StreamSocket.java b/java/src/Ice/src/main/java/IceInternal/StreamSocket.java index 63b26361668..93892f951a6 100644 --- a/java/src/Ice/src/main/java/IceInternal/StreamSocket.java +++ b/java/src/Ice/src/main/java/IceInternal/StreamSocket.java @@ -191,16 +191,6 @@ public class StreamSocket { assert(_fd != null); - // - // We don't want write to be called on Android's main thread as this will cause - // NetworkOnMainThreadException to be thrown. If this is the Android main thread - // we return 0 and this method will be called later from the thread pool. - // - if(buf.hasRemaining() && Util.isAndroidMainThread(Thread.currentThread())) - { - return 0; - } - int sent = 0; while(buf.hasRemaining()) { diff --git a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java index 78e1de99371..c8de356ea6e 100644 --- a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java +++ b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java @@ -110,16 +110,6 @@ final class UdpTransceiver implements Transceiver @Override public int write(Buffer buf) { - // - // We don't want write or send to be called on android main thread as this will cause - // NetworkOnMainThreadException to be thrown. If that is the android main thread - // we return false and this method will be later called from the thread pool - // - if(Util.isAndroidMainThread(Thread.currentThread())) - { - return SocketOperation.Write; - } - if(!buf.b.hasRemaining()) { return SocketOperation.None; diff --git a/java/src/Ice/src/main/java/IceInternal/Util.java b/java/src/Ice/src/main/java/IceInternal/Util.java index 1e32d032771..fc4248f66fb 100644 --- a/java/src/Ice/src/main/java/IceInternal/Util.java +++ b/java/src/Ice/src/main/java/IceInternal/Util.java @@ -230,43 +230,10 @@ public final class Util } // - // Return true if the given thread is the android main thread, also know as the GUI thread. + // Return true if we're running on Android. // - public static boolean - isAndroidMainThread(Thread thread) + public static boolean isAndroid() { - if(!System.getProperty("java.vm.name").startsWith("Dalvik")) - { - return false; - } - - if(_androidMainThread == null) - { - try - { - Class<?> c = Util.findClass("android.os.Looper", null); - java.lang.reflect.Method getMainLooper = c.getDeclaredMethod("getMainLooper", (Class<?>[])null); - java.lang.reflect.Method getThread = c.getDeclaredMethod("getThread", (Class<?>[])null); - - Object looper = getMainLooper.invoke(null); - _androidMainThread = (Thread)getThread.invoke(looper); - } - catch(java.lang.reflect.InvocationTargetException ex) - { - assert false; - } - catch(java.lang.NoSuchMethodException ex) - { - assert false; - } - catch(IllegalAccessException ex) - { - assert false; - } - } - - return thread != null && _androidMainThread == thread; + return System.getProperty("java.vm.name").startsWith("Dalvik"); } - - private static Thread _androidMainThread; } diff --git a/java/src/IceBox/build.gradle b/java/src/IceBox/build.gradle index d768d99e6e3..ce3248a549d 100644 --- a/java/src/IceBox/build.gradle +++ b/java/src/IceBox/build.gradle @@ -1,8 +1,22 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + slice { java { - include = ["${sliceDir}"] - args = "--ice --tie --checksum IceBox.SliceChecksums" - files = fileTree(dir: "$sliceDir/IceBox", includes:['*.ice'], excludes:["*F.ice"]) + set1 { + include = ["${sliceDir}"] + args = "--ice --tie --checksum IceBox.SliceChecksums" + files = fileTree(dir: "$sliceDir/IceBox", includes:['*.ice'], excludes:["*F.ice"]) + } } } @@ -12,7 +26,7 @@ idea.module { } dependencies { - compile project(':src/Ice') + compile project(':Ice') } def jarName = "IceBox${versionSuffix}.jar" diff --git a/java/src/IceDiscovery/build.gradle b/java/src/IceDiscovery/build.gradle index 313a8033e62..cd65504d34d 100644 --- a/java/src/IceDiscovery/build.gradle +++ b/java/src/IceDiscovery/build.gradle @@ -1,8 +1,22 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + slice { java { - include = ["${sliceDir}"] - args = "--ice" - files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"]) + set1 { + include = ["${sliceDir}"] + args = "--ice" + files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"]) + } } } @@ -12,7 +26,7 @@ idea.module { } dependencies { - compile project(':src/Ice') + compile project(':Ice') } def jarName = "IceDiscovery${versionSuffix}.jar" diff --git a/java/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle index ac8cccbaed5..f36dec177fa 100644 --- a/java/src/IceGrid/build.gradle +++ b/java/src/IceGrid/build.gradle @@ -1,8 +1,22 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + slice { java { - include = ["${sliceDir}"] - args = "--ice --tie --checksum IceGrid.SliceChecksums" - files = fileTree(dir: "$sliceDir/IceGrid", includes:['*.ice'], excludes:["*F.ice"]) + set1 { + include = ["${sliceDir}"] + args = "--ice --tie --checksum IceGrid.SliceChecksums" + files = fileTree(dir: "$sliceDir/IceGrid", includes:['*.ice'], excludes:["*F.ice"]) + } } } @@ -12,8 +26,8 @@ idea.module { } dependencies { - compile project(':src/Ice') - compile project(':src/Glacier2') + compile project(':Ice') + compile project(':Glacier2') } def jarName = "IceGrid${versionSuffix}.jar" diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle index d29436faea7..ae77c03ddb0 100644 --- a/java/src/IceGridGUI/build.gradle +++ b/java/src/IceGridGUI/build.gradle @@ -1,10 +1,22 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + apply plugin: 'application' apply from: "../../gradle/javafx7.gradle" dependencies { - compile project(':src/Ice') - compile project(':src/IceBox') - compile project(':src/IceGrid') + compile project(':Ice') + compile project(':IceBox') + compile project(':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' @@ -29,7 +41,6 @@ buildscript { dependencies { classpath group: 'net.sourceforge', name: 'proguard', version: '5.0' } - } def javaHome = System.getProperty('java.home') diff --git a/java/src/IcePatch2/build.gradle b/java/src/IcePatch2/build.gradle index 540a68b721b..67312fe2385 100644 --- a/java/src/IcePatch2/build.gradle +++ b/java/src/IcePatch2/build.gradle @@ -1,8 +1,22 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + slice { java { - include = ["${sliceDir}"] - args = "--ice --tie --checksum IcePatch2.SliceChecksums" - files = fileTree(dir: "$sliceDir/IcePatch2", includes:['*.ice'], excludes:["*F.ice"]) + set1 { + include = ["${sliceDir}"] + args = "--ice --tie --checksum IcePatch2.SliceChecksums" + files = fileTree(dir: "$sliceDir/IcePatch2", includes:['*.ice'], excludes:["*F.ice"]) + } } } @@ -12,7 +26,7 @@ idea.module { } dependencies { - compile project(':src/Ice') + compile project(':Ice') } def jarName = "IcePatch2${versionSuffix}.jar" diff --git a/java/src/IceStorm/build.gradle b/java/src/IceStorm/build.gradle index 6b65a87b64f..ff8de187d48 100644 --- a/java/src/IceStorm/build.gradle +++ b/java/src/IceStorm/build.gradle @@ -1,8 +1,22 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + slice { java { - include = ["${sliceDir}"] - args = "--ice --tie --checksum IceStorm.SliceChecksums" - files = fileTree(dir: "$sliceDir/IceStorm", includes:['*.ice'], excludes:["*F.ice"]) + set1 { + include = ["${sliceDir}"] + args = "--ice --tie --checksum IceStorm.SliceChecksums" + files = fileTree(dir: "$sliceDir/IceStorm", includes:['*.ice'], excludes:["*F.ice"]) + } } } @@ -12,7 +26,7 @@ idea.module { } dependencies { - compile project(':src/Ice') + compile project(':Ice') } def jarName = "IceStorm${versionSuffix}.jar" diff --git a/java/src/ant/build.gradle b/java/src/ant/build.gradle index d3f719531bc..a75c3a74e41 100644 --- a/java/src/ant/build.gradle +++ b/java/src/ant/build.gradle @@ -1,3 +1,15 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + repositories { mavenCentral() } diff --git a/java/test/Freeze/dbmap/db/.gitignore b/java/test/Freeze/dbmap/db/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/java/test/Freeze/dbmap/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/java/test/Freeze/evictor/db/DB_CONFIG b/java/test/Freeze/evictor/db/DB_CONFIG deleted file mode 100644 index b6d05535741..00000000000 --- a/java/test/Freeze/evictor/db/DB_CONFIG +++ /dev/null @@ -1,2 +0,0 @@ -set_flags DB_TXN_NOSYNC - diff --git a/java/test/Freeze/fileLock/db/.gitignore b/java/test/Freeze/fileLock/db/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/java/test/Freeze/fileLock/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/java/test/Ice/binding/run.py b/java/test/Ice/binding/run.py deleted file mode 100755 index 33fc2e8f3ac..00000000000 --- a/java/test/Ice/binding/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/java/test/Ice/checksum/run.py b/java/test/Ice/checksum/run.py deleted file mode 100755 index 33fc2e8f3ac..00000000000 --- a/java/test/Ice/checksum/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/java/test/Ice/classLoader/run.py b/java/test/Ice/classLoader/run.py deleted file mode 100755 index 33fc2e8f3ac..00000000000 --- a/java/test/Ice/classLoader/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/java/test/Ice/facets/run.py b/java/test/Ice/facets/run.py deleted file mode 100755 index 44aa7d73d00..00000000000 --- a/java/test/Ice/facets/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() -TestUtil.collocatedTest() diff --git a/java/test/Ice/hold/run.py b/java/test/Ice/hold/run.py deleted file mode 100755 index 33fc2e8f3ac..00000000000 --- a/java/test/Ice/hold/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/java/test/Ice/info/run.py b/java/test/Ice/info/run.py deleted file mode 100755 index 33fc2e8f3ac..00000000000 --- a/java/test/Ice/info/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/java/test/Ice/inheritance/run.py b/java/test/Ice/inheritance/run.py deleted file mode 100755 index 44aa7d73d00..00000000000 --- a/java/test/Ice/inheritance/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() -TestUtil.collocatedTest() diff --git a/java/test/Ice/location/run.py b/java/test/Ice/location/run.py deleted file mode 100755 index 33fc2e8f3ac..00000000000 --- a/java/test/Ice/location/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/java/test/Ice/packagemd/run.py b/java/test/Ice/packagemd/run.py deleted file mode 100755 index 33fc2e8f3ac..00000000000 --- a/java/test/Ice/packagemd/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/java/test/Ice/retry/run.py b/java/test/Ice/retry/run.py deleted file mode 100755 index a40df1a1bcb..00000000000 --- a/java/test/Ice/retry/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with collocated server.") -TestUtil.collocatedTest() diff --git a/java/test/Ice/serialize/run.py b/java/test/Ice/serialize/run.py deleted file mode 100755 index 33fc2e8f3ac..00000000000 --- a/java/test/Ice/serialize/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/java/test/Ice/threadPoolPriority/run.py b/java/test/Ice/threadPoolPriority/run.py deleted file mode 100755 index 3cbc4137c5e..00000000000 --- a/java/test/Ice/threadPoolPriority/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() diff --git a/java/test/Ice/timeout/run.py b/java/test/Ice/timeout/run.py deleted file mode 100755 index 33fc2e8f3ac..00000000000 --- a/java/test/Ice/timeout/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/java/test/IceGrid/simple/db/.gitignore b/java/test/IceGrid/simple/db/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/java/test/IceGrid/simple/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/java/test/android/.gitignore b/java/test/android/.gitignore deleted file mode 100644 index 36f971e324f..00000000000 --- a/java/test/android/.gitignore +++ /dev/null @@ -1 +0,0 @@ -bin/* diff --git a/java/test/android/.settings/com.zeroc.Slice2JavaPlugin.prefs b/java/test/android/.settings/com.zeroc.Slice2JavaPlugin.prefs deleted file mode 100644 index e16f272214d..00000000000 --- a/java/test/android/.settings/com.zeroc.Slice2JavaPlugin.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Dec 17 22:14:32 NST 2008 -eclipse.preferences.version=1 -jars= diff --git a/java/test/android/.settings/org.eclipse.jdt.core.prefs b/java/test/android/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 10b58d391b6..00000000000 --- a/java/test/android/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,266 +0,0 @@ -#Mon Dec 08 10:55:23 NST 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes= -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=52 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=21 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=8 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/java/test/android/.settings/org.eclipse.jdt.ui.prefs b/java/test/android/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 377fe71a31b..00000000000 --- a/java/test/android/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Fri Dec 05 11:14:03 NST 2008 -eclipse.preferences.version=1 -formatter_profile=_ZeroC -formatter_settings_version=11 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/> diff --git a/java/test/android/AndroidManifest.xml b/java/test/android/AndroidManifest.xml deleted file mode 100644 index ffd725f90b2..00000000000 --- a/java/test/android/AndroidManifest.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.zeroc.testsuite" - android:versionCode="1" - android:versionName="1.0.0"> - <uses-permission android:name="android.permission.INTERNET"></uses-permission> - <!-- - http://developer.android.com/guide/topics/manifest/uses-sdk-element.html - --> - <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/> - <application android:icon="@raw/icon" android:label="@string/app_name" android:name="TestApp" - android:allowBackup="false"> - <activity android:name=".TestSuite" - android:label="@string/app_name"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - <activity android:name="TestContainer"></activity> -</application> -</manifest>
\ No newline at end of file diff --git a/java/test/android/gen/com/zeroc/testsuite/BuildConfig.java b/java/test/android/gen/com/zeroc/testsuite/BuildConfig.java deleted file mode 100644 index dd14f6c3ca5..00000000000 --- a/java/test/android/gen/com/zeroc/testsuite/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package com.zeroc.testsuite; - -public final class BuildConfig { - public final static boolean DEBUG = true; -}
\ No newline at end of file diff --git a/java/test/android/gen/com/zeroc/testsuite/R.java b/java/test/android/gen/com/zeroc/testsuite/R.java deleted file mode 100644 index 77ab4d9e567..00000000000 --- a/java/test/android/gen/com/zeroc/testsuite/R.java +++ /dev/null @@ -1,33 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package com.zeroc.testsuite; - -public final class R { - public static final class attr { - } - public static final class id { - public static final int ipv6=0x7f050002; - public static final int next=0x7f050000; - public static final int secure=0x7f050001; - } - public static final class layout { - public static final int container=0x7f020000; - public static final int main=0x7f020001; - } - public static final class raw { - public static final int client=0x7f030000; - public static final int icon=0x7f030001; - public static final int server=0x7f030002; - } - public static final class string { - public static final int app_name=0x7f040000; - public static final int ipv6=0x7f040003; - public static final int next=0x7f040001; - public static final int ssl=0x7f040002; - } -} diff --git a/java/test/android/project.properties b/java/test/android/project.properties deleted file mode 100644 index b7c2081d560..00000000000 --- a/java/test/android/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-10 diff --git a/java/test/android/res/layout/container.xml b/java/test/android/res/layout/container.xml deleted file mode 100644 index 91afb966be7..00000000000 --- a/java/test/android/res/layout/container.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - > - - <ListView - android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:stackFromBottom="true" - android:transcriptMode="alwaysScroll"/> - - <Button - android:id="@+id/next" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="@string/next" - /> - - </LinearLayout> - diff --git a/java/test/android/res/layout/main.xml b/java/test/android/res/layout/main.xml deleted file mode 100644 index 612802f59b4..00000000000 --- a/java/test/android/res/layout/main.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="5dip" - > - - <ListView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:stackFromBottom="true" - - /> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="5dip" - > - - <TextView - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="30" - android:text="@string/ssl" - /> - - <CheckBox - android:id="@+id/secure" - android:layout_width="0dip" - android:layout_weight="70" - android:layout_height="wrap_content" - /> - - <TextView - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="30" - android:text="@string/ipv6" - /> - - <CheckBox - android:id="@+id/ipv6" - android:layout_width="0dip" - android:layout_weight="70" - android:layout_height="wrap_content" - /> - - </LinearLayout> -</LinearLayout>
\ No newline at end of file diff --git a/java/test/android/res/raw/client.bks b/java/test/android/res/raw/client.bks Binary files differdeleted file mode 100644 index 538d360fac0..00000000000 --- a/java/test/android/res/raw/client.bks +++ /dev/null diff --git a/java/test/android/res/raw/icon.png b/java/test/android/res/raw/icon.png Binary files differdeleted file mode 100644 index 75024841d32..00000000000 --- a/java/test/android/res/raw/icon.png +++ /dev/null diff --git a/java/test/android/res/raw/server.bks b/java/test/android/res/raw/server.bks Binary files differdeleted file mode 100644 index 1216ff6f26d..00000000000 --- a/java/test/android/res/raw/server.bks +++ /dev/null diff --git a/java/test/android/res/values/strings.xml b/java/test/android/res/values/strings.xml deleted file mode 100644 index 797e31f6429..00000000000 --- a/java/test/android/res/values/strings.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <string name="app_name">Test Suite</string> - <string name="next">Next</string> - <string name="ssl">SSL</string> - <string name="ipv6">IPv6</string> -</resources> diff --git a/java/test/android/src/com/zeroc/testsuite/TestApp.java b/java/test/android/src/com/zeroc/testsuite/TestApp.java deleted file mode 100644 index 811d8060f44..00000000000 --- a/java/test/android/src/com/zeroc/testsuite/TestApp.java +++ /dev/null @@ -1,795 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.testsuite; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.Writer; -import java.security.KeyManagementException; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.UnrecoverableKeyException; -import java.security.cert.CertificateException; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManagerFactory; - -import test.Util.Application.CommunicatorListener; -import Ice.Communicator; -import android.app.Application; -import android.os.Handler; -import android.os.Build.VERSION; - -public class TestApp extends Application -{ - static private class TestSuiteEntry - { - TestSuiteEntry(String name, Class<? extends test.Util.Application> client, - Class<? extends test.Util.Application> server, - Class<? extends test.Util.Application> collocated) - { - _name = name; - _client = client; - _server = server; - _collocated = collocated; - } - - String getName() - { - return _name; - } - - test.Util.Application getClient() - throws IllegalAccessException, InstantiationException - { - if(_client == null) - { - return null; - } - return _client.newInstance(); - } - - test.Util.Application getServer() - throws IllegalAccessException, InstantiationException - { - if(_server == null) - { - return null; - } - - return _server.newInstance(); - } - - test.Util.Application getCollocated() - throws IllegalAccessException, InstantiationException - { - if(_collocated == null) - { - return null; - } - - return _collocated.newInstance(); - } - - private String _name; - private Class<? extends test.Util.Application> _client; - private Class<? extends test.Util.Application> _server; - private Class<? extends test.Util.Application> _collocated; - } - - static final private TestSuiteEntry[] _tests = - { - new TestSuiteEntry("adapterDeactivation", test.Ice.adapterDeactivation.Client.class, - test.Ice.adapterDeactivation.Server.class, test.Ice.adapterDeactivation.Collocated.class), - new TestSuiteEntry("admin", test.Ice.admin.Client.class, test.Ice.admin.Server.class, null), - new TestSuiteEntry("ami", test.Ice.ami.Client.class, test.Ice.ami.Server.class, null), - new TestSuiteEntry("binding", test.Ice.binding.Client.class, test.Ice.binding.Server.class, null), - new TestSuiteEntry("checksum", test.Ice.checksum.Client.class, test.Ice.checksum.Server.class, null), - new TestSuiteEntry("classLoader", test.Ice.classLoader.Client.class, test.Ice.classLoader.Server.class, null), - new TestSuiteEntry("custom", test.Ice.custom.Client.class, test.Ice.custom.Server.class, - test.Ice.custom.Collocated.class), - new TestSuiteEntry("defaultServant", test.Ice.defaultServant.Client.class, null, null), - new TestSuiteEntry("defaultValue", test.Ice.defaultValue.Client.class, null, null), - new TestSuiteEntry("dispatcher", test.Ice.dispatcher.Client.class, test.Ice.dispatcher.Server.class, null), - new TestSuiteEntry("enums", test.Ice.enums.Client.class, test.Ice.enums.Server.class, null), - new TestSuiteEntry("exceptions", test.Ice.exceptions.Client.class, test.Ice.exceptions.Server.class, - test.Ice.exceptions.Collocated.class), - new TestSuiteEntry("facets", test.Ice.facets.Client.class, test.Ice.facets.Server.class, - test.Ice.facets.Collocated.class), - // Require SSL - //new TestSuiteEntry("hash", test.Ice.hash.Client.class, null, null), - new TestSuiteEntry("hold", test.Ice.hold.Client.class, test.Ice.hold.Server.class, null), - // The info test is not currently enabled - it relies on sockets to accurately return - // address and port information, which really only works in Android 2.3+. - //new TestSuiteEntry("info", test.Ice.info.Client.class, test.Ice.info.Server.class, null), - new TestSuiteEntry("inheritance", test.Ice.inheritance.Client.class, test.Ice.inheritance.Server.class, - test.Ice.inheritance.Collocated.class), - new TestSuiteEntry("interceptor", test.Ice.interceptor.Client.class, null, null), - new TestSuiteEntry("invoke", test.Ice.invoke.Client.class, test.Ice.invoke.Server.class, null), - new TestSuiteEntry("location", test.Ice.location.Client.class, test.Ice.location.Server.class, null), - // The metrics test uses too much memory. - //new TestSuiteEntry("metrics", test.Ice.metrics.Client.class, test.Ice.metrics.Server.class, null), - new TestSuiteEntry("objects", test.Ice.objects.Client.class, test.Ice.objects.Server.class, - test.Ice.objects.Collocated.class), - new TestSuiteEntry("operations", test.Ice.operations.Client.class, test.Ice.operations.Server.class, - test.Ice.operations.Collocated.class), - new TestSuiteEntry("optional", test.Ice.optional.Client.class, test.Ice.optional.Server.class, null), - new TestSuiteEntry("packagemd", test.Ice.packagemd.Client.class, test.Ice.packagemd.Server.class, null), - new TestSuiteEntry("proxy", test.Ice.proxy.Client.class, test.Ice.proxy.Server.class, - test.Ice.proxy.Collocated.class), - new TestSuiteEntry("retry", test.Ice.retry.Client.class, test.Ice.retry.Server.class, null), - new TestSuiteEntry("seqMapping", test.Ice.seqMapping.Client.class, test.Ice.seqMapping.Server.class, - test.Ice.seqMapping.Collocated.class), - new TestSuiteEntry("serialize", test.Ice.serialize.Client.class, test.Ice.serialize.Server.class, null), - new TestSuiteEntry("servantLocator", test.Ice.servantLocator.Client.class, - test.Ice.servantLocator.Server.class, test.Ice.servantLocator.Collocated.class), - new TestSuiteEntry("slicing/exceptions", test.Ice.slicing.exceptions.Client.class, - test.Ice.slicing.exceptions.Server.class, null), - new TestSuiteEntry("slicing/objects", test.Ice.slicing.objects.Client.class, - test.Ice.slicing.objects.Server.class, null), - new TestSuiteEntry("stream", test.Ice.stream.Client.class, null, null), - // The throughput test uses too much memory. - //new TestSuiteEntry("throughput", test.Ice.throughput.Client.class, test.Ice.throughput.Server.class, null), - new TestSuiteEntry("timeout", test.Ice.timeout.Client.class, test.Ice.timeout.Server.class, null), - }; - - static final private TestSuiteEntry[] _ssltests = - { - new TestSuiteEntry("adapterDeactivation", test.Ice.adapterDeactivation.Client.class, - test.Ice.adapterDeactivation.Server.class, test.Ice.adapterDeactivation.Collocated.class), - new TestSuiteEntry("ami", test.Ice.ami.Client.class, test.Ice.ami.Server.class, null), - new TestSuiteEntry("binding", test.Ice.binding.Client.class, test.Ice.binding.Server.class, null), - new TestSuiteEntry("checksum", test.Ice.checksum.Client.class, test.Ice.checksum.Server.class, null), - new TestSuiteEntry("classLoader", test.Ice.classLoader.Client.class, test.Ice.classLoader.Server.class, null), - new TestSuiteEntry("custom", test.Ice.custom.Client.class, test.Ice.custom.Server.class, - test.Ice.custom.Collocated.class), - new TestSuiteEntry("defaultServant", test.Ice.defaultServant.Client.class, null, null), - new TestSuiteEntry("defaultValue", test.Ice.defaultValue.Client.class, null, null), - new TestSuiteEntry("dispatcher", test.Ice.dispatcher.Client.class, test.Ice.dispatcher.Server.class, null), - new TestSuiteEntry("enums", test.Ice.enums.Client.class, test.Ice.enums.Server.class, null), - new TestSuiteEntry("exceptions", test.Ice.exceptions.Client.class, test.Ice.exceptions.Server.class, - test.Ice.exceptions.Collocated.class), - new TestSuiteEntry("facets", test.Ice.facets.Client.class, test.Ice.facets.Server.class, - test.Ice.facets.Collocated.class), - // The hash test uses too much memory. - //new TestSuiteEntry("hash", test.Ice.hash.Client.class, null, null), - new TestSuiteEntry("hold", test.Ice.hold.Client.class, test.Ice.hold.Server.class, null), - // The info test is not currently enabled - it relies on sockets to accurately return - // address and port information, which really only works in Android 2.3+. - //new TestSuiteEntry("info", test.Ice.info.Client.class, test.Ice.info.Server.class, null), - new TestSuiteEntry("inheritance", test.Ice.inheritance.Client.class, test.Ice.inheritance.Server.class, - test.Ice.inheritance.Collocated.class), - new TestSuiteEntry("interceptor", test.Ice.interceptor.Client.class, null, null), - new TestSuiteEntry("invoke", test.Ice.invoke.Client.class, test.Ice.invoke.Server.class, null), - new TestSuiteEntry("location", test.Ice.location.Client.class, test.Ice.location.Server.class, null), - // The metrics test uses too much memory. - //new TestSuiteEntry("metrics", test.Ice.metrics.Client.class, test.Ice.metrics.Server.class, null), - new TestSuiteEntry("objects", test.Ice.objects.Client.class, test.Ice.objects.Server.class, - test.Ice.objects.Collocated.class), - new TestSuiteEntry("operations", test.Ice.operations.Client.class, test.Ice.operations.Server.class, - test.Ice.operations.Collocated.class), - new TestSuiteEntry("optional", test.Ice.optional.Client.class, test.Ice.optional.Server.class, null), - new TestSuiteEntry("packagemd", test.Ice.packagemd.Client.class, test.Ice.packagemd.Server.class, null), - new TestSuiteEntry("proxy", test.Ice.proxy.Client.class, test.Ice.proxy.Server.class, - test.Ice.proxy.Collocated.class), - new TestSuiteEntry("retry", test.Ice.retry.Client.class, test.Ice.retry.Server.class, null), - new TestSuiteEntry("serialize", test.Ice.serialize.Client.class, test.Ice.serialize.Server.class, null), - new TestSuiteEntry("seqMapping", test.Ice.seqMapping.Client.class, test.Ice.seqMapping.Server.class, - test.Ice.seqMapping.Collocated.class), - new TestSuiteEntry("servantLocator", test.Ice.servantLocator.Client.class, - test.Ice.servantLocator.Server.class, test.Ice.servantLocator.Collocated.class), - new TestSuiteEntry("slicing/exceptions", test.Ice.slicing.exceptions.Client.class, - test.Ice.slicing.exceptions.Server.class, null), - new TestSuiteEntry("slicing/objects", test.Ice.slicing.objects.Client.class, - test.Ice.slicing.objects.Server.class, null), - new TestSuiteEntry("stream", test.Ice.stream.Client.class, null, null), - new TestSuiteEntry("timeout", test.Ice.timeout.Client.class, test.Ice.timeout.Server.class, null), - }; - private TestSuiteEntry[] _curtests = _tests; - - class MyWriter extends Writer - { - @Override - public void close() - throws IOException - { - flush(); - } - - @Override - public void flush() - throws IOException - { - final String s = _data.toString(); - if(s.length() > 0) - { - postOnOutput(s); - } - _data = new StringBuffer(); - } - - @Override - public void write(char[] buf, int offset, int count) - throws IOException - { - _data.append(buf, offset, count); - } - - private StringBuffer _data = new StringBuffer(); - } - - private Handler _handler; - private LinkedList<String> _strings = new LinkedList<String>(); - - public interface TestListener - { - public void onStartTest(String test); - - public void onOutput(String s); - - public void onComplete(int status); - } - - private TestListener _listener = null; - - private boolean _complete = false; - private int _status = 0; - private int _currentTest = -1; - - private boolean _ssl = false; - private boolean _sslInitialized = false; - private boolean _sslSupported = false; - private boolean _ipv6 = false; - private SSLContext _clientContext = null; - private SSLContext _serverContext = null; - private SSLInitializationListener _ssllistener; - - static abstract class TestThread extends Thread - { - test.Util.Application _app; - protected int _status; - - TestThread(test.Util.Application app) - { - _app = app; - } - - public int getStatus() - { - return _status; - } - - protected String[] setupAddress(String[] args, boolean ipv6) - { - if(ipv6) - { - String[] ipv6Args = - { - "--Ice.Default.Host=0:0:0:0:0:0:0:1", - "--Ice.IPv4=1", - "--Ice.IPv6=1", - "--Ice.PreferIPv6Address=1", - }; - - String[] nargs = new String[args.length + ipv6Args.length]; - System.arraycopy(args, 0, nargs, 0, args.length); - System.arraycopy(ipv6Args, 0, nargs, args.length, ipv6Args.length); - return nargs; - } - else - { - String[] ipv4Args = - { - "--Ice.Default.Host=127.0.0.1", - "--Ice.IPv4=1", - "--Ice.IPv6=0" - }; - - String[] nargs = new String[args.length + ipv4Args.length]; - System.arraycopy(args, 0, nargs, 0, args.length); - System.arraycopy(ipv4Args, 0, nargs, args.length, ipv4Args.length); - return nargs; - } - } - - protected String[] setupssl(String[] args, final SSLContext context) - { - String[] sslargs = - { - "--Ice.Plugin.IceSSL=IceSSL.PluginFactory", "--Ice.Default.Protocol=ssl", "--Ice.InitPlugins=0" - }; - - // - // Froyo apparently still suffers from Harmony bug 6047, requiring that we - // disable server-side verification of client certificates. - // - if(VERSION.SDK_INT == 8) // android.os.Build.VERSION_CODES.FROYO (8) - { - String[] arr = new String[sslargs.length + 1]; - System.arraycopy(sslargs, 0, arr, 0, sslargs.length); - arr[arr.length - 1] = "--IceSSL.VerifyPeer=0"; - sslargs = arr; - } - - String[] nargs = new String[args.length + sslargs.length]; - System.arraycopy(args, 0, nargs, 0, args.length); - System.arraycopy(sslargs, 0, nargs, args.length, sslargs.length); - args = nargs; - _app.setCommunicatorListener(new CommunicatorListener() - { - public void communicatorInitialized(Communicator c) - { - IceSSL.Plugin plugin = (IceSSL.Plugin)c.getPluginManager().getPlugin("IceSSL"); - plugin.setContext(context); - c.getPluginManager().initializePlugins(); - } - }); - return args; - } - } - - class ClientThread extends TestThread - { - private test.Util.Application _server; - - ClientThread(test.Util.Application c, test.Util.Application s) - { - super(c); - _server = s; - setName("ClientThread"); - } - - public void run() - { - String[] args = - { - "--Ice.NullHandleAbort=1", "--Ice.Warn.Connections=1" - }; - - args = setupAddress(args, _ipv6); - - if(_ssl) - { - args = setupssl(args, _clientContext); - } - _status = _app.main("Client", args); - // If the client failed, then stop the server -- the test is over. - if(_status != 0 && _server != null) - { - _server.stop(); - } - } - } - - class ServerThread extends TestThread - { - private test.Util.Application _client; - private ClientThread _clientThread; - - ServerThread(test.Util.Application c, test.Util.Application s) - { - super(s); - setName("ServerThread"); - _client = c; - } - - public void run() - { - String[] args = - { - "--Ice.NullHandleAbort=1", - "--Ice.Warn.Connections=1", - "--Ice.ThreadPool.Server.Size=1", - "--Ice.ThreadPool.Server.SizeMax=3", - "--Ice.ThreadPool.Server.SizeWarn=0" - }; - - args = setupAddress(args, _ipv6); - - if(_ssl) - { - args = setupssl(args, _serverContext); - } - _app.setServerReadyListener(new test.Util.Application.ServerReadyListener() - { - public void serverReady() - { - if(_client != null) - { - _clientThread = new ClientThread(_client, _app); - _clientThread.start(); - } - } - }); - - _status = _app.main("Server", args); - if(_clientThread != null) - { - while(_clientThread.isAlive()) - { - try - { - _clientThread.join(); - } - catch(InterruptedException e1) - { - } - } - if(_clientThread.getStatus() != 0) - { - _status = _clientThread.getStatus(); - } - } - } - } - - class CollocatedThread extends TestThread - { - CollocatedThread(test.Util.Application c) - { - super(c); - setName("CollocatedThread"); - } - - public void run() - { - String[] args = - { - "--Ice.NullHandleAbort=1" - }; - - args = setupAddress(args, _ipv6); - - if(_ssl) - { - args = setupssl(args, _clientContext); - } - _status = _app.main("Collocated", args); - } - } - - class TestRunner extends Thread - { - private List<TestThread> _threads; - - TestRunner(List<TestThread> l) - { - _threads = l; - } - - public void run() - { - for(TestThread t : _threads) - { - t.start(); - while(t.isAlive()) - { - try - { - t.join(); - } - catch(InterruptedException e) - { - } - } - int status = t.getStatus(); - if(status != 0) - { - postOnComplete(status); - return; - } - } - postOnComplete(0); - } - } - - synchronized private void postOnOutput(final String s) - { - _strings.add(s); - if(_listener != null) - { - final TestListener l = _listener; - _handler.post(new Runnable() - { - public void run() - { - l.onOutput(s); - } - }); - } - } - - synchronized private void postOnComplete(final int status) - { - _status = status; - _complete = true; - if(_listener != null) - { - final TestListener l = _listener; - _handler.post(new Runnable() - { - public void run() - { - l.onComplete(status); - } - }); - } - } - - public interface SSLInitializationListener - { - public void onComplete(); - - public void onError(); - - public void onWait(); - } - - // This is called from the SSL initialization thread. - synchronized private void sslContextInitialized(SSLContext clientContext, SSLContext serverContext) - { - _clientContext = clientContext; - _serverContext = serverContext; - _sslInitialized = true; - - if(_ssllistener != null) - { - final SSLInitializationListener listener = _ssllistener; - if(_clientContext == null | _serverContext == null) - { - _handler.post(new Runnable() - { - public void run() - { - listener.onError(); - } - }); - } - else - { - _handler.post(new Runnable() - { - public void run() - { - listener.onComplete(); - } - }); - } - } - } - - @Override - public void onCreate() - { - _handler = new Handler(); - - if(VERSION.SDK_INT == 8) // android.os.Build.VERSION_CODES.FROYO (8) - { - // - // Workaround for a bug in Android 2.2 (Froyo). - // - // See http://code.google.com/p/android/issues/detail?id=9431 - // - java.lang.System.setProperty("java.net.preferIPv4Stack", "true"); - java.lang.System.setProperty("java.net.preferIPv6Addresses", "false"); - } - - // - // The SSLEngine class only works properly in Froyo (or later). - // - _sslSupported = VERSION.SDK_INT >= 8; - } - - @Override - public void onTerminate() - { - } - - public List<String> getTestNames() - { - List<String> s = new ArrayList<String>(); - for(TestSuiteEntry t : _curtests) - { - s.add(t.getName()); - } - return s; - } - - synchronized public void setTestListener(TestListener listener) - { - _listener = listener; - if(_listener != null && _currentTest != -1) - { - _listener.onStartTest(_curtests[_currentTest].getName()); - for(String s : _strings) - { - _listener.onOutput(s); - } - if(_complete) - { - _listener.onComplete(_status); - } - } - } - - public void startNextTest() - { - assert _complete; - startTest((_currentTest + 1) % _curtests.length); - } - - synchronized public void startTest(int position) - { - assert !_ssl || (_ssl && _sslInitialized); - - PrintWriter pw = new PrintWriter(new MyWriter()); - - _currentTest = position; - _complete = false; - _strings.clear(); - - TestSuiteEntry entry = _curtests[position]; - test.Util.Application client; - test.Util.Application server; - test.Util.Application collocated; - - if(_listener != null) - { - _listener.onStartTest(entry.getName()); - } - - try - { - client = entry.getClient(); - server = entry.getServer(); - collocated = entry.getCollocated(); - } - catch(IllegalAccessException e) - { - e.printStackTrace(pw); - postOnComplete(-1); - return; - } - catch(InstantiationException e) - { - e.printStackTrace(pw); - postOnComplete(-1); - return; - } - - List<TestThread> l = new ArrayList<TestThread>(); - if(server != null) - { - server.setWriter(new MyWriter()); - // All servers must have a client. - assert client != null; - client.setWriter(new MyWriter()); - l.add(new ServerThread(client, server)); - if(collocated != null) - { - collocated.setWriter(new MyWriter()); - l.add(new CollocatedThread(collocated)); - } - } - else - { - client.setWriter(new MyWriter()); - l.add(new ClientThread(client, null)); - } - TestRunner r = new TestRunner(l); - r.setDaemon(true); - r.start(); - } - - public boolean isSSLSupported() - { - return _sslSupported; - } - - public void setIPv6(boolean ipv6) - { - _ipv6 = ipv6; - } - - public void setSSL(boolean ssl) - { - assert(!ssl || (ssl && _sslSupported)); - _ssl = ssl; - if(_ssl) - { - _curtests = _ssltests; - } - else - { - _curtests = _tests; - } - if(_currentTest > _curtests.length-1) - { - _currentTest = _curtests.length-1; - } - - if(_ssl && !_sslInitialized) - { - if(_ssllistener != null) - { - _ssllistener.onWait(); - } - Runnable r = new Runnable() - { - private SSLContext initializeContext(java.io.InputStream cert) - throws NoSuchAlgorithmException, KeyStoreException, IOException, CertificateException, - FileNotFoundException, UnrecoverableKeyException, KeyManagementException - { - SSLContext context = SSLContext.getInstance("TLS"); - KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); - - KeyStore ks = KeyStore.getInstance("BKS"); - char[] passphrase = "password".toCharArray(); - ks.load(cert, passphrase); - kmf.init(ks, passphrase); - - TrustManagerFactory tmf = - TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); - tmf.init(ks); - - context.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); - return context; - } - - public void run() - { - SSLContext clientContext = null; - SSLContext serverContext = null; - try - { - clientContext = initializeContext(getResources().openRawResource(R.raw.client)); - serverContext = initializeContext(getResources().openRawResource(R.raw.server)); - } - catch(Exception ex) - { - ex.printStackTrace(); - } - sslContextInitialized(clientContext, serverContext); - } - }; - - Thread t = new Thread(r); - t.setName("Initialize SSL Thread"); - t.setDaemon(true); - t.start(); - } - } - - synchronized public void setSSLInitializationListener(SSLInitializationListener listener) - { - _ssllistener = listener; - if(_ssl) - { - if(!_sslInitialized) - { - listener.onWait(); - } - else if(_clientContext == null || _serverContext == null) - { - listener.onError(); - } - else - { - listener.onComplete(); - } - } - } -} diff --git a/java/test/android/src/com/zeroc/testsuite/TestContainer.java b/java/test/android/src/com/zeroc/testsuite/TestContainer.java deleted file mode 100644 index 0c9dacbaf69..00000000000 --- a/java/test/android/src/com/zeroc/testsuite/TestContainer.java +++ /dev/null @@ -1,113 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.testsuite; - -import java.util.LinkedList; - -import android.app.ListActivity; -import android.os.Bundle; -import android.widget.ArrayAdapter; -import android.widget.Button; - -public class TestContainer extends ListActivity implements TestApp.TestListener -{ - private LinkedList<String> _strings = new LinkedList<String>(); - private ArrayAdapter<String> _adapter; - private boolean _partial = false; - private Button _next; - - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.container); - _adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, _strings); - setListAdapter(_adapter); - - _next = (Button)findViewById(R.id.next); - _next.setOnClickListener(new android.view.View.OnClickListener() - { - public void onClick(android.view.View v) - { - TestApp app = (TestApp)getApplication(); - app.startNextTest(); - } - }); - _next.setEnabled(false); - } - - @Override - public void onResume() - { - super.onResume(); - TestApp app = (TestApp)getApplication(); - app.setTestListener(this); - } - - @Override - public void onStop() - { - super.onStop(); - TestApp app = (TestApp)getApplication(); - app.setTestListener(null); - } - - public void onStartTest(String test) - { - setTitle(test); - _partial = false; - _strings.clear(); - _adapter.notifyDataSetChanged(); - _next.setEnabled(false); - } - - public void onComplete(int status) - { - _next.setEnabled(true); - } - - public void onOutput(String s) - { - int start = 0; - int end = s.length(); - int pos; - do - { - pos = s.indexOf('\n', start); - if(pos != -1) - { - addData(s.substring(start, pos), false); - start = pos+1; - } - } - while(start < end && pos != -1); - if(start < end) - { - addData(s.substring(start, end), true); - } - } - - private void addData(String s, boolean partialLine) - { - if(_partial) - { - String last = _strings.removeLast(); - last = last + s; - _strings.add(last); - _adapter.notifyDataSetChanged(); - } - else - { - _adapter.add(s); - } - _partial = partialLine; - } -} diff --git a/java/test/android/src/com/zeroc/testsuite/TestSuite.java b/java/test/android/src/com/zeroc/testsuite/TestSuite.java deleted file mode 100644 index 0b0a1178d6f..00000000000 --- a/java/test/android/src/com/zeroc/testsuite/TestSuite.java +++ /dev/null @@ -1,143 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package com.zeroc.testsuite; - -import java.util.ArrayList; -import java.util.List; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.ListActivity; -import android.app.ProgressDialog; -import android.content.DialogInterface; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.ArrayAdapter; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.ListView; -import android.widget.CompoundButton.OnCheckedChangeListener; - -public class TestSuite extends ListActivity -{ - private static final int DIALOG_INITIALIZING = 1; - private static final int DIALOG_SSL_FAILED = 2; - private List<String> _tests = new ArrayList<String>(); - - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.main); - - final TestApp app = (TestApp)getApplication(); - _tests.addAll(app.getTestNames()); - final ArrayAdapter<String> adapter = - new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, _tests); - setListAdapter(adapter); - app.setSSLInitializationListener(new TestApp.SSLInitializationListener() - { - private boolean dismiss = false; - - public void onComplete() - { - if(dismiss) - { - dismissDialog(DIALOG_INITIALIZING); - } - } - - public void onError() - { - if(dismiss) - { - dismissDialog(DIALOG_INITIALIZING); - } - showDialog(DIALOG_SSL_FAILED); - } - - public void onWait() - { - // Show the initializing dialog. - dismiss = true; - showDialog(DIALOG_INITIALIZING); - } - }); - CheckBox secure = (CheckBox)findViewById(R.id.secure); - if(app.isSSLSupported()) - { - secure.setOnCheckedChangeListener(new OnCheckedChangeListener() - { - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) - { - app.setSSL(isChecked); - _tests.clear(); - _tests.addAll(app.getTestNames()); - adapter.notifyDataSetChanged(); - } - }); - } - else - { - secure.setEnabled(false); - } - - CheckBox ipv6 = (CheckBox)findViewById(R.id.ipv6); - ipv6.setOnCheckedChangeListener(new OnCheckedChangeListener() - { - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) - { - app.setIPv6(isChecked); - } - }); - } - - protected void onListItemClick(ListView l, View v, int position, long id) - { - TestApp app = (TestApp)getApplication(); - app.startTest(position); - startActivity(new Intent(this, TestContainer.class)); - } - - @Override - protected Dialog onCreateDialog(int id) - { - switch (id) - { - case DIALOG_INITIALIZING: - { - ProgressDialog dialog = new ProgressDialog(this); - dialog.setTitle("Initializing"); - dialog.setMessage("Please wait while initializing SSL..."); - dialog.setIndeterminate(true); - dialog.setCancelable(false); - return dialog; - } - - case DIALOG_SSL_FAILED: - { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Error"); - builder.setMessage("SSL Initialization failed"); - builder.setCancelable(false); - builder.setPositiveButton("Ok", new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int whichButton) - { - finish(); - } - }); - return builder.create(); - } - } - return null; - } -} diff --git a/java/test/build.gradle b/java/test/build.gradle index f306f6c1aa7..366f51f9ed2 100644 --- a/java/test/build.gradle +++ b/java/test/build.gradle @@ -7,144 +7,14 @@ // // ********************************************************************** -slice { - java { - set1 { - include = ["${sliceDir}"] - files = fileTree(dir: ".", includes:['Ice/adapterDeactivation/*.ice', - 'Ice/ami/*.ice', - 'Ice/admin/*.ice', - 'Ice/background/*.ice', - 'Ice/binding/*.ice', - 'Ice/classLoader/*.ice', - 'Ice/custom/*.ice', - 'Ice/defaultServant/*.ice', - 'Ice/defaultValue/*.ice', - 'Ice/dispatcher/*.ice', - 'Ice/echo/*.ice', - 'Ice/exceptions/*.ice', - 'Ice/facets/*.ice', - 'Ice/faultTolerance/*.ice', - 'Ice/hash/*.ice', - 'Ice/hold/*.ice', - 'Ice/info/*.ice', - 'Ice/inheritance/*.ice', - 'Ice/interceptor/*.ice', - 'Ice/interrupt/*.ice', - 'Ice/invoke/*.ice', - 'Ice/location/*.ice', - 'Ice/metrics/*.ice', - 'Ice/networkProxy/*.ice', - 'Ice/proxy/*.ice', - 'Ice/retry/*.ice', - 'Ice/seqMapping/*.ice', - 'Ice/servantLocator/*.ice', - 'Ice/serialize/*.ice', - 'Ice/slicing/exceptions/*.ice', - 'Ice/slicing/objects/*.ice', - 'Ice/timeout/*.ice', - 'Ice/acm/*.ice', - 'Ice/throughput/*.ice', - 'Ice/threadPoolPriority/*.ice', - 'Ice/udp/*.ice', - 'Freeze/complex/*.ice', - 'Glacier2/router/*.ice', - 'Glacier2/sessionHelper/*.ice', - 'IceDiscovery/simple/*.ice', - 'IceGrid/simple/*.ice', - 'IceBox/admin/*.ice', - 'IceBox/configuration/*.ice', - 'IceSSL/configuration/*.ice', - 'Slice/keyword/*.ice', - 'Slice/macros/*.ice', - 'Slice/structure/*.ice']) - } - set2 { - include = ["${sliceDir}"] - args = "--tie" - files = fileTree(dir: ".", includes:['Ice/operations/*.ice', - 'Freeze/evictor/*.ice']) - } - set3 { - include = ["${sliceDir}"] - args = "--stream" - files = fileTree(dir: ".", includes:['Ice/objects/*.ice', - 'Ice/optional/*.ice', - 'Ice/stream/*.ice', - 'Ice/enums/*.ice']) - } - set4 { - include = ["${sliceDir}"] - args = "--checksum test.Ice.checksum.Test.SliceChecksums" - files = fileTree(dir: ".", includes:['Ice/checksum/Test.ice', - 'Ice/checksum/Types.ice']) - } - set5 { - include = ["${sliceDir}", "${projectDir}/Ice/packagemd"] - files = fileTree(dir: ".", includes:['Ice/packagemd/*.ice']) - } - set6 { - include = ["${sliceDir}"] - args = "--checksum test.Ice.checksum.server.Test.SliceChecksums" - files = fileTree(dir: ".", includes:['Ice/checksum/TestServer.ice', - 'Ice/checksum/TypesServer.ice']) - } - } - freezej { - files = [file("Freeze/complex/Complex.ice"), - file("${sliceDir}/Ice/Identity.ice")] - include = ["${sliceDir}"] - args = "--ice" - dict { - ComplexDict { - javaType = "test.Freeze.complex.Complex.ComplexDict" - key = "Complex::Key" - value = "Complex::Node" - } - } - dict { - ByteIntMap { - javaType = "test.Freeze.dbmap.ByteIntMap" - key = "byte" - value = "int" - index = [[:]] - } - } - dict { - IntIdentityMap { - javaType = "test.Freeze.dbmap.IntIdentityMap" - key = "int" - value = "Ice::Identity" - } - } - dict { - IntIdentityMapWithIndex { - javaType = "test.Freeze.dbmap.IntIdentityMapWithIndex" - key = "int" - value = "Ice::Identity" - index = [[ member: 'category']] - } - } - dict { - SortedMap { - javaType = "test.Freeze.dbmap.SortedMap" - key = "int" - value = "Ice::Identity" - index = [[ member: 'category']] - } - } - } -} +ext.testDir = "${projectDir}/src/main/java/test" +apply from: "slice.gradle" def hasLambda = org.gradle.internal.jvm.Jvm.current().getJavaVersion().toString().toFloat() >= 1.8f sourceSets { main { java { - srcDir '.' - exclude 'Ice/translator' - exclude 'Slice/generation' - exclude 'android' if (!hasLambda) { exclude '**/lambda' } @@ -160,13 +30,13 @@ idea.module { if (distJarDir == null) { dependencies { - compile project(':src/Ice') - compile project(':src/Freeze') - compile project(':src/IceDiscovery') - compile project(':src/IceBox') - compile project(':src/Glacier2') - compile project(':src/IceStorm') - compile project(':src/IceGrid') + compile project(':Ice') + compile project(':Freeze') + compile project(':IceDiscovery') + compile project(':IceBox') + compile project(':Glacier2') + compile project(':IceStorm') + compile project(':IceGrid') } } else { println "Using Ice jars installed in ${distJarDir}" diff --git a/java/test/slice.gradle b/java/test/slice.gradle new file mode 100644 index 00000000000..d743521c36f --- /dev/null +++ b/java/test/slice.gradle @@ -0,0 +1,139 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +task testSliceTask { + slice { + java { + set1 { + include = ["${sliceDir}"] + files = fileTree(dir: testDir, includes:['Ice/adapterDeactivation/*.ice', + 'Ice/ami/*.ice', + 'Ice/admin/*.ice', + 'Ice/background/*.ice', + 'Ice/binding/*.ice', + 'Ice/classLoader/*.ice', + 'Ice/custom/*.ice', + 'Ice/defaultServant/*.ice', + 'Ice/defaultValue/*.ice', + 'Ice/dispatcher/*.ice', + 'Ice/echo/*.ice', + 'Ice/exceptions/*.ice', + 'Ice/facets/*.ice', + 'Ice/faultTolerance/*.ice', + 'Ice/hash/*.ice', + 'Ice/hold/*.ice', + 'Ice/info/*.ice', + 'Ice/inheritance/*.ice', + 'Ice/interceptor/*.ice', + 'Ice/interrupt/*.ice', + 'Ice/invoke/*.ice', + 'Ice/location/*.ice', + 'Ice/metrics/*.ice', + 'Ice/networkProxy/*.ice', + 'Ice/proxy/*.ice', + 'Ice/retry/*.ice', + 'Ice/seqMapping/*.ice', + 'Ice/servantLocator/*.ice', + 'Ice/serialize/*.ice', + 'Ice/slicing/exceptions/*.ice', + 'Ice/slicing/objects/*.ice', + 'Ice/timeout/*.ice', + 'Ice/acm/*.ice', + 'Ice/throughput/*.ice', + 'Ice/threadPoolPriority/*.ice', + 'Ice/udp/*.ice', + 'Freeze/complex/*.ice', + 'Glacier2/router/*.ice', + 'Glacier2/sessionHelper/*.ice', + 'IceDiscovery/simple/*.ice', + 'IceGrid/simple/*.ice', + 'IceBox/admin/*.ice', + 'IceBox/configuration/*.ice', + 'IceSSL/configuration/*.ice', + 'Slice/keyword/*.ice', + 'Slice/macros/*.ice', + 'Slice/structure/*.ice']) + } + set2 { + include = ["${sliceDir}"] + args = "--tie" + files = fileTree(dir: testDir, includes:['Ice/operations/*.ice', + 'Freeze/evictor/*.ice']) + } + set3 { + include = ["${sliceDir}"] + args = "--stream" + files = fileTree(dir: testDir, includes:['Ice/objects/*.ice', + 'Ice/optional/*.ice', + 'Ice/stream/*.ice', + 'Ice/enums/*.ice']) + } + set4 { + include = ["${sliceDir}"] + args = "--checksum test.Ice.checksum.Test.SliceChecksums" + files = fileTree(dir: testDir, includes:['Ice/checksum/Test.ice', + 'Ice/checksum/Types.ice']) + } + set5 { + include = ["${sliceDir}", "${testDir}/Ice/packagemd"] + files = fileTree(dir: testDir, includes:['Ice/packagemd/*.ice']) + } + set6 { + include = ["${sliceDir}"] + args = "--checksum test.Ice.checksum.server.Test.SliceChecksums" + files = fileTree(dir: testDir, includes:['Ice/checksum/TestServer.ice', + 'Ice/checksum/TypesServer.ice']) + } + } + freezej { + files = [file("${testDir}/Freeze/complex/Complex.ice"), + file("${sliceDir}/Ice/Identity.ice")] + include = ["${sliceDir}"] + args = "--ice" + dict { + ComplexDict { + javaType = "test.Freeze.complex.Complex.ComplexDict" + key = "Complex::Key" + value = "Complex::Node" + } + } + dict { + ByteIntMap { + javaType = "test.Freeze.dbmap.ByteIntMap" + key = "byte" + value = "int" + index = [[:]] + } + } + dict { + IntIdentityMap { + javaType = "test.Freeze.dbmap.IntIdentityMap" + key = "int" + value = "Ice::Identity" + } + } + dict { + IntIdentityMapWithIndex { + javaType = "test.Freeze.dbmap.IntIdentityMapWithIndex" + key = "int" + value = "Ice::Identity" + index = [[ member: 'category']] + } + } + dict { + SortedMap { + javaType = "test.Freeze.dbmap.SortedMap" + key = "int" + value = "Ice::Identity" + index = [[ member: 'category']] + } + } + } + } +}
\ No newline at end of file diff --git a/java/test/Freeze/complex/.gitignore b/java/test/src/main/java/test/Freeze/complex/.gitignore index ca51e824975..ca51e824975 100644 --- a/java/test/Freeze/complex/.gitignore +++ b/java/test/src/main/java/test/Freeze/complex/.gitignore diff --git a/java/test/Freeze/complex/Client.java b/java/test/src/main/java/test/Freeze/complex/Client.java index e98b4ebb6fb..e98b4ebb6fb 100644 --- a/java/test/Freeze/complex/Client.java +++ b/java/test/src/main/java/test/Freeze/complex/Client.java diff --git a/java/test/Freeze/complex/Complex.ice b/java/test/src/main/java/test/Freeze/complex/Complex.ice index 1953e7e3caa..1953e7e3caa 100644 --- a/java/test/Freeze/complex/Complex.ice +++ b/java/test/src/main/java/test/Freeze/complex/Complex.ice diff --git a/java/test/Freeze/complex/Complex/AddNodeI.java b/java/test/src/main/java/test/Freeze/complex/Complex/AddNodeI.java index d380923382a..d380923382a 100644 --- a/java/test/Freeze/complex/Complex/AddNodeI.java +++ b/java/test/src/main/java/test/Freeze/complex/Complex/AddNodeI.java diff --git a/java/test/Freeze/complex/Complex/MultiplyNodeI.java b/java/test/src/main/java/test/Freeze/complex/Complex/MultiplyNodeI.java index 67dab5d7b71..67dab5d7b71 100644 --- a/java/test/Freeze/complex/Complex/MultiplyNodeI.java +++ b/java/test/src/main/java/test/Freeze/complex/Complex/MultiplyNodeI.java diff --git a/java/test/Freeze/complex/Complex/NumberNodeI.java b/java/test/src/main/java/test/Freeze/complex/Complex/NumberNodeI.java index 308f59b6170..308f59b6170 100644 --- a/java/test/Freeze/complex/Complex/NumberNodeI.java +++ b/java/test/src/main/java/test/Freeze/complex/Complex/NumberNodeI.java diff --git a/java/test/Freeze/complex/Complex/ObjectFactoryI.java b/java/test/src/main/java/test/Freeze/complex/Complex/ObjectFactoryI.java index 66c92bfbf7b..66c92bfbf7b 100644 --- a/java/test/Freeze/complex/Complex/ObjectFactoryI.java +++ b/java/test/src/main/java/test/Freeze/complex/Complex/ObjectFactoryI.java diff --git a/java/test/Freeze/complex/ParseError.java b/java/test/src/main/java/test/Freeze/complex/ParseError.java index 05b510c7093..05b510c7093 100644 --- a/java/test/Freeze/complex/ParseError.java +++ b/java/test/src/main/java/test/Freeze/complex/ParseError.java diff --git a/java/test/Freeze/complex/Parser.java b/java/test/src/main/java/test/Freeze/complex/Parser.java index 87edceea504..87edceea504 100644 --- a/java/test/Freeze/complex/Parser.java +++ b/java/test/src/main/java/test/Freeze/complex/Parser.java diff --git a/java/test/src/main/java/test/Freeze/complex/db/.gitignore b/java/test/src/main/java/test/Freeze/complex/db/.gitignore new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/java/test/src/main/java/test/Freeze/complex/db/.gitignore diff --git a/java/test/Freeze/complex/run.py b/java/test/src/main/java/test/Freeze/complex/run.py index 1b63b3c6e0d..1fdd637162c 100755 --- a/java/test/Freeze/complex/run.py +++ b/java/test/src/main/java/test/Freeze/complex/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Freeze/dbmap/.gitignore b/java/test/src/main/java/test/Freeze/dbmap/.gitignore index 9c39416c539..9c39416c539 100644 --- a/java/test/Freeze/dbmap/.gitignore +++ b/java/test/src/main/java/test/Freeze/dbmap/.gitignore diff --git a/java/test/Freeze/dbmap/Client.java b/java/test/src/main/java/test/Freeze/dbmap/Client.java index fe6c9a06680..fe6c9a06680 100644 --- a/java/test/Freeze/dbmap/Client.java +++ b/java/test/src/main/java/test/Freeze/dbmap/Client.java diff --git a/java/test/src/main/java/test/Freeze/dbmap/db/.gitignore b/java/test/src/main/java/test/Freeze/dbmap/db/.gitignore new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/java/test/src/main/java/test/Freeze/dbmap/db/.gitignore diff --git a/java/test/Freeze/dbmap/run.py b/java/test/src/main/java/test/Freeze/dbmap/run.py index 3f6f310a18e..d2ed1ebbb13 100755 --- a/java/test/Freeze/dbmap/run.py +++ b/java/test/src/main/java/test/Freeze/dbmap/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Freeze/evictor/.gitignore b/java/test/src/main/java/test/Freeze/evictor/.gitignore index 9c39416c539..9c39416c539 100644 --- a/java/test/Freeze/evictor/.gitignore +++ b/java/test/src/main/java/test/Freeze/evictor/.gitignore diff --git a/java/test/Freeze/evictor/AccountI.java b/java/test/src/main/java/test/Freeze/evictor/AccountI.java index 55e754e2553..55e754e2553 100644 --- a/java/test/Freeze/evictor/AccountI.java +++ b/java/test/src/main/java/test/Freeze/evictor/AccountI.java diff --git a/java/test/Freeze/evictor/Client.java b/java/test/src/main/java/test/Freeze/evictor/Client.java index a5e649fdf48..a5e649fdf48 100644 --- a/java/test/Freeze/evictor/Client.java +++ b/java/test/src/main/java/test/Freeze/evictor/Client.java diff --git a/java/test/Freeze/evictor/FacetI.java b/java/test/src/main/java/test/Freeze/evictor/FacetI.java index 46017f4d52a..46017f4d52a 100644 --- a/java/test/Freeze/evictor/FacetI.java +++ b/java/test/src/main/java/test/Freeze/evictor/FacetI.java diff --git a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorFactoryI.java index dcec049d6af..dcec049d6af 100644 --- a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java +++ b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorFactoryI.java diff --git a/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorI.java index d3667113863..d3667113863 100644 --- a/java/test/Freeze/evictor/RemoteEvictorI.java +++ b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorI.java diff --git a/java/test/Freeze/evictor/ServantI.java b/java/test/src/main/java/test/Freeze/evictor/ServantI.java index cff361d94e2..cff361d94e2 100644 --- a/java/test/Freeze/evictor/ServantI.java +++ b/java/test/src/main/java/test/Freeze/evictor/ServantI.java diff --git a/java/test/Freeze/evictor/Server.java b/java/test/src/main/java/test/Freeze/evictor/Server.java index e457fdf619e..e457fdf619e 100644 --- a/java/test/Freeze/evictor/Server.java +++ b/java/test/src/main/java/test/Freeze/evictor/Server.java diff --git a/java/test/Freeze/evictor/Test.ice b/java/test/src/main/java/test/Freeze/evictor/Test.ice index c31effe8451..c31effe8451 100644 --- a/java/test/Freeze/evictor/Test.ice +++ b/java/test/src/main/java/test/Freeze/evictor/Test.ice diff --git a/java/test/Freeze/evictor/config b/java/test/src/main/java/test/Freeze/evictor/config index 3fb2a18d86a..3fb2a18d86a 100644 --- a/java/test/Freeze/evictor/config +++ b/java/test/src/main/java/test/Freeze/evictor/config diff --git a/java/test/src/main/java/test/Freeze/evictor/db/.gitignore b/java/test/src/main/java/test/Freeze/evictor/db/.gitignore new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/java/test/src/main/java/test/Freeze/evictor/db/.gitignore diff --git a/java/test/Freeze/evictor/run.py b/java/test/src/main/java/test/Freeze/evictor/run.py index e88a97b8412..ee33a5ae7ea 100755 --- a/java/test/Freeze/evictor/run.py +++ b/java/test/src/main/java/test/Freeze/evictor/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Freeze/fileLock/.gitignore b/java/test/src/main/java/test/Freeze/fileLock/.gitignore index 9c39416c539..9c39416c539 100644 --- a/java/test/Freeze/fileLock/.gitignore +++ b/java/test/src/main/java/test/Freeze/fileLock/.gitignore diff --git a/java/test/Freeze/fileLock/Client.java b/java/test/src/main/java/test/Freeze/fileLock/Client.java index 8b8fd8c13a2..8b8fd8c13a2 100644 --- a/java/test/Freeze/fileLock/Client.java +++ b/java/test/src/main/java/test/Freeze/fileLock/Client.java diff --git a/java/test/Freeze/fileLock/ClientFail.java b/java/test/src/main/java/test/Freeze/fileLock/ClientFail.java index 2c589a90eb1..2c589a90eb1 100644 --- a/java/test/Freeze/fileLock/ClientFail.java +++ b/java/test/src/main/java/test/Freeze/fileLock/ClientFail.java diff --git a/java/test/src/main/java/test/Freeze/fileLock/db/.gitignore b/java/test/src/main/java/test/Freeze/fileLock/db/.gitignore new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/java/test/src/main/java/test/Freeze/fileLock/db/.gitignore diff --git a/java/test/Freeze/fileLock/run.py b/java/test/src/main/java/test/Freeze/fileLock/run.py index 54fd6966dae..8f7217a04e9 100755 --- a/java/test/Freeze/fileLock/run.py +++ b/java/test/src/main/java/test/Freeze/fileLock/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Glacier2/router/Callback.ice b/java/test/src/main/java/test/Glacier2/router/Callback.ice index 68a40cb866c..68a40cb866c 100644 --- a/java/test/Glacier2/router/Callback.ice +++ b/java/test/src/main/java/test/Glacier2/router/Callback.ice diff --git a/java/test/Glacier2/router/CallbackI.java b/java/test/src/main/java/test/Glacier2/router/CallbackI.java index e9290aa6b3e..e9290aa6b3e 100644 --- a/java/test/Glacier2/router/CallbackI.java +++ b/java/test/src/main/java/test/Glacier2/router/CallbackI.java diff --git a/java/test/Glacier2/router/CallbackReceiverI.java b/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java index ecf7e1d62b2..ecf7e1d62b2 100644 --- a/java/test/Glacier2/router/CallbackReceiverI.java +++ b/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java diff --git a/java/test/Glacier2/router/Client.java b/java/test/src/main/java/test/Glacier2/router/Client.java index 257e81c12cd..257e81c12cd 100644 --- a/java/test/Glacier2/router/Client.java +++ b/java/test/src/main/java/test/Glacier2/router/Client.java diff --git a/java/test/Glacier2/router/Server.java b/java/test/src/main/java/test/Glacier2/router/Server.java index 78ad7b573ce..78ad7b573ce 100644 --- a/java/test/Glacier2/router/Server.java +++ b/java/test/src/main/java/test/Glacier2/router/Server.java diff --git a/java/test/Glacier2/router/passwords b/java/test/src/main/java/test/Glacier2/router/passwords index a1527dec2b9..a1527dec2b9 100644 --- a/java/test/Glacier2/router/passwords +++ b/java/test/src/main/java/test/Glacier2/router/passwords diff --git a/java/test/Glacier2/router/run.py b/java/test/src/main/java/test/Glacier2/router/run.py index 68f88d7ef33..0fe99c10f25 100755 --- a/java/test/Glacier2/router/run.py +++ b/java/test/src/main/java/test/Glacier2/router/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Glacier2/sessionHelper/Callback.ice b/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice index cd37cdb95df..cd37cdb95df 100644 --- a/java/test/Glacier2/sessionHelper/Callback.ice +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice diff --git a/java/test/Glacier2/sessionHelper/CallbackI.java b/java/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java index 2cfacf26f5d..2cfacf26f5d 100644 --- a/java/test/Glacier2/sessionHelper/CallbackI.java +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java diff --git a/java/test/Glacier2/sessionHelper/Client.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java index f61f84d0051..f61f84d0051 100644 --- a/java/test/Glacier2/sessionHelper/Client.java +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java diff --git a/java/test/Glacier2/sessionHelper/Server.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java index d0cfd717a14..d0cfd717a14 100644 --- a/java/test/Glacier2/sessionHelper/Server.java +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java diff --git a/java/test/Glacier2/sessionHelper/passwords b/java/test/src/main/java/test/Glacier2/sessionHelper/passwords index a1527dec2b9..a1527dec2b9 100644 --- a/java/test/Glacier2/sessionHelper/passwords +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/passwords diff --git a/java/test/Glacier2/sessionHelper/run.py b/java/test/src/main/java/test/Glacier2/sessionHelper/run.py index f6e9c94d370..ddb8006f352 100755 --- a/java/test/Glacier2/sessionHelper/run.py +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/acm/AllTests.java b/java/test/src/main/java/test/Ice/acm/AllTests.java index a700cdb26b6..a700cdb26b6 100644 --- a/java/test/Ice/acm/AllTests.java +++ b/java/test/src/main/java/test/Ice/acm/AllTests.java diff --git a/java/test/Ice/acm/Client.java b/java/test/src/main/java/test/Ice/acm/Client.java index c6045f9a6ca..c6045f9a6ca 100644 --- a/java/test/Ice/acm/Client.java +++ b/java/test/src/main/java/test/Ice/acm/Client.java diff --git a/java/test/Ice/acm/RemoteCommunicatorI.java b/java/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java index 38cb0fc0384..38cb0fc0384 100644 --- a/java/test/Ice/acm/RemoteCommunicatorI.java +++ b/java/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java diff --git a/java/test/Ice/acm/RemoteObjectAdapterI.java b/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java index f216f0fee69..f216f0fee69 100644 --- a/java/test/Ice/acm/RemoteObjectAdapterI.java +++ b/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java diff --git a/java/test/Ice/acm/Server.java b/java/test/src/main/java/test/Ice/acm/Server.java index e267b9fa498..e267b9fa498 100644 --- a/java/test/Ice/acm/Server.java +++ b/java/test/src/main/java/test/Ice/acm/Server.java diff --git a/java/test/Ice/acm/Test.ice b/java/test/src/main/java/test/Ice/acm/Test.ice index 7a2085083e4..7a2085083e4 100644 --- a/java/test/Ice/acm/Test.ice +++ b/java/test/src/main/java/test/Ice/acm/Test.ice diff --git a/java/test/Ice/acm/TestI.java b/java/test/src/main/java/test/Ice/acm/TestI.java index be2e3a4a58e..be2e3a4a58e 100644 --- a/java/test/Ice/acm/TestI.java +++ b/java/test/src/main/java/test/Ice/acm/TestI.java diff --git a/java/test/Ice/acm/run.py b/java/test/src/main/java/test/Ice/acm/run.py index 519f05d7278..408be7e3127 100755 --- a/java/test/Ice/acm/run.py +++ b/java/test/src/main/java/test/Ice/acm/run.py @@ -10,7 +10,8 @@ import os, sys, getopt -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java index 05cbc8f3d59..05cbc8f3d59 100644 --- a/java/test/Ice/adapterDeactivation/AllTests.java +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java diff --git a/java/test/Ice/adapterDeactivation/Client.java b/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java index d5e66de93b6..d5e66de93b6 100644 --- a/java/test/Ice/adapterDeactivation/Client.java +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java diff --git a/java/test/Ice/adapterDeactivation/Collocated.java b/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java index 2ddd551b6ac..2ddd551b6ac 100644 --- a/java/test/Ice/adapterDeactivation/Collocated.java +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java diff --git a/java/test/Ice/adapterDeactivation/CookieI.java b/java/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java index 2d5d990508b..2d5d990508b 100644 --- a/java/test/Ice/adapterDeactivation/CookieI.java +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java diff --git a/java/test/Ice/adapterDeactivation/ServantLocatorI.java b/java/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java index 1856f6bddcd..1856f6bddcd 100644 --- a/java/test/Ice/adapterDeactivation/ServantLocatorI.java +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java diff --git a/java/test/Ice/adapterDeactivation/Server.java b/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java index 56d9ccd5c6b..56d9ccd5c6b 100644 --- a/java/test/Ice/adapterDeactivation/Server.java +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java diff --git a/java/test/Ice/adapterDeactivation/Test.ice b/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice index 7b1bd988078..7b1bd988078 100644 --- a/java/test/Ice/adapterDeactivation/Test.ice +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice diff --git a/java/test/Ice/adapterDeactivation/TestI.java b/java/test/src/main/java/test/Ice/adapterDeactivation/TestI.java index 38ce346f3de..38ce346f3de 100644 --- a/java/test/Ice/adapterDeactivation/TestI.java +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/TestI.java diff --git a/java/test/Ice/custom/run.py b/java/test/src/main/java/test/Ice/adapterDeactivation/run.py index 44aa7d73d00..8bb456187d9 100755 --- a/java/test/Ice/custom/run.py +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/admin/AllTests.java b/java/test/src/main/java/test/Ice/admin/AllTests.java index abc85ce0b86..abc85ce0b86 100644 --- a/java/test/Ice/admin/AllTests.java +++ b/java/test/src/main/java/test/Ice/admin/AllTests.java diff --git a/java/test/Ice/admin/Client.java b/java/test/src/main/java/test/Ice/admin/Client.java index bdd21e20559..bdd21e20559 100644 --- a/java/test/Ice/admin/Client.java +++ b/java/test/src/main/java/test/Ice/admin/Client.java diff --git a/java/test/Ice/admin/RemoteCommunicatorFactoryI.java b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java index 3100081f816..3100081f816 100644 --- a/java/test/Ice/admin/RemoteCommunicatorFactoryI.java +++ b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java diff --git a/java/test/Ice/admin/RemoteCommunicatorI.java b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java index a4137dd3d9d..a4137dd3d9d 100644 --- a/java/test/Ice/admin/RemoteCommunicatorI.java +++ b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java diff --git a/java/test/Ice/admin/RemoteLoggerI.java b/java/test/src/main/java/test/Ice/admin/RemoteLoggerI.java index 8a5a2a8e06e..8a5a2a8e06e 100644 --- a/java/test/Ice/admin/RemoteLoggerI.java +++ b/java/test/src/main/java/test/Ice/admin/RemoteLoggerI.java diff --git a/java/test/Ice/admin/Server.java b/java/test/src/main/java/test/Ice/admin/Server.java index a29e6a6d5a2..a29e6a6d5a2 100644 --- a/java/test/Ice/admin/Server.java +++ b/java/test/src/main/java/test/Ice/admin/Server.java diff --git a/java/test/Ice/admin/Test.ice b/java/test/src/main/java/test/Ice/admin/Test.ice index 608e6068a9b..608e6068a9b 100644 --- a/java/test/Ice/admin/Test.ice +++ b/java/test/src/main/java/test/Ice/admin/Test.ice diff --git a/java/test/Ice/admin/TestFacetI.java b/java/test/src/main/java/test/Ice/admin/TestFacetI.java index a1246dd8ff0..a1246dd8ff0 100644 --- a/java/test/Ice/admin/TestFacetI.java +++ b/java/test/src/main/java/test/Ice/admin/TestFacetI.java diff --git a/java/test/Ice/admin/run.py b/java/test/src/main/java/test/Ice/admin/run.py index 33fc2e8f3ac..d5fe04787c9 100755 --- a/java/test/Ice/admin/run.py +++ b/java/test/src/main/java/test/Ice/admin/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/ami/AMI.java b/java/test/src/main/java/test/Ice/ami/AMI.java index 94c9b751401..94c9b751401 100644 --- a/java/test/Ice/ami/AMI.java +++ b/java/test/src/main/java/test/Ice/ami/AMI.java diff --git a/java/test/Ice/ami/AllTests.java b/java/test/src/main/java/test/Ice/ami/AllTests.java index cfb6be791c3..cfb6be791c3 100644 --- a/java/test/Ice/ami/AllTests.java +++ b/java/test/src/main/java/test/Ice/ami/AllTests.java diff --git a/java/test/Ice/ami/Client.java b/java/test/src/main/java/test/Ice/ami/Client.java index 3e547a17ec0..3e547a17ec0 100644 --- a/java/test/Ice/ami/Client.java +++ b/java/test/src/main/java/test/Ice/ami/Client.java diff --git a/java/test/Ice/ami/Collocated.java b/java/test/src/main/java/test/Ice/ami/Collocated.java index 2c77bbd3833..2c77bbd3833 100644 --- a/java/test/Ice/ami/Collocated.java +++ b/java/test/src/main/java/test/Ice/ami/Collocated.java diff --git a/java/test/Ice/ami/Server.java b/java/test/src/main/java/test/Ice/ami/Server.java index b22e052fa06..b22e052fa06 100644 --- a/java/test/Ice/ami/Server.java +++ b/java/test/src/main/java/test/Ice/ami/Server.java diff --git a/java/test/Ice/ami/Test.ice b/java/test/src/main/java/test/Ice/ami/Test.ice index 7d1ddc7f374..7d1ddc7f374 100644 --- a/java/test/Ice/ami/Test.ice +++ b/java/test/src/main/java/test/Ice/ami/Test.ice diff --git a/java/test/Ice/ami/TestControllerI.java b/java/test/src/main/java/test/Ice/ami/TestControllerI.java index 9eebceb7214..9eebceb7214 100644 --- a/java/test/Ice/ami/TestControllerI.java +++ b/java/test/src/main/java/test/Ice/ami/TestControllerI.java diff --git a/java/test/Ice/ami/TestI.java b/java/test/src/main/java/test/Ice/ami/TestI.java index cc4f2a2040d..cc4f2a2040d 100644 --- a/java/test/Ice/ami/TestI.java +++ b/java/test/src/main/java/test/Ice/ami/TestI.java diff --git a/java/test/Ice/ami/lambda/AMI.java b/java/test/src/main/java/test/Ice/ami/lambda/AMI.java index 65bd185a849..65bd185a849 100644 --- a/java/test/Ice/ami/lambda/AMI.java +++ b/java/test/src/main/java/test/Ice/ami/lambda/AMI.java diff --git a/java/test/Ice/ami/run.py b/java/test/src/main/java/test/Ice/ami/run.py index a40df1a1bcb..6444a527f9a 100755 --- a/java/test/Ice/ami/run.py +++ b/java/test/src/main/java/test/Ice/ami/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/background/Acceptor.java b/java/test/src/main/java/test/Ice/background/Acceptor.java index 598ff348fb2..598ff348fb2 100644 --- a/java/test/Ice/background/Acceptor.java +++ b/java/test/src/main/java/test/Ice/background/Acceptor.java diff --git a/java/test/Ice/background/AllTests.java b/java/test/src/main/java/test/Ice/background/AllTests.java index ba04e6421b7..ba04e6421b7 100644 --- a/java/test/Ice/background/AllTests.java +++ b/java/test/src/main/java/test/Ice/background/AllTests.java diff --git a/java/test/Ice/background/BackgroundControllerI.java b/java/test/src/main/java/test/Ice/background/BackgroundControllerI.java index fb1a591e193..fb1a591e193 100644 --- a/java/test/Ice/background/BackgroundControllerI.java +++ b/java/test/src/main/java/test/Ice/background/BackgroundControllerI.java diff --git a/java/test/Ice/background/BackgroundI.java b/java/test/src/main/java/test/Ice/background/BackgroundI.java index 57adf958ca5..57adf958ca5 100644 --- a/java/test/Ice/background/BackgroundI.java +++ b/java/test/src/main/java/test/Ice/background/BackgroundI.java diff --git a/java/test/Ice/background/Client.java b/java/test/src/main/java/test/Ice/background/Client.java index 1955472ebab..1955472ebab 100644 --- a/java/test/Ice/background/Client.java +++ b/java/test/src/main/java/test/Ice/background/Client.java diff --git a/java/test/Ice/background/Collocated.java b/java/test/src/main/java/test/Ice/background/Collocated.java index ac3e4622f17..ac3e4622f17 100644 --- a/java/test/Ice/background/Collocated.java +++ b/java/test/src/main/java/test/Ice/background/Collocated.java diff --git a/java/test/Ice/background/Configuration.java b/java/test/src/main/java/test/Ice/background/Configuration.java index befe01738fc..befe01738fc 100644 --- a/java/test/Ice/background/Configuration.java +++ b/java/test/src/main/java/test/Ice/background/Configuration.java diff --git a/java/test/Ice/background/Connector.java b/java/test/src/main/java/test/Ice/background/Connector.java index afc3db49abe..afc3db49abe 100644 --- a/java/test/Ice/background/Connector.java +++ b/java/test/src/main/java/test/Ice/background/Connector.java diff --git a/java/test/Ice/background/EndpointFactory.java b/java/test/src/main/java/test/Ice/background/EndpointFactory.java index 09a8f35290b..09a8f35290b 100644 --- a/java/test/Ice/background/EndpointFactory.java +++ b/java/test/src/main/java/test/Ice/background/EndpointFactory.java diff --git a/java/test/Ice/background/EndpointI.java b/java/test/src/main/java/test/Ice/background/EndpointI.java index bed906911d6..bed906911d6 100644 --- a/java/test/Ice/background/EndpointI.java +++ b/java/test/src/main/java/test/Ice/background/EndpointI.java diff --git a/java/test/Ice/background/PluginFactory.java b/java/test/src/main/java/test/Ice/background/PluginFactory.java index 9edd6c8fa38..9edd6c8fa38 100644 --- a/java/test/Ice/background/PluginFactory.java +++ b/java/test/src/main/java/test/Ice/background/PluginFactory.java diff --git a/java/test/Ice/background/Server.java b/java/test/src/main/java/test/Ice/background/Server.java index 52aaf1f1f49..52aaf1f1f49 100644 --- a/java/test/Ice/background/Server.java +++ b/java/test/src/main/java/test/Ice/background/Server.java diff --git a/java/test/Ice/background/Test.ice b/java/test/src/main/java/test/Ice/background/Test.ice index b612eb4d280..b612eb4d280 100644 --- a/java/test/Ice/background/Test.ice +++ b/java/test/src/main/java/test/Ice/background/Test.ice diff --git a/java/test/Ice/background/Transceiver.java b/java/test/src/main/java/test/Ice/background/Transceiver.java index 738c7ef1f10..738c7ef1f10 100644 --- a/java/test/Ice/background/Transceiver.java +++ b/java/test/src/main/java/test/Ice/background/Transceiver.java diff --git a/java/test/Ice/background/run.py b/java/test/src/main/java/test/Ice/background/run.py index 33fc2e8f3ac..d5fe04787c9 100755 --- a/java/test/Ice/background/run.py +++ b/java/test/src/main/java/test/Ice/background/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/binding/AllTests.java b/java/test/src/main/java/test/Ice/binding/AllTests.java index 88aa196b157..88aa196b157 100644 --- a/java/test/Ice/binding/AllTests.java +++ b/java/test/src/main/java/test/Ice/binding/AllTests.java diff --git a/java/test/Ice/binding/Client.java b/java/test/src/main/java/test/Ice/binding/Client.java index 30d087baac3..30d087baac3 100644 --- a/java/test/Ice/binding/Client.java +++ b/java/test/src/main/java/test/Ice/binding/Client.java diff --git a/java/test/Ice/binding/RemoteCommunicatorI.java b/java/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java index fbebb72cd59..fbebb72cd59 100644 --- a/java/test/Ice/binding/RemoteCommunicatorI.java +++ b/java/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java diff --git a/java/test/Ice/binding/RemoteObjectAdapterI.java b/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java index a8b22ec5197..a8b22ec5197 100644 --- a/java/test/Ice/binding/RemoteObjectAdapterI.java +++ b/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java diff --git a/java/test/Ice/binding/Server.java b/java/test/src/main/java/test/Ice/binding/Server.java index 9c2926cdc3b..9c2926cdc3b 100644 --- a/java/test/Ice/binding/Server.java +++ b/java/test/src/main/java/test/Ice/binding/Server.java diff --git a/java/test/Ice/binding/Test.ice b/java/test/src/main/java/test/Ice/binding/Test.ice index 9b951c9b6fb..9b951c9b6fb 100644 --- a/java/test/Ice/binding/Test.ice +++ b/java/test/src/main/java/test/Ice/binding/Test.ice diff --git a/java/test/Ice/binding/TestI.java b/java/test/src/main/java/test/Ice/binding/TestI.java index 23a13b96ff8..23a13b96ff8 100644 --- a/java/test/Ice/binding/TestI.java +++ b/java/test/src/main/java/test/Ice/binding/TestI.java diff --git a/java/test/src/main/java/test/Ice/binding/run.py b/java/test/src/main/java/test/Ice/binding/run.py new file mode 100755 index 00000000000..d5fe04787c9 --- /dev/null +++ b/java/test/src/main/java/test/Ice/binding/run.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +import os, sys + +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil + +TestUtil.clientServerTest() diff --git a/java/test/Ice/checksum/AllTests.java b/java/test/src/main/java/test/Ice/checksum/AllTests.java index 3fb2c711746..3fb2c711746 100644 --- a/java/test/Ice/checksum/AllTests.java +++ b/java/test/src/main/java/test/Ice/checksum/AllTests.java diff --git a/java/test/Ice/checksum/ChecksumI.java b/java/test/src/main/java/test/Ice/checksum/ChecksumI.java index a85707f400e..a85707f400e 100644 --- a/java/test/Ice/checksum/ChecksumI.java +++ b/java/test/src/main/java/test/Ice/checksum/ChecksumI.java diff --git a/java/test/Ice/checksum/Client.java b/java/test/src/main/java/test/Ice/checksum/Client.java index 34d4f3ab1b8..34d4f3ab1b8 100644 --- a/java/test/Ice/checksum/Client.java +++ b/java/test/src/main/java/test/Ice/checksum/Client.java diff --git a/java/test/Ice/checksum/Server.java b/java/test/src/main/java/test/Ice/checksum/Server.java index c64042283e4..c64042283e4 100644 --- a/java/test/Ice/checksum/Server.java +++ b/java/test/src/main/java/test/Ice/checksum/Server.java diff --git a/java/test/Ice/checksum/Test.ice b/java/test/src/main/java/test/Ice/checksum/Test.ice index 060d9078201..060d9078201 100644 --- a/java/test/Ice/checksum/Test.ice +++ b/java/test/src/main/java/test/Ice/checksum/Test.ice diff --git a/java/test/Ice/checksum/TestServer.ice b/java/test/src/main/java/test/Ice/checksum/TestServer.ice index 0fef43faabf..0fef43faabf 100644 --- a/java/test/Ice/checksum/TestServer.ice +++ b/java/test/src/main/java/test/Ice/checksum/TestServer.ice diff --git a/java/test/Ice/checksum/Types.ice b/java/test/src/main/java/test/Ice/checksum/Types.ice index 8da301c229a..8da301c229a 100644 --- a/java/test/Ice/checksum/Types.ice +++ b/java/test/src/main/java/test/Ice/checksum/Types.ice diff --git a/java/test/Ice/checksum/TypesServer.ice b/java/test/src/main/java/test/Ice/checksum/TypesServer.ice index 0fd16b143bc..0fd16b143bc 100644 --- a/java/test/Ice/checksum/TypesServer.ice +++ b/java/test/src/main/java/test/Ice/checksum/TypesServer.ice diff --git a/java/test/src/main/java/test/Ice/checksum/run.py b/java/test/src/main/java/test/Ice/checksum/run.py new file mode 100755 index 00000000000..d5fe04787c9 --- /dev/null +++ b/java/test/src/main/java/test/Ice/checksum/run.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +import os, sys + +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil + +TestUtil.clientServerTest() diff --git a/java/test/Ice/classLoader/AbstractClassI.java b/java/test/src/main/java/test/Ice/classLoader/AbstractClassI.java index df7bcf8a4c4..df7bcf8a4c4 100644 --- a/java/test/Ice/classLoader/AbstractClassI.java +++ b/java/test/src/main/java/test/Ice/classLoader/AbstractClassI.java diff --git a/java/test/Ice/classLoader/AllTests.java b/java/test/src/main/java/test/Ice/classLoader/AllTests.java index d0181cff1a6..d0181cff1a6 100644 --- a/java/test/Ice/classLoader/AllTests.java +++ b/java/test/src/main/java/test/Ice/classLoader/AllTests.java diff --git a/java/test/Ice/classLoader/CertificateVerifierI.java b/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java index 3e681297f84..3e681297f84 100644 --- a/java/test/Ice/classLoader/CertificateVerifierI.java +++ b/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java diff --git a/java/test/Ice/classLoader/Client.java b/java/test/src/main/java/test/Ice/classLoader/Client.java index 20152d6b598..20152d6b598 100644 --- a/java/test/Ice/classLoader/Client.java +++ b/java/test/src/main/java/test/Ice/classLoader/Client.java diff --git a/java/test/Ice/classLoader/InitialI.java b/java/test/src/main/java/test/Ice/classLoader/InitialI.java index a8056715aad..a8056715aad 100644 --- a/java/test/Ice/classLoader/InitialI.java +++ b/java/test/src/main/java/test/Ice/classLoader/InitialI.java diff --git a/java/test/Ice/classLoader/PasswordCallbackI.java b/java/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java index e5eba1462dd..e5eba1462dd 100644 --- a/java/test/Ice/classLoader/PasswordCallbackI.java +++ b/java/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java diff --git a/java/test/Ice/classLoader/PluginFactoryI.java b/java/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java index 2416e04c420..2416e04c420 100644 --- a/java/test/Ice/classLoader/PluginFactoryI.java +++ b/java/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java diff --git a/java/test/Ice/classLoader/Server.java b/java/test/src/main/java/test/Ice/classLoader/Server.java index 79abca86364..79abca86364 100644 --- a/java/test/Ice/classLoader/Server.java +++ b/java/test/src/main/java/test/Ice/classLoader/Server.java diff --git a/java/test/Ice/classLoader/Test.ice b/java/test/src/main/java/test/Ice/classLoader/Test.ice index 2df8659720e..2df8659720e 100644 --- a/java/test/Ice/classLoader/Test.ice +++ b/java/test/src/main/java/test/Ice/classLoader/Test.ice diff --git a/java/test/src/main/java/test/Ice/classLoader/run.py b/java/test/src/main/java/test/Ice/classLoader/run.py new file mode 100755 index 00000000000..d5fe04787c9 --- /dev/null +++ b/java/test/src/main/java/test/Ice/classLoader/run.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +import os, sys + +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil + +TestUtil.clientServerTest() diff --git a/java/test/Ice/custom/AllTests.java b/java/test/src/main/java/test/Ice/custom/AllTests.java index be731b43efe..be731b43efe 100644 --- a/java/test/Ice/custom/AllTests.java +++ b/java/test/src/main/java/test/Ice/custom/AllTests.java diff --git a/java/test/Ice/custom/Client.java b/java/test/src/main/java/test/Ice/custom/Client.java index 17ad54b561f..17ad54b561f 100644 --- a/java/test/Ice/custom/Client.java +++ b/java/test/src/main/java/test/Ice/custom/Client.java diff --git a/java/test/Ice/custom/Collocated.java b/java/test/src/main/java/test/Ice/custom/Collocated.java index 2d8fd94f500..2d8fd94f500 100644 --- a/java/test/Ice/custom/Collocated.java +++ b/java/test/src/main/java/test/Ice/custom/Collocated.java diff --git a/java/test/Ice/custom/Server.java b/java/test/src/main/java/test/Ice/custom/Server.java index fe959c086ff..fe959c086ff 100644 --- a/java/test/Ice/custom/Server.java +++ b/java/test/src/main/java/test/Ice/custom/Server.java diff --git a/java/test/Ice/custom/Test.ice b/java/test/src/main/java/test/Ice/custom/Test.ice index 4743eb95492..4743eb95492 100644 --- a/java/test/Ice/custom/Test.ice +++ b/java/test/src/main/java/test/Ice/custom/Test.ice diff --git a/java/test/Ice/custom/TestI.java b/java/test/src/main/java/test/Ice/custom/TestI.java index e384d531ffd..e384d531ffd 100644 --- a/java/test/Ice/custom/TestI.java +++ b/java/test/src/main/java/test/Ice/custom/TestI.java diff --git a/java/test/Ice/adapterDeactivation/run.py b/java/test/src/main/java/test/Ice/custom/run.py index 44aa7d73d00..8bb456187d9 100755 --- a/java/test/Ice/adapterDeactivation/run.py +++ b/java/test/src/main/java/test/Ice/custom/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/defaultServant/AllTests.java b/java/test/src/main/java/test/Ice/defaultServant/AllTests.java index 50589050baf..50589050baf 100644 --- a/java/test/Ice/defaultServant/AllTests.java +++ b/java/test/src/main/java/test/Ice/defaultServant/AllTests.java diff --git a/java/test/Ice/defaultServant/Client.java b/java/test/src/main/java/test/Ice/defaultServant/Client.java index 4f9b3be9ec4..4f9b3be9ec4 100644 --- a/java/test/Ice/defaultServant/Client.java +++ b/java/test/src/main/java/test/Ice/defaultServant/Client.java diff --git a/java/test/Ice/defaultServant/MyObjectI.java b/java/test/src/main/java/test/Ice/defaultServant/MyObjectI.java index 64d4548f920..64d4548f920 100644 --- a/java/test/Ice/defaultServant/MyObjectI.java +++ b/java/test/src/main/java/test/Ice/defaultServant/MyObjectI.java diff --git a/java/test/Ice/defaultServant/Test.ice b/java/test/src/main/java/test/Ice/defaultServant/Test.ice index ce986ce32c3..ce986ce32c3 100644 --- a/java/test/Ice/defaultServant/Test.ice +++ b/java/test/src/main/java/test/Ice/defaultServant/Test.ice diff --git a/java/test/Ice/defaultServant/run.py b/java/test/src/main/java/test/Ice/defaultServant/run.py index eac86a98816..d36e7a611b3 100755 --- a/java/test/Ice/defaultServant/run.py +++ b/java/test/src/main/java/test/Ice/defaultServant/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/defaultValue/AllTests.java b/java/test/src/main/java/test/Ice/defaultValue/AllTests.java index a53a798bde6..a53a798bde6 100644 --- a/java/test/Ice/defaultValue/AllTests.java +++ b/java/test/src/main/java/test/Ice/defaultValue/AllTests.java diff --git a/java/test/Ice/defaultValue/Client.java b/java/test/src/main/java/test/Ice/defaultValue/Client.java index 78685aa1939..78685aa1939 100644 --- a/java/test/Ice/defaultValue/Client.java +++ b/java/test/src/main/java/test/Ice/defaultValue/Client.java diff --git a/java/test/Ice/defaultValue/Test.ice b/java/test/src/main/java/test/Ice/defaultValue/Test.ice index 2c41e0a3293..2c41e0a3293 100644 --- a/java/test/Ice/defaultValue/Test.ice +++ b/java/test/src/main/java/test/Ice/defaultValue/Test.ice diff --git a/java/test/Ice/defaultValue/run.py b/java/test/src/main/java/test/Ice/defaultValue/run.py index 2d55428a099..06025e5d073 100755 --- a/java/test/Ice/defaultValue/run.py +++ b/java/test/src/main/java/test/Ice/defaultValue/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/dispatcher/AllTests.java b/java/test/src/main/java/test/Ice/dispatcher/AllTests.java index e1badc24a9a..e1badc24a9a 100644 --- a/java/test/Ice/dispatcher/AllTests.java +++ b/java/test/src/main/java/test/Ice/dispatcher/AllTests.java diff --git a/java/test/Ice/dispatcher/Client.java b/java/test/src/main/java/test/Ice/dispatcher/Client.java index 9b490d763c1..9b490d763c1 100644 --- a/java/test/Ice/dispatcher/Client.java +++ b/java/test/src/main/java/test/Ice/dispatcher/Client.java diff --git a/java/test/Ice/dispatcher/Collocated.java b/java/test/src/main/java/test/Ice/dispatcher/Collocated.java index 453311a3584..453311a3584 100644 --- a/java/test/Ice/dispatcher/Collocated.java +++ b/java/test/src/main/java/test/Ice/dispatcher/Collocated.java diff --git a/java/test/Ice/dispatcher/Dispatcher.java b/java/test/src/main/java/test/Ice/dispatcher/Dispatcher.java index 2ee5dbb6f4d..2ee5dbb6f4d 100644 --- a/java/test/Ice/dispatcher/Dispatcher.java +++ b/java/test/src/main/java/test/Ice/dispatcher/Dispatcher.java diff --git a/java/test/Ice/dispatcher/Server.java b/java/test/src/main/java/test/Ice/dispatcher/Server.java index c4ef87e7451..c4ef87e7451 100644 --- a/java/test/Ice/dispatcher/Server.java +++ b/java/test/src/main/java/test/Ice/dispatcher/Server.java diff --git a/java/test/Ice/dispatcher/Test.ice b/java/test/src/main/java/test/Ice/dispatcher/Test.ice index bbeabc2210a..bbeabc2210a 100644 --- a/java/test/Ice/dispatcher/Test.ice +++ b/java/test/src/main/java/test/Ice/dispatcher/Test.ice diff --git a/java/test/Ice/dispatcher/TestControllerI.java b/java/test/src/main/java/test/Ice/dispatcher/TestControllerI.java index cd24a7982b3..cd24a7982b3 100644 --- a/java/test/Ice/dispatcher/TestControllerI.java +++ b/java/test/src/main/java/test/Ice/dispatcher/TestControllerI.java diff --git a/java/test/Ice/dispatcher/TestI.java b/java/test/src/main/java/test/Ice/dispatcher/TestI.java index 93dd8513ecc..93dd8513ecc 100644 --- a/java/test/Ice/dispatcher/TestI.java +++ b/java/test/src/main/java/test/Ice/dispatcher/TestI.java diff --git a/java/test/Ice/dispatcher/run.py b/java/test/src/main/java/test/Ice/dispatcher/run.py index a40df1a1bcb..6444a527f9a 100755 --- a/java/test/Ice/dispatcher/run.py +++ b/java/test/src/main/java/test/Ice/dispatcher/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/echo/BlobjectI.java b/java/test/src/main/java/test/Ice/echo/BlobjectI.java index 946284608c1..946284608c1 100644 --- a/java/test/Ice/echo/BlobjectI.java +++ b/java/test/src/main/java/test/Ice/echo/BlobjectI.java diff --git a/java/test/Ice/echo/Server.java b/java/test/src/main/java/test/Ice/echo/Server.java index 88daf466e01..88daf466e01 100644 --- a/java/test/Ice/echo/Server.java +++ b/java/test/src/main/java/test/Ice/echo/Server.java diff --git a/java/test/Ice/echo/Test.ice b/java/test/src/main/java/test/Ice/echo/Test.ice index 6528f1a7501..6528f1a7501 100644 --- a/java/test/Ice/echo/Test.ice +++ b/java/test/src/main/java/test/Ice/echo/Test.ice diff --git a/java/test/Ice/echo/run.py b/java/test/src/main/java/test/Ice/echo/run.py index 74984e633a4..de17f7cd696 100755 --- a/java/test/Ice/echo/run.py +++ b/java/test/src/main/java/test/Ice/echo/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/enums/AllTests.java b/java/test/src/main/java/test/Ice/enums/AllTests.java index 47aef9c0c83..47aef9c0c83 100644 --- a/java/test/Ice/enums/AllTests.java +++ b/java/test/src/main/java/test/Ice/enums/AllTests.java diff --git a/java/test/Ice/enums/Client.java b/java/test/src/main/java/test/Ice/enums/Client.java index f27ee458960..f27ee458960 100644 --- a/java/test/Ice/enums/Client.java +++ b/java/test/src/main/java/test/Ice/enums/Client.java diff --git a/java/test/Ice/enums/Server.java b/java/test/src/main/java/test/Ice/enums/Server.java index 24ef6d00730..24ef6d00730 100644 --- a/java/test/Ice/enums/Server.java +++ b/java/test/src/main/java/test/Ice/enums/Server.java diff --git a/java/test/Ice/enums/Test.ice b/java/test/src/main/java/test/Ice/enums/Test.ice index 5f7f84ec899..5f7f84ec899 100644 --- a/java/test/Ice/enums/Test.ice +++ b/java/test/src/main/java/test/Ice/enums/Test.ice diff --git a/java/test/Ice/enums/TestIntfI.java b/java/test/src/main/java/test/Ice/enums/TestIntfI.java index cbb511e7edd..cbb511e7edd 100644 --- a/java/test/Ice/enums/TestIntfI.java +++ b/java/test/src/main/java/test/Ice/enums/TestIntfI.java diff --git a/java/test/Ice/enums/run.py b/java/test/src/main/java/test/Ice/enums/run.py index efa77639a65..946154e0d1a 100755 --- a/java/test/Ice/enums/run.py +++ b/java/test/src/main/java/test/Ice/enums/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/exceptions/AMDServer.java b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java index afd5450bffc..afd5450bffc 100644 --- a/java/test/Ice/exceptions/AMDServer.java +++ b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java diff --git a/java/test/Ice/exceptions/AMDThrowerI.java b/java/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java index bd1013bd589..bd1013bd589 100644 --- a/java/test/Ice/exceptions/AMDThrowerI.java +++ b/java/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/src/main/java/test/Ice/exceptions/AllTests.java index 7d68606047e..7d68606047e 100644 --- a/java/test/Ice/exceptions/AllTests.java +++ b/java/test/src/main/java/test/Ice/exceptions/AllTests.java diff --git a/java/test/Ice/exceptions/Client.java b/java/test/src/main/java/test/Ice/exceptions/Client.java index ef66546fa26..ef66546fa26 100644 --- a/java/test/Ice/exceptions/Client.java +++ b/java/test/src/main/java/test/Ice/exceptions/Client.java diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/src/main/java/test/Ice/exceptions/Collocated.java index b85ca002b94..b85ca002b94 100644 --- a/java/test/Ice/exceptions/Collocated.java +++ b/java/test/src/main/java/test/Ice/exceptions/Collocated.java diff --git a/java/test/Ice/exceptions/DummyLogger.java b/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java index 4230b744f94..4230b744f94 100644 --- a/java/test/Ice/exceptions/DummyLogger.java +++ b/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java diff --git a/java/test/Ice/exceptions/EmptyI.java b/java/test/src/main/java/test/Ice/exceptions/EmptyI.java index f21f1bc484e..f21f1bc484e 100644 --- a/java/test/Ice/exceptions/EmptyI.java +++ b/java/test/src/main/java/test/Ice/exceptions/EmptyI.java diff --git a/java/test/Ice/exceptions/ObjectFactoryI.java b/java/test/src/main/java/test/Ice/exceptions/ObjectFactoryI.java index 87dd29b637b..87dd29b637b 100644 --- a/java/test/Ice/exceptions/ObjectFactoryI.java +++ b/java/test/src/main/java/test/Ice/exceptions/ObjectFactoryI.java diff --git a/java/test/Ice/exceptions/ServantLocatorI.java b/java/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java index 6619cd8f40c..6619cd8f40c 100644 --- a/java/test/Ice/exceptions/ServantLocatorI.java +++ b/java/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java diff --git a/java/test/Ice/exceptions/Server.java b/java/test/src/main/java/test/Ice/exceptions/Server.java index 539ac3bc304..539ac3bc304 100644 --- a/java/test/Ice/exceptions/Server.java +++ b/java/test/src/main/java/test/Ice/exceptions/Server.java diff --git a/java/test/Ice/exceptions/Test.ice b/java/test/src/main/java/test/Ice/exceptions/Test.ice index c1818494ad2..c1818494ad2 100644 --- a/java/test/Ice/exceptions/Test.ice +++ b/java/test/src/main/java/test/Ice/exceptions/Test.ice diff --git a/java/test/Ice/exceptions/TestAMD.ice b/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice index 4007abf0f52..4007abf0f52 100644 --- a/java/test/Ice/exceptions/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/src/main/java/test/Ice/exceptions/ThrowerI.java index 8859147bd36..8859147bd36 100644 --- a/java/test/Ice/exceptions/ThrowerI.java +++ b/java/test/src/main/java/test/Ice/exceptions/ThrowerI.java diff --git a/java/test/Ice/exceptions/run.py b/java/test/src/main/java/test/Ice/exceptions/run.py index 889f816c644..458762c1dfe 100755 --- a/java/test/Ice/exceptions/run.py +++ b/java/test/src/main/java/test/Ice/exceptions/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/facets/AI.java b/java/test/src/main/java/test/Ice/facets/AI.java index eb993bf3082..eb993bf3082 100644 --- a/java/test/Ice/facets/AI.java +++ b/java/test/src/main/java/test/Ice/facets/AI.java diff --git a/java/test/Ice/facets/AllTests.java b/java/test/src/main/java/test/Ice/facets/AllTests.java index 79308c3b113..79308c3b113 100644 --- a/java/test/Ice/facets/AllTests.java +++ b/java/test/src/main/java/test/Ice/facets/AllTests.java diff --git a/java/test/Ice/facets/BI.java b/java/test/src/main/java/test/Ice/facets/BI.java index bcc05365e0f..bcc05365e0f 100644 --- a/java/test/Ice/facets/BI.java +++ b/java/test/src/main/java/test/Ice/facets/BI.java diff --git a/java/test/Ice/facets/CI.java b/java/test/src/main/java/test/Ice/facets/CI.java index fab2a5758ee..fab2a5758ee 100644 --- a/java/test/Ice/facets/CI.java +++ b/java/test/src/main/java/test/Ice/facets/CI.java diff --git a/java/test/Ice/facets/Client.java b/java/test/src/main/java/test/Ice/facets/Client.java index 22867839eb7..22867839eb7 100644 --- a/java/test/Ice/facets/Client.java +++ b/java/test/src/main/java/test/Ice/facets/Client.java diff --git a/java/test/Ice/facets/Collocated.java b/java/test/src/main/java/test/Ice/facets/Collocated.java index 9503a7e7748..9503a7e7748 100644 --- a/java/test/Ice/facets/Collocated.java +++ b/java/test/src/main/java/test/Ice/facets/Collocated.java diff --git a/java/test/Ice/facets/DI.java b/java/test/src/main/java/test/Ice/facets/DI.java index cd4274dbaac..cd4274dbaac 100644 --- a/java/test/Ice/facets/DI.java +++ b/java/test/src/main/java/test/Ice/facets/DI.java diff --git a/java/test/Ice/facets/EI.java b/java/test/src/main/java/test/Ice/facets/EI.java index 6ebeb0ee8b3..6ebeb0ee8b3 100644 --- a/java/test/Ice/facets/EI.java +++ b/java/test/src/main/java/test/Ice/facets/EI.java diff --git a/java/test/Ice/facets/EmptyI.java b/java/test/src/main/java/test/Ice/facets/EmptyI.java index 89d633d6b7b..89d633d6b7b 100644 --- a/java/test/Ice/facets/EmptyI.java +++ b/java/test/src/main/java/test/Ice/facets/EmptyI.java diff --git a/java/test/Ice/facets/FI.java b/java/test/src/main/java/test/Ice/facets/FI.java index 5d945d86714..5d945d86714 100644 --- a/java/test/Ice/facets/FI.java +++ b/java/test/src/main/java/test/Ice/facets/FI.java diff --git a/java/test/Ice/facets/GI.java b/java/test/src/main/java/test/Ice/facets/GI.java index 397501ddeb7..397501ddeb7 100644 --- a/java/test/Ice/facets/GI.java +++ b/java/test/src/main/java/test/Ice/facets/GI.java diff --git a/java/test/Ice/facets/HI.java b/java/test/src/main/java/test/Ice/facets/HI.java index 49bc8de2337..49bc8de2337 100644 --- a/java/test/Ice/facets/HI.java +++ b/java/test/src/main/java/test/Ice/facets/HI.java diff --git a/java/test/Ice/facets/Server.java b/java/test/src/main/java/test/Ice/facets/Server.java index 0bba8b89cdf..0bba8b89cdf 100644 --- a/java/test/Ice/facets/Server.java +++ b/java/test/src/main/java/test/Ice/facets/Server.java diff --git a/java/test/Ice/facets/Test.ice b/java/test/src/main/java/test/Ice/facets/Test.ice index fa6a545118e..fa6a545118e 100644 --- a/java/test/Ice/facets/Test.ice +++ b/java/test/src/main/java/test/Ice/facets/Test.ice diff --git a/java/test/src/main/java/test/Ice/facets/run.py b/java/test/src/main/java/test/Ice/facets/run.py new file mode 100755 index 00000000000..8bb456187d9 --- /dev/null +++ b/java/test/src/main/java/test/Ice/facets/run.py @@ -0,0 +1,25 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +import os, sys + +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil + +TestUtil.clientServerTest() +TestUtil.collocatedTest() diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/src/main/java/test/Ice/faultTolerance/AllTests.java index 4e334301a62..4e334301a62 100644 --- a/java/test/Ice/faultTolerance/AllTests.java +++ b/java/test/src/main/java/test/Ice/faultTolerance/AllTests.java diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/src/main/java/test/Ice/faultTolerance/Client.java index 7f2fb23b80e..7f2fb23b80e 100644 --- a/java/test/Ice/faultTolerance/Client.java +++ b/java/test/src/main/java/test/Ice/faultTolerance/Client.java diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/src/main/java/test/Ice/faultTolerance/Server.java index 18d113fdeae..18d113fdeae 100644 --- a/java/test/Ice/faultTolerance/Server.java +++ b/java/test/src/main/java/test/Ice/faultTolerance/Server.java diff --git a/java/test/Ice/faultTolerance/Test.ice b/java/test/src/main/java/test/Ice/faultTolerance/Test.ice index e5f616aa8a0..e5f616aa8a0 100644 --- a/java/test/Ice/faultTolerance/Test.ice +++ b/java/test/src/main/java/test/Ice/faultTolerance/Test.ice diff --git a/java/test/Ice/faultTolerance/TestI.java b/java/test/src/main/java/test/Ice/faultTolerance/TestI.java index 3d3b362bd0a..3d3b362bd0a 100644 --- a/java/test/Ice/faultTolerance/TestI.java +++ b/java/test/src/main/java/test/Ice/faultTolerance/TestI.java diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/src/main/java/test/Ice/faultTolerance/run.py index 7ec29613f4c..11e4dfc9efd 100755 --- a/java/test/Ice/faultTolerance/run.py +++ b/java/test/src/main/java/test/Ice/faultTolerance/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/hash/Client.java b/java/test/src/main/java/test/Ice/hash/Client.java index 6a01bf62285..6a01bf62285 100644 --- a/java/test/Ice/hash/Client.java +++ b/java/test/src/main/java/test/Ice/hash/Client.java diff --git a/java/test/Ice/hash/Test.ice b/java/test/src/main/java/test/Ice/hash/Test.ice index e6b7243d1e7..e6b7243d1e7 100644 --- a/java/test/Ice/hash/Test.ice +++ b/java/test/src/main/java/test/Ice/hash/Test.ice diff --git a/java/test/Ice/hash/run.py b/java/test/src/main/java/test/Ice/hash/run.py index 3cec68b15ce..29d7f55f0f5 100755 --- a/java/test/Ice/hash/run.py +++ b/java/test/src/main/java/test/Ice/hash/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/hold/AllTests.java b/java/test/src/main/java/test/Ice/hold/AllTests.java index edb5aa78e63..edb5aa78e63 100644 --- a/java/test/Ice/hold/AllTests.java +++ b/java/test/src/main/java/test/Ice/hold/AllTests.java diff --git a/java/test/Ice/hold/Client.java b/java/test/src/main/java/test/Ice/hold/Client.java index 58e4e1abd32..58e4e1abd32 100644 --- a/java/test/Ice/hold/Client.java +++ b/java/test/src/main/java/test/Ice/hold/Client.java diff --git a/java/test/Ice/hold/HoldI.java b/java/test/src/main/java/test/Ice/hold/HoldI.java index b127f4bebb8..b127f4bebb8 100644 --- a/java/test/Ice/hold/HoldI.java +++ b/java/test/src/main/java/test/Ice/hold/HoldI.java diff --git a/java/test/Ice/hold/Server.java b/java/test/src/main/java/test/Ice/hold/Server.java index 97019f8021e..97019f8021e 100644 --- a/java/test/Ice/hold/Server.java +++ b/java/test/src/main/java/test/Ice/hold/Server.java diff --git a/java/test/Ice/hold/Test.ice b/java/test/src/main/java/test/Ice/hold/Test.ice index c77f95e299f..c77f95e299f 100644 --- a/java/test/Ice/hold/Test.ice +++ b/java/test/src/main/java/test/Ice/hold/Test.ice diff --git a/java/test/src/main/java/test/Ice/hold/run.py b/java/test/src/main/java/test/Ice/hold/run.py new file mode 100755 index 00000000000..d5fe04787c9 --- /dev/null +++ b/java/test/src/main/java/test/Ice/hold/run.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +import os, sys + +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil + +TestUtil.clientServerTest() diff --git a/java/test/Ice/info/AllTests.java b/java/test/src/main/java/test/Ice/info/AllTests.java index 77d4e6332a6..77d4e6332a6 100644 --- a/java/test/Ice/info/AllTests.java +++ b/java/test/src/main/java/test/Ice/info/AllTests.java diff --git a/java/test/Ice/info/Client.java b/java/test/src/main/java/test/Ice/info/Client.java index 2cd0d5b1f8b..2cd0d5b1f8b 100644 --- a/java/test/Ice/info/Client.java +++ b/java/test/src/main/java/test/Ice/info/Client.java diff --git a/java/test/Ice/info/Server.java b/java/test/src/main/java/test/Ice/info/Server.java index ebb4046e721..ebb4046e721 100644 --- a/java/test/Ice/info/Server.java +++ b/java/test/src/main/java/test/Ice/info/Server.java diff --git a/java/test/Ice/info/Test.ice b/java/test/src/main/java/test/Ice/info/Test.ice index 55bbc2ce48f..55bbc2ce48f 100644 --- a/java/test/Ice/info/Test.ice +++ b/java/test/src/main/java/test/Ice/info/Test.ice diff --git a/java/test/Ice/info/TestI.java b/java/test/src/main/java/test/Ice/info/TestI.java index 316cf7e438f..316cf7e438f 100644 --- a/java/test/Ice/info/TestI.java +++ b/java/test/src/main/java/test/Ice/info/TestI.java diff --git a/java/test/src/main/java/test/Ice/info/run.py b/java/test/src/main/java/test/Ice/info/run.py new file mode 100755 index 00000000000..d5fe04787c9 --- /dev/null +++ b/java/test/src/main/java/test/Ice/info/run.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +import os, sys + +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil + +TestUtil.clientServerTest() diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/src/main/java/test/Ice/inheritance/AllTests.java index 5a53c6916a1..5a53c6916a1 100644 --- a/java/test/Ice/inheritance/AllTests.java +++ b/java/test/src/main/java/test/Ice/inheritance/AllTests.java diff --git a/java/test/Ice/inheritance/CAI.java b/java/test/src/main/java/test/Ice/inheritance/CAI.java index b867eb6f836..b867eb6f836 100644 --- a/java/test/Ice/inheritance/CAI.java +++ b/java/test/src/main/java/test/Ice/inheritance/CAI.java diff --git a/java/test/Ice/inheritance/CBI.java b/java/test/src/main/java/test/Ice/inheritance/CBI.java index 6f07ec9b167..6f07ec9b167 100644 --- a/java/test/Ice/inheritance/CBI.java +++ b/java/test/src/main/java/test/Ice/inheritance/CBI.java diff --git a/java/test/Ice/inheritance/CCI.java b/java/test/src/main/java/test/Ice/inheritance/CCI.java index 1d88806b959..1d88806b959 100644 --- a/java/test/Ice/inheritance/CCI.java +++ b/java/test/src/main/java/test/Ice/inheritance/CCI.java diff --git a/java/test/Ice/inheritance/CDI.java b/java/test/src/main/java/test/Ice/inheritance/CDI.java index a1ac62fdf14..a1ac62fdf14 100644 --- a/java/test/Ice/inheritance/CDI.java +++ b/java/test/src/main/java/test/Ice/inheritance/CDI.java diff --git a/java/test/Ice/inheritance/Client.java b/java/test/src/main/java/test/Ice/inheritance/Client.java index 1fc5bdb3214..1fc5bdb3214 100644 --- a/java/test/Ice/inheritance/Client.java +++ b/java/test/src/main/java/test/Ice/inheritance/Client.java diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/src/main/java/test/Ice/inheritance/Collocated.java index 3c92c35545c..3c92c35545c 100644 --- a/java/test/Ice/inheritance/Collocated.java +++ b/java/test/src/main/java/test/Ice/inheritance/Collocated.java diff --git a/java/test/Ice/inheritance/IAI.java b/java/test/src/main/java/test/Ice/inheritance/IAI.java index 6f783f0bc58..6f783f0bc58 100644 --- a/java/test/Ice/inheritance/IAI.java +++ b/java/test/src/main/java/test/Ice/inheritance/IAI.java diff --git a/java/test/Ice/inheritance/IB1I.java b/java/test/src/main/java/test/Ice/inheritance/IB1I.java index 0c1de6cfb99..0c1de6cfb99 100644 --- a/java/test/Ice/inheritance/IB1I.java +++ b/java/test/src/main/java/test/Ice/inheritance/IB1I.java diff --git a/java/test/Ice/inheritance/IB2I.java b/java/test/src/main/java/test/Ice/inheritance/IB2I.java index 07fc2e53baa..07fc2e53baa 100644 --- a/java/test/Ice/inheritance/IB2I.java +++ b/java/test/src/main/java/test/Ice/inheritance/IB2I.java diff --git a/java/test/Ice/inheritance/ICI.java b/java/test/src/main/java/test/Ice/inheritance/ICI.java index 4ff569dbf16..4ff569dbf16 100644 --- a/java/test/Ice/inheritance/ICI.java +++ b/java/test/src/main/java/test/Ice/inheritance/ICI.java diff --git a/java/test/Ice/inheritance/InitialI.java b/java/test/src/main/java/test/Ice/inheritance/InitialI.java index 083314cf62d..083314cf62d 100644 --- a/java/test/Ice/inheritance/InitialI.java +++ b/java/test/src/main/java/test/Ice/inheritance/InitialI.java diff --git a/java/test/Ice/inheritance/Server.java b/java/test/src/main/java/test/Ice/inheritance/Server.java index 7ff0278c2a6..7ff0278c2a6 100644 --- a/java/test/Ice/inheritance/Server.java +++ b/java/test/src/main/java/test/Ice/inheritance/Server.java diff --git a/java/test/Ice/inheritance/Test.ice b/java/test/src/main/java/test/Ice/inheritance/Test.ice index 82d63b5078f..82d63b5078f 100644 --- a/java/test/Ice/inheritance/Test.ice +++ b/java/test/src/main/java/test/Ice/inheritance/Test.ice diff --git a/java/test/src/main/java/test/Ice/inheritance/run.py b/java/test/src/main/java/test/Ice/inheritance/run.py new file mode 100755 index 00000000000..8bb456187d9 --- /dev/null +++ b/java/test/src/main/java/test/Ice/inheritance/run.py @@ -0,0 +1,25 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +import os, sys + +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil + +TestUtil.clientServerTest() +TestUtil.collocatedTest() diff --git a/java/test/Ice/interceptor/AMDInterceptorI.java b/java/test/src/main/java/test/Ice/interceptor/AMDInterceptorI.java index e9cc88a1ba5..e9cc88a1ba5 100644 --- a/java/test/Ice/interceptor/AMDInterceptorI.java +++ b/java/test/src/main/java/test/Ice/interceptor/AMDInterceptorI.java diff --git a/java/test/Ice/interceptor/Client.java b/java/test/src/main/java/test/Ice/interceptor/Client.java index 12c913296b0..12c913296b0 100644 --- a/java/test/Ice/interceptor/Client.java +++ b/java/test/src/main/java/test/Ice/interceptor/Client.java diff --git a/java/test/Ice/interceptor/InterceptorI.java b/java/test/src/main/java/test/Ice/interceptor/InterceptorI.java index 04458722e3a..04458722e3a 100644 --- a/java/test/Ice/interceptor/InterceptorI.java +++ b/java/test/src/main/java/test/Ice/interceptor/InterceptorI.java diff --git a/java/test/Ice/interceptor/MyObjectI.java b/java/test/src/main/java/test/Ice/interceptor/MyObjectI.java index a2c10f04d38..a2c10f04d38 100644 --- a/java/test/Ice/interceptor/MyObjectI.java +++ b/java/test/src/main/java/test/Ice/interceptor/MyObjectI.java diff --git a/java/test/Ice/interceptor/MySystemException.java b/java/test/src/main/java/test/Ice/interceptor/MySystemException.java index ee7bc5a626b..ee7bc5a626b 100644 --- a/java/test/Ice/interceptor/MySystemException.java +++ b/java/test/src/main/java/test/Ice/interceptor/MySystemException.java diff --git a/java/test/Ice/interceptor/Test.ice b/java/test/src/main/java/test/Ice/interceptor/Test.ice index 04c460b8b5e..04c460b8b5e 100644 --- a/java/test/Ice/interceptor/Test.ice +++ b/java/test/src/main/java/test/Ice/interceptor/Test.ice diff --git a/java/test/Ice/interceptor/run.py b/java/test/src/main/java/test/Ice/interceptor/run.py index 91b248967b1..04638dadfa6 100755 --- a/java/test/Ice/interceptor/run.py +++ b/java/test/src/main/java/test/Ice/interceptor/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/interrupt/AllTests.java b/java/test/src/main/java/test/Ice/interrupt/AllTests.java index dbc7c159ddd..dbc7c159ddd 100644 --- a/java/test/Ice/interrupt/AllTests.java +++ b/java/test/src/main/java/test/Ice/interrupt/AllTests.java diff --git a/java/test/Ice/interrupt/Client.java b/java/test/src/main/java/test/Ice/interrupt/Client.java index edd6dfaa6ae..edd6dfaa6ae 100644 --- a/java/test/Ice/interrupt/Client.java +++ b/java/test/src/main/java/test/Ice/interrupt/Client.java diff --git a/java/test/Ice/interrupt/Collocated.java b/java/test/src/main/java/test/Ice/interrupt/Collocated.java index 6e164020aee..6e164020aee 100644 --- a/java/test/Ice/interrupt/Collocated.java +++ b/java/test/src/main/java/test/Ice/interrupt/Collocated.java diff --git a/java/test/Ice/interrupt/Server.java b/java/test/src/main/java/test/Ice/interrupt/Server.java index 9ec7a725d77..9ec7a725d77 100644 --- a/java/test/Ice/interrupt/Server.java +++ b/java/test/src/main/java/test/Ice/interrupt/Server.java diff --git a/java/test/Ice/interrupt/Test.ice b/java/test/src/main/java/test/Ice/interrupt/Test.ice index 5ff03302d8e..5ff03302d8e 100644 --- a/java/test/Ice/interrupt/Test.ice +++ b/java/test/src/main/java/test/Ice/interrupt/Test.ice diff --git a/java/test/Ice/interrupt/TestControllerI.java b/java/test/src/main/java/test/Ice/interrupt/TestControllerI.java index c3b9088393f..c3b9088393f 100644 --- a/java/test/Ice/interrupt/TestControllerI.java +++ b/java/test/src/main/java/test/Ice/interrupt/TestControllerI.java diff --git a/java/test/Ice/interrupt/TestI.java b/java/test/src/main/java/test/Ice/interrupt/TestI.java index 35016d42489..35016d42489 100644 --- a/java/test/Ice/interrupt/TestI.java +++ b/java/test/src/main/java/test/Ice/interrupt/TestI.java diff --git a/java/test/src/main/java/test/Ice/interrupt/run.py b/java/test/src/main/java/test/Ice/interrupt/run.py new file mode 100755 index 00000000000..a15d0a9c9e3 --- /dev/null +++ b/java/test/src/main/java/test/Ice/interrupt/run.py @@ -0,0 +1,28 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +import os, sys + +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil + +print("tests with regular server.") +TestUtil.clientServerTest() + +print("tests with collocated server.") +TestUtil.collocatedTest() diff --git a/java/test/Ice/invoke/AllTests.java b/java/test/src/main/java/test/Ice/invoke/AllTests.java index b22f4027b32..b22f4027b32 100644 --- a/java/test/Ice/invoke/AllTests.java +++ b/java/test/src/main/java/test/Ice/invoke/AllTests.java diff --git a/java/test/Ice/invoke/BlobjectAsyncI.java b/java/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java index c7e0837b946..c7e0837b946 100644 --- a/java/test/Ice/invoke/BlobjectAsyncI.java +++ b/java/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java diff --git a/java/test/Ice/invoke/BlobjectI.java b/java/test/src/main/java/test/Ice/invoke/BlobjectI.java index c676c38dc63..c676c38dc63 100644 --- a/java/test/Ice/invoke/BlobjectI.java +++ b/java/test/src/main/java/test/Ice/invoke/BlobjectI.java diff --git a/java/test/Ice/invoke/Client.java b/java/test/src/main/java/test/Ice/invoke/Client.java index e589d32075c..e589d32075c 100644 --- a/java/test/Ice/invoke/Client.java +++ b/java/test/src/main/java/test/Ice/invoke/Client.java diff --git a/java/test/Ice/invoke/ServantLocatorI.java b/java/test/src/main/java/test/Ice/invoke/ServantLocatorI.java index 9ed2262b995..9ed2262b995 100644 --- a/java/test/Ice/invoke/ServantLocatorI.java +++ b/java/test/src/main/java/test/Ice/invoke/ServantLocatorI.java diff --git a/java/test/Ice/invoke/Server.java b/java/test/src/main/java/test/Ice/invoke/Server.java index a6f315d5cf9..a6f315d5cf9 100644 --- a/java/test/Ice/invoke/Server.java +++ b/java/test/src/main/java/test/Ice/invoke/Server.java diff --git a/java/test/Ice/invoke/Test.ice b/java/test/src/main/java/test/Ice/invoke/Test.ice index 6aae90da746..6aae90da746 100644 --- a/java/test/Ice/invoke/Test.ice +++ b/java/test/src/main/java/test/Ice/invoke/Test.ice diff --git a/java/test/Ice/invoke/lambda/AllTests.java b/java/test/src/main/java/test/Ice/invoke/lambda/AllTests.java index 5b7764615a3..5b7764615a3 100644 --- a/java/test/Ice/invoke/lambda/AllTests.java +++ b/java/test/src/main/java/test/Ice/invoke/lambda/AllTests.java diff --git a/java/test/Ice/invoke/run.py b/java/test/src/main/java/test/Ice/invoke/run.py index 7ee3382b0a2..50be82e58ca 100755 --- a/java/test/Ice/invoke/run.py +++ b/java/test/src/main/java/test/Ice/invoke/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/location/AllTests.java b/java/test/src/main/java/test/Ice/location/AllTests.java index 636376a0253..636376a0253 100644 --- a/java/test/Ice/location/AllTests.java +++ b/java/test/src/main/java/test/Ice/location/AllTests.java diff --git a/java/test/Ice/location/Client.java b/java/test/src/main/java/test/Ice/location/Client.java index 4fc8e67893b..4fc8e67893b 100644 --- a/java/test/Ice/location/Client.java +++ b/java/test/src/main/java/test/Ice/location/Client.java diff --git a/java/test/Ice/location/HelloI.java b/java/test/src/main/java/test/Ice/location/HelloI.java index 5036d4cbc18..5036d4cbc18 100644 --- a/java/test/Ice/location/HelloI.java +++ b/java/test/src/main/java/test/Ice/location/HelloI.java diff --git a/java/test/Ice/location/Server.java b/java/test/src/main/java/test/Ice/location/Server.java index 4b09338d2ee..4b09338d2ee 100644 --- a/java/test/Ice/location/Server.java +++ b/java/test/src/main/java/test/Ice/location/Server.java diff --git a/java/test/Ice/location/ServerLocator.java b/java/test/src/main/java/test/Ice/location/ServerLocator.java index 0e27e888eb7..0e27e888eb7 100644 --- a/java/test/Ice/location/ServerLocator.java +++ b/java/test/src/main/java/test/Ice/location/ServerLocator.java diff --git a/java/test/Ice/location/ServerLocatorRegistry.java b/java/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java index 7a9fbc50ac8..7a9fbc50ac8 100644 --- a/java/test/Ice/location/ServerLocatorRegistry.java +++ b/java/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/src/main/java/test/Ice/location/ServerManagerI.java index 2ac89074ad7..2ac89074ad7 100644 --- a/java/test/Ice/location/ServerManagerI.java +++ b/java/test/src/main/java/test/Ice/location/ServerManagerI.java diff --git a/java/test/Ice/location/Test.ice b/java/test/src/main/java/test/Ice/location/Test.ice index f6d0dfd0a94..f6d0dfd0a94 100644 --- a/java/test/Ice/location/Test.ice +++ b/java/test/src/main/java/test/Ice/location/Test.ice diff --git a/java/test/Ice/location/TestI.java b/java/test/src/main/java/test/Ice/location/TestI.java index de3c6213bd7..de3c6213bd7 100644 --- a/java/test/Ice/location/TestI.java +++ b/java/test/src/main/java/test/Ice/location/TestI.java diff --git a/java/test/src/main/java/test/Ice/location/run.py b/java/test/src/main/java/test/Ice/location/run.py new file mode 100755 index 00000000000..d5fe04787c9 --- /dev/null +++ b/java/test/src/main/java/test/Ice/location/run.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +import os, sys + +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil + +TestUtil.clientServerTest() diff --git a/java/test/Ice/metrics/AMDMetricsI.java b/java/test/src/main/java/test/Ice/metrics/AMDMetricsI.java index e557e728a4e..e557e728a4e 100644 --- a/java/test/Ice/metrics/AMDMetricsI.java +++ b/java/test/src/main/java/test/Ice/metrics/AMDMetricsI.java diff --git a/java/test/Ice/metrics/AMDServer.java b/java/test/src/main/java/test/Ice/metrics/AMDServer.java index dc559764811..dc559764811 100644 --- a/java/test/Ice/metrics/AMDServer.java +++ b/java/test/src/main/java/test/Ice/metrics/AMDServer.java diff --git a/java/test/Ice/metrics/AllTests.java b/java/test/src/main/java/test/Ice/metrics/AllTests.java index 48d1fdb8a80..48d1fdb8a80 100644 --- a/java/test/Ice/metrics/AllTests.java +++ b/java/test/src/main/java/test/Ice/metrics/AllTests.java diff --git a/java/test/Ice/metrics/ChildInvocationObserverI.java b/java/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java index da56f726250..da56f726250 100644 --- a/java/test/Ice/metrics/ChildInvocationObserverI.java +++ b/java/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java diff --git a/java/test/Ice/metrics/Client.java b/java/test/src/main/java/test/Ice/metrics/Client.java index 48acc9244b1..48acc9244b1 100644 --- a/java/test/Ice/metrics/Client.java +++ b/java/test/src/main/java/test/Ice/metrics/Client.java diff --git a/java/test/Ice/metrics/Collocated.java b/java/test/src/main/java/test/Ice/metrics/Collocated.java index e1191a4de99..e1191a4de99 100644 --- a/java/test/Ice/metrics/Collocated.java +++ b/java/test/src/main/java/test/Ice/metrics/Collocated.java diff --git a/java/test/Ice/metrics/CollocatedObserverI.java b/java/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java index 607da015366..607da015366 100644 --- a/java/test/Ice/metrics/CollocatedObserverI.java +++ b/java/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java diff --git a/java/test/Ice/metrics/CommunicatorObserverI.java b/java/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java index 996d5a83b1a..996d5a83b1a 100644 --- a/java/test/Ice/metrics/CommunicatorObserverI.java +++ b/java/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java diff --git a/java/test/Ice/metrics/ConnectionObserverI.java b/java/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java index 395c31733e9..395c31733e9 100644 --- a/java/test/Ice/metrics/ConnectionObserverI.java +++ b/java/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java diff --git a/java/test/Ice/metrics/ControllerI.java b/java/test/src/main/java/test/Ice/metrics/ControllerI.java index 2f1434d523a..2f1434d523a 100644 --- a/java/test/Ice/metrics/ControllerI.java +++ b/java/test/src/main/java/test/Ice/metrics/ControllerI.java diff --git a/java/test/Ice/metrics/DispatchObserverI.java b/java/test/src/main/java/test/Ice/metrics/DispatchObserverI.java index 43b0683696c..43b0683696c 100644 --- a/java/test/Ice/metrics/DispatchObserverI.java +++ b/java/test/src/main/java/test/Ice/metrics/DispatchObserverI.java diff --git a/java/test/Ice/metrics/InvocationObserverI.java b/java/test/src/main/java/test/Ice/metrics/InvocationObserverI.java index cfb7e2c6547..cfb7e2c6547 100644 --- a/java/test/Ice/metrics/InvocationObserverI.java +++ b/java/test/src/main/java/test/Ice/metrics/InvocationObserverI.java diff --git a/java/test/Ice/metrics/MetricsI.java b/java/test/src/main/java/test/Ice/metrics/MetricsI.java index 51f10fd2661..51f10fd2661 100644 --- a/java/test/Ice/metrics/MetricsI.java +++ b/java/test/src/main/java/test/Ice/metrics/MetricsI.java diff --git a/java/test/Ice/metrics/ObserverI.java b/java/test/src/main/java/test/Ice/metrics/ObserverI.java index 1dadf4d63d8..1dadf4d63d8 100644 --- a/java/test/Ice/metrics/ObserverI.java +++ b/java/test/src/main/java/test/Ice/metrics/ObserverI.java diff --git a/java/test/Ice/metrics/RemoveObserverI.java b/java/test/src/main/java/test/Ice/metrics/RemoveObserverI.java index 6a5ad4817db..6a5ad4817db 100644 --- a/java/test/Ice/metrics/RemoveObserverI.java +++ b/java/test/src/main/java/test/Ice/metrics/RemoveObserverI.java diff --git a/java/test/Ice/metrics/Server.java b/java/test/src/main/java/test/Ice/metrics/Server.java index 70788ea876f..70788ea876f 100644 --- a/java/test/Ice/metrics/Server.java +++ b/java/test/src/main/java/test/Ice/metrics/Server.java diff --git a/java/test/Ice/metrics/Test.ice b/java/test/src/main/java/test/Ice/metrics/Test.ice index 41930f8c10a..41930f8c10a 100644 --- a/java/test/Ice/metrics/Test.ice +++ b/java/test/src/main/java/test/Ice/metrics/Test.ice diff --git a/java/test/Ice/metrics/TestAMD.ice b/java/test/src/main/java/test/Ice/metrics/TestAMD.ice index 0a9bf0209a9..0a9bf0209a9 100644 --- a/java/test/Ice/metrics/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/metrics/TestAMD.ice diff --git a/java/test/Ice/metrics/ThreadObserverI.java b/java/test/src/main/java/test/Ice/metrics/ThreadObserverI.java index af24dfd7df1..af24dfd7df1 100644 --- a/java/test/Ice/metrics/ThreadObserverI.java +++ b/java/test/src/main/java/test/Ice/metrics/ThreadObserverI.java diff --git a/java/test/Ice/metrics/run.py b/java/test/src/main/java/test/Ice/metrics/run.py index 208d9fce41e..7254e6ab696 100755 --- a/java/test/Ice/metrics/run.py +++ b/java/test/src/main/java/test/Ice/metrics/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/networkProxy/AllTests.java b/java/test/src/main/java/test/Ice/networkProxy/AllTests.java index f0b53afd8c3..f0b53afd8c3 100644 --- a/java/test/Ice/networkProxy/AllTests.java +++ b/java/test/src/main/java/test/Ice/networkProxy/AllTests.java diff --git a/java/test/Ice/networkProxy/Client.java b/java/test/src/main/java/test/Ice/networkProxy/Client.java index 411b276ac9a..411b276ac9a 100644 --- a/java/test/Ice/networkProxy/Client.java +++ b/java/test/src/main/java/test/Ice/networkProxy/Client.java diff --git a/java/test/Ice/networkProxy/Server.java b/java/test/src/main/java/test/Ice/networkProxy/Server.java index fe6e7c04ea9..fe6e7c04ea9 100644 --- a/java/test/Ice/networkProxy/Server.java +++ b/java/test/src/main/java/test/Ice/networkProxy/Server.java diff --git a/java/test/Ice/networkProxy/Test.ice b/java/test/src/main/java/test/Ice/networkProxy/Test.ice index 3e084d8a65e..3e084d8a65e 100644 --- a/java/test/Ice/networkProxy/Test.ice +++ b/java/test/src/main/java/test/Ice/networkProxy/Test.ice diff --git a/java/test/Ice/networkProxy/run.py b/java/test/src/main/java/test/Ice/networkProxy/run.py index 0a9814c4a28..766bcb373f6 100755 --- a/java/test/Ice/networkProxy/run.py +++ b/java/test/src/main/java/test/Ice/networkProxy/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/objects/AllTests.java b/java/test/src/main/java/test/Ice/objects/AllTests.java index ab43e76c368..ab43e76c368 100644 --- a/java/test/Ice/objects/AllTests.java +++ b/java/test/src/main/java/test/Ice/objects/AllTests.java diff --git a/java/test/Ice/objects/BI.java b/java/test/src/main/java/test/Ice/objects/BI.java index 09aebe13501..09aebe13501 100644 --- a/java/test/Ice/objects/BI.java +++ b/java/test/src/main/java/test/Ice/objects/BI.java diff --git a/java/test/Ice/objects/CI.java b/java/test/src/main/java/test/Ice/objects/CI.java index f46501a241c..f46501a241c 100644 --- a/java/test/Ice/objects/CI.java +++ b/java/test/src/main/java/test/Ice/objects/CI.java diff --git a/java/test/Ice/objects/Client.java b/java/test/src/main/java/test/Ice/objects/Client.java index 3d9f3803bc5..3d9f3803bc5 100644 --- a/java/test/Ice/objects/Client.java +++ b/java/test/src/main/java/test/Ice/objects/Client.java diff --git a/java/test/Ice/objects/Collocated.java b/java/test/src/main/java/test/Ice/objects/Collocated.java index 06d1f4bf5fd..06d1f4bf5fd 100644 --- a/java/test/Ice/objects/Collocated.java +++ b/java/test/src/main/java/test/Ice/objects/Collocated.java diff --git a/java/test/Ice/objects/DI.java b/java/test/src/main/java/test/Ice/objects/DI.java index 660efcd277c..660efcd277c 100644 --- a/java/test/Ice/objects/DI.java +++ b/java/test/src/main/java/test/Ice/objects/DI.java diff --git a/java/test/Ice/objects/EI.java b/java/test/src/main/java/test/Ice/objects/EI.java index e4930e1644d..e4930e1644d 100644 --- a/java/test/Ice/objects/EI.java +++ b/java/test/src/main/java/test/Ice/objects/EI.java diff --git a/java/test/Ice/objects/FI.java b/java/test/src/main/java/test/Ice/objects/FI.java index d51461c8031..d51461c8031 100644 --- a/java/test/Ice/objects/FI.java +++ b/java/test/src/main/java/test/Ice/objects/FI.java diff --git a/java/test/Ice/objects/HI.java b/java/test/src/main/java/test/Ice/objects/HI.java index e41ec794c82..e41ec794c82 100644 --- a/java/test/Ice/objects/HI.java +++ b/java/test/src/main/java/test/Ice/objects/HI.java diff --git a/java/test/Ice/objects/II.java b/java/test/src/main/java/test/Ice/objects/II.java index 8061d20e2cd..8061d20e2cd 100644 --- a/java/test/Ice/objects/II.java +++ b/java/test/src/main/java/test/Ice/objects/II.java diff --git a/java/test/Ice/objects/InitialI.java b/java/test/src/main/java/test/Ice/objects/InitialI.java index eaa1be7785b..eaa1be7785b 100644 --- a/java/test/Ice/objects/InitialI.java +++ b/java/test/src/main/java/test/Ice/objects/InitialI.java diff --git a/java/test/Ice/objects/JI.java b/java/test/src/main/java/test/Ice/objects/JI.java index ff82d0dac25..ff82d0dac25 100644 --- a/java/test/Ice/objects/JI.java +++ b/java/test/src/main/java/test/Ice/objects/JI.java diff --git a/java/test/Ice/objects/Server.java b/java/test/src/main/java/test/Ice/objects/Server.java index d327e7d5b53..d327e7d5b53 100644 --- a/java/test/Ice/objects/Server.java +++ b/java/test/src/main/java/test/Ice/objects/Server.java diff --git a/java/test/Ice/objects/Test.ice b/java/test/src/main/java/test/Ice/objects/Test.ice index d4644b11a64..d4644b11a64 100644 --- a/java/test/Ice/objects/Test.ice +++ b/java/test/src/main/java/test/Ice/objects/Test.ice diff --git a/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java b/java/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java index f9b0e8deb7a..f9b0e8deb7a 100644 --- a/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java +++ b/java/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java diff --git a/java/test/Ice/objects/run.py b/java/test/src/main/java/test/Ice/objects/run.py index f4d2befc202..89d67e015aa 100755 --- a/java/test/Ice/objects/run.py +++ b/java/test/src/main/java/test/Ice/objects/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/operations/AMDMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java index f577db345c1..f577db345c1 100644 --- a/java/test/Ice/operations/AMDMyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java diff --git a/java/test/Ice/operations/AMDServer.java b/java/test/src/main/java/test/Ice/operations/AMDServer.java index 063af513e84..063af513e84 100644 --- a/java/test/Ice/operations/AMDServer.java +++ b/java/test/src/main/java/test/Ice/operations/AMDServer.java diff --git a/java/test/Ice/operations/AMDTieMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java index 8d2e26b48d1..8d2e26b48d1 100644 --- a/java/test/Ice/operations/AMDTieMyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java diff --git a/java/test/Ice/operations/AMDTieServer.java b/java/test/src/main/java/test/Ice/operations/AMDTieServer.java index af88539eb00..af88539eb00 100644 --- a/java/test/Ice/operations/AMDTieServer.java +++ b/java/test/src/main/java/test/Ice/operations/AMDTieServer.java diff --git a/java/test/Ice/operations/AllTests.java b/java/test/src/main/java/test/Ice/operations/AllTests.java index b89c85f3745..b89c85f3745 100644 --- a/java/test/Ice/operations/AllTests.java +++ b/java/test/src/main/java/test/Ice/operations/AllTests.java diff --git a/java/test/Ice/operations/BatchOneways.java b/java/test/src/main/java/test/Ice/operations/BatchOneways.java index fc20955e9d2..fc20955e9d2 100644 --- a/java/test/Ice/operations/BatchOneways.java +++ b/java/test/src/main/java/test/Ice/operations/BatchOneways.java diff --git a/java/test/Ice/operations/BatchOnewaysAMI.java b/java/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java index f11df72b019..f11df72b019 100644 --- a/java/test/Ice/operations/BatchOnewaysAMI.java +++ b/java/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java diff --git a/java/test/Ice/operations/Client.java b/java/test/src/main/java/test/Ice/operations/Client.java index 2c957a13e34..2c957a13e34 100644 --- a/java/test/Ice/operations/Client.java +++ b/java/test/src/main/java/test/Ice/operations/Client.java diff --git a/java/test/Ice/operations/Collocated.java b/java/test/src/main/java/test/Ice/operations/Collocated.java index ecfab090c8c..ecfab090c8c 100644 --- a/java/test/Ice/operations/Collocated.java +++ b/java/test/src/main/java/test/Ice/operations/Collocated.java diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java index 5fddb73a3d5..5fddb73a3d5 100644 --- a/java/test/Ice/operations/MyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java diff --git a/java/test/Ice/operations/Oneways.java b/java/test/src/main/java/test/Ice/operations/Oneways.java index ded8ee39b3d..ded8ee39b3d 100644 --- a/java/test/Ice/operations/Oneways.java +++ b/java/test/src/main/java/test/Ice/operations/Oneways.java diff --git a/java/test/Ice/operations/OnewaysAMI.java b/java/test/src/main/java/test/Ice/operations/OnewaysAMI.java index dfaca37f114..dfaca37f114 100644 --- a/java/test/Ice/operations/OnewaysAMI.java +++ b/java/test/src/main/java/test/Ice/operations/OnewaysAMI.java diff --git a/java/test/Ice/operations/Server.java b/java/test/src/main/java/test/Ice/operations/Server.java index 22dba1da02b..22dba1da02b 100644 --- a/java/test/Ice/operations/Server.java +++ b/java/test/src/main/java/test/Ice/operations/Server.java diff --git a/java/test/Ice/operations/Test.ice b/java/test/src/main/java/test/Ice/operations/Test.ice index 38ab55f5909..38ab55f5909 100644 --- a/java/test/Ice/operations/Test.ice +++ b/java/test/src/main/java/test/Ice/operations/Test.ice diff --git a/java/test/Ice/operations/TestAMD.ice b/java/test/src/main/java/test/Ice/operations/TestAMD.ice index edcb970b236..edcb970b236 100644 --- a/java/test/Ice/operations/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/operations/TestAMD.ice diff --git a/java/test/Ice/operations/TieMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java index cbd7a833f15..cbd7a833f15 100644 --- a/java/test/Ice/operations/TieMyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java diff --git a/java/test/Ice/operations/TieServer.java b/java/test/src/main/java/test/Ice/operations/TieServer.java index 26bbdc7b7b5..26bbdc7b7b5 100644 --- a/java/test/Ice/operations/TieServer.java +++ b/java/test/src/main/java/test/Ice/operations/TieServer.java diff --git a/java/test/Ice/operations/Twoways.java b/java/test/src/main/java/test/Ice/operations/Twoways.java index c148edddb0e..c148edddb0e 100644 --- a/java/test/Ice/operations/Twoways.java +++ b/java/test/src/main/java/test/Ice/operations/Twoways.java diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java index 70e1a6566a0..70e1a6566a0 100644 --- a/java/test/Ice/operations/TwowaysAMI.java +++ b/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java diff --git a/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java b/java/test/src/main/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java index d5885bb2b31..d5885bb2b31 100644 --- a/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java +++ b/java/test/src/main/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java diff --git a/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java b/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java index 81f4dcb321e..81f4dcb321e 100644 --- a/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java +++ b/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java diff --git a/java/test/Ice/operations/run.py b/java/test/src/main/java/test/Ice/operations/run.py index 763a077b77d..4a622e6a75e 100755 --- a/java/test/Ice/operations/run.py +++ b/java/test/src/main/java/test/Ice/operations/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/optional/AMDInitialI.java b/java/test/src/main/java/test/Ice/optional/AMDInitialI.java index d47104d792d..d47104d792d 100644 --- a/java/test/Ice/optional/AMDInitialI.java +++ b/java/test/src/main/java/test/Ice/optional/AMDInitialI.java diff --git a/java/test/Ice/optional/AMDServer.java b/java/test/src/main/java/test/Ice/optional/AMDServer.java index b05e5b28f3c..b05e5b28f3c 100644 --- a/java/test/Ice/optional/AMDServer.java +++ b/java/test/src/main/java/test/Ice/optional/AMDServer.java diff --git a/java/test/Ice/optional/AllTests.java b/java/test/src/main/java/test/Ice/optional/AllTests.java index 0665eec3252..0665eec3252 100644 --- a/java/test/Ice/optional/AllTests.java +++ b/java/test/src/main/java/test/Ice/optional/AllTests.java diff --git a/java/test/Ice/optional/Client.java b/java/test/src/main/java/test/Ice/optional/Client.java index 22f05e262bc..22f05e262bc 100644 --- a/java/test/Ice/optional/Client.java +++ b/java/test/src/main/java/test/Ice/optional/Client.java diff --git a/java/test/Ice/optional/InitialI.java b/java/test/src/main/java/test/Ice/optional/InitialI.java index 191575aa992..191575aa992 100644 --- a/java/test/Ice/optional/InitialI.java +++ b/java/test/src/main/java/test/Ice/optional/InitialI.java diff --git a/java/test/Ice/optional/SerializableClass.java b/java/test/src/main/java/test/Ice/optional/SerializableClass.java index 1d29516c246..1d29516c246 100644 --- a/java/test/Ice/optional/SerializableClass.java +++ b/java/test/src/main/java/test/Ice/optional/SerializableClass.java diff --git a/java/test/Ice/optional/Server.java b/java/test/src/main/java/test/Ice/optional/Server.java index 15446ac47b5..15446ac47b5 100644 --- a/java/test/Ice/optional/Server.java +++ b/java/test/src/main/java/test/Ice/optional/Server.java diff --git a/java/test/Ice/optional/Test.ice b/java/test/src/main/java/test/Ice/optional/Test.ice index 96078ca538a..96078ca538a 100644 --- a/java/test/Ice/optional/Test.ice +++ b/java/test/src/main/java/test/Ice/optional/Test.ice diff --git a/java/test/Ice/optional/TestAMD.ice b/java/test/src/main/java/test/Ice/optional/TestAMD.ice index 95a283116dd..95a283116dd 100644 --- a/java/test/Ice/optional/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/optional/TestAMD.ice diff --git a/java/test/Ice/optional/lambda/AllTests.java b/java/test/src/main/java/test/Ice/optional/lambda/AllTests.java index db9fce3f89d..db9fce3f89d 100644 --- a/java/test/Ice/optional/lambda/AllTests.java +++ b/java/test/src/main/java/test/Ice/optional/lambda/AllTests.java diff --git a/java/test/Ice/optional/run.py b/java/test/src/main/java/test/Ice/optional/run.py index ab465630065..db4121d4784 100755 --- a/java/test/Ice/optional/run.py +++ b/java/test/src/main/java/test/Ice/optional/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/packagemd/AllTests.java b/java/test/src/main/java/test/Ice/packagemd/AllTests.java index 564bbebbded..564bbebbded 100644 --- a/java/test/Ice/packagemd/AllTests.java +++ b/java/test/src/main/java/test/Ice/packagemd/AllTests.java diff --git a/java/test/Ice/packagemd/Client.java b/java/test/src/main/java/test/Ice/packagemd/Client.java index 8081a790e76..8081a790e76 100644 --- a/java/test/Ice/packagemd/Client.java +++ b/java/test/src/main/java/test/Ice/packagemd/Client.java diff --git a/java/test/Ice/packagemd/InitialI.java b/java/test/src/main/java/test/Ice/packagemd/InitialI.java index 6d4d4fbaf96..6d4d4fbaf96 100644 --- a/java/test/Ice/packagemd/InitialI.java +++ b/java/test/src/main/java/test/Ice/packagemd/InitialI.java diff --git a/java/test/Ice/packagemd/NoPackage.ice b/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice index aa870ce5814..aa870ce5814 100644 --- a/java/test/Ice/packagemd/NoPackage.ice +++ b/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice diff --git a/java/test/Ice/packagemd/Package.ice b/java/test/src/main/java/test/Ice/packagemd/Package.ice index e962c55aea7..e962c55aea7 100644 --- a/java/test/Ice/packagemd/Package.ice +++ b/java/test/src/main/java/test/Ice/packagemd/Package.ice diff --git a/java/test/Ice/packagemd/Server.java b/java/test/src/main/java/test/Ice/packagemd/Server.java index 61bbb0dd2c6..61bbb0dd2c6 100644 --- a/java/test/Ice/packagemd/Server.java +++ b/java/test/src/main/java/test/Ice/packagemd/Server.java diff --git a/java/test/Ice/packagemd/Test.ice b/java/test/src/main/java/test/Ice/packagemd/Test.ice index c90179c6b11..c90179c6b11 100644 --- a/java/test/Ice/packagemd/Test.ice +++ b/java/test/src/main/java/test/Ice/packagemd/Test.ice diff --git a/java/test/src/main/java/test/Ice/packagemd/run.py b/java/test/src/main/java/test/Ice/packagemd/run.py new file mode 100755 index 00000000000..d5fe04787c9 --- /dev/null +++ b/java/test/src/main/java/test/Ice/packagemd/run.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +import os, sys + +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil + +TestUtil.clientServerTest() diff --git a/java/test/Ice/plugin/Client.java b/java/test/src/main/java/test/Ice/plugin/Client.java index 096f8d18a35..096f8d18a35 100644 --- a/java/test/Ice/plugin/Client.java +++ b/java/test/src/main/java/test/Ice/plugin/Client.java diff --git a/java/test/Ice/plugin/plugins/BasePlugin.java b/java/test/src/main/java/test/Ice/plugin/plugins/BasePlugin.java index 9ca8dbf3830..9ca8dbf3830 100644 --- a/java/test/Ice/plugin/plugins/BasePlugin.java +++ b/java/test/src/main/java/test/Ice/plugin/plugins/BasePlugin.java diff --git a/java/test/Ice/plugin/plugins/BasePluginFail.java b/java/test/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java index 863214bf8ab..863214bf8ab 100644 --- a/java/test/Ice/plugin/plugins/BasePluginFail.java +++ b/java/test/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java diff --git a/java/test/Ice/plugin/plugins/PluginFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginFactory.java index 02e8ad76d7e..02e8ad76d7e 100644 --- a/java/test/Ice/plugin/plugins/PluginFactory.java +++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginFactory.java diff --git a/java/test/Ice/plugin/plugins/PluginInitializeFailException.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java index d5bc41ca5d0..d5bc41ca5d0 100644 --- a/java/test/Ice/plugin/plugins/PluginInitializeFailException.java +++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java diff --git a/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java index a2f419ebecb..a2f419ebecb 100644 --- a/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java +++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java diff --git a/java/test/Ice/plugin/plugins/PluginOneFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java index b4895874772..b4895874772 100644 --- a/java/test/Ice/plugin/plugins/PluginOneFactory.java +++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java diff --git a/java/test/Ice/plugin/plugins/PluginOneFailFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java index 5fd118de41e..5fd118de41e 100644 --- a/java/test/Ice/plugin/plugins/PluginOneFailFactory.java +++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java diff --git a/java/test/Ice/plugin/plugins/PluginThreeFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java index 6fa993b414f..6fa993b414f 100644 --- a/java/test/Ice/plugin/plugins/PluginThreeFactory.java +++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java diff --git a/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java index bc5e4cc0be1..bc5e4cc0be1 100644 --- a/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java +++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java diff --git a/java/test/Ice/plugin/plugins/PluginTwoFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java index ecab2ba5222..ecab2ba5222 100644 --- a/java/test/Ice/plugin/plugins/PluginTwoFactory.java +++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java diff --git a/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java index 1b5ee8fb4af..1b5ee8fb4af 100644 --- a/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java +++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java diff --git a/java/test/Ice/plugin/run.py b/java/test/src/main/java/test/Ice/plugin/run.py index c886fc23c12..2b0bccd6c23 100755 --- a/java/test/Ice/plugin/run.py +++ b/java/test/src/main/java/test/Ice/plugin/run.py @@ -10,9 +10,8 @@ import os, sys -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/properties/Client.java b/java/test/src/main/java/test/Ice/properties/Client.java index 4b2571e185c..4b2571e185c 100644 --- a/java/test/Ice/properties/Client.java +++ b/java/test/src/main/java/test/Ice/properties/Client.java diff --git a/java/test/Ice/properties/config/.gitignore b/java/test/src/main/java/test/Ice/properties/config/.gitignore index 143c64680f3..143c64680f3 100644 --- a/java/test/Ice/properties/config/.gitignore +++ b/java/test/src/main/java/test/Ice/properties/config/.gitignore diff --git a/java/test/Ice/properties/config/config.1 b/java/test/src/main/java/test/Ice/properties/config/config.1 index 2a20653e4c5..2a20653e4c5 100644 --- a/java/test/Ice/properties/config/config.1 +++ b/java/test/src/main/java/test/Ice/properties/config/config.1 diff --git a/java/test/Ice/properties/config/config.2 b/java/test/src/main/java/test/Ice/properties/config/config.2 index be276df6602..be276df6602 100644 --- a/java/test/Ice/properties/config/config.2 +++ b/java/test/src/main/java/test/Ice/properties/config/config.2 diff --git a/java/test/Ice/properties/config/config.3 b/java/test/src/main/java/test/Ice/properties/config/config.3 index 55c1e1123f6..55c1e1123f6 100644 --- a/java/test/Ice/properties/config/config.3 +++ b/java/test/src/main/java/test/Ice/properties/config/config.3 diff --git a/java/test/Ice/properties/config/escapes.cfg b/java/test/src/main/java/test/Ice/properties/config/escapes.cfg index f438d2b59c8..f438d2b59c8 100644 --- a/java/test/Ice/properties/config/escapes.cfg +++ b/java/test/src/main/java/test/Ice/properties/config/escapes.cfg diff --git a/java/test/Ice/properties/run.py b/java/test/src/main/java/test/Ice/properties/run.py index ba394336fdf..034d0abef9d 100755 --- a/java/test/Ice/properties/run.py +++ b/java/test/src/main/java/test/Ice/properties/run.py @@ -11,7 +11,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/proxy/AMDMyDerivedClassI.java b/java/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java index 5cf41db2870..5cf41db2870 100644 --- a/java/test/Ice/proxy/AMDMyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java diff --git a/java/test/Ice/proxy/AMDServer.java b/java/test/src/main/java/test/Ice/proxy/AMDServer.java index 3629cf905b0..3629cf905b0 100644 --- a/java/test/Ice/proxy/AMDServer.java +++ b/java/test/src/main/java/test/Ice/proxy/AMDServer.java diff --git a/java/test/Ice/proxy/AllTests.java b/java/test/src/main/java/test/Ice/proxy/AllTests.java index 98e3c124fbb..98e3c124fbb 100644 --- a/java/test/Ice/proxy/AllTests.java +++ b/java/test/src/main/java/test/Ice/proxy/AllTests.java diff --git a/java/test/Ice/proxy/Client.java b/java/test/src/main/java/test/Ice/proxy/Client.java index 1ad397216c9..1ad397216c9 100644 --- a/java/test/Ice/proxy/Client.java +++ b/java/test/src/main/java/test/Ice/proxy/Client.java diff --git a/java/test/Ice/proxy/Collocated.java b/java/test/src/main/java/test/Ice/proxy/Collocated.java index 26e71003545..26e71003545 100644 --- a/java/test/Ice/proxy/Collocated.java +++ b/java/test/src/main/java/test/Ice/proxy/Collocated.java diff --git a/java/test/Ice/proxy/MyDerivedClassI.java b/java/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java index 35cc76794c0..35cc76794c0 100644 --- a/java/test/Ice/proxy/MyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java diff --git a/java/test/Ice/proxy/Server.java b/java/test/src/main/java/test/Ice/proxy/Server.java index ae09627cfe5..ae09627cfe5 100644 --- a/java/test/Ice/proxy/Server.java +++ b/java/test/src/main/java/test/Ice/proxy/Server.java diff --git a/java/test/Ice/proxy/Test.ice b/java/test/src/main/java/test/Ice/proxy/Test.ice index be3393a11a6..be3393a11a6 100644 --- a/java/test/Ice/proxy/Test.ice +++ b/java/test/src/main/java/test/Ice/proxy/Test.ice diff --git a/java/test/Ice/proxy/TestAMD.ice b/java/test/src/main/java/test/Ice/proxy/TestAMD.ice index c95dd99bd9a..c95dd99bd9a 100644 --- a/java/test/Ice/proxy/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/proxy/TestAMD.ice diff --git a/java/test/Ice/proxy/run.py b/java/test/src/main/java/test/Ice/proxy/run.py index 3fb660be2cb..c013796c45b 100755 --- a/java/test/Ice/proxy/run.py +++ b/java/test/src/main/java/test/Ice/proxy/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/retry/AllTests.java b/java/test/src/main/java/test/Ice/retry/AllTests.java index 2552f593dd0..2552f593dd0 100644 --- a/java/test/Ice/retry/AllTests.java +++ b/java/test/src/main/java/test/Ice/retry/AllTests.java diff --git a/java/test/Ice/retry/Client.java b/java/test/src/main/java/test/Ice/retry/Client.java index f26a2b43eca..f26a2b43eca 100644 --- a/java/test/Ice/retry/Client.java +++ b/java/test/src/main/java/test/Ice/retry/Client.java diff --git a/java/test/Ice/retry/Collocated.java b/java/test/src/main/java/test/Ice/retry/Collocated.java index 9a49ec6f991..9a49ec6f991 100644 --- a/java/test/Ice/retry/Collocated.java +++ b/java/test/src/main/java/test/Ice/retry/Collocated.java diff --git a/java/test/Ice/retry/Instrumentation.java b/java/test/src/main/java/test/Ice/retry/Instrumentation.java index 609a8225ef2..609a8225ef2 100644 --- a/java/test/Ice/retry/Instrumentation.java +++ b/java/test/src/main/java/test/Ice/retry/Instrumentation.java diff --git a/java/test/Ice/retry/RetryI.java b/java/test/src/main/java/test/Ice/retry/RetryI.java index f2afcc881dd..f2afcc881dd 100644 --- a/java/test/Ice/retry/RetryI.java +++ b/java/test/src/main/java/test/Ice/retry/RetryI.java diff --git a/java/test/Ice/retry/Server.java b/java/test/src/main/java/test/Ice/retry/Server.java index 678839b36a5..678839b36a5 100644 --- a/java/test/Ice/retry/Server.java +++ b/java/test/src/main/java/test/Ice/retry/Server.java diff --git a/java/test/Ice/retry/SystemFailure.java b/java/test/src/main/java/test/Ice/retry/SystemFailure.java index fc03b8e6f82..fc03b8e6f82 100644 --- a/java/test/Ice/retry/SystemFailure.java +++ b/java/test/src/main/java/test/Ice/retry/SystemFailure.java diff --git a/java/test/Ice/retry/Test.ice b/java/test/src/main/java/test/Ice/retry/Test.ice index 0e1be095f41..0e1be095f41 100644 --- a/java/test/Ice/retry/Test.ice +++ b/java/test/src/main/java/test/Ice/retry/Test.ice diff --git a/java/test/src/main/java/test/Ice/retry/run.py b/java/test/src/main/java/test/Ice/retry/run.py new file mode 100755 index 00000000000..6444a527f9a --- /dev/null +++ b/java/test/src/main/java/test/Ice/retry/run.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +import os, sys + +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil + +print("tests with regular server.") +TestUtil.clientServerTest() +print("tests with collocated server.") +TestUtil.collocatedTest() diff --git a/java/test/Ice/seqMapping/AMDMyClassI.java b/java/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java index 49ee338fc1d..49ee338fc1d 100644 --- a/java/test/Ice/seqMapping/AMDMyClassI.java +++ b/java/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java diff --git a/java/test/Ice/seqMapping/AMDServer.java b/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java index 5c3e9bc5fc0..5c3e9bc5fc0 100644 --- a/java/test/Ice/seqMapping/AMDServer.java +++ b/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java diff --git a/java/test/Ice/seqMapping/AllTests.java b/java/test/src/main/java/test/Ice/seqMapping/AllTests.java index 546de84ae74..546de84ae74 100644 --- a/java/test/Ice/seqMapping/AllTests.java +++ b/java/test/src/main/java/test/Ice/seqMapping/AllTests.java diff --git a/java/test/Ice/seqMapping/Client.java b/java/test/src/main/java/test/Ice/seqMapping/Client.java index 2124aefda4d..2124aefda4d 100644 --- a/java/test/Ice/seqMapping/Client.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Client.java diff --git a/java/test/Ice/seqMapping/Collocated.java b/java/test/src/main/java/test/Ice/seqMapping/Collocated.java index bafcdce6b20..bafcdce6b20 100644 --- a/java/test/Ice/seqMapping/Collocated.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Collocated.java diff --git a/java/test/Ice/seqMapping/MyClassI.java b/java/test/src/main/java/test/Ice/seqMapping/MyClassI.java index f0a2505be21..f0a2505be21 100644 --- a/java/test/Ice/seqMapping/MyClassI.java +++ b/java/test/src/main/java/test/Ice/seqMapping/MyClassI.java diff --git a/java/test/Ice/seqMapping/Serialize/Large.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java index 3b6e3edd327..3b6e3edd327 100644 --- a/java/test/Ice/seqMapping/Serialize/Large.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java diff --git a/java/test/Ice/seqMapping/Serialize/Small.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java index 3503c5415b5..3503c5415b5 100644 --- a/java/test/Ice/seqMapping/Serialize/Small.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java diff --git a/java/test/Ice/seqMapping/Serialize/SmallHolder.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java index f2f01a4805c..f2f01a4805c 100644 --- a/java/test/Ice/seqMapping/Serialize/SmallHolder.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java diff --git a/java/test/Ice/seqMapping/Serialize/Struct.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java index 30c80c752e6..30c80c752e6 100644 --- a/java/test/Ice/seqMapping/Serialize/Struct.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java diff --git a/java/test/Ice/seqMapping/Serialize/StructHolder.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java index 9768382d0e7..9768382d0e7 100644 --- a/java/test/Ice/seqMapping/Serialize/StructHolder.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java diff --git a/java/test/Ice/seqMapping/Server.java b/java/test/src/main/java/test/Ice/seqMapping/Server.java index eea5e6536dd..eea5e6536dd 100644 --- a/java/test/Ice/seqMapping/Server.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Server.java diff --git a/java/test/Ice/seqMapping/Test.ice b/java/test/src/main/java/test/Ice/seqMapping/Test.ice index 15dfffb884b..15dfffb884b 100644 --- a/java/test/Ice/seqMapping/Test.ice +++ b/java/test/src/main/java/test/Ice/seqMapping/Test.ice diff --git a/java/test/Ice/seqMapping/TestAMD.ice b/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice index 28b3aa3c434..28b3aa3c434 100644 --- a/java/test/Ice/seqMapping/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice diff --git a/java/test/Ice/seqMapping/Twoways.java b/java/test/src/main/java/test/Ice/seqMapping/Twoways.java index a6f50f8a327..a6f50f8a327 100644 --- a/java/test/Ice/seqMapping/Twoways.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Twoways.java diff --git a/java/test/Ice/seqMapping/TwowaysAMI.java b/java/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java index 575686dac1b..575686dac1b 100644 --- a/java/test/Ice/seqMapping/TwowaysAMI.java +++ b/java/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java diff --git a/java/test/Ice/seqMapping/run.py b/java/test/src/main/java/test/Ice/seqMapping/run.py index deebe811217..e3ca7f3e9c6 100755 --- a/java/test/Ice/seqMapping/run.py +++ b/java/test/src/main/java/test/Ice/seqMapping/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/serialize/AllTests.java b/java/test/src/main/java/test/Ice/serialize/AllTests.java index 212acc0893c..212acc0893c 100644 --- a/java/test/Ice/serialize/AllTests.java +++ b/java/test/src/main/java/test/Ice/serialize/AllTests.java diff --git a/java/test/Ice/serialize/Client.java b/java/test/src/main/java/test/Ice/serialize/Client.java index ffa339ba2ca..ffa339ba2ca 100644 --- a/java/test/Ice/serialize/Client.java +++ b/java/test/src/main/java/test/Ice/serialize/Client.java diff --git a/java/test/Ice/serialize/InitialI.java b/java/test/src/main/java/test/Ice/serialize/InitialI.java index 9fdd4e03c4c..9fdd4e03c4c 100644 --- a/java/test/Ice/serialize/InitialI.java +++ b/java/test/src/main/java/test/Ice/serialize/InitialI.java diff --git a/java/test/Ice/serialize/Server.java b/java/test/src/main/java/test/Ice/serialize/Server.java index 19346017593..19346017593 100644 --- a/java/test/Ice/serialize/Server.java +++ b/java/test/src/main/java/test/Ice/serialize/Server.java diff --git a/java/test/Ice/serialize/Test.ice b/java/test/src/main/java/test/Ice/serialize/Test.ice index 2d9a4030f63..2d9a4030f63 100644 --- a/java/test/Ice/serialize/Test.ice +++ b/java/test/src/main/java/test/Ice/serialize/Test.ice diff --git a/java/test/src/main/java/test/Ice/serialize/run.py b/java/test/src/main/java/test/Ice/serialize/run.py new file mode 100755 index 00000000000..d5fe04787c9 --- /dev/null +++ b/java/test/src/main/java/test/Ice/serialize/run.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +import os, sys + +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil + +TestUtil.clientServerTest() diff --git a/java/test/Ice/servantLocator/AMDCookieI.java b/java/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java index 5f0d227ed38..5f0d227ed38 100644 --- a/java/test/Ice/servantLocator/AMDCookieI.java +++ b/java/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java diff --git a/java/test/Ice/servantLocator/AMDServantLocatorI.java b/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java index 24b14d3ef39..24b14d3ef39 100644 --- a/java/test/Ice/servantLocator/AMDServantLocatorI.java +++ b/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java diff --git a/java/test/Ice/servantLocator/AMDServer.java b/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java index 29f8754170a..29f8754170a 100644 --- a/java/test/Ice/servantLocator/AMDServer.java +++ b/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java diff --git a/java/test/Ice/servantLocator/AMDTestActivationI.java b/java/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java index 31ecfeab516..31ecfeab516 100644 --- a/java/test/Ice/servantLocator/AMDTestActivationI.java +++ b/java/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java diff --git a/java/test/Ice/servantLocator/AMDTestI.java b/java/test/src/main/java/test/Ice/servantLocator/AMDTestI.java index 999b2871a89..999b2871a89 100644 --- a/java/test/Ice/servantLocator/AMDTestI.java +++ b/java/test/src/main/java/test/Ice/servantLocator/AMDTestI.java diff --git a/java/test/Ice/servantLocator/AllTests.java b/java/test/src/main/java/test/Ice/servantLocator/AllTests.java index 15273a5b687..15273a5b687 100644 --- a/java/test/Ice/servantLocator/AllTests.java +++ b/java/test/src/main/java/test/Ice/servantLocator/AllTests.java diff --git a/java/test/Ice/servantLocator/Client.java b/java/test/src/main/java/test/Ice/servantLocator/Client.java index c781cb5ac50..c781cb5ac50 100644 --- a/java/test/Ice/servantLocator/Client.java +++ b/java/test/src/main/java/test/Ice/servantLocator/Client.java diff --git a/java/test/Ice/servantLocator/Collocated.java b/java/test/src/main/java/test/Ice/servantLocator/Collocated.java index 612602d933d..612602d933d 100644 --- a/java/test/Ice/servantLocator/Collocated.java +++ b/java/test/src/main/java/test/Ice/servantLocator/Collocated.java diff --git a/java/test/Ice/servantLocator/CookieI.java b/java/test/src/main/java/test/Ice/servantLocator/CookieI.java index 52bab91e922..52bab91e922 100644 --- a/java/test/Ice/servantLocator/CookieI.java +++ b/java/test/src/main/java/test/Ice/servantLocator/CookieI.java diff --git a/java/test/Ice/servantLocator/ServantLocatorI.java b/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java index f3fa5388634..f3fa5388634 100644 --- a/java/test/Ice/servantLocator/ServantLocatorI.java +++ b/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java diff --git a/java/test/Ice/servantLocator/Server.java b/java/test/src/main/java/test/Ice/servantLocator/Server.java index bd3dfdc7288..bd3dfdc7288 100644 --- a/java/test/Ice/servantLocator/Server.java +++ b/java/test/src/main/java/test/Ice/servantLocator/Server.java diff --git a/java/test/Ice/servantLocator/Test.ice b/java/test/src/main/java/test/Ice/servantLocator/Test.ice index 1c12f4b8483..1c12f4b8483 100644 --- a/java/test/Ice/servantLocator/Test.ice +++ b/java/test/src/main/java/test/Ice/servantLocator/Test.ice diff --git a/java/test/Ice/servantLocator/TestAMD.ice b/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice index 2a776edb658..2a776edb658 100644 --- a/java/test/Ice/servantLocator/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice diff --git a/java/test/Ice/servantLocator/TestActivationI.java b/java/test/src/main/java/test/Ice/servantLocator/TestActivationI.java index 3c1c6f209ad..3c1c6f209ad 100644 --- a/java/test/Ice/servantLocator/TestActivationI.java +++ b/java/test/src/main/java/test/Ice/servantLocator/TestActivationI.java diff --git a/java/test/Ice/servantLocator/TestI.java b/java/test/src/main/java/test/Ice/servantLocator/TestI.java index b0704d4f6a6..b0704d4f6a6 100644 --- a/java/test/Ice/servantLocator/TestI.java +++ b/java/test/src/main/java/test/Ice/servantLocator/TestI.java diff --git a/java/test/Ice/servantLocator/run.py b/java/test/src/main/java/test/Ice/servantLocator/run.py index 3176df2a38e..7944176bc4a 100755 --- a/java/test/Ice/servantLocator/run.py +++ b/java/test/src/main/java/test/Ice/servantLocator/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/slicing/exceptions/AMDServer.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java index acca7cf53e8..acca7cf53e8 100644 --- a/java/test/Ice/slicing/exceptions/AMDServer.java +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java diff --git a/java/test/Ice/slicing/exceptions/AMDTestI.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java index 07ca77f5dad..07ca77f5dad 100644 --- a/java/test/Ice/slicing/exceptions/AMDTestI.java +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java diff --git a/java/test/Ice/slicing/exceptions/AllTests.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java index cd159a9006b..cd159a9006b 100644 --- a/java/test/Ice/slicing/exceptions/AllTests.java +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java diff --git a/java/test/Ice/slicing/exceptions/Client.java b/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java index bee392fe3b3..bee392fe3b3 100644 --- a/java/test/Ice/slicing/exceptions/Client.java +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java diff --git a/java/test/Ice/slicing/exceptions/ClientPrivate.ice b/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice index 703399d8502..703399d8502 100644 --- a/java/test/Ice/slicing/exceptions/ClientPrivate.ice +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice diff --git a/java/test/Ice/slicing/exceptions/Server.java b/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java index 0844dd92275..0844dd92275 100644 --- a/java/test/Ice/slicing/exceptions/Server.java +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java diff --git a/java/test/Ice/slicing/exceptions/ServerPrivate.ice b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice index d12869fb451..d12869fb451 100644 --- a/java/test/Ice/slicing/exceptions/ServerPrivate.ice +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice diff --git a/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice index ff2ee33b93e..ff2ee33b93e 100644 --- a/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice diff --git a/java/test/Ice/slicing/exceptions/TestI.java b/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java index 9cedab3b4af..9cedab3b4af 100644 --- a/java/test/Ice/slicing/exceptions/TestI.java +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java diff --git a/java/test/Ice/slicing/exceptions/run.py b/java/test/src/main/java/test/Ice/slicing/exceptions/run.py index 91d398b0071..e4130c0b4e6 100755 --- a/java/test/Ice/slicing/exceptions/run.py +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/slicing/objects/AMDServer.java b/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java index c905976b193..c905976b193 100644 --- a/java/test/Ice/slicing/objects/AMDServer.java +++ b/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java diff --git a/java/test/Ice/slicing/objects/AMDTestI.java b/java/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java index f1c9e814a9b..f1c9e814a9b 100644 --- a/java/test/Ice/slicing/objects/AMDTestI.java +++ b/java/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java diff --git a/java/test/Ice/slicing/objects/AllTests.java b/java/test/src/main/java/test/Ice/slicing/objects/AllTests.java index be43330eae1..be43330eae1 100644 --- a/java/test/Ice/slicing/objects/AllTests.java +++ b/java/test/src/main/java/test/Ice/slicing/objects/AllTests.java diff --git a/java/test/Ice/slicing/objects/Client.java b/java/test/src/main/java/test/Ice/slicing/objects/Client.java index e725c725339..e725c725339 100644 --- a/java/test/Ice/slicing/objects/Client.java +++ b/java/test/src/main/java/test/Ice/slicing/objects/Client.java diff --git a/java/test/Ice/slicing/objects/ClientPrivate.ice b/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice index 716147695ae..716147695ae 100644 --- a/java/test/Ice/slicing/objects/ClientPrivate.ice +++ b/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice diff --git a/java/test/Ice/slicing/objects/Server.java b/java/test/src/main/java/test/Ice/slicing/objects/Server.java index fded6895de1..fded6895de1 100644 --- a/java/test/Ice/slicing/objects/Server.java +++ b/java/test/src/main/java/test/Ice/slicing/objects/Server.java diff --git a/java/test/Ice/slicing/objects/ServerPrivate.ice b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice index f880521b7b1..f880521b7b1 100644 --- a/java/test/Ice/slicing/objects/ServerPrivate.ice +++ b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice diff --git a/java/test/Ice/slicing/objects/ServerPrivateAMD.ice b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice index abf0fc4ee64..abf0fc4ee64 100644 --- a/java/test/Ice/slicing/objects/ServerPrivateAMD.ice +++ b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice diff --git a/java/test/Ice/slicing/objects/TestI.java b/java/test/src/main/java/test/Ice/slicing/objects/TestI.java index aa199bfdcbe..aa199bfdcbe 100644 --- a/java/test/Ice/slicing/objects/TestI.java +++ b/java/test/src/main/java/test/Ice/slicing/objects/TestI.java diff --git a/java/test/Ice/slicing/objects/run.py b/java/test/src/main/java/test/Ice/slicing/objects/run.py index ceb32b83e11..cabf77e2817 100755 --- a/java/test/Ice/slicing/objects/run.py +++ b/java/test/src/main/java/test/Ice/slicing/objects/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/stream/Client.java b/java/test/src/main/java/test/Ice/stream/Client.java index 5d88f303e5d..5d88f303e5d 100644 --- a/java/test/Ice/stream/Client.java +++ b/java/test/src/main/java/test/Ice/stream/Client.java diff --git a/java/test/Ice/stream/Serialize/Small.java b/java/test/src/main/java/test/Ice/stream/Serialize/Small.java index 572d3ba10cf..572d3ba10cf 100644 --- a/java/test/Ice/stream/Serialize/Small.java +++ b/java/test/src/main/java/test/Ice/stream/Serialize/Small.java diff --git a/java/test/Ice/stream/Test.ice b/java/test/src/main/java/test/Ice/stream/Test.ice index 5be23454461..5be23454461 100644 --- a/java/test/Ice/stream/Test.ice +++ b/java/test/src/main/java/test/Ice/stream/Test.ice diff --git a/java/test/Ice/stream/run.py b/java/test/src/main/java/test/Ice/stream/run.py index 08e9e18a321..b071a5d9733 100755 --- a/java/test/Ice/stream/run.py +++ b/java/test/src/main/java/test/Ice/stream/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Ice/threadPoolPriority/Client.java b/java/test/src/main/java/test/Ice/threadPoolPriority/Client.java index 86dd9468d47..86dd9468d47 100644 --- a/java/test/Ice/threadPoolPriority/Client.java +++ b/java/test/src/main/java/test/Ice/threadPoolPriority/Client.java diff --git a/java/test/Ice/threadPoolPriority/PriorityI.java b/java/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java index 18579e7713a..18579e7713a 100644 --- a/java/test/Ice/threadPoolPriority/PriorityI.java +++ b/java/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java diff --git a/java/test/Ice/threadPoolPriority/Server.java b/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java index a1bdc6a0a31..a1bdc6a0a31 100644 --- a/java/test/Ice/threadPoolPriority/Server.java +++ b/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java diff --git a/java/test/Ice/threadPoolPriority/Test.ice b/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice index d69a2fac75a..d69a2fac75a 100644 --- a/java/test/Ice/threadPoolPriority/Test.ice +++ b/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice diff --git a/java/test/Ice/interrupt/run.py b/java/test/src/main/java/test/Ice/threadPoolPriority/run.py index 012b74ea130..46e1ee20e8d 100755 --- a/java/test/Ice/interrupt/run.py +++ b/java/test/src/main/java/test/Ice/threadPoolPriority/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] @@ -22,6 +23,3 @@ import TestUtil print("tests with regular server.") TestUtil.clientServerTest() - -print("tests with collocated server.") -TestUtil.collocatedTest()
\ No newline at end of file diff --git a/java/test/Ice/throughput/Client.java b/java/test/src/main/java/test/Ice/throughput/Client.java index b508b11bc96..b508b11bc96 100644 --- a/java/test/Ice/throughput/Client.java +++ b/java/test/src/main/java/test/Ice/throughput/Client.java diff --git a/java/test/Ice/throughput/Server.java b/java/test/src/main/java/test/Ice/throughput/Server.java index 95737f3dc10..95737f3dc10 100644 --- a/java/test/Ice/throughput/Server.java +++ b/java/test/src/main/java/test/Ice/throughput/Server.java diff --git a/java/test/Ice/throughput/Throughput.ice b/java/test/src/main/java/test/Ice/throughput/Throughput.ice index d1ebb567ec7..d1ebb567ec7 100644 --- a/java/test/Ice/throughput/Throughput.ice +++ b/java/test/src/main/java/test/Ice/throughput/Throughput.ice diff --git a/java/test/Ice/throughput/ThroughputI.java b/java/test/src/main/java/test/Ice/throughput/ThroughputI.java index 53253549102..53253549102 100644 --- a/java/test/Ice/throughput/ThroughputI.java +++ b/java/test/src/main/java/test/Ice/throughput/ThroughputI.java diff --git a/java/test/Ice/timeout/AllTests.java b/java/test/src/main/java/test/Ice/timeout/AllTests.java index 7f0239f32c5..7f0239f32c5 100644 --- a/java/test/Ice/timeout/AllTests.java +++ b/java/test/src/main/java/test/Ice/timeout/AllTests.java diff --git a/java/test/Ice/timeout/Client.java b/java/test/src/main/java/test/Ice/timeout/Client.java index 7476eb5c0e8..7476eb5c0e8 100644 --- a/java/test/Ice/timeout/Client.java +++ b/java/test/src/main/java/test/Ice/timeout/Client.java diff --git a/java/test/Ice/timeout/Server.java b/java/test/src/main/java/test/Ice/timeout/Server.java index b4006770863..b4006770863 100644 --- a/java/test/Ice/timeout/Server.java +++ b/java/test/src/main/java/test/Ice/timeout/Server.java diff --git a/java/test/Ice/timeout/Test.ice b/java/test/src/main/java/test/Ice/timeout/Test.ice index 69ca37fb5c5..69ca37fb5c5 100644 --- a/java/test/Ice/timeout/Test.ice +++ b/java/test/src/main/java/test/Ice/timeout/Test.ice diff --git a/java/test/Ice/timeout/TimeoutI.java b/java/test/src/main/java/test/Ice/timeout/TimeoutI.java index 61b8f7702c2..61b8f7702c2 100644 --- a/java/test/Ice/timeout/TimeoutI.java +++ b/java/test/src/main/java/test/Ice/timeout/TimeoutI.java diff --git a/java/test/src/main/java/test/Ice/timeout/run.py b/java/test/src/main/java/test/Ice/timeout/run.py new file mode 100755 index 00000000000..d5fe04787c9 --- /dev/null +++ b/java/test/src/main/java/test/Ice/timeout/run.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +import os, sys + +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil + +TestUtil.clientServerTest() diff --git a/java/test/Ice/timeout/timeout.jar b/java/test/src/main/java/test/Ice/timeout/timeout.jar Binary files differindex 81d74d85812..81d74d85812 100644 --- a/java/test/Ice/timeout/timeout.jar +++ b/java/test/src/main/java/test/Ice/timeout/timeout.jar diff --git a/java/test/Ice/udp/AllTests.java b/java/test/src/main/java/test/Ice/udp/AllTests.java index 82dc1224d46..82dc1224d46 100644 --- a/java/test/Ice/udp/AllTests.java +++ b/java/test/src/main/java/test/Ice/udp/AllTests.java diff --git a/java/test/Ice/udp/Client.java b/java/test/src/main/java/test/Ice/udp/Client.java index afd4927a470..afd4927a470 100644 --- a/java/test/Ice/udp/Client.java +++ b/java/test/src/main/java/test/Ice/udp/Client.java diff --git a/java/test/Ice/udp/Server.java b/java/test/src/main/java/test/Ice/udp/Server.java index 05cfc43cbc8..05cfc43cbc8 100644 --- a/java/test/Ice/udp/Server.java +++ b/java/test/src/main/java/test/Ice/udp/Server.java diff --git a/java/test/Ice/udp/Test.ice b/java/test/src/main/java/test/Ice/udp/Test.ice index be7a3269229..be7a3269229 100644 --- a/java/test/Ice/udp/Test.ice +++ b/java/test/src/main/java/test/Ice/udp/Test.ice diff --git a/java/test/Ice/udp/TestIntfI.java b/java/test/src/main/java/test/Ice/udp/TestIntfI.java index d4aba78a2c3..d4aba78a2c3 100644 --- a/java/test/Ice/udp/TestIntfI.java +++ b/java/test/src/main/java/test/Ice/udp/TestIntfI.java diff --git a/java/test/Ice/udp/run.py b/java/test/src/main/java/test/Ice/udp/run.py index cffeb7f24c9..efbd3b862cb 100755 --- a/java/test/Ice/udp/run.py +++ b/java/test/src/main/java/test/Ice/udp/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/IceBox/admin/AllTests.java b/java/test/src/main/java/test/IceBox/admin/AllTests.java index 4063486d1da..4063486d1da 100644 --- a/java/test/IceBox/admin/AllTests.java +++ b/java/test/src/main/java/test/IceBox/admin/AllTests.java diff --git a/java/test/IceBox/admin/Client.java b/java/test/src/main/java/test/IceBox/admin/Client.java index 80664c2edd0..80664c2edd0 100644 --- a/java/test/IceBox/admin/Client.java +++ b/java/test/src/main/java/test/IceBox/admin/Client.java diff --git a/java/test/IceBox/admin/Test.ice b/java/test/src/main/java/test/IceBox/admin/Test.ice index 88ab72b5322..88ab72b5322 100644 --- a/java/test/IceBox/admin/Test.ice +++ b/java/test/src/main/java/test/IceBox/admin/Test.ice diff --git a/java/test/IceBox/admin/TestFacetI.java b/java/test/src/main/java/test/IceBox/admin/TestFacetI.java index 642ee400d20..642ee400d20 100644 --- a/java/test/IceBox/admin/TestFacetI.java +++ b/java/test/src/main/java/test/IceBox/admin/TestFacetI.java diff --git a/java/test/IceBox/admin/TestServiceI.java b/java/test/src/main/java/test/IceBox/admin/TestServiceI.java index 7497771d248..7497771d248 100644 --- a/java/test/IceBox/admin/TestServiceI.java +++ b/java/test/src/main/java/test/IceBox/admin/TestServiceI.java diff --git a/java/test/IceBox/admin/config.icebox b/java/test/src/main/java/test/IceBox/admin/config.icebox index 34d0b233419..34d0b233419 100644 --- a/java/test/IceBox/admin/config.icebox +++ b/java/test/src/main/java/test/IceBox/admin/config.icebox diff --git a/java/test/IceBox/admin/config.service b/java/test/src/main/java/test/IceBox/admin/config.service index 23c6f841859..23c6f841859 100644 --- a/java/test/IceBox/admin/config.service +++ b/java/test/src/main/java/test/IceBox/admin/config.service diff --git a/java/test/IceBox/admin/run.py b/java/test/src/main/java/test/IceBox/admin/run.py index 3d88326f500..f84c3203acd 100755 --- a/java/test/IceBox/admin/run.py +++ b/java/test/src/main/java/test/IceBox/admin/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/IceBox/configuration/AllTests.java b/java/test/src/main/java/test/IceBox/configuration/AllTests.java index 68f5dd65dc6..68f5dd65dc6 100644 --- a/java/test/IceBox/configuration/AllTests.java +++ b/java/test/src/main/java/test/IceBox/configuration/AllTests.java diff --git a/java/test/IceBox/configuration/Client.java b/java/test/src/main/java/test/IceBox/configuration/Client.java index 39785e9de8a..39785e9de8a 100644 --- a/java/test/IceBox/configuration/Client.java +++ b/java/test/src/main/java/test/IceBox/configuration/Client.java diff --git a/java/test/IceBox/configuration/Test.ice b/java/test/src/main/java/test/IceBox/configuration/Test.ice index 757de8ea164..757de8ea164 100644 --- a/java/test/IceBox/configuration/Test.ice +++ b/java/test/src/main/java/test/IceBox/configuration/Test.ice diff --git a/java/test/IceBox/configuration/TestI.java b/java/test/src/main/java/test/IceBox/configuration/TestI.java index abe96b912f8..abe96b912f8 100644 --- a/java/test/IceBox/configuration/TestI.java +++ b/java/test/src/main/java/test/IceBox/configuration/TestI.java diff --git a/java/test/IceBox/configuration/TestServiceI.java b/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java index 037d5465968..037d5465968 100644 --- a/java/test/IceBox/configuration/TestServiceI.java +++ b/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java diff --git a/java/test/IceBox/configuration/config.icebox b/java/test/src/main/java/test/IceBox/configuration/config.icebox index 1dd4b90957c..1dd4b90957c 100644 --- a/java/test/IceBox/configuration/config.icebox +++ b/java/test/src/main/java/test/IceBox/configuration/config.icebox diff --git a/java/test/IceBox/configuration/config.icebox2 b/java/test/src/main/java/test/IceBox/configuration/config.icebox2 index 2866764f19f..2866764f19f 100644 --- a/java/test/IceBox/configuration/config.icebox2 +++ b/java/test/src/main/java/test/IceBox/configuration/config.icebox2 diff --git a/java/test/IceBox/configuration/config.service1 b/java/test/src/main/java/test/IceBox/configuration/config.service1 index 6028e615ff5..6028e615ff5 100644 --- a/java/test/IceBox/configuration/config.service1 +++ b/java/test/src/main/java/test/IceBox/configuration/config.service1 diff --git a/java/test/IceBox/configuration/config.service1-2 b/java/test/src/main/java/test/IceBox/configuration/config.service1-2 index c173914db2a..c173914db2a 100644 --- a/java/test/IceBox/configuration/config.service1-2 +++ b/java/test/src/main/java/test/IceBox/configuration/config.service1-2 diff --git a/java/test/IceBox/configuration/config.service2 b/java/test/src/main/java/test/IceBox/configuration/config.service2 index 78e08aadba6..78e08aadba6 100644 --- a/java/test/IceBox/configuration/config.service2 +++ b/java/test/src/main/java/test/IceBox/configuration/config.service2 diff --git a/java/test/IceBox/configuration/config.service2-2 b/java/test/src/main/java/test/IceBox/configuration/config.service2-2 index 36c8d0812cb..36c8d0812cb 100644 --- a/java/test/IceBox/configuration/config.service2-2 +++ b/java/test/src/main/java/test/IceBox/configuration/config.service2-2 diff --git a/java/test/IceBox/configuration/config.service3 b/java/test/src/main/java/test/IceBox/configuration/config.service3 index c93ed144701..c93ed144701 100644 --- a/java/test/IceBox/configuration/config.service3 +++ b/java/test/src/main/java/test/IceBox/configuration/config.service3 diff --git a/java/test/IceBox/configuration/config.service4 b/java/test/src/main/java/test/IceBox/configuration/config.service4 index 182fb3a7289..182fb3a7289 100644 --- a/java/test/IceBox/configuration/config.service4 +++ b/java/test/src/main/java/test/IceBox/configuration/config.service4 diff --git a/java/test/IceBox/configuration/run.py b/java/test/src/main/java/test/IceBox/configuration/run.py index 45c300b3b16..32ce304919c 100755 --- a/java/test/IceBox/configuration/run.py +++ b/java/test/src/main/java/test/IceBox/configuration/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/IceDiscovery/simple/AllTests.java b/java/test/src/main/java/test/IceDiscovery/simple/AllTests.java index 97546028b59..97546028b59 100644 --- a/java/test/IceDiscovery/simple/AllTests.java +++ b/java/test/src/main/java/test/IceDiscovery/simple/AllTests.java diff --git a/java/test/IceDiscovery/simple/Client.java b/java/test/src/main/java/test/IceDiscovery/simple/Client.java index 7b93371328e..7b93371328e 100644 --- a/java/test/IceDiscovery/simple/Client.java +++ b/java/test/src/main/java/test/IceDiscovery/simple/Client.java diff --git a/java/test/IceDiscovery/simple/ControllerI.java b/java/test/src/main/java/test/IceDiscovery/simple/ControllerI.java index 188b1c7182d..188b1c7182d 100644 --- a/java/test/IceDiscovery/simple/ControllerI.java +++ b/java/test/src/main/java/test/IceDiscovery/simple/ControllerI.java diff --git a/java/test/IceDiscovery/simple/Server.java b/java/test/src/main/java/test/IceDiscovery/simple/Server.java index 7bc444355f4..7bc444355f4 100644 --- a/java/test/IceDiscovery/simple/Server.java +++ b/java/test/src/main/java/test/IceDiscovery/simple/Server.java diff --git a/java/test/IceDiscovery/simple/Test.ice b/java/test/src/main/java/test/IceDiscovery/simple/Test.ice index 03d59e513a7..03d59e513a7 100644 --- a/java/test/IceDiscovery/simple/Test.ice +++ b/java/test/src/main/java/test/IceDiscovery/simple/Test.ice diff --git a/java/test/IceDiscovery/simple/TestIntfI.java b/java/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java index 339bc281081..339bc281081 100644 --- a/java/test/IceDiscovery/simple/TestIntfI.java +++ b/java/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java diff --git a/java/test/IceDiscovery/simple/run.py b/java/test/src/main/java/test/IceDiscovery/simple/run.py index d1581a0663c..2f14ff0442f 100755 --- a/java/test/IceDiscovery/simple/run.py +++ b/java/test/src/main/java/test/IceDiscovery/simple/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/IceGrid/simple/.gitignore b/java/test/src/main/java/test/IceGrid/simple/.gitignore index 1a5104f3c93..1a5104f3c93 100644 --- a/java/test/IceGrid/simple/.gitignore +++ b/java/test/src/main/java/test/IceGrid/simple/.gitignore diff --git a/java/test/IceGrid/simple/AllTests.java b/java/test/src/main/java/test/IceGrid/simple/AllTests.java index b6aba8b8594..b6aba8b8594 100644 --- a/java/test/IceGrid/simple/AllTests.java +++ b/java/test/src/main/java/test/IceGrid/simple/AllTests.java diff --git a/java/test/IceGrid/simple/Client.java b/java/test/src/main/java/test/IceGrid/simple/Client.java index 0da92bbeffe..0da92bbeffe 100644 --- a/java/test/IceGrid/simple/Client.java +++ b/java/test/src/main/java/test/IceGrid/simple/Client.java diff --git a/java/test/IceGrid/simple/Server.java b/java/test/src/main/java/test/IceGrid/simple/Server.java index 1b349a70773..1b349a70773 100644 --- a/java/test/IceGrid/simple/Server.java +++ b/java/test/src/main/java/test/IceGrid/simple/Server.java diff --git a/java/test/IceGrid/simple/Test.ice b/java/test/src/main/java/test/IceGrid/simple/Test.ice index 645988ffff1..645988ffff1 100644 --- a/java/test/IceGrid/simple/Test.ice +++ b/java/test/src/main/java/test/IceGrid/simple/Test.ice diff --git a/java/test/IceGrid/simple/TestI.java b/java/test/src/main/java/test/IceGrid/simple/TestI.java index 82ba95b7aad..82ba95b7aad 100644 --- a/java/test/IceGrid/simple/TestI.java +++ b/java/test/src/main/java/test/IceGrid/simple/TestI.java diff --git a/java/test/Freeze/complex/db/.gitignore b/java/test/src/main/java/test/IceGrid/simple/db/.gitignore index 39af5887579..39af5887579 100644 --- a/java/test/Freeze/complex/db/.gitignore +++ b/java/test/src/main/java/test/IceGrid/simple/db/.gitignore diff --git a/java/test/IceGrid/simple/run.py b/java/test/src/main/java/test/IceGrid/simple/run.py index d31cdaaea77..1dea25f18d6 100755 --- a/java/test/IceGrid/simple/run.py +++ b/java/test/src/main/java/test/IceGrid/simple/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/IceGrid/simple/simple_server.xml b/java/test/src/main/java/test/IceGrid/simple/simple_server.xml index 1548b0e482d..1548b0e482d 100644 --- a/java/test/IceGrid/simple/simple_server.xml +++ b/java/test/src/main/java/test/IceGrid/simple/simple_server.xml diff --git a/java/test/IceSSL/certs/c_dsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/c_dsa_ca1.jks Binary files differindex fd0b5d6e56d..fd0b5d6e56d 100644 --- a/java/test/IceSSL/certs/c_dsa_ca1.jks +++ b/java/test/src/main/java/test/IceSSL/certs/c_dsa_ca1.jks diff --git a/java/test/IceSSL/certs/c_rsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1.jks Binary files differindex ee0b1afc7b2..ee0b1afc7b2 100644 --- a/java/test/IceSSL/certs/c_rsa_ca1.jks +++ b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1.jks diff --git a/java/test/IceSSL/certs/c_rsa_ca1_exp.jks b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1_exp.jks Binary files differindex fdac5c1508a..fdac5c1508a 100644 --- a/java/test/IceSSL/certs/c_rsa_ca1_exp.jks +++ b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1_exp.jks diff --git a/java/test/IceSSL/certs/c_rsa_ca2.jks b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca2.jks Binary files differindex 56f0b25815c..56f0b25815c 100644 --- a/java/test/IceSSL/certs/c_rsa_ca2.jks +++ b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca2.jks diff --git a/java/test/IceSSL/certs/cacert1.jks b/java/test/src/main/java/test/IceSSL/certs/cacert1.jks Binary files differindex d17718e981f..d17718e981f 100644 --- a/java/test/IceSSL/certs/cacert1.jks +++ b/java/test/src/main/java/test/IceSSL/certs/cacert1.jks diff --git a/java/test/IceSSL/certs/cacert2.jks b/java/test/src/main/java/test/IceSSL/certs/cacert2.jks Binary files differindex 0a22dfe4696..0a22dfe4696 100644 --- a/java/test/IceSSL/certs/cacert2.jks +++ b/java/test/src/main/java/test/IceSSL/certs/cacert2.jks diff --git a/java/test/IceSSL/certs/cacerts.jks b/java/test/src/main/java/test/IceSSL/certs/cacerts.jks Binary files differindex b45456de292..b45456de292 100644 --- a/java/test/IceSSL/certs/cacerts.jks +++ b/java/test/src/main/java/test/IceSSL/certs/cacerts.jks diff --git a/java/test/IceSSL/certs/makecerts.py b/java/test/src/main/java/test/IceSSL/certs/makecerts.py index 3aea85737c8..3aea85737c8 100755..100644 --- a/java/test/IceSSL/certs/makecerts.py +++ b/java/test/src/main/java/test/IceSSL/certs/makecerts.py diff --git a/java/test/IceSSL/certs/s_cacert2.jks b/java/test/src/main/java/test/IceSSL/certs/s_cacert2.jks Binary files differindex 7d55050b1a5..7d55050b1a5 100644 --- a/java/test/IceSSL/certs/s_cacert2.jks +++ b/java/test/src/main/java/test/IceSSL/certs/s_cacert2.jks diff --git a/java/test/IceSSL/certs/s_dsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/s_dsa_ca1.jks Binary files differindex c2e9fb20e71..c2e9fb20e71 100644 --- a/java/test/IceSSL/certs/s_dsa_ca1.jks +++ b/java/test/src/main/java/test/IceSSL/certs/s_dsa_ca1.jks diff --git a/java/test/IceSSL/certs/s_rsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1.jks Binary files differindex f7c85ae50d5..f7c85ae50d5 100644 --- a/java/test/IceSSL/certs/s_rsa_ca1.jks +++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1.jks diff --git a/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks Binary files differindex 0bc38875428..0bc38875428 100644 --- a/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks +++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks diff --git a/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks Binary files differindex 1f734a49687..1f734a49687 100644 --- a/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks +++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks diff --git a/java/test/IceSSL/certs/s_rsa_ca1_exp.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_exp.jks Binary files differindex ca6a874a0b5..ca6a874a0b5 100644 --- a/java/test/IceSSL/certs/s_rsa_ca1_exp.jks +++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_exp.jks diff --git a/java/test/IceSSL/certs/s_rsa_ca2.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca2.jks Binary files differindex e2403e84e53..e2403e84e53 100644 --- a/java/test/IceSSL/certs/s_rsa_ca2.jks +++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca2.jks diff --git a/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks Binary files differindex 4b7f7ff0a5e..4b7f7ff0a5e 100644 --- a/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks +++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks diff --git a/java/test/IceSSL/certs/seed.dat b/java/test/src/main/java/test/IceSSL/certs/seed.dat Binary files differindex ba313c59460..ba313c59460 100644 --- a/java/test/IceSSL/certs/seed.dat +++ b/java/test/src/main/java/test/IceSSL/certs/seed.dat diff --git a/java/test/IceSSL/configuration/AllTests.java b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java index 1e955c8c1f5..1e955c8c1f5 100644 --- a/java/test/IceSSL/configuration/AllTests.java +++ b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java diff --git a/java/test/IceSSL/configuration/CertificateVerifierI.java b/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java index 03ae75ad659..03ae75ad659 100644 --- a/java/test/IceSSL/configuration/CertificateVerifierI.java +++ b/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java diff --git a/java/test/IceSSL/configuration/Client.java b/java/test/src/main/java/test/IceSSL/configuration/Client.java index 36ecfde860d..36ecfde860d 100644 --- a/java/test/IceSSL/configuration/Client.java +++ b/java/test/src/main/java/test/IceSSL/configuration/Client.java diff --git a/java/test/IceSSL/configuration/PasswordCallbackI.java b/java/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java index b7493caaffc..b7493caaffc 100644 --- a/java/test/IceSSL/configuration/PasswordCallbackI.java +++ b/java/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java diff --git a/java/test/IceSSL/configuration/Server.java b/java/test/src/main/java/test/IceSSL/configuration/Server.java index 9438f73d419..9438f73d419 100644 --- a/java/test/IceSSL/configuration/Server.java +++ b/java/test/src/main/java/test/IceSSL/configuration/Server.java diff --git a/java/test/IceSSL/configuration/ServerFactoryI.java b/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java index 34271e03f89..34271e03f89 100644 --- a/java/test/IceSSL/configuration/ServerFactoryI.java +++ b/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java diff --git a/java/test/IceSSL/configuration/ServerI.java b/java/test/src/main/java/test/IceSSL/configuration/ServerI.java index ca3e2835e23..ca3e2835e23 100644 --- a/java/test/IceSSL/configuration/ServerI.java +++ b/java/test/src/main/java/test/IceSSL/configuration/ServerI.java diff --git a/java/test/IceSSL/configuration/Test.ice b/java/test/src/main/java/test/IceSSL/configuration/Test.ice index b884e914104..b884e914104 100644 --- a/java/test/IceSSL/configuration/Test.ice +++ b/java/test/src/main/java/test/IceSSL/configuration/Test.ice diff --git a/java/test/IceSSL/configuration/run.py b/java/test/src/main/java/test/IceSSL/configuration/run.py index d812806ea22..791f566f4b2 100755 --- a/java/test/IceSSL/configuration/run.py +++ b/java/test/src/main/java/test/IceSSL/configuration/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/IceUtil/fileLock/.gitignore b/java/test/src/main/java/test/IceUtil/fileLock/.gitignore index 3c97cdc2906..3c97cdc2906 100644 --- a/java/test/IceUtil/fileLock/.gitignore +++ b/java/test/src/main/java/test/IceUtil/fileLock/.gitignore diff --git a/java/test/IceUtil/fileLock/Client.java b/java/test/src/main/java/test/IceUtil/fileLock/Client.java index ce67ad3fe50..ce67ad3fe50 100644 --- a/java/test/IceUtil/fileLock/Client.java +++ b/java/test/src/main/java/test/IceUtil/fileLock/Client.java diff --git a/java/test/IceUtil/fileLock/ClientFail.java b/java/test/src/main/java/test/IceUtil/fileLock/ClientFail.java index c96dc7c9b57..c96dc7c9b57 100644 --- a/java/test/IceUtil/fileLock/ClientFail.java +++ b/java/test/src/main/java/test/IceUtil/fileLock/ClientFail.java diff --git a/java/test/IceUtil/fileLock/run.py b/java/test/src/main/java/test/IceUtil/fileLock/run.py index 3f5b6dbea86..26ab933f034 100755 --- a/java/test/IceUtil/fileLock/run.py +++ b/java/test/src/main/java/test/IceUtil/fileLock/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/IceUtil/inputUtil/Client.java b/java/test/src/main/java/test/IceUtil/inputUtil/Client.java index 5d29a45452c..5d29a45452c 100644 --- a/java/test/IceUtil/inputUtil/Client.java +++ b/java/test/src/main/java/test/IceUtil/inputUtil/Client.java diff --git a/java/test/IceUtil/inputUtil/run.py b/java/test/src/main/java/test/IceUtil/inputUtil/run.py index ff92c5757a1..cb15b614259 100755 --- a/java/test/IceUtil/inputUtil/run.py +++ b/java/test/src/main/java/test/IceUtil/inputUtil/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Slice/generation/.gitignore b/java/test/src/main/java/test/Slice/generation/.gitignore index 90b07e9d451..90b07e9d451 100644 --- a/java/test/Slice/generation/.gitignore +++ b/java/test/src/main/java/test/Slice/generation/.gitignore diff --git a/java/test/Slice/generation/File1.ice b/java/test/src/main/java/test/Slice/generation/File1.ice index c92e0a00b2d..c92e0a00b2d 100644 --- a/java/test/Slice/generation/File1.ice +++ b/java/test/src/main/java/test/Slice/generation/File1.ice diff --git a/java/test/Slice/generation/File2.ice b/java/test/src/main/java/test/Slice/generation/File2.ice index 2d6f7a498f7..2d6f7a498f7 100644 --- a/java/test/Slice/generation/File2.ice +++ b/java/test/src/main/java/test/Slice/generation/File2.ice diff --git a/java/test/Slice/generation/list-generated.out b/java/test/src/main/java/test/Slice/generation/list-generated.out index cbacf36a41c..cbacf36a41c 100644 --- a/java/test/Slice/generation/list-generated.out +++ b/java/test/src/main/java/test/Slice/generation/list-generated.out diff --git a/java/test/Slice/generation/run.py b/java/test/src/main/java/test/Slice/generation/run.py index 248350f9438..72f21335e28 100755 --- a/java/test/Slice/generation/run.py +++ b/java/test/src/main/java/test/Slice/generation/run.py @@ -10,7 +10,8 @@ import os, sys, re -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Slice/keyword/Client.java b/java/test/src/main/java/test/Slice/keyword/Client.java index df96ebc985f..df96ebc985f 100644 --- a/java/test/Slice/keyword/Client.java +++ b/java/test/src/main/java/test/Slice/keyword/Client.java diff --git a/java/test/Slice/keyword/Key.ice b/java/test/src/main/java/test/Slice/keyword/Key.ice index f2002f43ccc..f2002f43ccc 100644 --- a/java/test/Slice/keyword/Key.ice +++ b/java/test/src/main/java/test/Slice/keyword/Key.ice diff --git a/java/test/Slice/keyword/run.py b/java/test/src/main/java/test/Slice/keyword/run.py index 4f211e2bdd8..1b7865a118d 100755 --- a/java/test/Slice/keyword/run.py +++ b/java/test/src/main/java/test/Slice/keyword/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Slice/macros/Client.java b/java/test/src/main/java/test/Slice/macros/Client.java index 4c4fa0e7b0a..4c4fa0e7b0a 100644 --- a/java/test/Slice/macros/Client.java +++ b/java/test/src/main/java/test/Slice/macros/Client.java diff --git a/java/test/Slice/macros/Test.ice b/java/test/src/main/java/test/Slice/macros/Test.ice index 2a791540afa..2a791540afa 100644 --- a/java/test/Slice/macros/Test.ice +++ b/java/test/src/main/java/test/Slice/macros/Test.ice diff --git a/java/test/Slice/macros/run.py b/java/test/src/main/java/test/Slice/macros/run.py index 11e187b79d2..4b62a2b9c3a 100755 --- a/java/test/Slice/macros/run.py +++ b/java/test/src/main/java/test/Slice/macros/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Slice/structure/Client.java b/java/test/src/main/java/test/Slice/structure/Client.java index 74f2239ae2e..74f2239ae2e 100644 --- a/java/test/Slice/structure/Client.java +++ b/java/test/src/main/java/test/Slice/structure/Client.java diff --git a/java/test/Slice/structure/Test.ice b/java/test/src/main/java/test/Slice/structure/Test.ice index 5cda671b732..5cda671b732 100644 --- a/java/test/Slice/structure/Test.ice +++ b/java/test/src/main/java/test/Slice/structure/Test.ice diff --git a/java/test/Slice/structure/run.py b/java/test/src/main/java/test/Slice/structure/run.py index a3d93af454d..c48b8cf432c 100755 --- a/java/test/Slice/structure/run.py +++ b/java/test/src/main/java/test/Slice/structure/run.py @@ -10,7 +10,8 @@ import os, sys -path = [ ".", "..", "../..", "../../..", "../../../.." ] +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", + "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: path = [os.path.join(head, p) for p in path] diff --git a/java/test/Util/Application.java b/java/test/src/main/java/test/Util/Application.java index 07c7d28b54e..07c7d28b54e 100644 --- a/java/test/Util/Application.java +++ b/java/test/src/main/java/test/Util/Application.java diff --git a/java/test/test.iml b/java/test/test.iml index 857ab40bfe4..975e1a9afea 100644 --- a/java/test/test.iml +++ b/java/test/test.iml @@ -5,7 +5,6 @@ <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" /> <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" /> @@ -15,16 +14,20 @@ <excludeFolder url="file://$MODULE_DIR$/build/classes" /> <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> + <excludeFolder url="file://$MODULE_DIR$/src/main/java/test/Ice/ami/lambda" /> + <excludeFolder url="file://$MODULE_DIR$/src/main/java/test/Ice/invoke/lambda" /> + <excludeFolder url="file://$MODULE_DIR$/src/main/java/test/Ice/operations/lambda" /> + <excludeFolder url="file://$MODULE_DIR$/src/main/java/test/Ice/optional/lambda" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="src_Ice" exported="" /> - <orderEntry type="module" module-name="src_Freeze" exported="" /> - <orderEntry type="module" module-name="src_IceDiscovery" exported="" /> - <orderEntry type="module" module-name="src_IceBox" exported="" /> - <orderEntry type="module" module-name="src_Glacier2" exported="" /> - <orderEntry type="module" module-name="src_IceStorm" exported="" /> - <orderEntry type="module" module-name="src_IceGrid" exported="" /> + <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="Freeze" exported="" /> + <orderEntry type="module" module-name="IceDiscovery" exported="" /> + <orderEntry type="module" module-name="IceBox" exported="" /> + <orderEntry type="module" module-name="Glacier2" exported="" /> + <orderEntry type="module" module-name="IceStorm" exported="" /> + <orderEntry type="module" module-name="IceGrid" exported="" /> </component> </module> |
