Mercurial > jdk8-mips64-public > corba / changeset

changeset

Merge jdk7-b130

Fri, 11 Feb 2011 23:35:52 -0800

author
mfang
date
Fri, 11 Feb 2011 23:35:52 -0800
changeset 252
563a8f8b5be3
parent 251
e0f0b358cd2c
parent 248
4cdf9b86f550
child 253
49a96611c870
child 254
a9335b646c1c

Merge

     1.1 --- a/.hgtags	Fri Feb 11 22:50:26 2011 -0800
     1.2 +++ b/.hgtags	Fri Feb 11 23:35:52 2011 -0800
     1.3 @@ -103,3 +103,4 @@
     1.4  d7532bcd3742f1576dd07ff9fbb535c9c9a276e9 jdk7-b126
     1.5  64775e83f4df894355f45555f50c410de6727b4e jdk7-b127
     1.6  9baa8f94a11d6c5cab3f9f0e5a20106326d0932e jdk7-b128
     1.7 +66fa0fcc779296c99746b09efce6109944f82f30 jdk7-b129

     2.1 --- a/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc	Fri Feb 11 22:50:26 2011 -0800
     2.2 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc	Fri Feb 11 23:35:52 2011 -0800
     2.3 @@ -1,5 +1,5 @@
     2.4  ;
     2.5 -; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
     2.6 +; Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
     2.7  ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  ;
     2.9  ; This code is free software; you can redistribute it and/or modify it

     3.1 --- a/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc	Fri Feb 11 22:50:26 2011 -0800
     3.2 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc	Fri Feb 11 23:35:52 2011 -0800
     3.3 @@ -1,5 +1,5 @@
     3.4  ;
     3.5 -; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
     3.6 +; Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
     3.7  ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8  ;
     3.9  ; This code is free software; you can redistribute it and/or modify it

     4.1 --- a/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc	Fri Feb 11 22:50:26 2011 -0800
     4.2 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc	Fri Feb 11 23:35:52 2011 -0800
     4.3 @@ -1,5 +1,5 @@
     4.4  ;
     4.5 -; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
     4.6 +; Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
     4.7  ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8  ;
     4.9  ; This code is free software; you can redistribute it and/or modify it

     5.1 --- a/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc	Fri Feb 11 22:50:26 2011 -0800
     5.2 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc	Fri Feb 11 23:35:52 2011 -0800
     5.3 @@ -1,5 +1,5 @@
     5.4  ;
     5.5 -; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
     5.6 +; Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
     5.7  ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8  ;
     5.9  ; This code is free software; you can redistribute it and/or modify it

     6.1 --- a/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc	Fri Feb 11 22:50:26 2011 -0800
     6.2 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc	Fri Feb 11 23:35:52 2011 -0800
     6.3 @@ -1,5 +1,5 @@
     6.4  ;
     6.5 -; Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
     6.6 +; Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
     6.7  ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8  ;
     6.9  ; This code is free software; you can redistribute it and/or modify it

     7.1 --- a/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc	Fri Feb 11 22:50:26 2011 -0800
     7.2 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc	Fri Feb 11 23:35:52 2011 -0800
     7.3 @@ -1,6 +1,6 @@
     7.4  ;
     7.5  
     7.6 -; Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
     7.7 +; Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
     7.8  ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.9  ;
    7.10  ; This code is free software; you can redistribute it and/or modify it

     8.1 --- a/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc	Fri Feb 11 22:50:26 2011 -0800
     8.2 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc	Fri Feb 11 23:35:52 2011 -0800
     8.3 @@ -1,5 +1,5 @@
     8.4  ;
     8.5 -; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
     8.6 +; Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
     8.7  ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     8.8  ;
     8.9  ; This code is free software; you can redistribute it and/or modify it

     9.1 --- a/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc	Fri Feb 11 22:50:26 2011 -0800
     9.2 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc	Fri Feb 11 23:35:52 2011 -0800
     9.3 @@ -1,5 +1,5 @@
     9.4  ;
     9.5 -; Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
     9.6 +; Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
     9.7  ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     9.8  ;
     9.9  ; This code is free software; you can redistribute it and/or modify it

Mercurial Repository: jdk8-mips64-public/corba

mercurial