summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Glacier2/build.gradle2
-rw-r--r--java/src/Ice/build.gradle2
-rw-r--r--java/src/IceBox/build.gradle2
-rw-r--r--java/src/IceDiscovery/build.gradle2
-rw-r--r--java/src/IceGrid/build.gradle2
-rw-r--r--java/src/IceGridGUI/build.gradle144
-rw-r--r--java/src/IceGridGUI/icegridgui.pro2
-rw-r--r--java/src/IceGridGUI/plain-jar.gradle2
-rw-r--r--java/src/IceGridGUI/proguard-jar.gradle2
-rw-r--r--java/src/IceLocatorDiscovery/build.gradle2
-rw-r--r--java/src/IcePatch2/build.gradle2
-rw-r--r--java/src/IceStorm/build.gradle2
12 files changed, 11 insertions, 155 deletions
diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle
index e0f263c7531..26f3f49e3e9 100644
--- a/java/src/Glacier2/build.gradle
+++ b/java/src/Glacier2/build.gradle
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
diff --git a/java/src/Ice/build.gradle b/java/src/Ice/build.gradle
index 7b79d8b95cc..0640c4a9f6c 100644
--- a/java/src/Ice/build.gradle
+++ b/java/src/Ice/build.gradle
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
diff --git a/java/src/IceBox/build.gradle b/java/src/IceBox/build.gradle
index a2b805c8e7a..fbf71f50966 100644
--- a/java/src/IceBox/build.gradle
+++ b/java/src/IceBox/build.gradle
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
diff --git a/java/src/IceDiscovery/build.gradle b/java/src/IceDiscovery/build.gradle
index 43dc7279b24..fb807e3e562 100644
--- a/java/src/IceDiscovery/build.gradle
+++ b/java/src/IceDiscovery/build.gradle
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
diff --git a/java/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle
index 02ab4534845..f12c92bfd5f 100644
--- a/java/src/IceGrid/build.gradle
+++ b/java/src/IceGrid/build.gradle
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
deleted file mode 100644
index 20ae84097bd..00000000000
--- a/java/src/IceGridGUI/build.gradle
+++ /dev/null
@@ -1,144 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 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.8
-targetCompatibility = 1.8
-
-project.ext.displayName = "IceGridGUI Compat"
-project.ext.description = ""
-
-project.ext.macosx = System.properties['os.name'] == "Mac OS X"
-
-// Check for JavaFX support
-project.ext.javafxJar = searchFile([{System.env['JFXRT_HOME']}, { System.env['JAVA_HOME']}, {System.properties['java.home']}],
- ['jfxrt.jar', 'lib/jfxrt.jar', 'lib/ext/jfxrt.jar', 'jre/lib/jfxrt.jar',
- 'jre/lib/ext/jfxrt.jar'])
-
-project.ext.hasJavaFx = javafxJar != null
-
-if (project.ext.hasJavaFx) {
- apply plugin: 'application'
- apply from: 'javafx.gradle'
-} else {
- sourceSets {
- main {
- java {
- exclude '**/LiveDeployment/GraphView.java'
- }
- }
- }
-}
-
-configurations {
- bundleapp
-}
-
-dependencies {
- compile project(':ice')
- compile project(':icelocatordiscovery')
- compile project(':icebox')
- compile project(':icestorm')
- compile project(':glacier2')
- compile project(':icegrid')
- compile "com.jgoodies:jgoodies-looks:${jgoodiesLooksVersion}"
- compile "com.jgoodies:jgoodies-forms:${jgoodiesFormsVersion}"
- bundleapp 'com.oracle:appbundler:1.0'
-}
-
-project.ext.tmpJarName = "IceGridGUITEMP.jar"
-project.ext.jarName = "icegridgui.jar"
-project.ext.env = System.getenv()
-project.ext.keystore = env['JARSIGNER_KEYSTORE']
-project.ext.keystore_password = env['JARSIGNER_KEYSTORE_PASSWORD']
-
-jar {
- archiveName = tmpJarName
- if (!hasJavaFx) {
- manifest {
- attributes 'Main-Class': "com.zeroc.IceGridGUI.Main"
- }
- }
-}
-
-project.ext.libJars = []
-['rt.jar', 'jsse.jar', 'i386/default/jclSC170/vm.jar', 'amd64/default/jclSC170/vm.jar', 'ibmcertpathfw.jar', 'math.jar'].each {
- def jfile = searchFile([{System.env['JAVA_HOME']}, {System.properties['java.home']}],
- ["${it}", "lib/${it}", "jre/lib/${it}"])
- if (jfile) {
- project.ext.libJars << jfile
- }
-}
-
-if (hasJavaFx) {
- project.ext.libJars << javafxJar
-}
-
-if(icegridguiProguard.toBoolean()){
- apply from: "proguard-jar.gradle"
-}else{
- apply from: "plain-jar.gradle"
-}
-
-task signjar(dependsOn: updateManifest) << {
- if(keystore != null && keystore.length() > 0) {
- ant.signjar(jar: "${libDir}/${jarName}",
- alias: 'zeroc.com',
- keystore:"${keystore}",
- storepass:"${keystore_password}")
- }
-}
-assemble.dependsOn(signjar)
-
-if(macosx)
-{
- def appName = "IceGrid GUI"
- task bundleapp(dependsOn: updateManifest) << {
- ant.taskdef(name: 'bundleapp',
- classname: 'com.oracle.appbundler.AppBundlerTask',
- classpath: configurations.bundleapp.asPath)
-
- ant.bundleapp(outputdirectory: "${libDir}",
- name: appName,
- displayname: appName,
- identifier: "com.zeroc.IceGridGUI",
- icon: "${projectDir}/src/main/resources/icons/icegrid.icns",
- shortversion: "${project.version}",
- applicationCategory: "public.app-category.utilities",
- mainclassname: "com.zeroc.IceGridGUI/MainProxy",
- copyright: "Copyright © 2005-2016 ZeroC, Inc. All rights reserved.") {
- classpath(file: "${libDir}/${jarName}") {
- }
- option(value: "-Dapple.laf.useScreenMenuBar=true") {
- }
- option(value: "-Dcom.apple.macos.use-file-dialog-packages=true") {
- }
- option(value: "-Dcom.apple.macos.useScreenMenuBar=true") {
- }
- option(value: "-Xdock:name=IceGrid GUI") {
- }
- option(value: "-Dcom.apple.mrj.application.apple.menu.about.name=${appName}") {
- }
- }
- }
- assemble.dependsOn(bundleapp)
-
- task copyBundle(type: Copy, dependsOn: bundleapp) {
- from "${libDir}/${appName}.app"
- into "${DESTDIR}/${prefix}/${appName}.app"
- }
-}
-
-clean {
- delete("${libDir}/${jarName}")
- delete("${libDir}/IceGrid GUI.app")
-}
-
-if(macosx) {
- install.dependsOn(copyBundle)
-} \ No newline at end of file
diff --git a/java/src/IceGridGUI/icegridgui.pro b/java/src/IceGridGUI/icegridgui.pro
index 8621a9e8239..07ffc2e70ab 100644
--- a/java/src/IceGridGUI/icegridgui.pro
+++ b/java/src/IceGridGUI/icegridgui.pro
@@ -1,6 +1,6 @@
# **********************************************************************
#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 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.
diff --git a/java/src/IceGridGUI/plain-jar.gradle b/java/src/IceGridGUI/plain-jar.gradle
index 11bd5bdae6c..b135529467c 100644
--- a/java/src/IceGridGUI/plain-jar.gradle
+++ b/java/src/IceGridGUI/plain-jar.gradle
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
diff --git a/java/src/IceGridGUI/proguard-jar.gradle b/java/src/IceGridGUI/proguard-jar.gradle
index 9bc066be01e..60c0096439e 100644
--- a/java/src/IceGridGUI/proguard-jar.gradle
+++ b/java/src/IceGridGUI/proguard-jar.gradle
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
diff --git a/java/src/IceLocatorDiscovery/build.gradle b/java/src/IceLocatorDiscovery/build.gradle
index dc45b8c5715..1a508377b1d 100644
--- a/java/src/IceLocatorDiscovery/build.gradle
+++ b/java/src/IceLocatorDiscovery/build.gradle
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
diff --git a/java/src/IcePatch2/build.gradle b/java/src/IcePatch2/build.gradle
index fc13667fbad..a4af0f9bdf7 100644
--- a/java/src/IcePatch2/build.gradle
+++ b/java/src/IcePatch2/build.gradle
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
diff --git a/java/src/IceStorm/build.gradle b/java/src/IceStorm/build.gradle
index 704dd83b5b3..cedd107d224 100644
--- a/java/src/IceStorm/build.gradle
+++ b/java/src/IceStorm/build.gradle
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.