summaryrefslogtreecommitdiff
path: root/protobuf/test/java
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 /protobuf/test/java
parentfixing testicedist.py for 5487 (diff)
downloadice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.bz2
ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.xz
ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.zip
merging javascript branch
Diffstat (limited to 'protobuf/test/java')
-rw-r--r--protobuf/test/java/AllTests.java2
-rw-r--r--protobuf/test/java/Client.java2
-rw-r--r--protobuf/test/java/MyClassI.java2
-rw-r--r--protobuf/test/java/Server.java2
-rw-r--r--protobuf/test/java/Test.ice2
-rw-r--r--protobuf/test/java/Test.proto2
-rw-r--r--protobuf/test/java/ant/ProtocTask.java2
-rw-r--r--protobuf/test/java/build.xml2
-rwxr-xr-xprotobuf/test/java/run.py2
9 files changed, 9 insertions, 9 deletions
diff --git a/protobuf/test/java/AllTests.java b/protobuf/test/java/AllTests.java
index 48d6e02db61..0efab863677 100644
--- a/protobuf/test/java/AllTests.java
+++ b/protobuf/test/java/AllTests.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 Protobuf is licensed to you under the terms
// described in the ICE_PROTOBUF_LICENSE file included in this
diff --git a/protobuf/test/java/Client.java b/protobuf/test/java/Client.java
index bdd232e91e7..d81a55c77b7 100644
--- a/protobuf/test/java/Client.java
+++ b/protobuf/test/java/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 Protobuf is licensed to you under the terms
// described in the ICE_PROTOBUF_LICENSE file included in this
diff --git a/protobuf/test/java/MyClassI.java b/protobuf/test/java/MyClassI.java
index a6ccbc5dca2..a157ccb195f 100644
--- a/protobuf/test/java/MyClassI.java
+++ b/protobuf/test/java/MyClassI.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 Protobuf is licensed to you under the terms
// described in the ICE_PROTOBUF_LICENSE file included in this
diff --git a/protobuf/test/java/Server.java b/protobuf/test/java/Server.java
index c01a0dbb86f..bbacaf97b9d 100644
--- a/protobuf/test/java/Server.java
+++ b/protobuf/test/java/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 Protobuf is licensed to you under the terms
// described in the ICE_PROTOBUF_LICENSE file included in this
diff --git a/protobuf/test/java/Test.ice b/protobuf/test/java/Test.ice
index bbc3f5b3d38..9bdc7a4aeba 100644
--- a/protobuf/test/java/Test.ice
+++ b/protobuf/test/java/Test.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 Protobuf is licensed to you under the terms
// described in the ICE_PROTOBUF_LICENSE file included in this
diff --git a/protobuf/test/java/Test.proto b/protobuf/test/java/Test.proto
index 29e8ec3c165..c11fefd78f1 100644
--- a/protobuf/test/java/Test.proto
+++ b/protobuf/test/java/Test.proto
@@ -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/protobuf/test/java/ant/ProtocTask.java b/protobuf/test/java/ant/ProtocTask.java
index 2c52bf3b37d..d74dc4a5e43 100644
--- a/protobuf/test/java/ant/ProtocTask.java
+++ b/protobuf/test/java/ant/ProtocTask.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 Protobuf is licensed to you under the terms
// described in the ICE_PROTOBUF_LICENSE file included in this
diff --git a/protobuf/test/java/build.xml b/protobuf/test/java/build.xml
index 9ac305bfe1e..7cbf15d359c 100644
--- a/protobuf/test/java/build.xml
+++ b/protobuf/test/java/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 Protobuf is licensed to you under the terms described
in the ICE_PROTOBUF_LICENSE file included in this distribution.
diff --git a/protobuf/test/java/run.py b/protobuf/test/java/run.py
index b329edb67ff..6514a64a471 100755
--- a/protobuf/test/java/run.py
+++ b/protobuf/test/java/run.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 Protobuf is licensed to you under the terms
# described in the ICE_PROTOBUF_LICENSE file included in this