summaryrefslogtreecommitdiff
path: root/java/demo/IceGrid
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2014-03-19 12:45:55 -0700
committerMark Spruiell <mes@zeroc.com>2014-03-19 12:45:55 -0700
commitcdcffbcc3c3c052afdeb772ff0167e7a90b525bb (patch)
tree4f16ee41ef7d33394c44e9db81e4d6cd89908250 /java/demo/IceGrid
parentfixing testicedist.py for 5487 (diff)
downloadice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.bz2
ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.xz
ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.zip
merging javascript branch
Diffstat (limited to 'java/demo/IceGrid')
-rw-r--r--java/demo/IceGrid/build.xml2
-rw-r--r--java/demo/IceGrid/icebox/Client.java2
-rw-r--r--java/demo/IceGrid/icebox/Hello.ice2
-rw-r--r--java/demo/IceGrid/icebox/HelloI.java2
-rw-r--r--java/demo/IceGrid/icebox/HelloServiceI.java2
-rw-r--r--java/demo/IceGrid/icebox/build.xml2
-rwxr-xr-xjava/demo/IceGrid/icebox/expect.py2
-rw-r--r--java/demo/IceGrid/simple/Client.java2
-rw-r--r--java/demo/IceGrid/simple/Hello.ice2
-rw-r--r--java/demo/IceGrid/simple/HelloI.java2
-rw-r--r--java/demo/IceGrid/simple/Server.java2
-rw-r--r--java/demo/IceGrid/simple/application.xml2
-rw-r--r--java/demo/IceGrid/simple/application_with_replication.xml2
-rw-r--r--java/demo/IceGrid/simple/application_with_template.xml2
-rw-r--r--java/demo/IceGrid/simple/build.xml2
-rwxr-xr-xjava/demo/IceGrid/simple/expect.py2
16 files changed, 16 insertions, 16 deletions
diff --git a/java/demo/IceGrid/build.xml b/java/demo/IceGrid/build.xml
index cf5ca1929cd..dd1fcd6e6cd 100644
--- a/java/demo/IceGrid/build.xml
+++ b/java/demo/IceGrid/build.xml
@@ -1,7 +1,7 @@
<!--
**********************************************************************
- Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+ 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.
diff --git a/java/demo/IceGrid/icebox/Client.java b/java/demo/IceGrid/icebox/Client.java
index 8f5257b5dae..c1d7287a14a 100644
--- a/java/demo/IceGrid/icebox/Client.java
+++ b/java/demo/IceGrid/icebox/Client.java
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// 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.
diff --git a/java/demo/IceGrid/icebox/Hello.ice b/java/demo/IceGrid/icebox/Hello.ice
index 04ceffe91cf..dab0c71be4d 100644
--- a/java/demo/IceGrid/icebox/Hello.ice
+++ b/java/demo/IceGrid/icebox/Hello.ice
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// 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.
diff --git a/java/demo/IceGrid/icebox/HelloI.java b/java/demo/IceGrid/icebox/HelloI.java
index 47d84c51d85..fa27d2b9778 100644
--- a/java/demo/IceGrid/icebox/HelloI.java
+++ b/java/demo/IceGrid/icebox/HelloI.java
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// 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.
diff --git a/java/demo/IceGrid/icebox/HelloServiceI.java b/java/demo/IceGrid/icebox/HelloServiceI.java
index f7386dcc208..6b6191f3ec9 100644
--- a/java/demo/IceGrid/icebox/HelloServiceI.java
+++ b/java/demo/IceGrid/icebox/HelloServiceI.java
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// 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.
diff --git a/java/demo/IceGrid/icebox/build.xml b/java/demo/IceGrid/icebox/build.xml
index fcb74337995..f457d7411c5 100644
--- a/java/demo/IceGrid/icebox/build.xml
+++ b/java/demo/IceGrid/icebox/build.xml
@@ -1,7 +1,7 @@
<!--
**********************************************************************
- Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+ 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.
diff --git a/java/demo/IceGrid/icebox/expect.py b/java/demo/IceGrid/icebox/expect.py
index 0d30dd6e97c..d8cf5250777 100755
--- a/java/demo/IceGrid/icebox/expect.py
+++ b/java/demo/IceGrid/icebox/expect.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# 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.
diff --git a/java/demo/IceGrid/simple/Client.java b/java/demo/IceGrid/simple/Client.java
index 7c521540928..26764921a85 100644
--- a/java/demo/IceGrid/simple/Client.java
+++ b/java/demo/IceGrid/simple/Client.java
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// 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.
diff --git a/java/demo/IceGrid/simple/Hello.ice b/java/demo/IceGrid/simple/Hello.ice
index 4859970f6a1..617d061e087 100644
--- a/java/demo/IceGrid/simple/Hello.ice
+++ b/java/demo/IceGrid/simple/Hello.ice
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// 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.
diff --git a/java/demo/IceGrid/simple/HelloI.java b/java/demo/IceGrid/simple/HelloI.java
index bccc9e2ede2..a3229d06d64 100644
--- a/java/demo/IceGrid/simple/HelloI.java
+++ b/java/demo/IceGrid/simple/HelloI.java
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// 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.
diff --git a/java/demo/IceGrid/simple/Server.java b/java/demo/IceGrid/simple/Server.java
index 063fce2f744..2fccc0aac4e 100644
--- a/java/demo/IceGrid/simple/Server.java
+++ b/java/demo/IceGrid/simple/Server.java
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// 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.
diff --git a/java/demo/IceGrid/simple/application.xml b/java/demo/IceGrid/simple/application.xml
index 10cc35c7a9d..73965be39f9 100644
--- a/java/demo/IceGrid/simple/application.xml
+++ b/java/demo/IceGrid/simple/application.xml
@@ -1,7 +1,7 @@
<!--
**********************************************************************
- Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+ 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.
diff --git a/java/demo/IceGrid/simple/application_with_replication.xml b/java/demo/IceGrid/simple/application_with_replication.xml
index 2c16ebd2f67..f22b0f371d6 100644
--- a/java/demo/IceGrid/simple/application_with_replication.xml
+++ b/java/demo/IceGrid/simple/application_with_replication.xml
@@ -1,7 +1,7 @@
<!--
**********************************************************************
- Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+ 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.
diff --git a/java/demo/IceGrid/simple/application_with_template.xml b/java/demo/IceGrid/simple/application_with_template.xml
index 26f3b2f722d..91672dc7da9 100644
--- a/java/demo/IceGrid/simple/application_with_template.xml
+++ b/java/demo/IceGrid/simple/application_with_template.xml
@@ -1,7 +1,7 @@
<!--
**********************************************************************
- Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+ 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.
diff --git a/java/demo/IceGrid/simple/build.xml b/java/demo/IceGrid/simple/build.xml
index 3935adbff87..ee38a1da721 100644
--- a/java/demo/IceGrid/simple/build.xml
+++ b/java/demo/IceGrid/simple/build.xml
@@ -1,7 +1,7 @@
<!--
**********************************************************************
- Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+ 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.
diff --git a/java/demo/IceGrid/simple/expect.py b/java/demo/IceGrid/simple/expect.py
index 5d63634c450..203e6145ae9 100755
--- a/java/demo/IceGrid/simple/expect.py
+++ b/java/demo/IceGrid/simple/expect.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# 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.