Mercurial > hg > openjdk > jdk6 > corba

changeset 53:4f0834bbc28e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author ohair
date Thu, 23 Dec 2010 16:20:31 -0800
parents d0decbad791f (current diff) 5bf7ee38e457 (diff)
children 0d7037ddb07c
files
diffstat 17 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/shared/Defs-java.gmk	Thu Dec 23 16:16:24 2010 -0800
+++ b/make/common/shared/Defs-java.gmk	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, 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/make/common/shared/Platform.gmk	Thu Dec 23 16:16:24 2010 -0800
+++ b/make/common/shared/Platform.gmk	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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/make/sun/corba/Makefile	Thu Dec 23 16:16:24 2010 -0800
+++ b/make/sun/corba/Makefile	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, 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/make/sun/corba/core/Makefile	Thu Dec 23 16:16:24 2010 -0800
+++ b/make/sun/corba/core/Makefile	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2010, 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/make/sun/rmi/rmic/FILES.gmk	Thu Dec 23 16:16:24 2010 -0800
+++ b/make/sun/rmi/rmic/FILES.gmk	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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/CorbaResourceUtil.java	Thu Dec 23 16:16:24 2010 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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/presentation/rmi/ExceptionHandlerImpl.java	Thu Dec 23 16:16:24 2010 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, 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/tools/corba/se/idl/constExpr/Expression.java	Thu Dec 23 16:16:24 2010 -0800
+++ b/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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/javax/rmi/PortableRemoteObject.java	Thu Dec 23 16:16:24 2010 -0800
+++ b/src/share/classes/javax/rmi/PortableRemoteObject.java	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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/org/omg/CORBA/ORB.java	Thu Dec 23 16:16:24 2010 -0800
+++ b/src/share/classes/org/omg/CORBA/ORB.java	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2010, 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/org/omg/CORBA/SetOverrideType.java	Thu Dec 23 16:16:24 2010 -0800
+++ b/src/share/classes/org/omg/CORBA/SetOverrideType.java	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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/org/omg/CORBA/TCKind.java	Thu Dec 23 16:16:24 2010 -0800
+++ b/src/share/classes/org/omg/CORBA/TCKind.java	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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/org/omg/CORBA/UnknownUserException.java	Thu Dec 23 16:16:24 2010 -0800
+++ b/src/share/classes/org/omg/CORBA/UnknownUserException.java	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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/org/omg/CORBA/portable/ServantObject.java	Thu Dec 23 16:16:24 2010 -0800
+++ b/src/share/classes/org/omg/CORBA/portable/ServantObject.java	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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/org/omg/CosNaming/nameservice.idl	Thu Dec 23 16:16:24 2010 -0800
+++ b/src/share/classes/org/omg/CosNaming/nameservice.idl	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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/org/omg/PortableInterceptor/Interceptors.idl	Thu Dec 23 16:16:24 2010 -0800
+++ b/src/share/classes/org/omg/PortableInterceptor/Interceptors.idl	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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/sun/corba/Bridge.java	Thu Dec 23 16:16:24 2010 -0800
+++ b/src/share/classes/sun/corba/Bridge.java	Thu Dec 23 16:20:31 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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