Mercurial > hg > openjdk > jdk7 > corba

changeset 265:78d8cf04697e jdk7-b138

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author mfang
date Mon, 11 Apr 2011 14:09:27 -0700
parents 53c6f4ad1e06 (diff) 2f8ada17792a (current diff)
children 60b074ec6fcf
files
diffstat 18 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 ;
-; Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+; Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ;
 ; This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 ;
-; Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+; Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ;
 ; This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 ;
-; Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+; Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ;
 ; This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 ;
-; Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+; Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ;
 ; This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 ;
-; Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+; Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ;
 ; This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc	Mon Apr 11 14:09:27 2011 -0700
@@ -1,6 +1,6 @@
 ;
 
-; Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+; Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ;
 ; This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 ;
-; Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+; Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ;
 ; This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc	Mon Apr 11 13:36:55 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc	Mon Apr 11 14:09:27 2011 -0700
@@ -1,5 +1,5 @@
 ;
-; Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+; Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ;
 ; This code is free software; you can redistribute it and/or modify it