Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorduke
Wed, 05 Jul 2017 16:39:48 +0200
changeset 930 2f703334f63f
parent 929 d958f883b42a (diff)
parent 923 e9301d8f49ef (current diff)
child 932 2aabadbd9e85
Merge
jdk/make/ASSEMBLY_EXCEPTION file | annotate | diff | comparison | revisions
jdk/make/LICENSE file | annotate | diff | comparison | revisions
jdk/make/README file | annotate | diff | comparison | revisions
jdk/make/README-builds.html file | annotate | diff | comparison | revisions
jdk/make/README.html file | annotate | diff | comparison | revisions
jdk/make/THIRD_PARTY_README file | annotate | diff | comparison | revisions
jdk/make/java/nio/spp.sh file | annotate | diff | comparison | revisions
jdk/src/windows/classes/sun/java2d/d3d/D3DBackBufferSurfaceData.java file | annotate | diff | comparison | revisions
jdk/src/windows/classes/sun/java2d/windows/DDBlitLoops.java file | annotate | diff | comparison | revisions
jdk/src/windows/classes/sun/java2d/windows/DDRenderer.java file | annotate | diff | comparison | revisions
jdk/src/windows/classes/sun/java2d/windows/DDScaleLoops.java file | annotate | diff | comparison | revisions
jdk/src/windows/classes/sun/java2d/windows/Win32OffScreenSurfaceData.java file | annotate | diff | comparison | revisions
jdk/src/windows/classes/sun/java2d/windows/Win32SurfaceData.java file | annotate | diff | comparison | revisions
jdk/src/windows/classes/sun/java2d/windows/Win32SurfaceDataProxy.java file | annotate | diff | comparison | revisions
jdk/src/windows/classes/sun/java2d/windows/WinBackBuffer.java file | annotate | diff | comparison | revisions
jdk/src/windows/classes/sun/java2d/windows/WinBackBufferSurfaceData.java file | annotate | diff | comparison | revisions
jdk/src/windows/classes/sun/java2d/windows/WinVolatileSurfaceManager.java file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/d3d/D3DRuntimeTest.cpp file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/d3d/D3DRuntimeTest.h file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/d3d/D3DTestRaster.h file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/d3d/D3DTextRenderer_md.cpp file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/d3d/D3DUtils.cpp file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/d3d/D3DUtils.h file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/DDBlitLoops.cpp file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/DDRenderer.cpp file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/RegistryKey.cpp file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/RegistryKey.h file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/Win32OffScreenSurfaceData.cpp file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/Win32SurfaceData.cpp file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/Win32SurfaceData.h file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/WinBackBufferSurfaceData.cpp file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/ddrawObject.cpp file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/ddrawObject.h file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/ddrawUtils.cpp file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/ddrawUtils.h file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/dxCapabilities.cpp file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/dxCapabilities.h file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/dxInit.cpp file | annotate | diff | comparison | revisions
jdk/src/windows/native/sun/java2d/windows/dxInit.h file | annotate | diff | comparison | revisions 
--- a/corba/.hgtags	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 16:39:48 2017 +0200
@@ -6,3 +6,4 @@
 8b71960f79ce0a6fb8ddfeec03f03d400a361747 jdk7-b29
 c0252adbb2abbfdd6c35595429ac6fbdd98e20ac jdk7-b30
 ef6af34d75a7b44e77083f1d4ee47631fa09d3b4 jdk7-b31
+80a0f46a6203e727012bd579fe38a609b83decce jdk7-b32
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk	Wed Jul 05 16:39:48 2017 +0200
@@ -41,4 +41,7 @@
 	com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java \
 	com/sun/corba/se/impl/dynamicany/DynStructImpl.java \
 	com/sun/corba/se/impl/dynamicany/DynUnionImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynValueImpl.java
+	com/sun/corba/se/impl/dynamicany/DynValueImpl.java \
+	com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java \
+	com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java
+
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk	Wed Jul 05 16:39:48 2017 +0200
@@ -52,6 +52,8 @@
 	com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java \
 	com/sun/corba/se/impl/encoding/EncapsInputStream.java \
 	com/sun/corba/se/impl/encoding/EncapsOutputStream.java \
+	com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \
+	com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java \
 	com/sun/corba/se/impl/encoding/MarkAndResetHandler.java \
 	com/sun/corba/se/impl/encoding/MarshalInputStream.java \
 	com/sun/corba/se/impl/encoding/MarshalOutputStream.java \
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk	Wed Jul 05 16:39:48 2017 +0200
@@ -63,6 +63,7 @@
 	com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java \
 	com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java \
 	com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java \
+	com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \
 	com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \
 	com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \
 	com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk	Wed Jul 05 16:39:48 2017 +0200
@@ -27,6 +27,7 @@
 	com/sun/corba/se/impl/orbutil/CacheTable.java \
 	com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java \
 	com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java \
+	com/sun/corba/se/impl/orbutil/GetPropertyAction.java \
 	com/sun/corba/se/impl/orbutil/HexOutputStream.java \
 	com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java \
 	com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java \
@@ -76,6 +77,7 @@
 	com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java \
 	com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java \
 	com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java \
+	com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java \
 	com/sun/corba/se/impl/orbutil/graph/Node.java \
 	com/sun/corba/se/impl/orbutil/graph/NodeData.java \
 	com/sun/corba/se/impl/orbutil/graph/Graph.java \
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk	Wed Jul 05 16:39:48 2017 +0200
@@ -63,6 +63,7 @@
 	com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java \
 	com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java \
 	com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java \
+	com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java \
 	com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java \
 	com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java \
 	com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java \
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk	Wed Jul 05 16:39:48 2017 +0200
@@ -29,6 +29,7 @@
 
 com_sun_corba_se_spi_legacy_interceptor_java = \
 	com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java \
+	com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java \
 	com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java \
 	com/sun/corba/se/spi/legacy/interceptor/UnknownType.java
 
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk	Wed Jul 05 16:39:48 2017 +0200
@@ -35,5 +35,6 @@
 	com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \
 	com/sun/corba/se/spi/monitoring/MonitoredAttribute.java \
 	com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java \
+	com/sun/corba/se/spi/monitoring/MonitoringConstants.java \
 	com/sun/corba/se/spi/monitoring/MonitoringManager.java \
 	com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java 
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk	Wed Jul 05 16:39:48 2017 +0200
@@ -27,6 +27,7 @@
 	com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java \
 	com/sun/corba/se/spi/presentation/rmi/DynamicStub.java \
 	com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \
+	com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \
 	com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \
 	com/sun/corba/se/spi/presentation/rmi/StubAdapter.java
 
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk	Wed Jul 05 16:39:48 2017 +0200
@@ -26,6 +26,7 @@
 com_sun_corba_se_spi_transport_java = \
 	com/sun/corba/se/spi/transport/CorbaAcceptor.java \
 	com/sun/corba/se/spi/transport/CorbaConnection.java \
+	com/sun/corba/se/spi/transport/CorbaConnectionCache.java \
 	com/sun/corba/se/spi/transport/CorbaContactInfo.java \
 	com/sun/corba/se/spi/transport/CorbaContactInfoList.java \
 	com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java \
--- a/corba/make/com/sun/corba/minclude/org_omg_CosNaming.jmk	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/com/sun/corba/minclude/org_omg_CosNaming.jmk	Wed Jul 05 16:39:48 2017 +0200
@@ -47,6 +47,7 @@
 	org/omg/CosNaming/NamingContext.java \
 	org/omg/CosNaming/NamingContextHelper.java \
 	org/omg/CosNaming/NamingContextHolder.java \
+	org/omg/CosNaming/NamingContextOperations.java \
 	org/omg/CosNaming/_NamingContextStub.java \
 	org/omg/CosNaming/NamingContextPackage/AlreadyBound.java \
 	org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java \
--- a/corba/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk	Wed Jul 05 16:39:48 2017 +0200
@@ -47,6 +47,10 @@
 	org/omg/DynamicAny/DynUnionOperations.java \
 	org/omg/DynamicAny/DynValue.java \
 	org/omg/DynamicAny/DynValueOperations.java \
+	org/omg/DynamicAny/DynValueBox.java \
+	org/omg/DynamicAny/DynValueBoxOperations.java \
+	org/omg/DynamicAny/DynValueCommon.java \
+	org/omg/DynamicAny/DynValueCommonOperations.java \
 	org/omg/DynamicAny/NameDynAnyPair.java \
 	org/omg/DynamicAny/NameValuePair.java \
 	org/omg/DynamicAny/DynAnyPackage/InvalidValue.java \
@@ -70,8 +74,16 @@
 	org/omg/DynamicAny/DynSequenceHelper.java \
 	org/omg/DynamicAny/NameDynAnyPairSeqHelper.java \
 	org/omg/DynamicAny/NameValuePairHelper.java \
-	org/omg/DynamicAny/NameValuePairSeqHelper.java 
-
+	org/omg/DynamicAny/NameValuePairSeqHelper.java  \
+	org/omg/DynamicAny/_DynAnyFactoryStub.java \
+	org/omg/DynamicAny/_DynAnyStub.java \
+	org/omg/DynamicAny/_DynArrayStub.java \
+	org/omg/DynamicAny/_DynEnumStub.java \
+	org/omg/DynamicAny/_DynFixedStub.java \
+	org/omg/DynamicAny/_DynSequenceStub.java \
+	org/omg/DynamicAny/_DynStructStub.java \
+	org/omg/DynamicAny/_DynUnionStub.java \
+	org/omg/DynamicAny/_DynValueStub.java
 
 DYNANY_HELP_HOLD_java = \
 	org/omg/DynamicAny/AnySeqHolder.java \
--- a/corba/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk	Wed Jul 05 16:39:48 2017 +0200
@@ -106,6 +106,7 @@
 	org/omg/IOP/CodecPackage/TypeMismatchHelper.java \
 	org/omg/IOP/ENCODING_CDR_ENCAPS.java \
 	org/omg/IOP/Encoding.java \
+	org/omg/IOP/ExceptionDetailMessage.java \
 	org/omg/Dynamic/Parameter.java 
 
 # Helper and Holder files to be removed:
--- a/corba/make/com/sun/corba/se/sources/Makefile	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/com/sun/corba/se/sources/Makefile	Wed Jul 05 16:39:48 2017 +0200
@@ -46,6 +46,8 @@
 include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk
 include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
 
+FILES_java += com/sun/corba/se/org/omg/CORBA/ORB.java
+
 #
 # Dirs
 #
--- a/corba/make/common/shared/Compiler-sun.gmk	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/common/shared/Compiler-sun.gmk	Wed Jul 05 16:39:48 2017 +0200
@@ -31,11 +31,8 @@
 
 # Sun Studio Compiler settings specific to Solaris
 ifeq ($(PLATFORM), solaris)
-  # FIXUP: Change to SS12 when validated
-  #COMPILER_VERSION=SS12
-  #REQUIRED_CC_VER=5.9
-  COMPILER_VERSION=SS11
-  REQUIRED_CC_VER=5.8
+  COMPILER_VERSION=SS12
+  REQUIRED_CC_VER=5.9
   CC             = $(COMPILER_PATH)cc
   CPP            = $(COMPILER_PATH)cc -E
   CXX            = $(COMPILER_PATH)CC
--- a/corba/make/javax/xa/Makefile	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/javax/xa/Makefile	Wed Jul 05 16:39:48 2017 +0200
@@ -35,7 +35,7 @@
 #
 # Files to compile
 #
-AUTO_FILES_JAVA_DIRS = javax/transaction/xa
+AUTO_FILES_JAVA_DIRS = javax/transaction
 
 #
 # Rules
--- a/corba/make/jprt.config	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/jprt.config	Wed Jul 05 16:39:48 2017 +0200
@@ -127,9 +127,7 @@
     if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
         compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
     else
-        # FIXUP: Change to SS12 when validated
-	#compiler_name=SS12
-        compiler_name=SS11
+	compiler_name=SS12
     fi
     compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
     ALT_COMPILER_PATH="${compiler_path}"
--- a/corba/make/org/omg/CORBA/Makefile	Wed Jul 05 16:39:45 2017 +0200
+++ b/corba/make/org/omg/CORBA/Makefile	Wed Jul 05 16:39:48 2017 +0200
@@ -47,8 +47,8 @@
 endif
 
 FILES_java = \
-        $(ORG_OMG_SENDINGCONTEXT_java) \
-        $(ORG_OMG_CORBA_2_3_java) \
+        $(org_omg_SendingContext_java) \
+        $(org_omg_CORBA_2_3_java) \
         $(ORG_OMG_CORBA_java)
 
 #
jdk-sandbox