Mercurial > hg > release > icedtea7-forest-2.6 > corba
changeset 283:563a8f8b5be3 jdk7-b130
Merge
author | mfang |
---|---|
date | Fri, 11 Feb 2011 23:35:52 -0800 |
parents | e0f0b358cd2c (current diff) 4cdf9b86f550 (diff) |
children | 59f02c101698 49a96611c870 a9335b646c1c |
files | |
diffstat | 9 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Feb 11 22:50:26 2011 -0800 +++ b/.hgtags Fri Feb 11 23:35:52 2011 -0800 @@ -103,3 +103,4 @@ d7532bcd3742f1576dd07ff9fbb535c9c9a276e9 jdk7-b126 64775e83f4df894355f45555f50c410de6727b4e jdk7-b127 9baa8f94a11d6c5cab3f9f0e5a20106326d0932e jdk7-b128 +66fa0fcc779296c99746b09efce6109944f82f30 jdk7-b129
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc Fri Feb 11 22:50:26 2011 -0800 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc Fri Feb 11 23:35:52 2011 -0800 @@ -1,5 +1,5 @@ ; -; Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. +; Copyright (c) 2003, 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 Fri Feb 11 22:50:26 2011 -0800 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc Fri Feb 11 23:35:52 2011 -0800 @@ -1,5 +1,5 @@ ; -; Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. +; Copyright (c) 2003, 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 Fri Feb 11 22:50:26 2011 -0800 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc Fri Feb 11 23:35:52 2011 -0800 @@ -1,5 +1,5 @@ ; -; Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. +; Copyright (c) 2003, 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 Fri Feb 11 22:50:26 2011 -0800 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc Fri Feb 11 23:35:52 2011 -0800 @@ -1,5 +1,5 @@ ; -; Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. +; Copyright (c) 2003, 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 Fri Feb 11 22:50:26 2011 -0800 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc Fri Feb 11 23:35:52 2011 -0800 @@ -1,5 +1,5 @@ ; -; Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. +; Copyright (c) 2003, 2004, 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 Fri Feb 11 22:50:26 2011 -0800 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc Fri Feb 11 23:35:52 2011 -0800 @@ -1,6 +1,6 @@ ; -; Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved. +; Copyright (c) 2003, 2009, 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 Fri Feb 11 22:50:26 2011 -0800 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc Fri Feb 11 23:35:52 2011 -0800 @@ -1,5 +1,5 @@ ; -; Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. +; Copyright (c) 2003, 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 Fri Feb 11 22:50:26 2011 -0800 +++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc Fri Feb 11 23:35:52 2011 -0800 @@ -1,5 +1,5 @@ ; -; Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. +; Copyright (c) 2003, 2004, 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