diff --git a/.hgtags b/.hgtags
index 18b9aa210fc..7aa6626ac83 100644
--- a/.hgtags
+++ b/.hgtags
@@ -319,3 +319,4 @@ f66c185284727f6e6ffd27e9c45ed2dd9da0a691 jdk9-b71
 7c577fda1855d03c04546694d514678f596508c9 jdk9-b74
 f55df5cfe11c97e4b58998b76f5bd00a73cde12d jdk9-b75
 eeea9adfd1e3d075ef82148c00a4847a1aab4d26 jdk9-b76
+c25e882cee9622ec75c4e9d60633539a2f0a8809 jdk9-b77
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index e7cd2f8b813..4a5b7897a36 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -319,3 +319,4 @@ c706ef5ea5da00078dc5e4334660315f7d99c15b jdk9-b71
 57f3134853ecdd4a3ee2d4d26f22ba981d653d79 jdk9-b74
 8fd6eeb878606e39c908f12535f34ebbfd225a4a jdk9-b75
 d82072b699b880a1f647a5e2d7c0f86cec958941 jdk9-b76
+7972dc8f2a47f0c4cd8f02fa5662af41f028aa14 jdk9-b77
diff --git a/corba/.hgtags b/corba/.hgtags
index 5f4956021f3..3f3d3c4089b 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -319,3 +319,4 @@ f9f3706bd24c42c07cb260fe05730a749b8e52f4 jdk9-b72
 622fe934e351e89107edf3c667d6b57f543f58f1 jdk9-b74
 960b56805abd8460598897481820bd6a75f979e7 jdk9-b75
 d8126bc88fa5cd1ae4e44d86a4b1280ca1c9e2aa jdk9-b76
+8bb2441c0fec8b28f7bf11a0ca3ec1642e7ef457 jdk9-b77
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index ec379ef03c1..9662d2a1477 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -479,3 +479,4 @@ e37d432868be0aa7cb5e0f3d7caff1e825d8ead3 jdk9-b73
 fff6b54e9770ac4c12c2fb4cab5aa7672affa4bd jdk9-b74
 2f354281e9915275693c4e519a959b8a6f22d3a3 jdk9-b75
 0bc8d1656d6f2b1fdfe803c1305a108bb9939f35 jdk9-b76
+e66c3813789debfc06f206afde1bf7a84cb08451 jdk9-b77
diff --git a/hotspot/src/cpu/aarch64/vm/aarch64.ad b/hotspot/src/cpu/aarch64/vm/aarch64.ad
index bef849a2050..37d1b09cdda 100644
--- a/hotspot/src/cpu/aarch64/vm/aarch64.ad
+++ b/hotspot/src/cpu/aarch64/vm/aarch64.ad
@@ -2389,9 +2389,11 @@ int HandlerImpl::emit_exception_handler(CodeBuffer& cbuf)
   // Note that the code buffer's insts_mark is always relative to insts.
   // That's why we must use the macroassembler to generate a handler.
   MacroAssembler _masm(&cbuf);
-  address base =
-  __ start_a_stub(size_exception_handler());
-  if (base == NULL)  return 0;  // CodeBuffer::expand failed
+  address base = __ start_a_stub(size_exception_handler());
+  if (base == NULL) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;  // CodeBuffer::expand failed
+  }
   int offset = __ offset();
   __ far_jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
   assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
@@ -2405,9 +2407,11 @@ int HandlerImpl::emit_deopt_handler(CodeBuffer& cbuf)
   // Note that the code buffer's insts_mark is always relative to insts.
   // That's why we must use the macroassembler to generate a handler.
   MacroAssembler _masm(&cbuf);
-  address base =
-  __ start_a_stub(size_deopt_handler());
-  if (base == NULL)  return 0;  // CodeBuffer::expand failed
+  address base = __ start_a_stub(size_deopt_handler());
+  if (base == NULL) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;  // CodeBuffer::expand failed
+  }
   int offset = __ offset();
 
   __ adr(lr, __ pc());
@@ -3657,24 +3661,37 @@ encode %{
     MacroAssembler _masm(&cbuf);
 
     address addr = (address)$meth$$method;
+    address call;
     if (!_method) {
       // A call to a runtime wrapper, e.g. new, new_typeArray_Java, uncommon_trap.
-      __ trampoline_call(Address(addr, relocInfo::runtime_call_type), &cbuf);
+      call = __ trampoline_call(Address(addr, relocInfo::runtime_call_type), &cbuf);
     } else if (_optimized_virtual) {
-      __ trampoline_call(Address(addr, relocInfo::opt_virtual_call_type), &cbuf);
+      call = __ trampoline_call(Address(addr, relocInfo::opt_virtual_call_type), &cbuf);
     } else {
-      __ trampoline_call(Address(addr, relocInfo::static_call_type), &cbuf);
+      call = __ trampoline_call(Address(addr, relocInfo::static_call_type), &cbuf);
+    }
+    if (call == NULL) {
+      ciEnv::current()->record_failure("CodeCache is full"); 
+      return;
     }
 
     if (_method) {
       // Emit stub for static call
-      CompiledStaticCall::emit_to_interp_stub(cbuf);
+      address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+      if (stub == NULL) {
+        ciEnv::current()->record_failure("CodeCache is full"); 
+        return;
+      }
     }
   %}
 
   enc_class aarch64_enc_java_dynamic_call(method meth) %{
     MacroAssembler _masm(&cbuf);
-    __ ic_call((address)$meth$$method);
+    address call = __ ic_call((address)$meth$$method);
+    if (call == NULL) {
+      ciEnv::current()->record_failure("CodeCache is full"); 
+      return;
+    }
   %}
 
   enc_class aarch64_enc_call_epilog() %{
@@ -3695,7 +3712,11 @@ encode %{
     address entry = (address)$meth$$method;
     CodeBlob *cb = CodeCache::find_blob(entry);
     if (cb) {
-      __ trampoline_call(Address(entry, relocInfo::runtime_call_type));
+      address call = __ trampoline_call(Address(entry, relocInfo::runtime_call_type));
+      if (call == NULL) {
+        ciEnv::current()->record_failure("CodeCache is full"); 
+        return;
+      }
     } else {
       int gpcnt;
       int fpcnt;
diff --git a/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp
index 5cb78d2055d..bdfc017aa82 100644
--- a/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp
@@ -327,9 +327,16 @@ void ArrayCopyStub::emit_code(LIR_Assembler* ce) {
   ce->align_call(lir_static_call);
 
   ce->emit_static_call_stub();
+  if (ce->compilation()->bailed_out()) {
+    return; // CodeCache is full
+  }
   Address resolve(SharedRuntime::get_resolve_static_call_stub(),
                   relocInfo::static_call_type);
-  __ trampoline_call(resolve);
+  address call = __ trampoline_call(resolve);
+  if (call == NULL) {
+    ce->bailout("trampoline stub overflow");
+    return;
+  }
   ce->add_call_info_here(info());
 
 #ifndef PRODUCT
diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
index 353486c402d..907370d1385 100644
--- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
@@ -1996,13 +1996,21 @@ void LIR_Assembler::align_call(LIR_Code code) {  }
 
 
 void LIR_Assembler::call(LIR_OpJavaCall* op, relocInfo::relocType rtype) {
-  __ trampoline_call(Address(op->addr(), rtype));
+  address call = __ trampoline_call(Address(op->addr(), rtype));
+  if (call == NULL) {
+    bailout("trampoline stub overflow");
+    return;
+  }
   add_call_info(code_offset(), op->info());
 }
 
 
 void LIR_Assembler::ic_call(LIR_OpJavaCall* op) {
-  __ ic_call(op->addr());
+  address call = __ ic_call(op->addr());
+  if (call == NULL) {
+    bailout("trampoline stub overflow");
+    return;
+  }
   add_call_info(code_offset(), op->info());
 }
 
diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp
index d6d323857d3..6d7e27e617b 100644
--- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp
+++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp
@@ -26,6 +26,9 @@
 #ifndef CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP
 #define CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP
 
+// ArrayCopyStub needs access to bailout
+friend class ArrayCopyStub;
+
  private:
 
   int array_element_size(BasicType type) const;
diff --git a/hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp
index 44e124cf6d9..b30a4a6df10 100644
--- a/hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp
@@ -51,7 +51,7 @@ bool CompiledIC::is_icholder_call_site(virtual_call_Relocation* call_site) {
 // ----------------------------------------------------------------------------
 
 #define __ _masm.
-void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
+address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
   // Stub is fixed up when the corresponding call is converted from
   // calling compiled code to calling interpreted code.
   // mov rmethod, 0
@@ -63,10 +63,11 @@ void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
   // That's why we must use the macroassembler to generate a stub.
   MacroAssembler _masm(&cbuf);
 
-  address base = __ start_a_stub(to_interp_stub_size()*2);
-
+  address base = __ start_a_stub(to_interp_stub_size());
   int offset = __ offset();
-  if (base == NULL)  return;  // CodeBuffer::expand failed
+  if (base == NULL) {
+    return NULL;  // CodeBuffer::expand failed
+  }
   // static stub relocation stores the instruction address of the call
   __ relocate(static_stub_Relocation::spec(mark));
   // static stub relocation also tags the Method* in the code-stream.
@@ -76,6 +77,7 @@ void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
 
   assert((__ offset() - offset) <= (int)to_interp_stub_size(), "stub too big");
   __ end_a_stub();
+  return base;
 }
 #undef __
 
diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
index e8f0612460c..2bd4127cd50 100644
--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
@@ -664,7 +664,7 @@ void MacroAssembler::call_VM_helper(Register oop_result, address entry_point, in
 // Maybe emit a call via a trampoline.  If the code cache is small
 // trampolines won't be emitted.
 
-void MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) {
+address MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) {
   assert(entry.rspec().type() == relocInfo::runtime_call_type
          || entry.rspec().type() == relocInfo::opt_virtual_call_type
          || entry.rspec().type() == relocInfo::static_call_type
@@ -672,7 +672,10 @@ void MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) {
 
   unsigned int start_offset = offset();
   if (far_branches() && !Compile::current()->in_scratch_emit_size()) {
-    emit_trampoline_stub(offset(), entry.target());
+    address stub = emit_trampoline_stub(start_offset, entry.target());
+    if (stub == NULL) {
+      return NULL; // CodeCache is full
+    }
   }
 
   if (cbuf) cbuf->set_insts_mark();
@@ -682,6 +685,8 @@ void MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) {
   } else {
     bl(pc());
   }
+  // just need to return a non-null address
+  return pc();
 }
 
 
@@ -696,13 +701,11 @@ void MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) {
 //   load the call target from the constant pool
 //   branch (LR still points to the call site above)
 
-void MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset,
+address MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset,
                                              address dest) {
   address stub = start_a_stub(Compile::MAX_stubs_size/2);
   if (stub == NULL) {
-    start_a_stub(Compile::MAX_stubs_size/2);
-    Compile::current()->env()->record_out_of_memory_failure();
-    return;
+    return NULL;  // CodeBuffer::expand failed
   }
 
   // Create a trampoline stub relocation which relates this trampoline stub
@@ -729,15 +732,16 @@ void MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset,
   assert(is_NativeCallTrampolineStub_at(stub_start_addr), "doesn't look like a trampoline");
 
   end_a_stub();
+  return stub;
 }
 
-void MacroAssembler::ic_call(address entry) {
+address MacroAssembler::ic_call(address entry) {
   RelocationHolder rh = virtual_call_Relocation::spec(pc());
   // address const_ptr = long_constant((jlong)Universe::non_oop_word());
   // unsigned long offset;
   // ldr_constant(rscratch2, const_ptr);
   movptr(rscratch2, (uintptr_t)Universe::non_oop_word());
-  trampoline_call(Address(entry, rh));
+  return trampoline_call(Address(entry, rh));
 }
 
 // Implementation of call_VM versions
diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp
index 5f903720d97..9711266f52d 100644
--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp
@@ -539,7 +539,7 @@ public:
 
   static int patch_oop(address insn_addr, address o);
 
-  void emit_trampoline_stub(int insts_call_instruction_offset, address target);
+  address emit_trampoline_stub(int insts_call_instruction_offset, address target);
 
   // The following 4 methods return the offset of the appropriate move instruction
 
@@ -942,7 +942,7 @@ public:
 
   // Calls
 
-  void trampoline_call(Address entry, CodeBuffer *cbuf = NULL);
+  address trampoline_call(Address entry, CodeBuffer *cbuf = NULL);
 
   static bool far_branches() {
     return ReservedCodeCacheSize > branch_range;
@@ -962,7 +962,7 @@ public:
   }
 
   // Emit the CompiledIC call idiom
-  void ic_call(address entry);
+  address ic_call(address entry);
 
 public:
 
diff --git a/hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp b/hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp
index 1b54594d09c..762a329e259 100644
--- a/hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp
@@ -94,7 +94,7 @@ bool CompiledIC::is_icholder_call_site(virtual_call_Relocation* call_site) {
 
 const int IC_pos_in_java_to_interp_stub = 8;
 #define __ _masm.
-void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
+address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
 #ifdef COMPILER2
   // Get the mark within main instrs section which is set to the address of the call.
   address call_addr = cbuf.insts_mark();
@@ -106,8 +106,7 @@ void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
   // Start the stub.
   address stub = __ start_a_stub(CompiledStaticCall::to_interp_stub_size());
   if (stub == NULL) {
-    Compile::current()->env()->record_out_of_memory_failure();
-    return;
+    return NULL; // CodeCache is full
   }
 
   // For java_to_interp stubs we use R11_scratch1 as scratch register
@@ -149,6 +148,7 @@ void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
 
  // End the stub.
   __ end_a_stub();
+  return stub;
 #else
   ShouldNotReachHere();
 #endif
diff --git a/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp b/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp
index 00330ef3461..2c95de9b782 100644
--- a/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp
+++ b/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp
@@ -2187,7 +2187,7 @@ void InterpreterMacroAssembler::get_method_counters(Register method,
 }
 
 void InterpreterMacroAssembler::increment_invocation_counter(Register Rcounters, Register iv_be_count, Register Rtmp_r0) {
-  assert(UseCompiler, "incrementing must be useful");
+  assert(UseCompiler || LogTouchedMethods, "incrementing must be useful");
   Register invocation_count = iv_be_count;
   Register backedge_count   = Rtmp_r0;
   int delta = InvocationCounter::count_increment;
diff --git a/hotspot/src/cpu/ppc/vm/ppc.ad b/hotspot/src/cpu/ppc/vm/ppc.ad
index a4e5f5a454a..5e0e977e287 100644
--- a/hotspot/src/cpu/ppc/vm/ppc.ad
+++ b/hotspot/src/cpu/ppc/vm/ppc.ad
@@ -1082,7 +1082,7 @@ void CallStubImpl::emit_trampoline_stub(MacroAssembler &_masm, int destination_t
   // Start the stub.
   address stub = __ start_a_stub(Compile::MAX_stubs_size/2);
   if (stub == NULL) {
-    Compile::current()->env()->record_out_of_memory_failure();
+    ciEnv::current()->record_failure("CodeCache is full");
     return;
   }
 
@@ -1160,7 +1160,7 @@ EmitCallOffsets emit_call_with_trampoline_stub(MacroAssembler &_masm, address en
 
     // Emit the trampoline stub which will be related to the branch-and-link below.
     CallStubImpl::emit_trampoline_stub(_masm, entry_point_toc_offset, offsets.insts_call_instruction_offset);
-    if (Compile::current()->env()->failing()) { return offsets; } // Code cache may be full.
+    if (ciEnv::current()->failing()) { return offsets; } // Code cache may be full.
     __ relocate(rtype);
   }
 
@@ -3397,7 +3397,7 @@ encode %{
 
         // Emit the trampoline stub which will be related to the branch-and-link below.
         CallStubImpl::emit_trampoline_stub(_masm, entry_point_toc_offset, start_offset);
-        if (Compile::current()->env()->failing()) { return; } // Code cache may be full.
+        if (ciEnv::current()->failing()) { return; } // Code cache may be full.
         __ relocate(_optimized_virtual ?
                     relocInfo::opt_virtual_call_type : relocInfo::static_call_type);
       }
@@ -3410,7 +3410,11 @@ encode %{
       __ bl(__ pc());  // Emits a relocation.
 
       // The stub for call to interpreter.
-      CompiledStaticCall::emit_to_interp_stub(cbuf);
+      address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+      if (stub == NULL) {
+        ciEnv::current()->record_failure("CodeCache is full"); 
+        return;
+      }
     }
   %}
 
@@ -3455,7 +3459,11 @@ encode %{
 
     assert(_method, "execute next statement conditionally");
     // The stub for call to interpreter.
-    CompiledStaticCall::emit_to_interp_stub(cbuf);
+    address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+    if (stub == NULL) {
+      ciEnv::current()->record_failure("CodeCache is full"); 
+      return;
+    }
 
     // Restore original sp.
     __ ld(R11_scratch1, 0, R1_SP); // Load caller sp.
diff --git a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
index f998a9c3a12..4f511dce70d 100644
--- a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
@@ -432,6 +432,9 @@ void ArrayCopyStub::emit_code(LIR_Assembler* ce) {
   __ mov(length()->as_register(),  O4);
 
   ce->emit_static_call_stub();
+  if (ce->compilation()->bailed_out()) {
+    return; // CodeCache is full
+  }
 
   __ call(SharedRuntime::get_resolve_static_call_stub(), relocInfo::static_call_type);
   __ delayed()->nop();
diff --git a/hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp b/hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp
index a4b2a094a5b..b6021917710 100644
--- a/hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp
@@ -53,7 +53,7 @@ bool CompiledIC::is_icholder_call_site(virtual_call_Relocation* call_site) {
 // ----------------------------------------------------------------------------
 
 #define __ _masm.
-void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
+address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
 #ifdef COMPILER2
   // Stub is fixed up when the corresponding call is converted from calling
   // compiled code to calling interpreted code.
@@ -64,9 +64,10 @@ void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
 
   MacroAssembler _masm(&cbuf);
 
-  address base =
-  __ start_a_stub(to_interp_stub_size()*2);
-  if (base == NULL) return;  // CodeBuffer::expand failed.
+  address base = __ start_a_stub(to_interp_stub_size());
+  if (base == NULL) {
+    return NULL;  // CodeBuffer::expand failed.
+  }
 
   // Static stub relocation stores the instruction address of the call.
   __ relocate(static_stub_Relocation::spec(mark));
@@ -81,6 +82,7 @@ void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
 
   // Update current stubs pointer and restore code_end.
   __ end_a_stub();
+  return base;
 #else
   ShouldNotReachHere();
 #endif
diff --git a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp
index 153bfbdda55..44ad8d91dae 100644
--- a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp
@@ -2314,7 +2314,7 @@ void InterpreterMacroAssembler::get_method_counters(Register method,
 }
 
 void InterpreterMacroAssembler::increment_invocation_counter( Register Rcounters, Register Rtmp, Register Rtmp2 ) {
-  assert(UseCompiler, "incrementing must be useful");
+  assert(UseCompiler || LogTouchedMethods, "incrementing must be useful");
   assert_different_registers(Rcounters, Rtmp, Rtmp2);
 
   Address inv_counter(Rcounters, MethodCounters::invocation_counter_offset() +
diff --git a/hotspot/src/cpu/sparc/vm/sparc.ad b/hotspot/src/cpu/sparc/vm/sparc.ad
index 4a742755f29..04491901ddb 100644
--- a/hotspot/src/cpu/sparc/vm/sparc.ad
+++ b/hotspot/src/cpu/sparc/vm/sparc.ad
@@ -1773,9 +1773,11 @@ int HandlerImpl::emit_exception_handler(CodeBuffer& cbuf) {
   AddressLiteral exception_blob(OptoRuntime::exception_blob()->entry_point());
   MacroAssembler _masm(&cbuf);
 
-  address base =
-  __ start_a_stub(size_exception_handler());
-  if (base == NULL)  return 0;  // CodeBuffer::expand failed
+  address base = __ start_a_stub(size_exception_handler());
+  if (base == NULL) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;  // CodeBuffer::expand failed
+  }
 
   int offset = __ offset();
 
@@ -1796,9 +1798,11 @@ int HandlerImpl::emit_deopt_handler(CodeBuffer& cbuf) {
   AddressLiteral deopt_blob(SharedRuntime::deopt_blob()->unpack());
   MacroAssembler _masm(&cbuf);
 
-  address base =
-  __ start_a_stub(size_deopt_handler());
-  if (base == NULL)  return 0;  // CodeBuffer::expand failed
+  address base = __ start_a_stub(size_deopt_handler());
+  if (base == NULL) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;  // CodeBuffer::expand failed
+  }
 
   int offset = __ offset();
   __ save_frame(0);
@@ -2599,7 +2603,12 @@ encode %{
       emit_call_reloc(cbuf, $meth$$method, relocInfo::static_call_type);
     }
     if (_method) {  // Emit stub for static call.
-      CompiledStaticCall::emit_to_interp_stub(cbuf);
+      address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+      // Stub does not fit into scratch buffer if TraceJumps is enabled
+      if (stub == NULL && !(TraceJumps && Compile::current()->in_scratch_emit_size())) {
+        ciEnv::current()->record_failure("CodeCache is full");
+        return;
+      } 
     }
   %}
 
diff --git a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
index 71684561223..a3196fe0b6d 100644
--- a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
@@ -503,6 +503,9 @@ void ArrayCopyStub::emit_code(LIR_Assembler* ce) {
   ce->align_call(lir_static_call);
 
   ce->emit_static_call_stub();
+  if (ce->compilation()->bailed_out()) {
+    return; // CodeCache is full
+  }
   AddressLiteral resolve(SharedRuntime::get_resolve_static_call_stub(),
                          relocInfo::static_call_type);
   __ call(resolve);
diff --git a/hotspot/src/cpu/x86/vm/compiledIC_x86.cpp b/hotspot/src/cpu/x86/vm/compiledIC_x86.cpp
index 9537ef971f7..29eba2fb99d 100644
--- a/hotspot/src/cpu/x86/vm/compiledIC_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/compiledIC_x86.cpp
@@ -50,7 +50,7 @@ bool CompiledIC::is_icholder_call_site(virtual_call_Relocation* call_site) {
 // ----------------------------------------------------------------------------
 
 #define __ _masm.
-void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
+address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
   // Stub is fixed up when the corresponding call is converted from
   // calling compiled code to calling interpreted code.
   // movq rbx, 0
@@ -62,9 +62,10 @@ void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
   // That's why we must use the macroassembler to generate a stub.
   MacroAssembler _masm(&cbuf);
 
-  address base =
-  __ start_a_stub(to_interp_stub_size()*2);
-  if (base == NULL) return;  // CodeBuffer::expand failed.
+  address base = __ start_a_stub(to_interp_stub_size());
+  if (base == NULL) {
+    return NULL;  // CodeBuffer::expand failed.
+  }
   // Static stub relocation stores the instruction address of the call.
   __ relocate(static_stub_Relocation::spec(mark), Assembler::imm_operand);
   // Static stub relocation also tags the Method* in the code-stream.
@@ -74,6 +75,7 @@ void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
 
   // Update current stubs pointer and restore insts_end.
   __ end_a_stub();
+  return base;
 }
 #undef __
 
diff --git a/hotspot/src/cpu/x86/vm/x86.ad b/hotspot/src/cpu/x86/vm/x86.ad
index 53825e4fbb2..c8aa50a106c 100644
--- a/hotspot/src/cpu/x86/vm/x86.ad
+++ b/hotspot/src/cpu/x86/vm/x86.ad
@@ -1594,7 +1594,10 @@ int HandlerImpl::emit_exception_handler(CodeBuffer& cbuf) {
   // That's why we must use the macroassembler to generate a handler.
   MacroAssembler _masm(&cbuf);
   address base = __ start_a_stub(size_exception_handler());
-  if (base == NULL)  return 0;  // CodeBuffer::expand failed
+  if (base == NULL) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;  // CodeBuffer::expand failed
+  }
   int offset = __ offset();
   __ jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
   assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
@@ -1609,7 +1612,10 @@ int HandlerImpl::emit_deopt_handler(CodeBuffer& cbuf) {
   // That's why we must use the macroassembler to generate a handler.
   MacroAssembler _masm(&cbuf);
   address base = __ start_a_stub(size_deopt_handler());
-  if (base == NULL)  return 0;  // CodeBuffer::expand failed
+  if (base == NULL) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;  // CodeBuffer::expand failed
+  }
   int offset = __ offset();
 
 #ifdef _LP64
diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad
index be2f7e65b36..dfe10d5b02a 100644
--- a/hotspot/src/cpu/x86/vm/x86_32.ad
+++ b/hotspot/src/cpu/x86/vm/x86_32.ad
@@ -1907,7 +1907,11 @@ encode %{
                      static_call_Relocation::spec(), RELOC_IMM32 );
     }
     if (_method) {  // Emit stub for static call.
-      CompiledStaticCall::emit_to_interp_stub(cbuf);
+      address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+      if (stub == NULL) {
+        ciEnv::current()->record_failure("CodeCache is full");
+        return;
+      } 
     }
   %}
 
diff --git a/hotspot/src/cpu/x86/vm/x86_64.ad b/hotspot/src/cpu/x86/vm/x86_64.ad
index ea8b1c81276..c04661cda7d 100644
--- a/hotspot/src/cpu/x86/vm/x86_64.ad
+++ b/hotspot/src/cpu/x86/vm/x86_64.ad
@@ -2137,7 +2137,11 @@ encode %{
     }
     if (_method) {
       // Emit stub for static call.
-      CompiledStaticCall::emit_to_interp_stub(cbuf);
+      address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+      if (stub == NULL) {
+        ciEnv::current()->record_failure("CodeCache is full");
+        return;
+      } 
     }
   %}
 
diff --git a/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp b/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp
index 143dc317380..185a8b169c0 100644
--- a/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp
@@ -60,8 +60,9 @@ bool CompiledIC::is_icholder_call_site(virtual_call_Relocation* call_site) {
 
 // ----------------------------------------------------------------------------
 
-void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
+address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
   ShouldNotReachHere(); // Only needed for COMPILER2.
+  return NULL;
 }
 
 int CompiledStaticCall::to_interp_stub_size() {
diff --git a/hotspot/src/os/aix/vm/os_aix.cpp b/hotspot/src/os/aix/vm/os_aix.cpp
index c78577c542f..f2c3933f35f 100644
--- a/hotspot/src/os/aix/vm/os_aix.cpp
+++ b/hotspot/src/os/aix/vm/os_aix.cpp
@@ -971,34 +971,32 @@ bool os::create_thread(Thread* thread, ThreadType thr_type, size_t stack_size) {
   guarantee(pthread_attr_setsuspendstate_np(&attr, PTHREAD_CREATE_SUSPENDED_NP) == 0, "???");
 
   // calculate stack size if it's not specified by caller
-  if (os::Aix::supports_variable_stack_size()) {
-    if (stack_size == 0) {
-      stack_size = os::Aix::default_stack_size(thr_type);
+  if (stack_size == 0) {
+    stack_size = os::Aix::default_stack_size(thr_type);
 
-      switch (thr_type) {
-      case os::java_thread:
-        // Java threads use ThreadStackSize whose default value can be changed with the flag -Xss.
-        assert(JavaThread::stack_size_at_create() > 0, "this should be set");
-        stack_size = JavaThread::stack_size_at_create();
+    switch (thr_type) {
+    case os::java_thread:
+      // Java threads use ThreadStackSize whose default value can be changed with the flag -Xss.
+      assert(JavaThread::stack_size_at_create() > 0, "this should be set");
+      stack_size = JavaThread::stack_size_at_create();
+      break;
+    case os::compiler_thread:
+      if (CompilerThreadStackSize > 0) {
+        stack_size = (size_t)(CompilerThreadStackSize * K);
         break;
-      case os::compiler_thread:
-        if (CompilerThreadStackSize > 0) {
-          stack_size = (size_t)(CompilerThreadStackSize * K);
-          break;
-        } // else fall through:
-          // use VMThreadStackSize if CompilerThreadStackSize is not defined
-      case os::vm_thread:
-      case os::pgc_thread:
-      case os::cgc_thread:
-      case os::watcher_thread:
-        if (VMThreadStackSize > 0) stack_size = (size_t)(VMThreadStackSize * K);
-        break;
-      }
+      } // else fall through:
+        // use VMThreadStackSize if CompilerThreadStackSize is not defined
+    case os::vm_thread:
+    case os::pgc_thread:
+    case os::cgc_thread:
+    case os::watcher_thread:
+      if (VMThreadStackSize > 0) stack_size = (size_t)(VMThreadStackSize * K);
+      break;
     }
+  }
 
-    stack_size = MAX2(stack_size, os::Aix::min_stack_allowed);
-    pthread_attr_setstacksize(&attr, stack_size);
-  } //else let thread_create() pick the default value (96 K on AIX)
+  stack_size = MAX2(stack_size, os::Aix::min_stack_allowed);
+  pthread_attr_setstacksize(&attr, stack_size);
 
   pthread_t tid;
   int ret = pthread_create(&tid, &attr, (void* (*)(void*)) java_start, thread);
diff --git a/hotspot/src/os/aix/vm/os_aix.hpp b/hotspot/src/os/aix/vm/os_aix.hpp
index faba5c2b45e..8e96dd9f6c5 100644
--- a/hotspot/src/os/aix/vm/os_aix.hpp
+++ b/hotspot/src/os/aix/vm/os_aix.hpp
@@ -131,8 +131,6 @@ class Aix {
   static void initialize_libo4();
   static void initialize_libperfstat();
 
-  static bool supports_variable_stack_size();
-
  public:
   static void init_thread_fpu_state();
   static pthread_t main_thread(void)                                { return _main_thread; }
diff --git a/hotspot/src/os/bsd/vm/os_bsd.cpp b/hotspot/src/os/bsd/vm/os_bsd.cpp
index 8f935d85c05..1c243ae387f 100644
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp
@@ -739,40 +739,35 @@ bool os::create_thread(Thread* thread, ThreadType thr_type, size_t stack_size) {
   pthread_attr_init(&attr);
   pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 
-  // stack size
-  if (os::Bsd::supports_variable_stack_size()) {
-    // calculate stack size if it's not specified by caller
-    if (stack_size == 0) {
-      stack_size = os::Bsd::default_stack_size(thr_type);
+  // calculate stack size if it's not specified by caller
+  if (stack_size == 0) {
+    stack_size = os::Bsd::default_stack_size(thr_type);
 
-      switch (thr_type) {
-      case os::java_thread:
-        // Java threads use ThreadStackSize which default value can be
-        // changed with the flag -Xss
-        assert(JavaThread::stack_size_at_create() > 0, "this should be set");
-        stack_size = JavaThread::stack_size_at_create();
+    switch (thr_type) {
+    case os::java_thread:
+      // Java threads use ThreadStackSize which default value can be
+      // changed with the flag -Xss
+      assert(JavaThread::stack_size_at_create() > 0, "this should be set");
+      stack_size = JavaThread::stack_size_at_create();
+      break;
+    case os::compiler_thread:
+      if (CompilerThreadStackSize > 0) {
+        stack_size = (size_t)(CompilerThreadStackSize * K);
         break;
-      case os::compiler_thread:
-        if (CompilerThreadStackSize > 0) {
-          stack_size = (size_t)(CompilerThreadStackSize * K);
-          break;
-        } // else fall through:
-          // use VMThreadStackSize if CompilerThreadStackSize is not defined
-      case os::vm_thread:
-      case os::pgc_thread:
-      case os::cgc_thread:
-      case os::watcher_thread:
-        if (VMThreadStackSize > 0) stack_size = (size_t)(VMThreadStackSize * K);
-        break;
-      }
+      } // else fall through:
+        // use VMThreadStackSize if CompilerThreadStackSize is not defined
+    case os::vm_thread:
+    case os::pgc_thread:
+    case os::cgc_thread:
+    case os::watcher_thread:
+      if (VMThreadStackSize > 0) stack_size = (size_t)(VMThreadStackSize * K);
+      break;
     }
-
-    stack_size = MAX2(stack_size, os::Bsd::min_stack_allowed);
-    pthread_attr_setstacksize(&attr, stack_size);
-  } else {
-    // let pthread_create() pick the default value.
   }
 
+  stack_size = MAX2(stack_size, os::Bsd::min_stack_allowed);
+  pthread_attr_setstacksize(&attr, stack_size);
+
   ThreadState state;
 
   {
diff --git a/hotspot/src/os/bsd/vm/os_bsd.hpp b/hotspot/src/os/bsd/vm/os_bsd.hpp
index 8c6dbb78888..8b48cb78cf0 100644
--- a/hotspot/src/os/bsd/vm/os_bsd.hpp
+++ b/hotspot/src/os/bsd/vm/os_bsd.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -75,8 +75,6 @@ class Bsd {
   static julong physical_memory() { return _physical_memory; }
   static void initialize_system_info();
 
-  static bool supports_variable_stack_size();
-
   static void rebuild_cpu_to_node_map();
   static GrowableArray<int>* cpu_to_node()    { return _cpu_to_node; }
 
diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
index 0af27515e89..bd4aa14b32f 100644
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -653,8 +653,7 @@ static void *java_start(Thread *thread) {
   OSThread* osthread = thread->osthread();
   Monitor* sync = osthread->startThread_lock();
 
-  // thread_id is kernel thread id (similar to Solaris LWP id)
-  osthread->set_thread_id(os::Linux::gettid());
+  osthread->set_thread_id(os::current_thread_id());
 
   if (UseNUMA) {
     int lgrp_id = os::numa_get_group_id();
@@ -712,39 +711,35 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
   pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 
   // stack size
-  if (os::Linux::supports_variable_stack_size()) {
-    // calculate stack size if it's not specified by caller
-    if (stack_size == 0) {
-      stack_size = os::Linux::default_stack_size(thr_type);
+  // calculate stack size if it's not specified by caller
+  if (stack_size == 0) {
+    stack_size = os::Linux::default_stack_size(thr_type);
 
-      switch (thr_type) {
-      case os::java_thread:
-        // Java threads use ThreadStackSize which default value can be
-        // changed with the flag -Xss
-        assert(JavaThread::stack_size_at_create() > 0, "this should be set");
-        stack_size = JavaThread::stack_size_at_create();
+    switch (thr_type) {
+    case os::java_thread:
+      // Java threads use ThreadStackSize which default value can be
+      // changed with the flag -Xss
+      assert(JavaThread::stack_size_at_create() > 0, "this should be set");
+      stack_size = JavaThread::stack_size_at_create();
+      break;
+    case os::compiler_thread:
+      if (CompilerThreadStackSize > 0) {
+        stack_size = (size_t)(CompilerThreadStackSize * K);
         break;
-      case os::compiler_thread:
-        if (CompilerThreadStackSize > 0) {
-          stack_size = (size_t)(CompilerThreadStackSize * K);
-          break;
-        } // else fall through:
-          // use VMThreadStackSize if CompilerThreadStackSize is not defined
-      case os::vm_thread:
-      case os::pgc_thread:
-      case os::cgc_thread:
-      case os::watcher_thread:
-        if (VMThreadStackSize > 0) stack_size = (size_t)(VMThreadStackSize * K);
-        break;
-      }
+      } // else fall through:
+        // use VMThreadStackSize if CompilerThreadStackSize is not defined
+    case os::vm_thread:
+    case os::pgc_thread:
+    case os::cgc_thread:
+    case os::watcher_thread:
+      if (VMThreadStackSize > 0) stack_size = (size_t)(VMThreadStackSize * K);
+      break;
     }
-
-    stack_size = MAX2(stack_size, os::Linux::min_stack_allowed);
-    pthread_attr_setstacksize(&attr, stack_size);
-  } else {
-    // let pthread_create() pick the default value.
   }
 
+  stack_size = MAX2(stack_size, os::Linux::min_stack_allowed);
+  pthread_attr_setstacksize(&attr, stack_size);
+
   // glibc guard page
   pthread_attr_setguardsize(&attr, os::Linux::default_guard_size(thr_type));
 
@@ -1424,7 +1419,8 @@ size_t os::lasterror(char *buf, size_t len) {
   return n;
 }
 
-intx os::current_thread_id() { return (intx)pthread_self(); }
+// thread_id is kernel thread id (similar to Solaris LWP id)
+intx os::current_thread_id() { return os::Linux::gettid(); }
 int os::current_process_id() {
   return ::getpid();
 }
diff --git a/hotspot/src/os/linux/vm/os_linux.hpp b/hotspot/src/os/linux/vm/os_linux.hpp
index 9128344ace2..b8104e75ebc 100644
--- a/hotspot/src/os/linux/vm/os_linux.hpp
+++ b/hotspot/src/os/linux/vm/os_linux.hpp
@@ -83,8 +83,6 @@ class Linux {
   static void set_glibc_version(const char *s)      { _glibc_version = s; }
   static void set_libpthread_version(const char *s) { _libpthread_version = s; }
 
-  static bool supports_variable_stack_size();
-
   static void rebuild_cpu_to_node_map();
   static GrowableArray<int>* cpu_to_node()    { return _cpu_to_node; }
 
diff --git a/hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp b/hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp
index 9381b5dcd17..d8829b51c6f 100644
--- a/hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp
+++ b/hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2012, 2014 SAP AG. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -489,10 +489,6 @@ void os::Aix::init_thread_fpu_state(void) {
 
 size_t os::Aix::min_stack_allowed = 128*K;
 
-// Aix is always in floating stack mode. The stack size for a new
-// thread can be set via pthread_attr_setstacksize().
-bool os::Aix::supports_variable_stack_size() { return true; }
-
 // return default stack size for thr_type
 size_t os::Aix::default_stack_size(os::ThreadType thr_type) {
   // default stack size (compiler thread needs larger stack)
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
index 4b2da94715a..423fea33748 100644
--- a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
+++ b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -780,9 +780,6 @@ bool os::is_allocatable(size_t bytes) {
 
 #ifdef AMD64
 size_t os::Bsd::min_stack_allowed  = 64 * K;
-
-// amd64: pthread on amd64 is always in floating stack mode
-bool os::Bsd::supports_variable_stack_size() {  return true; }
 #else
 size_t os::Bsd::min_stack_allowed  =  (48 DEBUG_ONLY(+4))*K;
 
@@ -790,7 +787,6 @@ size_t os::Bsd::min_stack_allowed  =  (48 DEBUG_ONLY(+4))*K;
 #define GET_GS() ({int gs; __asm__ volatile("movw %%gs, %w0":"=q"(gs)); gs&0xffff;})
 #endif
 
-bool os::Bsd::supports_variable_stack_size() { return true; }
 #endif // AMD64
 
 // return default stack size for thr_type
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
index 0ed05eb9a76..9b2db238c0e 100644
--- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -290,10 +290,6 @@ bool os::is_allocatable(size_t bytes) {
 
 size_t os::Bsd::min_stack_allowed = 64 * K;
 
-bool os::Bsd::supports_variable_stack_size() {
-  return true;
-}
-
 size_t os::Bsd::default_stack_size(os::ThreadType thr_type) {
 #ifdef _LP64
   size_t s = (thr_type == os::compiler_thread ? 4 * M : 1 * M);
diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
index 2d116ef212c..3a3ffd9fb30 100644
--- a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+++ b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -496,9 +496,6 @@ bool os::is_allocatable(size_t bytes) {
 
 size_t os::Linux::min_stack_allowed  = 64 * K;
 
-// aarch64: pthread on aarch64 is always in floating stack mode
-bool os::Linux::supports_variable_stack_size() {  return true; }
-
 // return default stack size for thr_type
 size_t os::Linux::default_stack_size(os::ThreadType thr_type) {
   // default stack size (compiler thread needs larger stack)
diff --git a/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp b/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
index a605d147bd4..ebf67a09f3a 100644
--- a/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
+++ b/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
@@ -467,8 +467,6 @@ void os::Linux::set_fpu_control_word(int fpu_control) {
 
 size_t os::Linux::min_stack_allowed = 128*K;
 
-bool os::Linux::supports_variable_stack_size() { return true; }
-
 // return default stack size for thr_type
 size_t os::Linux::default_stack_size(os::ThreadType thr_type) {
   // default stack size (compiler thread needs larger stack)
diff --git a/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp b/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
index e733cc9e6ab..0c1c6263586 100644
--- a/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
+++ b/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -733,9 +733,6 @@ bool os::is_allocatable(size_t bytes) {
 
 size_t os::Linux::min_stack_allowed  = 128 * K;
 
-// pthread on Ubuntu is always in floating stack mode
-bool os::Linux::supports_variable_stack_size() {  return true; }
-
 // return default stack size for thr_type
 size_t os::Linux::default_stack_size(os::ThreadType thr_type) {
   // default stack size (compiler thread needs larger stack)
diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
index 700c6a762a7..decb51ea74f 100644
--- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
@@ -623,11 +623,6 @@ size_t os::Linux::min_stack_allowed  = 64 * K;
 size_t os::Linux::min_stack_allowed  =  (48 DEBUG_ONLY(+4))*K;
 #endif // AMD64
 
-// Test if pthread library can support variable thread stack size.
-bool os::Linux::supports_variable_stack_size() {
-  return true;
-}
-
 // return default stack size for thr_type
 size_t os::Linux::default_stack_size(os::ThreadType thr_type) {
   // default stack size (compiler thread needs larger stack)
diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
index 08c46153e5f..5473f8aa44d 100644
--- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -305,10 +305,6 @@ bool os::is_allocatable(size_t bytes) {
 
 size_t os::Linux::min_stack_allowed = 64 * K;
 
-bool os::Linux::supports_variable_stack_size() {
-  return true;
-}
-
 size_t os::Linux::default_stack_size(os::ThreadType thr_type) {
 #ifdef _LP64
   size_t s = (thr_type == os::compiler_thread ? 4 * M : 1 * M);
diff --git a/hotspot/src/share/vm/c1/c1_Compiler.cpp b/hotspot/src/share/vm/c1/c1_Compiler.cpp
index 84a7bd09682..dad6edb35b3 100644
--- a/hotspot/src/share/vm/c1/c1_Compiler.cpp
+++ b/hotspot/src/share/vm/c1/c1_Compiler.cpp
@@ -239,25 +239,6 @@ bool Compiler::is_intrinsic_supported(methodHandle method) {
   return true;
 }
 
-bool Compiler::is_intrinsic_disabled_by_flag(methodHandle method) {
-  vmIntrinsics::ID id = method->intrinsic_id();
-  assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
-
-  if (vmIntrinsics::is_disabled_by_flags(id)) {
-    return true;
-  }
-
-  if (!InlineNatives && id != vmIntrinsics::_Reference_get) {
-    return true;
-  }
-
-  if (!InlineClassNatives && id == vmIntrinsics::_getClass) {
-    return true;
-  }
-
-  return false;
-}
-
 void Compiler::compile_method(ciEnv* env, ciMethod* method, int entry_bci) {
   BufferBlob* buffer_blob = CompilerThread::current()->get_buffer_blob();
   assert(buffer_blob != NULL, "Must exist");
@@ -275,7 +256,3 @@ void Compiler::compile_method(ciEnv* env, ciMethod* method, int entry_bci) {
 void Compiler::print_timers() {
   Compilation::print_timers();
 }
-
-bool Compiler::is_intrinsic_available(methodHandle method, methodHandle compilation_context) {
-  return is_intrinsic_supported(method) && !is_intrinsic_disabled_by_flag(method);
-}
diff --git a/hotspot/src/share/vm/c1/c1_Compiler.hpp b/hotspot/src/share/vm/c1/c1_Compiler.hpp
index 8b8c8d414e3..96a6bad4f5e 100644
--- a/hotspot/src/share/vm/c1/c1_Compiler.hpp
+++ b/hotspot/src/share/vm/c1/c1_Compiler.hpp
@@ -55,18 +55,9 @@ class Compiler: public AbstractCompiler {
   // Print compilation timers and statistics
   virtual void print_timers();
 
-  // Check the availability of an intrinsic for 'method' given a compilation context.
-  // The compilation context is needed to support per-method usage of the
-  // DisableIntrinsic flag. However, as C1 ignores the DisableIntrinsic flag, it
-  // ignores the compilation context.
-  virtual bool is_intrinsic_available(methodHandle method, methodHandle compilation_context);
-
   // Check if the C1 compiler supports an intrinsic for 'method'.
   virtual bool is_intrinsic_supported(methodHandle method);
 
-  // Processing of command-line flags specific to the C1 compiler.
-  virtual bool is_intrinsic_disabled_by_flag(methodHandle method);
-
   // Size of the code buffer
   static int code_buffer_size();
 };
diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
index e607b02febc..f3b25e8fa41 100644
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
@@ -3491,8 +3491,16 @@ void GraphBuilder::build_graph_for_intrinsic(ciMethod* callee) {
 bool GraphBuilder::try_inline_intrinsics(ciMethod* callee) {
   // For calling is_intrinsic_available we need to transition to
   // the '_thread_in_vm' state because is_intrinsic_available()
-  // does not accesses critical VM-internal data.
-  if (!_compilation->compiler()->is_intrinsic_available(callee->get_Method(), NULL)) {
+  // accesses critical VM-internal data.
+  bool is_available = false;
+  {
+    VM_ENTRY_MARK;
+    methodHandle mh(THREAD, callee->get_Method());
+    methodHandle ct(THREAD, method()->get_Method());
+    is_available = _compilation->compiler()->is_intrinsic_available(mh, ct);
+  }
+
+  if (!is_available) {
     if (!InlineNatives) {
       // Return false and also set message that the inlining of
       // intrinsics has been disabled in general.
diff --git a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
index f82913e0d18..2f99452a5a9 100644
--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
@@ -443,6 +443,7 @@ void LIR_Assembler::emit_call(LIR_OpJavaCall* op) {
 
   // emit the static call stub stuff out of line
   emit_static_call_stub();
+  CHECK_BAILOUT();
 
   switch (op->code()) {
   case lir_static_call:
diff --git a/hotspot/src/share/vm/classfile/imageDecompressor.cpp b/hotspot/src/share/vm/classfile/imageDecompressor.cpp
index 68c5c56f2a4..d6339500234 100644
--- a/hotspot/src/share/vm/classfile/imageDecompressor.cpp
+++ b/hotspot/src/share/vm/classfile/imageDecompressor.cpp
@@ -22,8 +22,8 @@
  *
  */
 
-#include "runtime/thread.inline.hpp"
 #include "precompiled.hpp"
+#include "runtime/thread.inline.hpp"
 #include "classfile/imageDecompressor.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/bytes.hpp"
diff --git a/hotspot/src/share/vm/classfile/imageDecompressor.hpp b/hotspot/src/share/vm/classfile/imageDecompressor.hpp
index c57a8523fdf..6fca341b003 100644
--- a/hotspot/src/share/vm/classfile/imageDecompressor.hpp
+++ b/hotspot/src/share/vm/classfile/imageDecompressor.hpp
@@ -26,7 +26,6 @@
 #define SHARE_VM_CLASSFILE_IMAGEDECOMPRESSOR_HPP
 
 #include "runtime/thread.inline.hpp"
-#include "precompiled.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/imageFile.hpp"
 #include "classfile/symbolTable.hpp"
diff --git a/hotspot/src/share/vm/classfile/vmSymbols.cpp b/hotspot/src/share/vm/classfile/vmSymbols.cpp
index 1a968acc82c..cbbc4122853 100644
--- a/hotspot/src/share/vm/classfile/vmSymbols.cpp
+++ b/hotspot/src/share/vm/classfile/vmSymbols.cpp
@@ -417,8 +417,59 @@ int vmIntrinsics::predicates_needed(vmIntrinsics::ID id) {
   }
 }
 
-bool vmIntrinsics::is_disabled_by_flags(vmIntrinsics::ID id) {
+bool vmIntrinsics::is_disabled_by_flags(methodHandle method, methodHandle compilation_context) {
+  vmIntrinsics::ID id = method->intrinsic_id();
   assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
+
+  // Check if the intrinsic corresponding to 'method' has been disabled on
+  // the command line by using the DisableIntrinsic flag (either globally
+  // or on a per-method level, see src/share/vm/compiler/abstractCompiler.hpp
+  // for details).
+  // Usually, the compilation context is the caller of the method 'method'.
+  // The only case when for a non-recursive method 'method' the compilation context
+  // is not the caller of the 'method' (but it is the method itself) is
+  // java.lang.ref.Referene::get.
+  // For java.lang.ref.Reference::get, the intrinsic version is used
+  // instead of the compiled version so that the value in the referent
+  // field can be registered by the G1 pre-barrier code. The intrinsified
+  // version of Reference::get also adds a memory barrier to prevent
+  // commoning reads from the referent field across safepoint since GC
+  // can change the referent field's value. See Compile::Compile()
+  // in src/share/vm/opto/compile.cpp or
+  // GraphBuilder::GraphBuilder() in src/share/vm/c1/c1_GraphBuilder.cpp
+  // for more details.
+  ccstr disable_intr = NULL;
+  if ((DisableIntrinsic[0] != '\0' && strstr(DisableIntrinsic, vmIntrinsics::name_at(id)) != NULL) ||
+      (!compilation_context.is_null() &&
+       CompilerOracle::has_option_value(compilation_context, "DisableIntrinsic", disable_intr) &&
+       strstr(disable_intr, vmIntrinsics::name_at(id)) != NULL)
+  ) {
+    return true;
+  }
+
+  // -XX:-InlineNatives disables nearly all intrinsics except the ones listed in
+  // the following switch statement.
+  if (!InlineNatives) {
+    switch (id) {
+    case vmIntrinsics::_indexOf:
+    case vmIntrinsics::_compareTo:
+    case vmIntrinsics::_equals:
+    case vmIntrinsics::_equalsC:
+    case vmIntrinsics::_getAndAddInt:
+    case vmIntrinsics::_getAndAddLong:
+    case vmIntrinsics::_getAndSetInt:
+    case vmIntrinsics::_getAndSetLong:
+    case vmIntrinsics::_getAndSetObject:
+    case vmIntrinsics::_loadFence:
+    case vmIntrinsics::_storeFence:
+    case vmIntrinsics::_fullFence:
+    case vmIntrinsics::_Reference_get:
+      break;
+    default:
+      return true;
+    }
+  }
+
   switch (id) {
   case vmIntrinsics::_isInstance:
   case vmIntrinsics::_isAssignableFrom:
@@ -430,6 +481,7 @@ bool vmIntrinsics::is_disabled_by_flags(vmIntrinsics::ID id) {
   case vmIntrinsics::_Class_cast:
   case vmIntrinsics::_getLength:
   case vmIntrinsics::_newArray:
+  case vmIntrinsics::_getClass:
     if (!InlineClassNatives) return true;
     break;
   case vmIntrinsics::_currentThread:
@@ -522,6 +574,12 @@ bool vmIntrinsics::is_disabled_by_flags(vmIntrinsics::ID id) {
   case vmIntrinsics::_getAndSetInt:
   case vmIntrinsics::_getAndSetLong:
   case vmIntrinsics::_getAndSetObject:
+  case vmIntrinsics::_loadFence:
+  case vmIntrinsics::_storeFence:
+  case vmIntrinsics::_fullFence:
+  case vmIntrinsics::_compareAndSwapObject:
+  case vmIntrinsics::_compareAndSwapLong:
+  case vmIntrinsics::_compareAndSwapInt:
     if (!InlineUnsafeOps) return true;
     break;
   case vmIntrinsics::_getShortUnaligned:
@@ -584,8 +642,8 @@ bool vmIntrinsics::is_disabled_by_flags(vmIntrinsics::ID id) {
     if (!InlineObjectCopy || !InlineArrayCopy) return true;
     break;
   case vmIntrinsics::_compareTo:
-     if (!SpecialStringCompareTo) return true;
-     break;
+    if (!SpecialStringCompareTo) return true;
+    break;
   case vmIntrinsics::_indexOf:
     if (!SpecialStringIndexOf) return true;
     break;
@@ -602,8 +660,8 @@ bool vmIntrinsics::is_disabled_by_flags(vmIntrinsics::ID id) {
     if (!InlineReflectionGetCallerClass) return true;
     break;
   case vmIntrinsics::_multiplyToLen:
-      if (!UseMultiplyToLenIntrinsic) return true;
-      break;
+    if (!UseMultiplyToLenIntrinsic) return true;
+    break;
   case vmIntrinsics::_squareToLen:
     if (!UseSquareToLenIntrinsic) return true;
     break;
diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/hotspot/src/share/vm/classfile/vmSymbols.hpp
index 9e67c5012e0..e012469abde 100644
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp
@@ -568,6 +568,11 @@
   template(java_lang_management_ThreadInfo_constructor_signature, "(Ljava/lang/Thread;ILjava/lang/Object;Ljava/lang/Thread;JJJJ[Ljava/lang/StackTraceElement;)V") \
   template(java_lang_management_ThreadInfo_with_locks_constructor_signature, "(Ljava/lang/Thread;ILjava/lang/Object;Ljava/lang/Thread;JJJJ[Ljava/lang/StackTraceElement;[Ljava/lang/Object;[I[Ljava/lang/Object;)V") \
   template(long_long_long_long_void_signature,         "(JJJJ)V")                                                 \
+  template(finalizer_histogram_klass,                  "java/lang/ref/FinalizerHistogram")                        \
+  template(void_finalizer_histogram_entry_array_signature,  "()[Ljava/lang/ref/FinalizerHistogram$Entry;")                        \
+  template(get_finalizer_histogram_name,               "getFinalizerHistogram")                                   \
+  template(finalizer_histogram_entry_name_field,       "className")                                               \
+  template(finalizer_histogram_entry_count_field,      "instanceCount")                                           \
                                                                                                                   \
   template(java_lang_management_MemoryPoolMXBean,      "java/lang/management/MemoryPoolMXBean")                   \
   template(java_lang_management_MemoryManagerMXBean,   "java/lang/management/MemoryManagerMXBean")                \
@@ -1384,10 +1389,9 @@ public:
   // 'method' requires predicated logic.
   static int predicates_needed(vmIntrinsics::ID id);
 
-  // Returns true if an intrinsic is disabled by command-line flags and
-  // false otherwise. Implements functionality common to the C1
-  // and the C2 compiler.
-  static bool is_disabled_by_flags(vmIntrinsics::ID id);
+  // Returns true if a compiler intrinsic is disabled by command-line flags
+  // and false otherwise.
+  static bool is_disabled_by_flags(methodHandle method, methodHandle compilation_context);
 };
 
 #endif // SHARE_VM_CLASSFILE_VMSYMBOLS_HPP
diff --git a/hotspot/src/share/vm/code/compiledIC.hpp b/hotspot/src/share/vm/code/compiledIC.hpp
index 5d14381c842..56d37c07336 100644
--- a/hotspot/src/share/vm/code/compiledIC.hpp
+++ b/hotspot/src/share/vm/code/compiledIC.hpp
@@ -306,7 +306,7 @@ class CompiledStaticCall: public NativeCall {
   friend CompiledStaticCall* compiledStaticCall_at(Relocation* call_site);
 
   // Code
-  static void emit_to_interp_stub(CodeBuffer &cbuf);
+  static address emit_to_interp_stub(CodeBuffer &cbuf);
   static int to_interp_stub_size();
   static int reloc_to_interp_stub();
 
diff --git a/hotspot/src/share/vm/compiler/abstractCompiler.hpp b/hotspot/src/share/vm/compiler/abstractCompiler.hpp
index e3a727b0886..41c155d09a3 100644
--- a/hotspot/src/share/vm/compiler/abstractCompiler.hpp
+++ b/hotspot/src/share/vm/compiler/abstractCompiler.hpp
@@ -75,8 +75,8 @@ class AbstractCompiler : public CHeapObj<mtCompiler> {
   //
   // The second parameter, 'compilation_context', is needed to implement functionality
   // related to the DisableIntrinsic command-line flag. The DisableIntrinsic flag can
-  // be used to prohibit the C2 compiler (but not the C1 compiler) to use an intrinsic.
-  // There are three ways to disable an intrinsic using the DisableIntrinsic flag:
+  // be used to prohibit the compilers to use an intrinsic. There are three ways to
+  // disable an intrinsic using the DisableIntrinsic flag:
   //
   // (1) -XX:DisableIntrinsic=_hashCode,_getClass
   //     Disables intrinsification of _hashCode and _getClass globally
@@ -96,7 +96,8 @@ class AbstractCompiler : public CHeapObj<mtCompiler> {
   // compilation context is aClass::aMethod and java.lang.ref.Reference::get,
   // respectively.
   virtual bool is_intrinsic_available(methodHandle method, methodHandle compilation_context) {
-    return false;
+    return is_intrinsic_supported(method) &&
+           !vmIntrinsics::is_disabled_by_flags(method, compilation_context);
   }
 
   // Determines if an intrinsic is supported by the compiler, that is,
@@ -111,13 +112,6 @@ class AbstractCompiler : public CHeapObj<mtCompiler> {
     return false;
   }
 
-  // Implements compiler-specific processing of command-line flags.
-  // Processing of command-line flags common to all compilers is implemented
-  // in vmIntrinsicss::is_disabled_by_flag.
-  virtual bool is_intrinsic_disabled_by_flag(methodHandle method) {
-    return false;
-  }
-
   // Compiler type queries.
   bool is_c1()                                   { return _type == c1; }
   bool is_c2()                                   { return _type == c2; }
diff --git a/hotspot/src/share/vm/opto/arraycopynode.cpp b/hotspot/src/share/vm/opto/arraycopynode.cpp
index b09cecc8760..0672fc8054e 100644
--- a/hotspot/src/share/vm/opto/arraycopynode.cpp
+++ b/hotspot/src/share/vm/opto/arraycopynode.cpp
@@ -79,10 +79,15 @@ void ArrayCopyNode::connect_outputs(GraphKit* kit) {
 
 #ifndef PRODUCT
 const char* ArrayCopyNode::_kind_names[] = {"arraycopy", "arraycopy, validated arguments", "clone", "oop array clone", "CopyOf", "CopyOfRange"};
+
 void ArrayCopyNode::dump_spec(outputStream *st) const {
   CallNode::dump_spec(st);
   st->print(" (%s%s)", _kind_names[_kind], _alloc_tightly_coupled ? ", tightly coupled allocation" : "");
 }
+
+void ArrayCopyNode::dump_compact_spec(outputStream* st) const {
+  st->print("%s%s", _kind_names[_kind], _alloc_tightly_coupled ? ",tight" : "");
+}
 #endif
 
 intptr_t ArrayCopyNode::get_length_if_constant(PhaseGVN *phase) const {
diff --git a/hotspot/src/share/vm/opto/arraycopynode.hpp b/hotspot/src/share/vm/opto/arraycopynode.hpp
index 967ae556d4e..a2237cdd2ef 100644
--- a/hotspot/src/share/vm/opto/arraycopynode.hpp
+++ b/hotspot/src/share/vm/opto/arraycopynode.hpp
@@ -164,6 +164,7 @@ public:
 
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
+  virtual void dump_compact_spec(outputStream* st) const;
 #endif
 };
 #endif // SHARE_VM_OPTO_ARRAYCOPYNODE_HPP
diff --git a/hotspot/src/share/vm/opto/c2_globals.hpp b/hotspot/src/share/vm/opto/c2_globals.hpp
index dbdfc532776..61abb9c0893 100644
--- a/hotspot/src/share/vm/opto/c2_globals.hpp
+++ b/hotspot/src/share/vm/opto/c2_globals.hpp
@@ -623,9 +623,6 @@
   diagnostic(bool, PrintIntrinsics, false,                                  \
           "prints attempted and successful inlining of intrinsics")         \
                                                                             \
-  diagnostic(ccstrlist, DisableIntrinsic, "",                               \
-          "do not expand intrinsics whose (internal) names appear here")    \
-                                                                            \
   develop(bool, StressReflectiveCode, false,                                \
           "Use inexact types at allocations, etc., to test reflection")     \
                                                                             \
diff --git a/hotspot/src/share/vm/opto/c2compiler.cpp b/hotspot/src/share/vm/opto/c2compiler.cpp
index 64ac374d00d..8da6995d80c 100644
--- a/hotspot/src/share/vm/opto/c2compiler.cpp
+++ b/hotspot/src/share/vm/opto/c2compiler.cpp
@@ -157,14 +157,6 @@ void C2Compiler::print_timers() {
   Compile::print_timers();
 }
 
-bool C2Compiler::is_intrinsic_available(methodHandle method, methodHandle compilation_context) {
-  // Assume a non-virtual dispatch. A virtual dispatch is
-  // possible for only a limited set of available intrinsics whereas
-  // a non-virtual dispatch is possible for all available intrinsics.
-  return is_intrinsic_supported(method, false) &&
-         !is_intrinsic_disabled_by_flag(method, compilation_context);
-}
-
 bool C2Compiler::is_intrinsic_supported(methodHandle method, bool is_virtual) {
   vmIntrinsics::ID id = method->intrinsic_id();
   assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
@@ -436,78 +428,6 @@ bool C2Compiler::is_intrinsic_supported(methodHandle method, bool is_virtual) {
   return true;
 }
 
-bool C2Compiler::is_intrinsic_disabled_by_flag(methodHandle method, methodHandle compilation_context) {
-  vmIntrinsics::ID id = method->intrinsic_id();
-  assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
-
-  if (vmIntrinsics::is_disabled_by_flags(method->intrinsic_id())) {
-    return true;
-  }
-
-  // Check if the intrinsic corresponding to 'method' has been disabled on
-  // the command line by using the DisableIntrinsic flag (either globally
-  // or on a per-method level, see src/share/vm/compiler/abstractCompiler.hpp
-  // for details).
-  // Usually, the compilation context is the caller of the method 'method'.
-  // The only case when for a non-recursive method 'method' the compilation context
-  // is not the caller of the 'method' (but it is the method itself) is
-  // java.lang.ref.Referene::get.
-  // For java.lang.ref.Reference::get, the intrinsic version is used
-  // instead of the C2-compiled version so that the value in the referent
-  // field can be registered by the G1 pre-barrier code. The intrinsified
-  // version of Reference::get also adds a memory barrier to prevent
-  // commoning reads from the referent field across safepoint since GC
-  // can change the referent field's value. See Compile::Compile()
-  // in src/share/vm/opto/compile.cpp for more details.
-  ccstr disable_intr = NULL;
-  if ((DisableIntrinsic[0] != '\0' && strstr(DisableIntrinsic, vmIntrinsics::name_at(id)) != NULL) ||
-      (!compilation_context.is_null() &&
-       CompilerOracle::has_option_value(compilation_context, "DisableIntrinsic", disable_intr) &&
-       strstr(disable_intr, vmIntrinsics::name_at(id)) != NULL)
-  ) {
-    return true;
-  }
-
-  // -XX:-InlineNatives disables nearly all intrinsics except the ones listed in
-  // the following switch statement.
-  if (!InlineNatives) {
-    switch (id) {
-    case vmIntrinsics::_indexOf:
-    case vmIntrinsics::_compareTo:
-    case vmIntrinsics::_equals:
-    case vmIntrinsics::_equalsC:
-    case vmIntrinsics::_getAndAddInt:
-    case vmIntrinsics::_getAndAddLong:
-    case vmIntrinsics::_getAndSetInt:
-    case vmIntrinsics::_getAndSetLong:
-    case vmIntrinsics::_getAndSetObject:
-    case vmIntrinsics::_loadFence:
-    case vmIntrinsics::_storeFence:
-    case vmIntrinsics::_fullFence:
-    case vmIntrinsics::_Reference_get:
-      break;
-    default:
-      return true;
-    }
-  }
-
-  if (!InlineUnsafeOps) {
-    switch (id) {
-    case vmIntrinsics::_loadFence:
-    case vmIntrinsics::_storeFence:
-    case vmIntrinsics::_fullFence:
-    case vmIntrinsics::_compareAndSwapObject:
-    case vmIntrinsics::_compareAndSwapLong:
-    case vmIntrinsics::_compareAndSwapInt:
-      return true;
-    default:
-      return false;
-    }
-  }
-
-  return false;
-}
-
 int C2Compiler::initial_code_buffer_size() {
   assert(SegmentedCodeCache, "Should be only used with a segmented code cache");
   return Compile::MAX_inst_size + Compile::MAX_locs_size + initial_const_capacity;
diff --git a/hotspot/src/share/vm/opto/c2compiler.hpp b/hotspot/src/share/vm/opto/c2compiler.hpp
index d651b1de0e5..f8308190444 100644
--- a/hotspot/src/share/vm/opto/c2compiler.hpp
+++ b/hotspot/src/share/vm/opto/c2compiler.hpp
@@ -51,11 +51,11 @@ public:
   // Print compilation timers and statistics
   void print_timers();
 
-  // Check the availability of an intrinsic for 'method' given a compilation context.
-  virtual bool is_intrinsic_available(methodHandle method, methodHandle compilation_context);
-
   // Return true if the intrinsification of a method supported by the compiler
-  // assuming a non-virtual dispatch. Return false otherwise.
+  // assuming a non-virtual dispatch. (A virtual dispatch is
+  // possible for only a limited set of available intrinsics whereas
+  // a non-virtual dispatch is possible for all available intrinsics.)
+  // Return false otherwise.
   virtual bool is_intrinsic_supported(methodHandle method) {
     return is_intrinsic_supported(method, false);
   }
@@ -64,13 +64,6 @@ public:
   // the dispatch mode specified by the 'is_virtual' parameter.
   virtual bool is_intrinsic_supported(methodHandle method, bool is_virtual);
 
-  // Processing of command-line flags specific to the C2 compiler.
-  virtual bool is_intrinsic_disabled_by_flag(methodHandle method) {
-    return is_intrinsic_disabled_by_flag(method, NULL);
-  }
-
-  virtual bool is_intrinsic_disabled_by_flag(methodHandle method, methodHandle compilation_context);
-
   // Initial size of the code buffer (may be increased at runtime)
   static int initial_code_buffer_size();
 };
diff --git a/hotspot/src/share/vm/opto/callnode.cpp b/hotspot/src/share/vm/opto/callnode.cpp
index b0b73830313..3e44fec0a6c 100644
--- a/hotspot/src/share/vm/opto/callnode.cpp
+++ b/hotspot/src/share/vm/opto/callnode.cpp
@@ -52,6 +52,7 @@ const Type *StartNode::bottom_type() const { return _domain; }
 const Type *StartNode::Value(PhaseTransform *phase) const { return _domain; }
 #ifndef PRODUCT
 void StartNode::dump_spec(outputStream *st) const { st->print(" #"); _domain->dump_on(st);}
+void StartNode::dump_compact_spec(outputStream *st) const { /* empty */ }
 #endif
 
 //------------------------------Ideal------------------------------------------
@@ -121,6 +122,23 @@ void ParmNode::dump_spec(outputStream *st) const {
     if( !Verbose && !WizardMode )   bottom_type()->dump_on(st);
   }
 }
+
+void ParmNode::dump_compact_spec(outputStream *st) const {
+  if (_con < TypeFunc::Parms) {
+    st->print("%s", names[_con]);
+  } else {
+    st->print("%d:", _con-TypeFunc::Parms);
+    // unconditionally dump bottom_type
+    bottom_type()->dump_on(st);
+  }
+}
+
+// For a ParmNode, all immediate inputs and outputs are considered relevant
+// both in compact and standard representation.
+void ParmNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+  this->collect_nodes(in_rel, 1, false, false);
+  this->collect_nodes(out_rel, -1, false, false);
+}
 #endif
 
 uint ParmNode::ideal_reg() const {
@@ -948,6 +966,14 @@ void CallJavaNode::dump_spec(outputStream *st) const {
   if( _method ) _method->print_short_name(st);
   CallNode::dump_spec(st);
 }
+
+void CallJavaNode::dump_compact_spec(outputStream* st) const {
+  if (_method) {
+    _method->print_short_name(st);
+  } else {
+    st->print("<?>");
+  }
+}
 #endif
 
 //=============================================================================
@@ -995,6 +1021,16 @@ void CallStaticJavaNode::dump_spec(outputStream *st) const {
   }
   CallJavaNode::dump_spec(st);
 }
+
+void CallStaticJavaNode::dump_compact_spec(outputStream* st) const {
+  if (_method) {
+    _method->print_short_name(st);
+  } else if (_name) {
+    st->print("%s", _name);
+  } else {
+    st->print("<?>");
+  }
+}
 #endif
 
 //=============================================================================
@@ -1130,6 +1166,19 @@ void SafePointNode::dump_spec(outputStream *st) const {
   st->print(" SafePoint ");
   _replaced_nodes.dump(st);
 }
+
+// The related nodes of a SafepointNode are all data inputs, excluding the
+// control boundary, as well as all outputs till level 2 (to include projection
+// nodes and targets). In compact mode, just include inputs till level 1 and
+// outputs as before.
+void SafePointNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+  if (compact) {
+    this->collect_nodes(in_rel, 1, false, false);
+  } else {
+    this->collect_nodes_in_all_data(in_rel, false);
+  }
+  this->collect_nodes(out_rel, -2, false, false);
+}
 #endif
 
 const RegMask &SafePointNode::in_RegMask(uint idx) const {
@@ -1676,6 +1725,27 @@ void AbstractLockNode::set_eliminated_lock_counter() {
     _counter->set_tag(NamedCounter::EliminatedLockCounter);
   }
 }
+
+const char* AbstractLockNode::_kind_names[] = {"Regular", "NonEscObj", "Coarsened", "Nested"};
+
+void AbstractLockNode::dump_spec(outputStream* st) const {
+  st->print("%s ", _kind_names[_kind]);
+  CallNode::dump_spec(st);
+}
+
+void AbstractLockNode::dump_compact_spec(outputStream* st) const {
+  st->print("%s", _kind_names[_kind]);
+}
+
+// The related set of lock nodes includes the control boundary.
+void AbstractLockNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+  if (compact) {
+      this->collect_nodes(in_rel, 1, false, false);
+    } else {
+      this->collect_nodes_in_all_data(in_rel, true);
+    }
+    this->collect_nodes(out_rel, -2, false, false);
+}
 #endif
 
 //=============================================================================
diff --git a/hotspot/src/share/vm/opto/callnode.hpp b/hotspot/src/share/vm/opto/callnode.hpp
index 990962188e5..2c788e52a11 100644
--- a/hotspot/src/share/vm/opto/callnode.hpp
+++ b/hotspot/src/share/vm/opto/callnode.hpp
@@ -84,6 +84,7 @@ public:
   virtual uint ideal_reg() const { return 0; }
 #ifndef PRODUCT
   virtual void  dump_spec(outputStream *st) const;
+  virtual void  dump_compact_spec(outputStream *st) const;
 #endif
 };
 
@@ -110,6 +111,8 @@ public:
   virtual uint ideal_reg() const;
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
+  virtual void dump_compact_spec(outputStream *st) const;
+  virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
 #endif
 };
 
@@ -476,6 +479,7 @@ public:
 
 #ifndef PRODUCT
   virtual void           dump_spec(outputStream *st) const;
+  virtual void           related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
 #endif
 };
 
@@ -675,6 +679,7 @@ public:
 
 #ifndef PRODUCT
   virtual void  dump_spec(outputStream *st) const;
+  virtual void  dump_compact_spec(outputStream *st) const;
 #endif
 };
 
@@ -730,6 +735,7 @@ public:
   virtual int         Opcode() const;
 #ifndef PRODUCT
   virtual void        dump_spec(outputStream *st) const;
+  virtual void        dump_compact_spec(outputStream *st) const;
 #endif
 };
 
@@ -951,6 +957,7 @@ private:
   } _kind;
 #ifndef PRODUCT
   NamedCounter* _counter;
+  static const char* _kind_names[Nested+1];
 #endif
 
 protected:
@@ -1005,6 +1012,9 @@ public:
 #ifndef PRODUCT
   void create_lock_counter(JVMState* s);
   NamedCounter* counter() const { return _counter; }
+  virtual void dump_spec(outputStream* st) const;
+  virtual void dump_compact_spec(outputStream* st) const;
+  virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
 #endif
 };
 
diff --git a/hotspot/src/share/vm/opto/cfgnode.cpp b/hotspot/src/share/vm/opto/cfgnode.cpp
index fcb3fcd2c20..9014eb6df4a 100644
--- a/hotspot/src/share/vm/opto/cfgnode.cpp
+++ b/hotspot/src/share/vm/opto/cfgnode.cpp
@@ -2023,6 +2023,14 @@ const RegMask &PhiNode::out_RegMask() const {
 }
 
 #ifndef PRODUCT
+void PhiNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+  // For a PhiNode, the set of related nodes includes all inputs till level 2,
+  // and all outputs till level 1. In compact mode, inputs till level 1 are
+  // collected.
+  this->collect_nodes(in_rel, compact ? 1 : 2, false, false);
+  this->collect_nodes(out_rel, -1, false, false);
+}
+
 void PhiNode::dump_spec(outputStream *st) const {
   TypeNode::dump_spec(st);
   if (is_tripcount()) {
@@ -2047,11 +2055,33 @@ const RegMask &GotoNode::out_RegMask() const {
   return RegMask::Empty;
 }
 
+#ifndef PRODUCT
+//-----------------------------related-----------------------------------------
+// The related nodes of a GotoNode are all inputs at level 1, as well as the
+// outputs at level 1. This is regardless of compact mode.
+void GotoNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+  this->collect_nodes(in_rel, 1, false, false);
+  this->collect_nodes(out_rel, -1, false, false);
+}
+#endif
+
+
 //=============================================================================
 const RegMask &JumpNode::out_RegMask() const {
   return RegMask::Empty;
 }
 
+#ifndef PRODUCT
+//-----------------------------related-----------------------------------------
+// The related nodes of a JumpNode are all inputs at level 1, as well as the
+// outputs at level 2 (to include actual jump targets beyond projection nodes).
+// This is regardless of compact mode.
+void JumpNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+  this->collect_nodes(in_rel, 1, false, false);
+  this->collect_nodes(out_rel, -2, false, false);
+}
+#endif
+
 //=============================================================================
 const RegMask &JProjNode::out_RegMask() const {
   return RegMask::Empty;
@@ -2105,7 +2135,18 @@ uint JumpProjNode::cmp( const Node &n ) const {
 #ifndef PRODUCT
 void JumpProjNode::dump_spec(outputStream *st) const {
   ProjNode::dump_spec(st);
-   st->print("@bci %d ",_dest_bci);
+  st->print("@bci %d ",_dest_bci);
+}
+
+void JumpProjNode::dump_compact_spec(outputStream *st) const {
+  ProjNode::dump_compact_spec(st);
+  st->print("(%d)%d@%d", _switch_val, _proj_no, _dest_bci);
+}
+
+void JumpProjNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+  // The related nodes of a JumpProjNode are its inputs and outputs at level 1.
+  this->collect_nodes(in_rel, 1, false, false);
+  this->collect_nodes(out_rel, -1, false, false);
 }
 #endif
 
diff --git a/hotspot/src/share/vm/opto/cfgnode.hpp b/hotspot/src/share/vm/opto/cfgnode.hpp
index 7d851b564e0..33a378e5be5 100644
--- a/hotspot/src/share/vm/opto/cfgnode.hpp
+++ b/hotspot/src/share/vm/opto/cfgnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -204,6 +204,7 @@ public:
   virtual const RegMask &out_RegMask() const;
   virtual const RegMask &in_RegMask(uint) const;
 #ifndef PRODUCT
+  virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
   virtual void dump_spec(outputStream *st) const;
 #endif
 #ifdef ASSERT
@@ -229,6 +230,10 @@ public:
   virtual const Type *Value( PhaseTransform *phase ) const;
   virtual Node *Identity( PhaseTransform *phase );
   virtual const RegMask &out_RegMask() const;
+
+#ifndef PRODUCT
+  virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+#endif
 };
 
 //------------------------------CProjNode--------------------------------------
@@ -382,6 +387,7 @@ public:
 
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
+  virtual void related(GrowableArray <Node *> *in_rel, GrowableArray <Node *> *out_rel, bool compact) const;
 #endif
 };
 
@@ -393,6 +399,11 @@ public:
 protected:
   // Type of If input when this branch is always taken
   virtual bool always_taken(const TypeTuple* t) const = 0;
+
+#ifndef PRODUCT
+public:
+  virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+#endif
 };
 
 class IfTrueNode : public IfProjNode {
@@ -455,6 +466,9 @@ public:
   virtual int   Opcode() const;
   virtual const RegMask& out_RegMask() const;
   virtual const Node* is_block_proj() const { return this; }
+#ifndef PRODUCT
+  virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+#endif
 };
 
 class JumpProjNode : public JProjNode {
@@ -479,6 +493,8 @@ class JumpProjNode : public JProjNode {
   uint proj_no()     const { return _proj_no; }
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
+  virtual void dump_compact_spec(outputStream *st) const;
+  virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
 #endif
 };
 
diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp
index 5025d8360a6..3cf18d16ceb 100644
--- a/hotspot/src/share/vm/opto/compile.cpp
+++ b/hotspot/src/share/vm/opto/compile.cpp
@@ -594,6 +594,10 @@ uint Compile::scratch_emit_size(const Node* n) {
     n->as_MachBranch()->label_set(&fakeL, 0);
   }
   n->emit(buf, this->regalloc());
+
+  // Emitting into the scratch buffer should not fail
+  assert (!failing(), err_msg_res("Must not have pending failure. Reason is: %s", failure_reason()));
+
   if (is_branch) // Restore label.
     n->as_MachBranch()->label_set(saveL, save_bnum);
 
diff --git a/hotspot/src/share/vm/opto/ifnode.cpp b/hotspot/src/share/vm/opto/ifnode.cpp
index bc107f4b7d5..cd60f19cd67 100644
--- a/hotspot/src/share/vm/opto/ifnode.cpp
+++ b/hotspot/src/share/vm/opto/ifnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, 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
@@ -1601,11 +1601,41 @@ Node *IfProjNode::Identity(PhaseTransform *phase) {
   return this;
 }
 
-//------------------------------dump_spec--------------------------------------
 #ifndef PRODUCT
+//-------------------------------related---------------------------------------
+// An IfProjNode's related node set consists of its input (an IfNode) including
+// the IfNode's condition, plus all of its outputs at level 1. In compact mode,
+// the restrictions for IfNode apply (see IfNode::rel).
+void IfProjNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+  Node* ifNode = this->in(0);
+  in_rel->append(ifNode);
+  if (compact) {
+    ifNode->collect_nodes(in_rel, 3, false, true);
+  } else {
+    ifNode->collect_nodes_in_all_data(in_rel, false);
+  }
+  this->collect_nodes(out_rel, -1, false, false);
+}
+
+//------------------------------dump_spec--------------------------------------
 void IfNode::dump_spec(outputStream *st) const {
   st->print("P=%f, C=%f",_prob,_fcnt);
 }
+
+//-------------------------------related---------------------------------------
+// For an IfNode, the set of related output nodes is just the output nodes till
+// depth 2, i.e, the IfTrue/IfFalse projection nodes plus the nodes they refer.
+// The related input nodes contain no control nodes, but all data nodes
+// pertaining to the condition. In compact mode, the input nodes are collected
+// up to a depth of 3.
+void IfNode::related(GrowableArray <Node *> *in_rel, GrowableArray <Node *> *out_rel, bool compact) const {
+  if (compact) {
+    this->collect_nodes(in_rel, 3, false, true);
+  } else {
+    this->collect_nodes_in_all_data(in_rel, false);
+  }
+  this->collect_nodes(out_rel, -2, false, false);
+}
 #endif
 
 //------------------------------idealize_test----------------------------------
diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp
index 23b993edcbd..417135b7c54 100644
--- a/hotspot/src/share/vm/opto/library_call.cpp
+++ b/hotspot/src/share/vm/opto/library_call.cpp
@@ -327,7 +327,7 @@ CallGenerator* Compile::make_vm_intrinsic(ciMethod* m, bool is_virtual) {
     methodHandle mh(THREAD, m->get_Method());
     methodHandle ct(THREAD, method()->get_Method());
     is_available = compiler->is_intrinsic_supported(mh, is_virtual) &&
-                   !compiler->is_intrinsic_disabled_by_flag(mh, ct);
+                   !vmIntrinsics::is_disabled_by_flags(mh, ct);
   }
 
   if (is_available) {
diff --git a/hotspot/src/share/vm/opto/movenode.cpp b/hotspot/src/share/vm/opto/movenode.cpp
index 234cdebf031..8fe9b0233be 100644
--- a/hotspot/src/share/vm/opto/movenode.cpp
+++ b/hotspot/src/share/vm/opto/movenode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -396,3 +396,17 @@ const Type *MoveD2LNode::Value( PhaseTransform *phase ) const {
   return TypeLong::make( v.get_jlong() );
 }
 
+#ifndef PRODUCT
+//----------------------------BinaryNode---------------------------------------
+// The set of related nodes for a BinaryNode is all data inputs and all outputs
+// till level 2 (i.e., one beyond the associated CMoveNode). In compact mode,
+// it's the inputs till level 1 and the outputs till level 2.
+void BinaryNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+  if (compact) {
+    this->collect_nodes(in_rel, 1, false, true);
+  } else {
+    this->collect_nodes_in_all_data(in_rel, false);
+  }
+  this->collect_nodes(out_rel, -2, false, false);
+}
+#endif
diff --git a/hotspot/src/share/vm/opto/movenode.hpp b/hotspot/src/share/vm/opto/movenode.hpp
index bb99f7ba083..4cd94185063 100644
--- a/hotspot/src/share/vm/opto/movenode.hpp
+++ b/hotspot/src/share/vm/opto/movenode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -145,6 +145,10 @@ class BinaryNode : public Node {
   BinaryNode( Node *n1, Node *n2 ) : Node(0,n1,n2) { }
   virtual int Opcode() const;
   virtual uint ideal_reg() const { return 0; }
+
+#ifndef PRODUCT
+  virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+#endif
 };
 
 
diff --git a/hotspot/src/share/vm/opto/multnode.cpp b/hotspot/src/share/vm/opto/multnode.cpp
index 00ff009660c..3648fef790e 100644
--- a/hotspot/src/share/vm/opto/multnode.cpp
+++ b/hotspot/src/share/vm/opto/multnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -118,6 +118,20 @@ const TypePtr *ProjNode::adr_type() const {
 bool ProjNode::pinned() const { return in(0)->pinned(); }
 #ifndef PRODUCT
 void ProjNode::dump_spec(outputStream *st) const { st->print("#%d",_con); if(_is_io_use) st->print(" (i_o_use)");}
+
+void ProjNode::dump_compact_spec(outputStream *st) const {
+  for (DUIterator i = this->outs(); this->has_out(i); i++) {
+    Node* o = this->out(i);
+    if (NotANode(o)) {
+      st->print("[?]");
+    } else if (o == NULL) {
+      st->print("[_]");
+    } else {
+      st->print("[%d]", o->_idx);
+    }
+  }
+  st->print("#%d", _con);
+}
 #endif
 
 //----------------------------check_con----------------------------------------
diff --git a/hotspot/src/share/vm/opto/multnode.hpp b/hotspot/src/share/vm/opto/multnode.hpp
index 02558db1679..25f8c503436 100644
--- a/hotspot/src/share/vm/opto/multnode.hpp
+++ b/hotspot/src/share/vm/opto/multnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -87,6 +87,7 @@ public:
 
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
+  virtual void dump_compact_spec(outputStream *st) const;
 #endif
 
   // Return uncommon trap call node if proj is for "proj->[region->..]call_uct"
diff --git a/hotspot/src/share/vm/opto/node.cpp b/hotspot/src/share/vm/opto/node.cpp
index 5b2aa145d81..a331ac637cf 100644
--- a/hotspot/src/share/vm/opto/node.cpp
+++ b/hotspot/src/share/vm/opto/node.cpp
@@ -1489,16 +1489,6 @@ jfloat Node::getf() const {
 
 #ifndef PRODUCT
 
-//----------------------------NotANode----------------------------------------
-// Used in debugging code to avoid walking across dead or uninitialized edges.
-static inline bool NotANode(const Node* n) {
-  if (n == NULL)                   return true;
-  if (((intptr_t)n & 1) != 0)      return true;  // uninitialized, etc.
-  if (*(address*)n == badAddress)  return true;  // kill by Node::destruct
-  return false;
-}
-
-
 //------------------------------find------------------------------------------
 // Find a neighbor of this Node with the given _idx
 // If idx is negative, find its absolute value, following both _in and _out.
@@ -1636,11 +1626,11 @@ void Node::set_debug_orig(Node* orig) {
 
 //------------------------------dump------------------------------------------
 // Dump a Node
-void Node::dump(const char* suffix, outputStream *st) const {
+void Node::dump(const char* suffix, bool mark, outputStream *st) const {
   Compile* C = Compile::current();
   bool is_new = C->node_arena()->contains(this);
   C->_in_dump_cnt++;
-  st->print("%c%d\t%s\t=== ", is_new ? ' ' : 'o', _idx, Name());
+  st->print("%c%d%s\t%s\t=== ", is_new ? ' ' : 'o', _idx, mark ? " >" : "", Name());
 
   // Dump the required and precedence inputs
   dump_req(st);
@@ -1760,42 +1750,60 @@ void Node::dump_out(outputStream *st) const {
   st->print("]] ");
 }
 
-//------------------------------dump_nodes-------------------------------------
-static void dump_nodes(const Node* start, int d, bool only_ctrl) {
-  Node* s = (Node*)start; // remove const
-  if (NotANode(s)) return;
-
-  uint depth = (uint)ABS(d);
-  int direction = d;
-  Compile* C = Compile::current();
-  GrowableArray <Node *> nstack(C->unique());
-
-  nstack.append(s);
+//----------------------------collect_nodes_i----------------------------------
+// Collects nodes from an Ideal graph, starting from a given start node and
+// moving in a given direction until a certain depth (distance from the start
+// node) is reached. Duplicates are ignored.
+// Arguments:
+//   nstack:        the nodes are collected into this array.
+//   start:         the node at which to start collecting.
+//   direction:     if this is a positive number, collect input nodes; if it is
+//                  a negative number, collect output nodes.
+//   depth:         collect nodes up to this distance from the start node.
+//   include_start: whether to include the start node in the result collection.
+//   only_ctrl:     whether to regard control edges only during traversal.
+//   only_data:     whether to regard data edges only during traversal.
+static void collect_nodes_i(GrowableArray<Node*> *nstack, const Node* start, int direction, uint depth, bool include_start, bool only_ctrl, bool only_data) {
+  Node* s = (Node*) start; // remove const
+  nstack->append(s);
   int begin = 0;
   int end = 0;
   for(uint i = 0; i < depth; i++) {
-    end = nstack.length();
+    end = nstack->length();
     for(int j = begin; j < end; j++) {
-      Node* tp  = nstack.at(j);
+      Node* tp  = nstack->at(j);
       uint limit = direction > 0 ? tp->len() : tp->outcnt();
       for(uint k = 0; k < limit; k++) {
         Node* n = direction > 0 ? tp->in(k) : tp->raw_out(k);
 
         if (NotANode(n))  continue;
         // do not recurse through top or the root (would reach unrelated stuff)
-        if (n->is_Root() || n->is_top())  continue;
+        if (n->is_Root() || n->is_top()) continue;
         if (only_ctrl && !n->is_CFG()) continue;
+        if (only_data && n->is_CFG()) continue;
 
-        bool on_stack = nstack.contains(n);
+        bool on_stack = nstack->contains(n);
         if (!on_stack) {
-          nstack.append(n);
+          nstack->append(n);
         }
       }
     }
     begin = end;
   }
-  end = nstack.length();
-  if (direction > 0) {
+  if (!include_start) {
+    nstack->remove(s);
+  }
+}
+
+//------------------------------dump_nodes-------------------------------------
+static void dump_nodes(const Node* start, int d, bool only_ctrl) {
+  if (NotANode(start)) return;
+
+  GrowableArray <Node *> nstack(Compile::current()->unique());
+  collect_nodes_i(&nstack, start, d, (uint) ABS(d), true, only_ctrl, false);
+
+  int end = nstack.length();
+  if (d > 0) {
     for(int j = end-1; j >= 0; j--) {
       nstack.at(j)->dump();
     }
@@ -1817,6 +1825,221 @@ void Node::dump_ctrl(int d) const {
   dump_nodes(this, d, true);
 }
 
+//-----------------------------dump_compact------------------------------------
+void Node::dump_comp() const {
+  this->dump_comp("\n");
+}
+
+//-----------------------------dump_compact------------------------------------
+// Dump a Node in compact representation, i.e., just print its name and index.
+// Nodes can specify additional specifics to print in compact representation by
+// implementing dump_compact_spec.
+void Node::dump_comp(const char* suffix, outputStream *st) const {
+  Compile* C = Compile::current();
+  C->_in_dump_cnt++;
+  st->print("%s(%d)", Name(), _idx);
+  this->dump_compact_spec(st);
+  if (suffix) {
+    st->print("%s", suffix);
+  }
+  C->_in_dump_cnt--;
+}
+
+//----------------------------dump_related-------------------------------------
+// Dump a Node's related nodes - the notion of "related" depends on the Node at
+// hand and is determined by the implementation of the virtual method rel.
+void Node::dump_related() const {
+  Compile* C = Compile::current();
+  GrowableArray <Node *> in_rel(C->unique());
+  GrowableArray <Node *> out_rel(C->unique());
+  this->related(&in_rel, &out_rel, false);
+  for (int i = in_rel.length() - 1; i >= 0; i--) {
+    in_rel.at(i)->dump();
+  }
+  this->dump("\n", true);
+  for (int i = 0; i < out_rel.length(); i++) {
+    out_rel.at(i)->dump();
+  }
+}
+
+//----------------------------dump_related-------------------------------------
+// Dump a Node's related nodes up to a given depth (distance from the start
+// node).
+// Arguments:
+//   d_in:  depth for input nodes.
+//   d_out: depth for output nodes (note: this also is a positive number).
+void Node::dump_related(uint d_in, uint d_out) const {
+  Compile* C = Compile::current();
+  GrowableArray <Node *> in_rel(C->unique());
+  GrowableArray <Node *> out_rel(C->unique());
+
+  // call collect_nodes_i directly
+  collect_nodes_i(&in_rel, this, 1, d_in, false, false, false);
+  collect_nodes_i(&out_rel, this, -1, d_out, false, false, false);
+
+  for (int i = in_rel.length() - 1; i >= 0; i--) {
+    in_rel.at(i)->dump();
+  }
+  this->dump("\n", true);
+  for (int i = 0; i < out_rel.length(); i++) {
+    out_rel.at(i)->dump();
+  }
+}
+
+//------------------------dump_related_compact---------------------------------
+// Dump a Node's related nodes in compact representation. The notion of
+// "related" depends on the Node at hand and is determined by the implementation
+// of the virtual method rel.
+void Node::dump_related_compact() const {
+  Compile* C = Compile::current();
+  GrowableArray <Node *> in_rel(C->unique());
+  GrowableArray <Node *> out_rel(C->unique());
+  this->related(&in_rel, &out_rel, true);
+  int n_in = in_rel.length();
+  int n_out = out_rel.length();
+
+  this->dump_comp(n_in == 0 ? "\n" : "  ");
+  for (int i = 0; i < n_in; i++) {
+    in_rel.at(i)->dump_comp(i == n_in - 1 ? "\n" : "  ");
+  }
+  for (int i = 0; i < n_out; i++) {
+    out_rel.at(i)->dump_comp(i == n_out - 1 ? "\n" : "  ");
+  }
+}
+
+//------------------------------related----------------------------------------
+// Collect a Node's related nodes. The default behaviour just collects the
+// inputs and outputs at depth 1, including both control and data flow edges,
+// regardless of whether the presentation is compact or not. For data nodes,
+// the default is to collect all data inputs (till level 1 if compact), and
+// outputs till level 1.
+void Node::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+  if (this->is_CFG()) {
+    collect_nodes_i(in_rel, this, 1, 1, false, false, false);
+    collect_nodes_i(out_rel, this, -1, 1, false, false, false);
+  } else {
+    if (compact) {
+      this->collect_nodes(in_rel, 1, false, true);
+    } else {
+      this->collect_nodes_in_all_data(in_rel, false);
+    }
+    this->collect_nodes(out_rel, -1, false, false);
+  }
+}
+
+//---------------------------collect_nodes-------------------------------------
+// An entry point to the low-level node collection facility, to start from a
+// given node in the graph. The start node is by default not included in the
+// result.
+// Arguments:
+//   ns:   collect the nodes into this data structure.
+//   d:    the depth (distance from start node) to which nodes should be
+//         collected. A value >0 indicates input nodes, a value <0, output
+//         nodes.
+//   ctrl: include only control nodes.
+//   data: include only data nodes.
+void Node::collect_nodes(GrowableArray<Node*> *ns, int d, bool ctrl, bool data) const {
+  if (ctrl && data) {
+    // ignore nonsensical combination
+    return;
+  }
+  collect_nodes_i(ns, this, d, (uint) ABS(d), false, ctrl, data);
+}
+
+//--------------------------collect_nodes_in-----------------------------------
+static void collect_nodes_in(Node* start, GrowableArray<Node*> *ns, bool primary_is_data, bool collect_secondary) {
+  // The maximum depth is determined using a BFS that visits all primary (data
+  // or control) inputs and increments the depth at each level.
+  uint d_in = 0;
+  GrowableArray<Node*> nodes(Compile::current()->unique());
+  nodes.push(start);
+  int nodes_at_current_level = 1;
+  int n_idx = 0;
+  while (nodes_at_current_level > 0) {
+    // Add all primary inputs reachable from the current level to the list, and
+    // increase the depth if there were any.
+    int nodes_at_next_level = 0;
+    bool nodes_added = false;
+    while (nodes_at_current_level > 0) {
+      nodes_at_current_level--;
+      Node* current = nodes.at(n_idx++);
+      for (uint i = 0; i < current->len(); i++) {
+        Node* n = current->in(i);
+        if (NotANode(n)) {
+          continue;
+        }
+        if ((primary_is_data && n->is_CFG()) || (!primary_is_data && !n->is_CFG())) {
+          continue;
+        }
+        if (!nodes.contains(n)) {
+          nodes.push(n);
+          nodes_added = true;
+          nodes_at_next_level++;
+        }
+      }
+    }
+    if (nodes_added) {
+      d_in++;
+    }
+    nodes_at_current_level = nodes_at_next_level;
+  }
+  start->collect_nodes(ns, d_in, !primary_is_data, primary_is_data);
+  if (collect_secondary) {
+    // Now, iterate over the secondary nodes in ns and add the respective
+    // boundary reachable from them.
+    GrowableArray<Node*> sns(Compile::current()->unique());
+    for (GrowableArrayIterator<Node*> it = ns->begin(); it != ns->end(); ++it) {
+      Node* n = *it;
+      n->collect_nodes(&sns, 1, primary_is_data, !primary_is_data);
+      for (GrowableArrayIterator<Node*> d = sns.begin(); d != sns.end(); ++d) {
+        ns->append_if_missing(*d);
+      }
+      sns.clear();
+    }
+  }
+}
+
+//---------------------collect_nodes_in_all_data-------------------------------
+// Collect the entire data input graph. Include the control boundary if
+// requested.
+// Arguments:
+//   ns:   collect the nodes into this data structure.
+//   ctrl: if true, include the control boundary.
+void Node::collect_nodes_in_all_data(GrowableArray<Node*> *ns, bool ctrl) const {
+  collect_nodes_in((Node*) this, ns, true, ctrl);
+}
+
+//--------------------------collect_nodes_in_all_ctrl--------------------------
+// Collect the entire control input graph. Include the data boundary if
+// requested.
+//   ns:   collect the nodes into this data structure.
+//   data: if true, include the control boundary.
+void Node::collect_nodes_in_all_ctrl(GrowableArray<Node*> *ns, bool data) const {
+  collect_nodes_in((Node*) this, ns, false, data);
+}
+
+//------------------collect_nodes_out_all_ctrl_boundary------------------------
+// Collect the entire output graph until hitting control node boundaries, and
+// include those.
+void Node::collect_nodes_out_all_ctrl_boundary(GrowableArray<Node*> *ns) const {
+  // Perform a BFS and stop at control nodes.
+  GrowableArray<Node*> nodes(Compile::current()->unique());
+  nodes.push((Node*) this);
+  while (nodes.length() > 0) {
+    Node* current = nodes.pop();
+    if (NotANode(current)) {
+      continue;
+    }
+    ns->append_if_missing(current);
+    if (!current->is_CFG()) {
+      for (DUIterator i = current->outs(); current->has_out(i); i++) {
+        nodes.push(current->out(i));
+      }
+    }
+  }
+  ns->remove((Node*) this);
+}
+
 // VERIFICATION CODE
 // For each input edge to a node (ie - for each Use-Def edge), verify that
 // there is a corresponding Def-Use edge.
@@ -2173,6 +2396,11 @@ void TypeNode::dump_spec(outputStream *st) const {
     st->print(" #"); _type->dump_on(st);
   }
 }
+
+void TypeNode::dump_compact_spec(outputStream *st) const {
+  st->print("#");
+  _type->dump_on(st);
+}
 #endif
 uint TypeNode::hash() const {
   return Node::hash() + _type->hash();
diff --git a/hotspot/src/share/vm/opto/node.hpp b/hotspot/src/share/vm/opto/node.hpp
index 2dfedbc085a..97c844891d0 100644
--- a/hotspot/src/share/vm/opto/node.hpp
+++ b/hotspot/src/share/vm/opto/node.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -1038,13 +1038,35 @@ public:
   Node* find(int idx) const;         // Search the graph for the given idx.
   Node* find_ctrl(int idx) const;    // Search control ancestors for the given idx.
   void dump() const { dump("\n"); }  // Print this node.
-  void dump(const char* suffix, outputStream *st = tty) const;// Print this node.
+  void dump(const char* suffix, bool mark = false, outputStream *st = tty) const; // Print this node.
   void dump(int depth) const;        // Print this node, recursively to depth d
   void dump_ctrl(int depth) const;   // Print control nodes, to depth d
-  virtual void dump_req(outputStream *st = tty) const;     // Print required-edge info
-  virtual void dump_prec(outputStream *st = tty) const;    // Print precedence-edge info
-  virtual void dump_out(outputStream *st = tty) const;     // Print the output edge info
-  virtual void dump_spec(outputStream *st) const {}; // Print per-node info
+  void dump_comp() const;            // Print this node in compact representation.
+  // Print this node in compact representation.
+  void dump_comp(const char* suffix, outputStream *st = tty) const;
+  virtual void dump_req(outputStream *st = tty) const;    // Print required-edge info
+  virtual void dump_prec(outputStream *st = tty) const;   // Print precedence-edge info
+  virtual void dump_out(outputStream *st = tty) const;    // Print the output edge info
+  virtual void dump_spec(outputStream *st) const {};      // Print per-node info
+  // Print compact per-node info
+  virtual void dump_compact_spec(outputStream *st) const { dump_spec(st); }
+  void dump_related() const;             // Print related nodes (depends on node at hand).
+  // Print related nodes up to given depths for input and output nodes.
+  void dump_related(uint d_in, uint d_out) const;
+  void dump_related_compact() const;     // Print related nodes in compact representation.
+  // Collect related nodes.
+  virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+  // Collect nodes starting from this node, explicitly including/excluding control and data links.
+  void collect_nodes(GrowableArray<Node*> *ns, int d, bool ctrl, bool data) const;
+
+  // Node collectors, to be used in implementations of Node::rel().
+  // Collect the entire data input graph. Include control inputs if requested.
+  void collect_nodes_in_all_data(GrowableArray<Node*> *ns, bool ctrl) const;
+  // Collect the entire control input graph. Include data inputs if requested.
+  void collect_nodes_in_all_ctrl(GrowableArray<Node*> *ns, bool data) const;
+  // Collect the entire output graph until hitting and including control nodes.
+  void collect_nodes_out_all_ctrl_boundary(GrowableArray<Node*> *ns) const;
+
   void verify_edges(Unique_Node_List &visited); // Verify bi-directional edges
   void verify() const;               // Check Def-Use info for my subgraph
   static void verify_recur(const Node *n, int verify_depth, VectorSet &old_space, VectorSet &new_space);
@@ -1091,6 +1113,20 @@ public:
 #endif
 };
 
+
+#ifndef PRODUCT
+
+// Used in debugging code to avoid walking across dead or uninitialized edges.
+inline bool NotANode(const Node* n) {
+  if (n == NULL)                   return true;
+  if (((intptr_t)n & 1) != 0)      return true;  // uninitialized, etc.
+  if (*(address*)n == badAddress)  return true;  // kill by Node::destruct
+  return false;
+}
+
+#endif
+
+
 //-----------------------------------------------------------------------------
 // Iterators over DU info, and associated Node functions.
 
@@ -1618,6 +1654,7 @@ public:
   virtual       uint  ideal_reg() const;
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
+  virtual void dump_compact_spec(outputStream *st) const;
 #endif
 };
 
diff --git a/hotspot/src/share/vm/opto/output.cpp b/hotspot/src/share/vm/opto/output.cpp
index 4c9ccaa43a1..7423155de04 100644
--- a/hotspot/src/share/vm/opto/output.cpp
+++ b/hotspot/src/share/vm/opto/output.cpp
@@ -1504,6 +1504,13 @@ void Compile::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
       n->emit(*cb, _regalloc);
       current_offset  = cb->insts_size();
 
+      // Above we only verified that there is enough space in the instruction section.
+      // However, the instruction may emit stubs that cause code buffer expansion.
+      // Bail out here if expansion failed due to a lack of code cache space.
+      if (failing()) {
+        return;
+      }
+
 #ifdef ASSERT
       if (n->size(_regalloc) < (current_offset-instr_offset)) {
         n->dump();
@@ -1632,11 +1639,14 @@ void Compile::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
   if (_method) {
     // Emit the exception handler code.
     _code_offsets.set_value(CodeOffsets::Exceptions, HandlerImpl::emit_exception_handler(*cb));
+    if (failing()) {
+      return; // CodeBuffer::expand failed
+    }
     // Emit the deopt handler code.
     _code_offsets.set_value(CodeOffsets::Deopt, HandlerImpl::emit_deopt_handler(*cb));
 
     // Emit the MethodHandle deopt handler code (if required).
-    if (has_method_handle_invokes()) {
+    if (has_method_handle_invokes() && !failing()) {
       // We can use the same code as for the normal deopt handler, we
       // just need a different entry point address.
       _code_offsets.set_value(CodeOffsets::DeoptMH, HandlerImpl::emit_deopt_handler(*cb));
diff --git a/hotspot/src/share/vm/opto/rootnode.cpp b/hotspot/src/share/vm/opto/rootnode.cpp
index 4cf51528df5..e5542f6ff74 100644
--- a/hotspot/src/share/vm/opto/rootnode.cpp
+++ b/hotspot/src/share/vm/opto/rootnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -88,3 +88,18 @@ const Type *HaltNode::Value( PhaseTransform *phase ) const {
 const RegMask &HaltNode::out_RegMask() const {
   return RegMask::Empty;
 }
+
+#ifndef PRODUCT
+//-----------------------------related-----------------------------------------
+// Include all control inputs in the related set, and also the input data
+// boundary. In compact mode, include all inputs till level 2. Also include
+// all outputs at level 1.
+void HaltNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+  if (compact) {
+    this->collect_nodes(in_rel, 2, false, false);
+  } else {
+    this->collect_nodes_in_all_ctrl(in_rel, true);
+  }
+  this->collect_nodes(out_rel, -1, false, false);
+}
+#endif
diff --git a/hotspot/src/share/vm/opto/rootnode.hpp b/hotspot/src/share/vm/opto/rootnode.hpp
index cef207d649e..3be5dfa7673 100644
--- a/hotspot/src/share/vm/opto/rootnode.hpp
+++ b/hotspot/src/share/vm/opto/rootnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -64,6 +64,10 @@ public:
   virtual const RegMask &out_RegMask() const;
   virtual uint ideal_reg() const { return NotAMachineReg; }
   virtual uint match_edge(uint idx) const { return 0; }
+
+#ifndef PRODUCT
+  virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+#endif
 };
 
 #endif // SHARE_VM_OPTO_ROOTNODE_HPP
diff --git a/hotspot/src/share/vm/opto/subnode.cpp b/hotspot/src/share/vm/opto/subnode.cpp
index 27cf544da11..a41538d75d5 100644
--- a/hotspot/src/share/vm/opto/subnode.cpp
+++ b/hotspot/src/share/vm/opto/subnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -498,6 +498,37 @@ Node *CmpNode::Identity( PhaseTransform *phase ) {
   return this;
 }
 
+#ifndef PRODUCT
+//----------------------------related------------------------------------------
+// Related nodes of comparison nodes include all data inputs (until hitting a
+// control boundary) as well as all outputs until and including control nodes
+// as well as their projections. In compact mode, data inputs till depth 1 and
+// all outputs till depth 1 are considered.
+void CmpNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+  if (compact) {
+    this->collect_nodes(in_rel, 1, false, true);
+    this->collect_nodes(out_rel, -1, false, false);
+  } else {
+    this->collect_nodes_in_all_data(in_rel, false);
+    this->collect_nodes_out_all_ctrl_boundary(out_rel);
+    // Now, find all control nodes in out_rel, and include their projections
+    // and projection targets (if any) in the result.
+    GrowableArray<Node*> proj(Compile::current()->unique());
+    for (GrowableArrayIterator<Node*> it = out_rel->begin(); it != out_rel->end(); ++it) {
+      Node* n = *it;
+      if (n->is_CFG() && !n->is_Proj()) {
+        // Assume projections and projection targets are found at levels 1 and 2.
+        n->collect_nodes(&proj, -2, false, false);
+        for (GrowableArrayIterator<Node*> p = proj.begin(); p != proj.end(); ++p) {
+          out_rel->append_if_missing(*p);
+        }
+        proj.clear();
+      }
+    }
+  }
+}
+#endif
+
 //=============================================================================
 //------------------------------cmp--------------------------------------------
 // Simplify a CmpI (compare 2 integers) node, based on local information.
@@ -1396,17 +1427,31 @@ const Type *BoolNode::Value( PhaseTransform *phase ) const {
   return _test.cc2logical( phase->type( in(1) ) );
 }
 
+#ifndef PRODUCT
 //------------------------------dump_spec--------------------------------------
 // Dump special per-node info
-#ifndef PRODUCT
 void BoolNode::dump_spec(outputStream *st) const {
   st->print("[");
   _test.dump_on(st);
   st->print("]");
 }
+
+//-------------------------------related---------------------------------------
+// A BoolNode's related nodes are all of its data inputs, and all of its
+// outputs until control nodes are hit, which are included. In compact
+// representation, inputs till level 3 and immediate outputs are included.
+void BoolNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+  if (compact) {
+    this->collect_nodes(in_rel, 3, false, true);
+    this->collect_nodes(out_rel, -1, false, false);
+  } else {
+    this->collect_nodes_in_all_data(in_rel, false);
+    this->collect_nodes_out_all_ctrl_boundary(out_rel);
+  }
+}
 #endif
 
-//------------------------------is_counted_loop_exit_test--------------------------------------
+//----------------------is_counted_loop_exit_test------------------------------
 // Returns true if node is used by a counted loop node.
 bool BoolNode::is_counted_loop_exit_test() {
   for( DUIterator_Fast imax, i = fast_outs(imax); i < imax; i++ ) {
diff --git a/hotspot/src/share/vm/opto/subnode.hpp b/hotspot/src/share/vm/opto/subnode.hpp
index 485cd17717b..a287ffaf026 100644
--- a/hotspot/src/share/vm/opto/subnode.hpp
+++ b/hotspot/src/share/vm/opto/subnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -60,7 +60,6 @@ public:
   // Supplied function to return the additive identity type.
   // This is returned whenever the subtracts inputs are the same.
   virtual const Type *add_id() const = 0;
-
 };
 
 
@@ -140,6 +139,13 @@ public:
   const Type *add_id() const { return TypeInt::ZERO; }
   const Type *bottom_type() const { return TypeInt::CC; }
   virtual uint ideal_reg() const { return Op_RegFlags; }
+
+#ifndef PRODUCT
+  // CmpNode and subclasses include all data inputs (until hitting a control
+  // boundary) in their related node set, as well as all outputs until and
+  // including eventual control nodes and their projections.
+  virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+#endif
 };
 
 //------------------------------CmpINode---------------------------------------
@@ -311,6 +317,7 @@ public:
   bool is_counted_loop_exit_test();
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
+  virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
 #endif
 };
 
diff --git a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp b/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp
index 83e371c446f..f0e43a44fdb 100644
--- a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp
+++ b/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp
@@ -70,7 +70,10 @@ Flag::Error CICompilerCountConstraintFunc(bool verbose, intx* value) {
 #endif
 
   // The default CICompilerCount's value is CI_COMPILER_COUNT.
-  assert(min_number_of_compiler_threads <= CI_COMPILER_COUNT, "minimum should be less or equal default number");
+  // With a client VM, -XX:+TieredCompilation causes TieredCompilation
+  // to be true here (the option is validated later) and
+  // min_number_of_compiler_threads to exceed CI_COMPILER_COUNT.
+  min_number_of_compiler_threads = MIN2(min_number_of_compiler_threads, CI_COMPILER_COUNT);
 
   if (*value < (intx)min_number_of_compiler_threads) {
     if (verbose == true) {
diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp
index d2982e0d422..20098056d42 100644
--- a/hotspot/src/share/vm/runtime/globals.hpp
+++ b/hotspot/src/share/vm/runtime/globals.hpp
@@ -848,6 +848,9 @@ public:
   product(bool, UseCRC32CIntrinsics, false,                                 \
           "use intrinsics for java.util.zip.CRC32C")                        \
                                                                             \
+  diagnostic(ccstrlist, DisableIntrinsic, "",                               \
+         "do not expand intrinsics whose (internal) names appear here")     \
+                                                                            \
   develop(bool, TraceCallFixup, false,                                      \
           "Trace all call fixups")                                          \
                                                                             \
@@ -3913,7 +3916,7 @@ public:
   product(bool, PerfDisableSharedMem, false,                                \
           "Store performance data in standard memory")                      \
                                                                             \
-  product(intx, PerfDataMemorySize, 32*K,                                   \
+  product(intx, PerfDataMemorySize, 64*K,                                   \
           "Size of performance data memory region. Will be rounded "        \
           "up to a multiple of the native os page size.")                   \
                                                                             \
diff --git a/hotspot/src/share/vm/services/diagnosticCommand.cpp b/hotspot/src/share/vm/services/diagnosticCommand.cpp
index e0fa2193c11..8c326cf73f5 100644
--- a/hotspot/src/share/vm/services/diagnosticCommand.cpp
+++ b/hotspot/src/share/vm/services/diagnosticCommand.cpp
@@ -37,6 +37,7 @@
 #include "services/management.hpp"
 #include "services/writeableFlags.hpp"
 #include "utilities/macros.hpp"
+#include "oops/objArrayOop.inline.hpp"
 
 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
 
@@ -57,6 +58,8 @@ void DCmdRegistrant::register_dcmds(){
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VMUptimeDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemGCDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<RunFinalizationDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapInfoDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<FinalizerInfoDCmd>(full_export, true, false));
 #if INCLUDE_SERVICES // Heap dumping/inspection supported
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(DCmd_Source_Internal | DCmd_Source_AttachAPI, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(full_export, true, false));
@@ -333,6 +336,60 @@ void RunFinalizationDCmd::execute(DCmdSource source, TRAPS) {
                          vmSymbols::void_method_signature(), CHECK);
 }
 
+void HeapInfoDCmd::execute(DCmdSource source, TRAPS) {
+  Universe::heap()->print_on(output());
+}
+
+void FinalizerInfoDCmd::execute(DCmdSource source, TRAPS) {
+  ResourceMark rm;
+
+
+  Klass* k = SystemDictionary::resolve_or_null(
+    vmSymbols::finalizer_histogram_klass(), THREAD);
+  assert(k != NULL, "FinalizerHistogram class is not accessible");
+
+  instanceKlassHandle klass(THREAD, k);
+  JavaValue result(T_ARRAY);
+
+  // We are calling lang.ref.FinalizerHistogram.getFinalizerHistogram() method
+  // and expect it to return array of FinalizerHistogramEntry as Object[]
+
+  JavaCalls::call_static(&result, klass,
+                         vmSymbols::get_finalizer_histogram_name(),
+                         vmSymbols::void_finalizer_histogram_entry_array_signature(), CHECK);
+
+  objArrayOop result_oop = (objArrayOop) result.get_jobject();
+  if (result_oop->length() == 0) {
+    output()->print_cr("No instances waiting for finalization found");
+    return;
+  }
+
+  oop foop = result_oop->obj_at(0);
+  InstanceKlass* ik = InstanceKlass::cast(foop->klass());
+
+  fieldDescriptor count_fd, name_fd;
+
+  Klass* count_res = ik->find_field(
+    vmSymbols::finalizer_histogram_entry_count_field(), vmSymbols::int_signature(), &count_fd);
+
+  Klass* name_res = ik->find_field(
+    vmSymbols::finalizer_histogram_entry_name_field(), vmSymbols::string_signature(), &name_fd);
+
+  assert(count_res != NULL && name_res != NULL, "Unexpected layout of FinalizerHistogramEntry");
+
+  output()->print_cr("Unreachable instances waiting for finalization");
+  output()->print_cr("#instances  class name");
+  output()->print_cr("-----------------------");
+
+  for (int i = 0; i < result_oop->length(); ++i) {
+    oop element_oop = result_oop->obj_at(i);
+    oop str_oop = element_oop->obj_field(name_fd.offset());
+    char *name = java_lang_String::as_utf8_string(str_oop);
+    int count = element_oop->int_field(count_fd.offset());
+    output()->print_cr("%10d  %s", count, name);
+  }
+}
+
 #if INCLUDE_SERVICES // Heap dumping/inspection supported
 HeapDumpDCmd::HeapDumpDCmd(outputStream* output, bool heap) :
                            DCmdWithParser(output, heap),
diff --git a/hotspot/src/share/vm/services/diagnosticCommand.hpp b/hotspot/src/share/vm/services/diagnosticCommand.hpp
index 9362687128a..3106c0c9079 100644
--- a/hotspot/src/share/vm/services/diagnosticCommand.hpp
+++ b/hotspot/src/share/vm/services/diagnosticCommand.hpp
@@ -241,6 +241,46 @@ public:
     virtual void execute(DCmdSource source, TRAPS);
 };
 
+class HeapInfoDCmd : public DCmd {
+public:
+  HeapInfoDCmd(outputStream* output, bool heap) : DCmd(output, heap) { }
+  static const char* name() { return "GC.heap_info"; }
+  static const char* description() {
+    return "Provide generic Java heap information.";
+  }
+  static const char* impact() {
+    return "Medium";
+  }
+  static int num_arguments() { return 0; }
+  static const JavaPermission permission() {
+    JavaPermission p = {"java.lang.management.ManagementPermission",
+      "monitor", NULL};
+      return p;
+  }
+
+  virtual void execute(DCmdSource source, TRAPS);
+};
+
+class FinalizerInfoDCmd : public DCmd {
+public:
+  FinalizerInfoDCmd(outputStream* output, bool heap) : DCmd(output, heap) { }
+  static const char* name() { return "GC.finalizer_info"; }
+  static const char* description() {
+    return "Provide information about Java finalization queue.";
+  }
+  static const char* impact() {
+    return "Medium";
+  }
+  static int num_arguments() { return 0; }
+  static const JavaPermission permission() {
+    JavaPermission p = {"java.lang.management.ManagementPermission",
+      "monitor", NULL};
+      return p;
+  }
+
+  virtual void execute(DCmdSource source, TRAPS);
+};
+
 #if INCLUDE_SERVICES   // Heap dumping supported
 // See also: dump_heap in attachListener.cpp
 class HeapDumpDCmd : public DCmdWithParser {
diff --git a/hotspot/test/compiler/arguments/CheckCICompilerCount.java b/hotspot/test/compiler/arguments/CheckCICompilerCount.java
index 4f50e3b3162..ed32ade9bde 100644
--- a/hotspot/test/compiler/arguments/CheckCICompilerCount.java
+++ b/hotspot/test/compiler/arguments/CheckCICompilerCount.java
@@ -26,6 +26,7 @@ import jdk.test.lib.*;
 /*
  * @test CheckCheckCICompilerCount
  * @bug 8130858
+ * @bug 8132525
  * @summary Check that correct range of values for CICompilerCount are allowed depending on whether tiered is enabled or not
  * @library /testlibrary
  * @modules java.base/sun.misc
@@ -36,12 +37,28 @@ import jdk.test.lib.*;
 public class CheckCICompilerCount {
     private static final String[][] NON_TIERED_ARGUMENTS = {
         {
+            "-server",
             "-XX:-TieredCompilation",
             "-XX:+PrintFlagsFinal",
             "-XX:CICompilerCount=0",
             "-version"
         },
         {
+            "-server",
+            "-XX:-TieredCompilation",
+            "-XX:+PrintFlagsFinal",
+            "-XX:CICompilerCount=1",
+            "-version"
+        },
+        {
+            "-client",
+            "-XX:-TieredCompilation",
+            "-XX:+PrintFlagsFinal",
+            "-XX:CICompilerCount=0",
+            "-version"
+        },
+        {
+            "-client",
             "-XX:-TieredCompilation",
             "-XX:+PrintFlagsFinal",
             "-XX:CICompilerCount=1",
@@ -50,6 +67,13 @@ public class CheckCICompilerCount {
     };
 
     private static final String[][] NON_TIERED_EXPECTED_OUTPUTS = {
+        {
+            "CICompilerCount=0 must be at least 1",
+            "Improperly specified VM option 'CICompilerCount=0'"
+        },
+        {
+            "intx CICompilerCount                          := 1                                   {product}"
+        },
         {
             "CICompilerCount=0 must be at least 1",
             "Improperly specified VM option 'CICompilerCount=0'"
@@ -60,18 +84,36 @@ public class CheckCICompilerCount {
     };
 
     private static final int[] NON_TIERED_EXIT = {
+        1,
+        0,
         1,
         0
     };
 
     private static final String[][] TIERED_ARGUMENTS = {
         {
+            "-server",
             "-XX:+TieredCompilation",
             "-XX:+PrintFlagsFinal",
             "-XX:CICompilerCount=1",
             "-version"
         },
         {
+            "-server",
+            "-XX:+TieredCompilation",
+            "-XX:+PrintFlagsFinal",
+            "-XX:CICompilerCount=2",
+            "-version"
+        },
+        {
+            "-client",
+            "-XX:+TieredCompilation",
+            "-XX:+PrintFlagsFinal",
+            "-XX:CICompilerCount=1",
+            "-version"
+        },
+        {
+            "-client",
             "-XX:+TieredCompilation",
             "-XX:+PrintFlagsFinal",
             "-XX:CICompilerCount=2",
@@ -80,6 +122,13 @@ public class CheckCICompilerCount {
     };
 
     private static final String[][] TIERED_EXPECTED_OUTPUTS = {
+        {
+            "CICompilerCount=1 must be at least 2",
+            "Improperly specified VM option 'CICompilerCount=1'"
+        },
+        {
+            "intx CICompilerCount                          := 2                                   {product}"
+        },
         {
             "CICompilerCount=1 must be at least 2",
             "Improperly specified VM option 'CICompilerCount=1'"
@@ -90,6 +139,8 @@ public class CheckCICompilerCount {
     };
 
     private static final int[] TIERED_EXIT = {
+        1,
+        0,
         1,
         0
     };
diff --git a/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java b/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java
index 0eb1852552a..7bae35ee714 100644
--- a/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java
+++ b/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java
@@ -87,6 +87,24 @@ public class PrintTouchedMethods {
       output.shouldNotContain("TestLogTouchedMethods.methodB:()V");
       output.shouldHaveExitValue(0);
 
+      String[] javaArgs4 = {"-XX:+UnlockDiagnosticVMOptions", "-Xint", "-XX:+LogTouchedMethods", "-XX:+PrintTouchedMethodsAtExit", "-XX:-TieredCompilation", "TestLogTouchedMethods"};
+      pb = ProcessTools.createJavaProcessBuilder(javaArgs4);
+      output = new OutputAnalyzer(pb.start());
+      lines = output.asLines();
+
+      if (lines.size() < 1) {
+        throw new Exception("Empty output");
+      }
+
+      first = lines.get(0);
+      if (!first.equals("# Method::print_touched_methods version 1")) {
+        throw new Exception("First line mismatch");
+      }
+
+      output.shouldContain("TestLogTouchedMethods.methodA:()V");
+      output.shouldNotContain("TestLogTouchedMethods.methodB:()V");
+      output.shouldHaveExitValue(0);
+
       // Test jcmd PrintTouchedMethods VM.print_touched_methods
       String pid = Integer.toString(ProcessTools.getProcessId());
       pb = new ProcessBuilder();
diff --git a/hotspot/test/serviceability/dcmd/gc/FinalizerInfoTest.java b/hotspot/test/serviceability/dcmd/gc/FinalizerInfoTest.java
new file mode 100644
index 00000000000..1e53a234b5a
--- /dev/null
+++ b/hotspot/test/serviceability/dcmd/gc/FinalizerInfoTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import org.testng.annotations.Test;
+import org.testng.Assert;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
+import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.dcmd.CommandExecutor;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
+
+/*
+ * @test
+ * @summary
+ * @library /testlibrary
+ * @build jdk.test.lib.*
+ * @build jdk.test.lib.dcmd.*
+ * @run testng FinalizerInfoTest
+ */
+public class FinalizerInfoTest {
+    static ReentrantLock lock = new ReentrantLock();
+    static volatile int wasInitialized = 0;
+    static volatile int wasTrapped = 0;
+    static final String cmd = "GC.finalizer_info";
+    static final int objectsCount = 1000;
+
+    class MyObject {
+        public MyObject() {
+            // Make sure object allocation/deallocation is not optimized out
+            wasInitialized += 1;
+        }
+
+        protected void finalize() {
+            // Trap the object in a finalization queue
+            wasTrapped += 1;
+            lock.lock();
+        }
+    }
+
+    public void run(CommandExecutor executor) {
+        try {
+            lock.lock();
+            for(int i = 0; i < objectsCount; ++i) {
+                new MyObject();
+            }
+            System.out.println("Objects initialized: " + objectsCount);
+            System.gc();
+
+            while(wasTrapped < 1) {
+                // Waiting for gc thread.
+            }
+
+            OutputAnalyzer output = executor.execute(cmd);
+            output.shouldContain("MyObject");
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Test
+    public void pid() {
+        run(new PidJcmdExecutor());
+    }
+}
diff --git a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTestb.java b/hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java
similarity index 58%
rename from langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTestb.java
rename to hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java
index 87c254f7387..daedf1252ef 100644
--- a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTestb.java
+++ b/hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -21,20 +21,34 @@
  * questions.
  */
 
+import org.testng.annotations.Test;
+import org.testng.Assert;
+
+import java.io.IOException;
+
+import jdk.test.lib.dcmd.CommandExecutor;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
+import jdk.test.lib.OutputAnalyzer;
+
+
 /*
  * @test
- * @bug 8024809
- * @summary javac, some lambda programs are rejected by flow analysis
- * @compile/fail/ref=SelfInitializerInLambdaTestb.out -XDrawDiagnostics SelfInitializerInLambdaTestb.java
+ * @summary Test of diagnostic command GC.heap_info
+ * @library /testlibrary
+ * @build jdk.test.lib.*
+ * @build jdk.test.lib.dcmd.*
+ * @run testng HeapInfoTest
  */
+public class HeapInfoTest {
+    public void run(CommandExecutor executor) {
+        String cmd = "GC.heap_info";
+        OutputAnalyzer output = executor.execute(cmd);
+        output.shouldContain("Metaspace");
+    }
 
-public class SelfInitializerInLambdaTestb {
-
-    final Runnable r1;
-
-    final Runnable r2 = ()-> System.out.println(r1);
-
-    SelfInitializerInLambdaTestb() {
-        r1 = ()->System.out.println(r1);
+    @Test
+    public void pid() {
+        run(new PidJcmdExecutor());
     }
 }
+
diff --git a/hotspot/test/serviceability/dcmd/gc/RunFinalizationTest.java b/hotspot/test/serviceability/dcmd/gc/RunFinalizationTest.java
index 21606a83b7c..bc34351974c 100644
--- a/hotspot/test/serviceability/dcmd/gc/RunFinalizationTest.java
+++ b/hotspot/test/serviceability/dcmd/gc/RunFinalizationTest.java
@@ -21,15 +21,13 @@
  * questions.
  */
 
-import org.testng.annotations.Test;
-import org.testng.Assert;
-
+import java.util.concurrent.Phaser;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.TimeoutException;
 
 import jdk.test.lib.dcmd.CommandExecutor;
 import jdk.test.lib.dcmd.JMXExecutor;
+import jdk.test.lib.Utils;
 
 /*
  * @test
@@ -41,62 +39,71 @@ import jdk.test.lib.dcmd.JMXExecutor;
  *          jdk.jvmstat/sun.jvmstat.monitor
  * @build jdk.test.lib.*
  * @build jdk.test.lib.dcmd.*
- * @run testng RunFinalizationTest
+ * @run main/othervm RunFinalizationTest
  */
 public class RunFinalizationTest {
-    static ReentrantLock lock = new ReentrantLock();
-    static Condition cond = lock.newCondition();
+    private static final long TIMEOUT = Utils.adjustTimeout(15000); // 15s
+    private static final Phaser ph = new Phaser(3);
     static volatile boolean wasFinalized = false;
     static volatile boolean wasInitialized = false;
 
-    class MyObject {
+    static class MyObject {
         public MyObject() {
             /* Make sure object allocation/deallocation is not optimized out */
             wasInitialized = true;
         }
 
         protected void finalize() {
-            lock.lock();
-            wasFinalized = true;
-            cond.signalAll();
-            lock.unlock();
+            if (!Thread.currentThread().getName().equals("Finalizer")) {
+                wasFinalized = true;
+                ph.arrive();
+            } else {
+                ph.arriveAndAwaitAdvance();
+            }
         }
     }
 
     public static MyObject o;
 
-    public void run(CommandExecutor executor) {
-        lock.lock();
+    private static void run(CommandExecutor executor) {
         o = new MyObject();
         o = null;
         System.gc();
         executor.execute("GC.run_finalization");
 
-        int waited = 0;
-        int waitTime = 15;
+        System.out.println("Waiting for signal from finalizer");
 
-        try {
-            System.out.println("Waiting for signal from finalizer");
-
-            while (!cond.await(waitTime, TimeUnit.SECONDS)) {
-                waited += waitTime;
-                System.out.println(String.format("Waited %d seconds", waited));
+        long targetTime = System.currentTimeMillis() + TIMEOUT;
+        while (System.currentTimeMillis() < targetTime) {
+            try {
+                ph.awaitAdvanceInterruptibly(ph.arrive(), 200, TimeUnit.MILLISECONDS);
+                System.out.println("Received signal");
+                break;
+            } catch (InterruptedException e) {
+                fail("Test error: Interrupted while waiting for signal from finalizer", e);
+            } catch (TimeoutException e) {
+                System.out.println("Haven't received signal in 200ms. Retrying ...");
             }
-
-            System.out.println("Received signal");
-        } catch (InterruptedException e) {
-            Assert.fail("Test error: Interrupted while waiting for signal from finalizer", e);
-        } finally {
-            lock.unlock();
         }
 
         if (!wasFinalized) {
-            Assert.fail("Test failure: Object was not finalized");
+            fail("Test failure: Object was not finalized");
         }
     }
 
-    @Test
-    public void jmx() {
-        run(new JMXExecutor());
+    public static void main(String ... args) {
+        MyObject o = new MyObject();
+        o = null;
+        Runtime.getRuntime().addShutdownHook(new Thread(()->{
+            run(new JMXExecutor());
+        }));
+    }
+
+    private static void fail(String msg, Exception e) {
+        throw new Error(msg, e);
+    }
+
+    private static void fail(String msg) {
+        throw new Error(msg);
     }
 }
diff --git a/hotspot/test/testlibrary/jdk/test/lib/Utils.java b/hotspot/test/testlibrary/jdk/test/lib/Utils.java
index 73027cbaab3..eb9ae00017c 100644
--- a/hotspot/test/testlibrary/jdk/test/lib/Utils.java
+++ b/hotspot/test/testlibrary/jdk/test/lib/Utils.java
@@ -314,9 +314,8 @@ public final class Utils {
      */
     public static String fileAsString(String filename) throws IOException {
         Path filePath = Paths.get(filename);
-        return Files.exists(filePath)
-            ? Files.lines(filePath).collect(Collectors.joining(NEW_LINE))
-            : null;
+        if (!Files.exists(filePath)) return null;
+        return new String(Files.readAllBytes(filePath));
     }
 
     /**
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 6165f2117df..e3b3c6177a6 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -319,3 +319,4 @@ be5efc34a43bdd982d1cbe11cb2f6d6a060dde60 jdk9-b73
 eadcb2b55cd1daf77625813aad0f6f3967b1528a jdk9-b74
 16b5e696f948cd8aa9b3afdb686ddffd48bd17a8 jdk9-b75
 36801a89a04201b59874ec776ffe85d6253c9ab5 jdk9-b76
+be357705874c4ba1a69c38fb211e5e31e35bf9cb jdk9-b77
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6350682.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6350682.java
rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java
index 04d4f2502b7..e955df49676 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6350682.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.common;
+package common;
 
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.TransformerFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6723276Test.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6723276Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java
index 7e1ecd89a6f..63ac73d4973 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6723276Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.common;
+package common;
 
 import org.testng.annotations.Test;
 import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169.xml b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169.xml
rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169.xsd b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169Test.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java
index fa35c3aa2cb..8f03995bc10 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.common;
+package common;
 
 import java.io.InputStream;
 import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug7143711Test.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug7143711Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java
index 7b38db0c0c2..5074da2150b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug7143711Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.common;
+package common;
 
 import java.security.AllPermission;
 import java.security.Permission;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6320118.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6320118.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java
index 959a978f6f0..87d3829e658 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6320118.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.datatype;
+package datatype;
 
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937951Test.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java
similarity index 88%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937951Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java
index a7335644c61..161f127b9b2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937951Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,11 @@
  * questions.
  */
 
-package javax.xml.datatype;
+package datatype;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937964Test.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937964Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java
index 31aff0538f9..73ea2930cf2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937964Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,15 @@
  * questions.
  */
 
-package javax.xml.datatype;
+package datatype;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
 import javax.xml.namespace.QName;
 
 import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug7042647Test.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java
similarity index 89%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug7042647Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java
index 36438265010..3bf98f65bed 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug7042647Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,15 @@
  * questions.
  */
 
-package javax.xml.datatype;
+package datatype;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DatatypeFactoryTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DatatypeFactoryTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java
index 67e458ee719..c6977e98967 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DatatypeFactoryTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,16 @@
  * questions.
  */
 
-package javax.xml.datatype;
+package datatype;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
+import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 
 import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DurationTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DurationTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java
index f97536c8765..ece77adc8fa 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DurationTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.datatype;
+package datatype;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -30,6 +30,10 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
 import javax.xml.namespace.QName;
 
 import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/FactoryFindTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java
index e9e84bd61a3..87e46373e8b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/FactoryFindTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,13 @@
  * questions.
  */
 
-package javax.xml.datatype;
+package datatype;
 
 import java.net.URL;
 import java.net.URLClassLoader;
 
+import javax.xml.datatype.DatatypeFactory;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/XMLGregorianCalendarTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/XMLGregorianCalendarTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java
index b842fd5a177..4c3deb901ac 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/XMLGregorianCalendarTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,12 @@
  * questions.
  */
 
-package javax.xml.datatype;
+package datatype;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915524.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915524.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java
index f496447619d..3540089c9ef 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915524.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915748.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915748.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java
index 9e04b082254..8c8f71714de 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915748.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java
index 3bc3c357443..b18f8094710 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966138.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966138.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java
index ddd0bf5ff89..5244112fe3f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966138.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java
index dd55013d571..890ada5f019 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.xsd b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java
index 7133089d296..9cf87b200af 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.xsd b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6339023.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6339023.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java
index 273708cc209..7b611bd9993 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6339023.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6355326.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6355326.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java
index 911baf4a07f..cea41cc9a87 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6355326.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6367542.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6367542.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java
index fa77a70df16..c0a3e164834 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6367542.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6520131.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6520131.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java
index c30f43070da..982d481014e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6520131.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6521260.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6521260.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java
index bcfa894ed53..3c9a97644eb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6521260.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java
index 2966d0accc6..fec67cdfe20 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,6 +32,9 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 /*
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java
index 7c669698814..b19a28ba29a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import java.io.File;
 import java.io.IOException;
@@ -31,6 +31,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.annotations.Test;
+import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
 /*
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6333993Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6333993Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java
index b54e9c61de0..84c06b829b4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6333993Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import java.io.ByteArrayInputStream;
 
@@ -34,6 +34,8 @@ import javax.xml.xpath.XPathFactory;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
 
 /*
  * @bug 6333993
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517707Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517707Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java
index 67241c85d05..9bc2c6c3a0f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517707Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -33,6 +33,9 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Entity;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517717Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517717Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java
index 02e1972b11a..44bab9c37f7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517717Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -32,6 +32,9 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Entity;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6909336Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6909336Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java
index 85e90cd294b..15dc9636af6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6909336Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
@@ -30,6 +30,7 @@ import javax.xml.transform.dom.DOMResult;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import org.w3c.dom.Document;
 import org.w3c.dom.bootstrap.DOMImplementationRegistry;
 
 /*
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java
index 6a4fba6245c..0bc4669c4e6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.w3c.dom;
+package dom;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -34,6 +34,21 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import org.w3c.dom.Attr;
+import org.w3c.dom.CDATASection;
+import org.w3c.dom.Comment;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMError;
+import org.w3c.dom.DOMErrorHandler;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Entity;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
 import org.w3c.dom.ls.DOMImplementationLS;
 import org.w3c.dom.ls.LSInput;
 import org.w3c.dom.ls.LSParser;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.xsd b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMXPathTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMXPathTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java
index fa92dc7175b..ebd97facd4b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMXPathTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java
@@ -20,12 +20,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.w3c.dom;
+package dom;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import org.w3c.dom.DOMImplementation;
 
 /*
  * @bug 8042244
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/JdkXmlDomTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/JdkXmlDomTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java
index b65b4fd6bff..4c1269cf79c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/JdkXmlDomTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.w3c.dom;
+package dom;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/TCKEncodingTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/TCKEncodingTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java
index a5148fb563b..4f4ece1766a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/TCKEncodingTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom;
+package dom;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -32,6 +32,7 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug4973153.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug4973153.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java
index 6b9b44ccaac..b16d06c6172 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug4973153.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom.ls;
+package dom.ls;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6290947.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6290947.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java
index 065dfcbe491..9ef91451fbe 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6290947.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom.ls;
+package dom.ls;
 
 import java.io.StringBufferInputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6354955.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6354955.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java
index d184cf8e6f2..cdaa0cf4d03 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6354955.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom.ls;
+package dom.ls;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6376823.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6376823.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java
index f3ba84e2e0e..d4fcc32aeb9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6376823.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom.ls;
+package dom.ls;
 
 import java.io.StringBufferInputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6710741Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6710741Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java
index 3f70fb7b6bb..d0b95b99073 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6710741Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom.ls;
+package dom.ls;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -30,6 +30,8 @@ import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSException;
 
 /*
  * @bug 6710741
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTCKTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTCKTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java
index 69e27e1bb96..8c609fc594d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTCKTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom.ls;
+package dom.ls;
 
 import java.io.IOException;
 import java.io.StringBufferInputStream;
@@ -39,6 +39,10 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSParser;
+import org.w3c.dom.ls.LSParserFilter;
 import org.w3c.dom.traversal.NodeFilter;
 import org.xml.sax.SAXException;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java
index 3d0c199ea3f..bf24b878037 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom.ls;
+package dom.ls;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -33,6 +33,10 @@ import org.w3c.dom.DOMError;
 import org.w3c.dom.DOMErrorHandler;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSParser;
+import org.w3c.dom.ls.LSResourceResolver;
 
 /*
  * @summary Test LSParser's DOMConfiguration for supported properties.
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSSerializerTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSSerializerTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java
index 9df924a3c43..172d3299d5b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSSerializerTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.w3c.dom.ls;
+package dom.ls;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -39,6 +39,10 @@ import org.w3c.dom.DOMError;
 import org.w3c.dom.DOMErrorHandler;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSException;
+import org.w3c.dom.ls.LSOutput;
+import org.w3c.dom.ls.LSSerializer;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/note_in_dtd.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/note_in_dtd.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/note_in_dtd.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/note_in_dtd.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/test.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/test.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/test.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/test.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/test.xsd b/jaxp/test/javax/xml/jaxp/unittest/dom/test.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/test.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/dom/test.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd.bak b/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd.bak
deleted file mode 100644
index 6fbfdfeb67b..00000000000
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd.bak
+++ /dev/null
@@ -1,13 +0,0 @@
-<!ELEMENT document ANY>
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT publisher (#PCDATA)>
-<!ELEMENT book (#PCDATA)>
-<!ELEMENT bookurn (#PCDATA)>
-<!ELEMENT xmlns:pages (#PCDATA)>
-<!ATTLIST book price CDATA "$100">
-<!ATTLIST book author CDATA "Herold">
-<!ATTLIST book number ID #REQUIRED>
-<!ATTLIST bookurn xmlns CDATA "10">
-<!ATTLIST bookurn xmlns:isbn CDATA "10">
-<!ENTITY mkm "I am Krishna">
-<!ENTITY km "I am KrishnaMohan">
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml.bak b/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml.bak
deleted file mode 100644
index c4fab83ca91..00000000000
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml.bak
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding ="utf-8"?>
-<!DOCTYPE document SYSTEM "ExternalDTD.dtd" [
-<!ENTITY max "Substituted text">
-]>
-<!-- ExternalDTD throws a Negative array size Exception when 
-trying to parse with the above DTD reference AND an entity declaration-->
-<document>
-	<title>The Publishers </title>
-	<publisher>        
-	Alfred Publishing
-	15535 Morrison
-	South Oaks CA 91403
-        &max;
-	</publisher>
-	<book price="$100" author = "Herold" number = "no_11">eXtensible Markup Language</book>
-  	<bookurn xmlns='urn:loc.gov:books' xmlns:isbn='urn:ISBN:0-395-36341-6'/> 
-        <pb/>
-	<pages />
-</document>
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java
index 7978e5c7c15..5c8248a065b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,13 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.File;
 
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.xml.sax.helpers.DefaultHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4934208.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4934208.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java
index 8e77af0ef87..50f5514f3af 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4934208.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4967002.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4967002.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java
index 3fd09a7b6e4..084323445a9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4967002.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java
index b8ab86e6858..c87f47187c7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import javax.xml.parsers.SAXParserFactory;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java
index 38036a725e0..6a50919122f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java
index 39091809059..f48e0bdc783 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java
index 292a3042e71..68d9a170435 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import javax.xml.validation.SchemaFactory;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5025825.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5025825.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java
index a2912089f9e..9a87104746b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5025825.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6309988.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6309988.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java
index 499dc2a5861..fc38d41c3e4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6309988.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6341770.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6341770.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java
index e5b1f74a793..94873dfaab3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6341770.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6361283.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6361283.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java
index 8a0f3c9f322..f3bfb88fce1 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6361283.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6506304Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6506304Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java
index b93e7333977..a7e82d51eab 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6506304Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,10 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java
index c1d141eef53..c6a03542a43 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.FileReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java
index c76304d8bad..e7aa719dd81 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java
index 49488360b0d..ff3d19388e6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.InputStream;
 import java.io.StringBufferInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786ErrorHandler.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786ErrorHandler.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java
index 5d55cea1029..b938eb6eb6f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786ErrorHandler.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6594813.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6594813.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java
index d660f958bcc..a89d834642f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6594813.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.StringReader;
 import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.dtd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java
index d68837793fe..db724d83e86 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841_xhtml11-flat.dtd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841_xhtml11-flat.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841_xhtml11-flat.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841_xhtml11-flat.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6690015.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6690015.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java
index 50838e82196..25f536f73bb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6690015.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.FileInputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6760982.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6760982.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java
index 1a2bc04f9de..cfd2fe26a74 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6760982.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.File;
 import java.io.FileReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6849942Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6849942Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java
index 3a28a094243..c65bd1bc285 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6849942Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,13 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.ByteArrayInputStream;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608.dtd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java
index c4a7f7a42e6..bd1e303dc17 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,14 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.File;
 import java.io.IOException;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608_1.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608_1.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608_1.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608_1.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7166896Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java
similarity index 91%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7166896Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java
index e886bca59c9..7230f9c1488 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7166896Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,14 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.IOException;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug8073385.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug8073385.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java
index 1d3aa66ce08..5a034c378b9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug8073385.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.StringReader;
 import java.util.Locale;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/DosTest.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/DosTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/DosTest3.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest3.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/DosTest3.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest3.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/FactoryFindTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java
index 6f769714125..031b0fea2a2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/FactoryFindTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,13 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.net.URL;
 import java.net.URLClassLoader;
 
+import javax.xml.parsers.SAXParserFactory;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyDefaultHandler.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyDefaultHandler.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java
index a63bcd4cf26..c690163eb86 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyDefaultHandler.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyErrorHandler.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyErrorHandler.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java
index 3dc24dcdfcb..695c932f603 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyErrorHandler.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/ParseEmptyStream.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/ParseEmptyStream.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java
index cc9ba34faa7..a6dafccba4c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/ParseEmptyStream.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,13 @@
  * questions.
  */
 
-package javax.xml.parsers;
+package parsers;
 
 import java.io.StringReader;
 
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/bug6690015.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/bug6690015.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/bug6690015.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/bug6690015.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/bug6760982.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/bug6760982.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/bug6760982.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/bug6760982.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/catalog.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/catalog.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/catalog.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/catalog.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/entity.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/entity.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/entity.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/entity.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/entity64K.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/entity64K.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/entity64K.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/entity64K.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/test.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/test.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test1.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/test1.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test1.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/test1.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test2.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/test2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/test2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys3002.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/toys3002.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys3002.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/toys3002.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/Bug6794483Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/Bug6794483Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java
index ee5e2587d6c..841191704eb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/Bug6794483Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.parsers.xinclude;
+package parsers.xinclude;
 
 import static java.lang.System.lineSeparator;
 import static org.testng.Assert.assertEquals;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/test1.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test1.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/test1.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test1.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/test2.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/test2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Attributes2ImplTest.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Attributes2ImplTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java
index 362440fcf55..e8a1bba6864 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Attributes2ImplTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.xml.sax;
+package sax;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6889654Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6889654Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java
index ece2b16f09c..e5043aa0f48 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6889654Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.xml.sax;
+package sax;
 
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6925410Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6925410Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java
index 280d2c8d6e1..5679ed6b262 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6925410Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.xml.sax;
+package sax;
 
 import javax.xml.datatype.DatatypeConfigurationException;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6949607Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6949607Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java
index 800788a8581..d8fd89cd29a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6949607Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.xml.sax;
+package sax;
 
 import java.io.ByteArrayInputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6992561Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6992561Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java
index f4761bf9440..d82fe101f47 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6992561Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.xml.sax;
+package sax;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778.xml b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778.xml
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java
index 39039ddc223..77809766d5e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.xml.sax;
+package sax;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/DefaultHandler2Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/DefaultHandler2Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java
index ecce29090ce..15205d745cb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/DefaultHandler2Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.xml.sax;
+package sax;
 
 import java.io.IOException;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/IssueTracker56Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/IssueTracker56Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java
index 9b26c5d04e0..b5a46472f34 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/IssueTracker56Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.xml.sax;
+package sax;
 
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/MyDefaultHandler2.java b/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/MyDefaultHandler2.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java
index 548d662256e..44ac9fde73d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/MyDefaultHandler2.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.xml.sax;
+package sax;
 
 import java.io.IOException;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/NSSupportTest.java b/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/NSSupportTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java
index b2c5221f259..c04ecc7ab54 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/NSSupportTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.xml.sax;
+package sax;
 
 import java.util.Enumeration;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/SAXExceptionExt.java b/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/SAXExceptionExt.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java
index 3e5421c5573..9b9800d27fa 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/SAXExceptionExt.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package org.xml.sax;
+package sax;
 
 import org.xml.sax.SAXException;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/externalDTD.dtd b/jaxp/test/javax/xml/jaxp/unittest/sax/externalDTD.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/externalDTD.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/sax/externalDTD.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/sax/toys.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/toys.xml
rename to jaxp/test/javax/xml/jaxp/unittest/sax/toys.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/toys_error.xml b/jaxp/test/javax/xml/jaxp/unittest/sax/toys_error.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/toys_error.xml
rename to jaxp/test/javax/xml/jaxp/unittest/sax/toys_error.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/AttributeLocalNameTest/AttributeLocalNameTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/AttributeLocalNameTest/AttributeLocalNameTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java
index dd2570c8daa..01d54e05785 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/AttributeLocalNameTest/AttributeLocalNameTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.AttributeLocalNameTest;
+package stream.AttributeLocalNameTest;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6370703.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6370703.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java
index 0366b2ef831..f386e5d5a30 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6370703.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream;
+package stream;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6378422.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6378422.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java
index be4e230a51f..f273d1f002e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6378422.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream;
+package stream;
 
 import javax.xml.stream.XMLInputFactory;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6380870.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6380870.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java
index 8f8cfa45f98..8eb6a7ffad9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6380870.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream;
+package stream;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6489502.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6489502.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java
index 1c0793995fa..9cc264a4fd6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6489502.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream;
+package stream;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6509774.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6509774.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java
index 711775fba81..b92f4bf0757 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6509774.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream;
+package stream;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6688002Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6688002Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java
index 594546296b4..57bb97ed144 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6688002Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,13 +21,18 @@
  * questions.
  */
 
-package javax.xml.stream;
+package stream;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java
index 08be1fe5c51..ac317469cd7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,9 +21,13 @@
  * questions.
  */
 
-package javax.xml.stream;
+package stream;
 
 import javax.xml.namespace.QName;
+import javax.xml.stream.EventFilter;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/CoalesceTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/CoalesceTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java
index 899e2705892..70f286cefbe 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/CoalesceTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package javax.xml.stream.CoalesceTest;
+package stream.CoalesceTest;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/coalesce.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/coalesce.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/coalesce.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/coalesce.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/EntityTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/EntityTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java
index 0da8153adce..aa72e3fb139 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/EntityTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.EntitiesTest;
+package stream.EntitiesTest;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/testCharRef.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/testCharRef.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/testCharRef.xml.output b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml.output
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/testCharRef.xml.output
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml.output
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EventReaderDelegateTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EventReaderDelegateTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java
index 77186aea6e1..b314ff7a022 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EventReaderDelegateTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,14 +21,20 @@
  * questions.
  */
 
-package javax.xml.stream;
+package stream;
 
 import org.testng.annotations.Test;
 import org.testng.Assert;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.XMLEvent;
 import javax.xml.stream.util.EventReaderDelegate;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue41Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue41Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java
index 87d3ad41587..738f4e3329a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue41Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.Events;
+package stream.EventsTest;
 
 import java.io.StringReader;
 import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue48Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue48Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java
index b10b6cd92c0..b5673029449 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue48Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.Events;
+package stream.EventsTest;
 
 import java.io.StringReader;
 import java.util.Iterator;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue53Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue53Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java
index c9c1deeac13..7193d27e48f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue53Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.Events;
+package stream.EventsTest;
 
 import javax.xml.stream.XMLEventFactory;
 import javax.xml.stream.events.StartDocument;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue58Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue58Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java
index 30ce60028dd..3c467411b70 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue58Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.Events;
+package stream.EventsTest;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java
index 555c8a8a565..f016df38df4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream;
+package stream;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,6 +32,9 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Properties;
 
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.policy b/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.policy
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.policy
rename to jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.policy
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/IgnoreExternalDTDTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java
similarity index 90%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/IgnoreExternalDTDTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java
index 79b6c89603c..5475cba5d6e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/IgnoreExternalDTDTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,15 @@
  * questions.
  */
 
-package javax.xml.stream;
+package stream;
 
 import java.io.StringReader;
 
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
 import org.testng.annotations.Test;
 
 /*
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/ProcessingInstruction/ProcessingInstructionTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/ProcessingInstruction/ProcessingInstructionTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java
index 9dc297f9761..1234a37a803 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/ProcessingInstruction/ProcessingInstructionTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.ProcessingInstruction;
+package stream.ProcessingInstructionTest;
 
 import java.io.InputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/StreamReaderDelegateTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/StreamReaderDelegateTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java
index b1f76f9672b..d7f9f485fc2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/StreamReaderDelegateTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream;
+package stream;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -30,6 +30,11 @@ import java.io.InputStream;
 import java.util.Iterator;
 
 import javax.xml.namespace.NamespaceContext;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.util.StreamReaderDelegate;
 
 import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventLocationTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventLocationTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java
index eccc7ff7d0c..6c760382c58 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventLocationTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,8 +21,10 @@
  * questions.
  */
 
-package javax.xml.stream;
+package stream;
 
+import javax.xml.stream.Location;
+import javax.xml.stream.XMLEventFactory;
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6489890.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6489890.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java
index 84a49f956c4..0d554808f79 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6489890.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6555001.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6555001.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java
index dfd95e3aca2..566186c4c33 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6555001.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6586466Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6586466Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java
index c3484426bad..319c50ad7fa 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6586466Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
 
 import org.testng.annotations.Test;
 import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6613059Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6613059Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java
index 73fe8c4c61e..88d0be0c17d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6613059Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
 
 import org.testng.annotations.Test;
 import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6668115Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6668115Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java
index a66ec748058..c56e7569c3c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6668115Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6846133Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6846133Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java
index 0470a6bf441..16bf959dc45 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6846133Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
 
 import javax.xml.stream.XMLStreamException;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Issue40Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Issue40Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java
index 48ecebcae90..161b6e6dcdb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Issue40Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/bug6613059.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/bug6613059.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/bug6613059.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/bug6613059.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/play.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/play.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/play2.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/play2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/sgml.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/sgml.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/sgml.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/sgml.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java
index 9c2df037342..1805e9922f0 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLEventWriterTest;
+package stream.XMLEventWriterTest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java
index d12ca93b4a9..ab076f27d6e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLEventWriterTest;
+package stream.XMLEventWriterTest;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/merge-1.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-1.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/merge-1.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-1.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/merge-2.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/merge-2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/replace1.txt b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/replace1.txt
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/replace1.txt
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/replace1.txt
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6756677Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6756677Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java
index 569d6c5f5f9..17604ac6d09 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6756677Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLInputFactoryTest;
+package stream.XMLInputFactoryTest;
 
 import javax.xml.stream.XMLInputFactory;
 
@@ -36,7 +36,7 @@ public class Bug6756677Test {
 
     @Test
     public void testNewInstance() {
-        String myFactory = "javax.xml.stream.XMLInputFactoryTest.MyInputFactory";
+        String myFactory = "stream.XMLInputFactoryTest.MyInputFactory";
         try {
             System.setProperty("MyInputFactory", myFactory);
             XMLInputFactory xif = XMLInputFactory.newInstance("MyInputFactory", null);
@@ -52,7 +52,7 @@ public class Bug6756677Test {
     // newFactory was added in StAX 1.2
     @Test
     public void testNewFactory() {
-        String myFactory = "javax.xml.stream.XMLInputFactoryTest.MyInputFactory";
+        String myFactory = "stream.XMLInputFactoryTest.MyInputFactory";
         ClassLoader cl = null;
         try {
             System.setProperty("MyInputFactory", myFactory);
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6909759Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6909759Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java
index 1c699c83323..36cc136dadd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6909759Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLInputFactoryTest;
+package stream.XMLInputFactoryTest;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/IssueTracker38.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/IssueTracker38.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java
index f468d7a0f41..448a854d45f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/IssueTracker38.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLInputFactoryTest;
+package stream.XMLInputFactoryTest;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/MyInputFactory.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/MyInputFactory.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java
index 581c122585c..551d3f0f8d2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/MyInputFactory.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLInputFactoryTest;
+package stream.XMLInputFactoryTest;
 
 import java.io.InputStream;
 import java.io.Reader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/play.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/play.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/play.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/play.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/Bug6846132Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/Bug6846132Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java
index 9e5093d35e6..15afdafd751 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/Bug6846132Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLOutputFactoryTest;
+package stream.XMLOutputFactoryTest;
 
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLOutputFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java
index 64517c363ed..884c9235d24 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLOutputFactoryTest;
+package stream.XMLOutputFactoryTest;
 
 import java.io.ByteArrayOutputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/StreamResultTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/StreamResultTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java
index 368c80c1b0d..96d928c6572 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/StreamResultTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLOutputFactoryTest;
+package stream.XMLOutputFactoryTest;
 
 import java.io.ByteArrayOutputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java
index 9d4ca307fff..1a0780398d6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLResolverTest;
+package stream.XMLResolverTest;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/replace1.txt b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace1.txt
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/replace1.txt
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace1.txt
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/replace2.txt b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace2.txt
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/replace2.txt
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace2.txt
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamExceptionTest/ExceptionTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamExceptionTest/ExceptionTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java
index a64d93f1dd8..3e0dda7d042 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamExceptionTest/ExceptionTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamExceptionTest;
+package stream.XMLStreamExceptionTest;
 
 import java.io.IOException;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481615.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481615.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java
index 25bc88d22d6..1aa221969d3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481615.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamFilterTest;
+package stream.XMLStreamFilterTest;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481678.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481678.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java
index 1f697b775a5..9b3273ac09e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481678.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamFilterTest;
+package stream.XMLStreamFilterTest;
 
 import java.io.InputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java
index 5625f78177f..3df73ae0472 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamFilterTest;
+package stream.XMLStreamFilterTest;
 
 import javax.xml.stream.StreamFilter;
 import javax.xml.stream.XMLInputFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTypeFilter.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTypeFilter.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java
index 95b3f505a27..1fd6e20fe08 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTypeFilter.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamFilterTest;
+package stream.XMLStreamFilterTest;
 
 import javax.xml.stream.EventFilter;
 import javax.xml.stream.StreamFilter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BOMTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BOMTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java
index eb7c3b44770..b253e95b1b0 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BOMTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6388460.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6388460.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java
index 4d6b58ad41a..c73348c744c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6388460.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6472982Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6472982Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java
index 830718fe175..c22dde736de 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6472982Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import java.io.InputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java
index fe0da552cc8..b9ffde7fefd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import java.io.ByteArrayInputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6847819Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6847819Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java
index c9211c06781..2480b727d90 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6847819Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import org.testng.annotations.Test;
 import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BugTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BugTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java
index 2499a07db4a..15e01a21896 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BugTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DefaultAttributeTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DefaultAttributeTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java
index 33e8c5b9353..6ce3bd4568d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DefaultAttributeTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import java.util.Iterator;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DoubleXmlnsTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DoubleXmlnsTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java
index da73bd6cc91..df1ced6bb61 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DoubleXmlnsTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Hello.wsdl.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Hello.wsdl.data
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Hello.wsdl.data
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Hello.wsdl.data
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java
index dcd2d39b2bb..06dc2665a7f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue44Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue44Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java
index 47ed0bc9ff9..082aa87d0c4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue44Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue47Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue47Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java
index 736971d1f5a..7d868423677 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue47Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker24.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker24.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java
index 0d2f723fcd1..dd0fb1a0bf9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker24.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker35.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker35.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java
index 2f93c9810b6..1aa8d6b4c7c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker35.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import java.io.InputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java
index ed9dc284943..c616a3aa669 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java
index c58fd03908d..50dfed8a487 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java
index c39106f24bc..d1c007402ff 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/NamespaceTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/NamespaceTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java
index 75d32705daf..5c9440d0998 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/NamespaceTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import java.io.InputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/StreamReaderTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/StreamReaderTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java
index 8b7475db66a..cbaa37863cf 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/StreamReaderTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/SupportDTDTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/SupportDTDTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java
index 7b8e28e8a01..1a2e325fdd2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/SupportDTDTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/UTF8-BOM.xml.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF8-BOM.xml.data
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/UTF8-BOM.xml.data
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF8-BOM.xml.data
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java
index 5e193f667fa..5befcb70609 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XML11Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XML11Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java
index 2293aaca37a..ac98279175d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XML11Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XMLSchema.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XMLSchema.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XMLSchema.xsd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XMLSchema.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/datatypes.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/datatypes.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/datatypes.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/datatypes.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/report.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/report.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/report.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/report.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/sgml.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/sgml.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/sgml.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/sgml.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/voicexml.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/voicexml.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/voicexml.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/voicexml.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/vxml.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/vxml.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/vxml.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/vxml.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/xml11.xml.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/xml11.xml.data
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/xml11.xml.data
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/xml11.xml.data
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/AttributeEscapeTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/AttributeEscapeTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java
index 0cd9466dbf3..7a426c93f8d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/AttributeEscapeTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6452107.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6452107.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java
index 2d45aa2f603..b3148c60502 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6452107.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6600882Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6600882Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java
index 3b22705100a..f34b559f86c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6600882Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import java.io.ByteArrayOutputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6675332Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6675332Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java
index a22580670a0..e52fb4acbd4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6675332Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import java.io.StringWriter;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug7037352Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug7037352Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java
index a15b7a6142f..7c1e50264d5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug7037352Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import javax.xml.XMLConstants;
 import javax.xml.namespace.NamespaceContext;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DOMUtil.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DOMUtil.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java
index 674e00dc193..f59ef011018 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DOMUtil.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DomUtilTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DomUtilTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java
index 76d5c981bd3..d2c2491e36e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DomUtilTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EmptyElementTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EmptyElementTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java
index 475c3edb323..b813ef5607c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EmptyElementTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import java.io.ByteArrayOutputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EncodingTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EncodingTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java
index d79a2331374..50973152487 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EncodingTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import java.io.ByteArrayOutputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NamespaceTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NamespaceTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java
index 7f036defb2f..24d89a08ba6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NamespaceTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import java.io.ByteArrayOutputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NullUriDetectionTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NullUriDetectionTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java
index 9dbb40cec11..3eb0222cbaf 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NullUriDetectionTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import java.io.StringWriter;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/SqeLinuxTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/SqeLinuxTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java
index fa53214f633..90ca0f313a2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/SqeLinuxTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import java.io.ByteArrayOutputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/UnprefixedNameTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/UnprefixedNameTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java
index c4174cf10fa..5e05fd82394 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/UnprefixedNameTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/WriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/WriterTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java
index 05f777d9327..adb43d95e0a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/WriterTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/XMLStreamWriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/XMLStreamWriterTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java
index 4fa782130f9..2bc71a315ce 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/XMLStreamWriterTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
 
 import java.io.StringWriter;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/message_12.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/message_12.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/message_12.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/message_12.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testEight.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testEight.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testEight.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testEight.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testFive.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFive.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testFive.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFive.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testFour.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFour.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testFour.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFour.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testOne.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testOne.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testOne.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testOne.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testSeven.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSeven.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testSeven.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSeven.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testSix.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSix.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testSix.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSix.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testThree.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testThree.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testThree.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testThree.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/basic-form.vxml b/jaxp/test/javax/xml/jaxp/unittest/stream/basic-form.vxml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/basic-form.vxml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/basic-form.vxml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/report.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/report.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/report.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/report.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml-bad-systemId.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/sgml-bad-systemId.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml-bad-systemId.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/sgml-bad-systemId.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/sgml.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/sgml.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml_Bug6509774.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/sgml_Bug6509774.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml_Bug6509774.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/sgml_Bug6509774.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile1.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/testfile1.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile1.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/testfile1.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile2.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/testfile2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/testfile2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile3.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/testfile3.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile3.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/testfile3.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile4.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/testfile4.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile4.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/testfile4.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/toys.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/toys.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/toys.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/vxml.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/vxml.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/vxml.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/vxml.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/5368141.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/5368141.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/5368141.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/5368141.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.dtd b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.out b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.out
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.out
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.out
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java
index 605baf81ef5..f0dc71feb5a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341_golden.dtd b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341_golden.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341_golden.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341_golden.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341_golden.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341_golden.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341_golden.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341_golden.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4892774.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4892774.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java
index c4b54f80cd0..e65bdaf6058 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4892774.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.File;
 
@@ -32,16 +32,17 @@ import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.sax.SAXResult;
 import javax.xml.transform.stax.StAXResult;
 import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.util.DOMUtil;
-import javax.xml.transform.util.SAXUtil;
-import javax.xml.transform.util.StAXUtil;
-import javax.xml.transform.util.StreamUtil;
 
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import transform.util.DOMUtil;
+import transform.util.SAXUtil;
+import transform.util.StAXUtil;
+import transform.util.StreamUtil;
+
 /*
  * @bug 4892774
  * @summary Test identity transformer with all possible types of Source and Result combinations for doucment version and encoding information.
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java
index 7d061c2c2c0..4d406747c8a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6175602.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6175602.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java
index ae568341344..bb3c7d61a29 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6175602.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java
index 9b508796ac9..eaaa3f77908 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491_2.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491_2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491_2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491_2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6216226Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java
similarity index 91%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6216226Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java
index ec856b7116f..275fd8c5af1 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6216226Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,13 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.File;
 import java.io.StringReader;
 
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6311448.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6311448.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java
index 5b395170918..db6925d00e4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6311448.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6384805.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6384805.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java
index c59b9555f0a..680398bf037 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6384805.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.util.Iterator;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6465722.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6465722.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java
index 3a261092f0e..80d5139e7c3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6465722.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.StringReader;
 import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6467808.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6467808.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java
index e32947c1814..7a7fb1aa074 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6467808.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490380.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490380.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java
index 5ec65e81110..4385fb245bf 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490380.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.StringWriter;
 import java.net.URL;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490921.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490921.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java
index b8ec881fdc6..38f72d5a89f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490921.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6505031.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6505031.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6505031.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6505031.java
index 931bf6dc34b..d3fa4fd30f4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6505031.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6505031.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.StringWriter;
 import java.util.HashMap;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6513892.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6513892.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java
index ac9fab16438..da26d64e2ec 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6513892.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6537167.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6537167.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java
index f64c67213b5..c75ff71b584 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6537167.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6540545.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6540545.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java
index e9ddaee53a7..2c76ad694fa 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6540545.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.StringWriter;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6559595.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6559595.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java
index 1c568b1b86c..162c92a2e8a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6559595.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.StringReader;
 import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6565260.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6565260.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java
index d6a548bff68..3b0f6361b1d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6565260.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.StringWriter;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6940416.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6940416.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java
index 5c881e10089..41f7279506a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6940416.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java
index 6099296b73f..5f5fa0e8fdd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -33,6 +33,12 @@ import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
 
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java
index c74fb355e89..7a2c5427633 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -29,6 +29,10 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.InputStream;
 
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600.policy b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600.policy
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600.policy
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600.policy
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java
index 4211bdf5d8d..f364f5d2332 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,12 +21,14 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.File;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java
similarity index 90%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java
index b6039c120e1..70767a47d3b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,12 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.InputStream;
 
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6652519Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6652519Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java
index afec16489fd..9be065fb038 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6652519Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,12 +21,14 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.File;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.stream.StreamSource;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6689809Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6689809Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java
index dec6b4eb799..91da2f6d4fd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6689809Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,11 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.CharArrayWriter;
 
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Inc.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Inc.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Inc.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Inc.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java
similarity index 91%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java
index 9a77ed1a1bf..60de73f31e0 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,13 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.File;
 import java.io.StringWriter;
 
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java
similarity index 89%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java
index 646043feaa6..6742d3fe47e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,15 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.FileOutputStream;
 
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java
index d2e6eba9b41..07a18b6ad14 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,13 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.File;
 import java.io.StringWriter;
 
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java
similarity index 88%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java
index 2a8460a10a7..3d9a74012b1 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,12 +21,20 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.StringWriter;
 
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.SourceLocator;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java
similarity index 90%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java
index 5b3e71c18a2..d67a58ad847 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,15 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.StringWriter;
 
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DOMResultTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DOMResultTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java
index b08d532bd09..b21fadd8724 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DOMResultTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,11 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import org.testng.annotations.Test;
 import org.testng.Assert;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -33,6 +34,10 @@ import java.io.IOException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java b/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java
index 44976edcc1a..81227c7d691 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/FactoryFindTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java
index 370f0fff2ac..c0f17b8d5c0 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/FactoryFindTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,13 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.net.URL;
 import java.net.URLClassLoader;
 
+import javax.xml.transform.TransformerFactory;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java
index 35bcab3dc23..b0912eb8479 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.StringWriter;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java
index 1c63d974bb0..b2be968bea6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.StringReader;
 import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/MsWordXMLImport.xsl.data b/jaxp/test/javax/xml/jaxp/unittest/transform/MsWordXMLImport.xsl.data
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/MsWordXMLImport.xsl.data
rename to jaxp/test/javax/xml/jaxp/unittest/transform/MsWordXMLImport.xsl.data
index 9ba08025521..07e954144c8 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/MsWordXMLImport.xsl.data
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/MsWordXMLImport.xsl.data
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  *
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/NCAA_Conference_Schedule_XML.dtd b/jaxp/test/javax/xml/jaxp/unittest/transform/NCAA_Conference_Schedule_XML.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/NCAA_Conference_Schedule_XML.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/transform/NCAA_Conference_Schedule_XML.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/OpenJDK100017Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java
similarity index 91%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/OpenJDK100017Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java
index b7bb1ac75ab..abe964f55c5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/OpenJDK100017Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,12 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.IOException;
 
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.sax.SAXTransformerFactory;
 import javax.xml.transform.sax.TransformerHandler;
 import javax.xml.transform.stream.StreamResult;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/PredicateInKeyTest.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xml
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/PredicateInKeyTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xml
index 10886c5c88c..2c6015beb02 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/PredicateInKeyTest.xml
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xml
@@ -3,7 +3,7 @@
   * PredicateInKeyTest.xml - XSLT test input file for PredicatInKeyTest.xsl
   *
  *
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/PredicateInKeyTest.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xsl
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/PredicateInKeyTest.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xsl
index 77d3095de68..358c0af2ac3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/PredicateInKeyTest.xsl
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
  *
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SAX2DOMTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SAX2DOMTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java
index fb480e11a29..6e3a9afeb36 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SAX2DOMTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SAX2DOMTest.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SAX2DOMTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java
index c158d7a85be..888f278edd7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -31,6 +31,10 @@ import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java
index 142fbd2fc37..d0e7ae34d6e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,14 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.File;
 import java.io.StringWriter;
 
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/StAXSourceTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/StAXSourceTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java
index a1b9bc242e0..dc149f49031 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/StAXSourceTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -31,6 +31,10 @@ import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.stax.StAXResult;
 import javax.xml.transform.stax.StAXSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerFactoryTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerFactoryTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java
index 16f94995c3c..62b84977bb7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerFactoryTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,6 +29,13 @@ import java.io.InputStream;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.URIResolver;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stax.StAXResult;
 import javax.xml.transform.stax.StAXSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java
index d331d2af5a0..18229dc28c9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -29,6 +29,9 @@ import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
 
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerUtilFactory.java b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java
similarity index 84%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerUtilFactory.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java
index a234aa0f356..793dd7ad6ac 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerUtilFactory.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,13 +21,13 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
-import javax.xml.transform.util.DOMUtil;
-import javax.xml.transform.util.SAXUtil;
-import javax.xml.transform.util.StAXUtil;
-import javax.xml.transform.util.StreamUtil;
-import javax.xml.transform.util.TransformerUtil;
+import transform.util.DOMUtil;
+import transform.util.SAXUtil;
+import transform.util.StAXUtil;
+import transform.util.StreamUtil;
+import transform.util.TransformerUtil;
 
 public class TransformerUtilFactory {
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/VersionDefaultHandler.java b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/VersionDefaultHandler.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java
index 26bda31979b..ff8fbfe189b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/VersionDefaultHandler.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/VersionEventWriter.java b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/VersionEventWriter.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java
index c7589da5c32..51ff18c421d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/VersionEventWriter.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.stream.XMLEventReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/ViewEditor1.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/ViewEditor1.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/ViewEditor1.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/ViewEditor1.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/XSLTFunctionsTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/XSLTFunctionsTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java
index ce00db31d9b..90e02cb3b2d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/XSLTFunctionsTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java
@@ -21,16 +21,22 @@
  * questions.
  */
 
-package javax.xml.transform;
+package transform;
 
 import java.io.StringReader;
 import java.io.StringWriter;
 
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.URIResolver;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
+
 import static org.testng.Assert.assertEquals;
 
 /*
@@ -112,9 +118,9 @@ public class XSLTFunctionsTest {
             + "<xsl:element name=\"root\">"
             + "<xsl:variable name=\"other_doc\" select=\"document(&#39;externalDoc&#39;)\"/>"
             + "<!-- Source -->"
-            + "<xsl:value-of select=\"cfunc:javax.xml.transform.DocumentExtFunc.test(/Test)\"/>"
+            + "<xsl:value-of select=\"cfunc:transform.DocumentExtFunc.test(/Test)\"/>"
             + "<!-- document() -->"
-            + "<xsl:value-of select=\"cfunc:javax.xml.transform.DocumentExtFunc.test($other_doc/Test)\"/>"
+            + "<xsl:value-of select=\"cfunc:transform.DocumentExtFunc.test($other_doc/Test)\"/>"
             + "</xsl:element></xsl:template></xsl:transform>";
 
     static final String documentTesteExpectedResult = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/attribset27.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/attribset27.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/attribset27.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/attribset27.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog.xsd b/jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog_10.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/catalog_10.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog_10.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/catalog_10.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/config.dtd b/jaxp/test/javax/xml/jaxp/unittest/transform/config.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/config.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/transform/config.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/config.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/config.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/config.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/config.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/default-layout.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/default-layout.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/default-layout.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/default-layout.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/global-variables.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/global-variables.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/global-variables.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/global-variables.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/global.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/global.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/global.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/global.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/home.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/home.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/home.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/home.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/in.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/in.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/in.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/in.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/inner.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/inner.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/inner.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/inner.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/logon.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/logon.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/logon.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/logon.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/maps.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/maps.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/maps.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/maps.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/msgAttach.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/msgAttach.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/msgAttach.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/msgAttach.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/numbering63.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/numbering63.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/numbering63.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/numbering63.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/outer.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/outer.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/outer.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/outer.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/redirect.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/redirect.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/redirect.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/redirect.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/sax/Bug6451633.java b/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/sax/Bug6451633.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java
index 855fa6ee1e6..a299656033e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/sax/Bug6451633.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform.sax;
+package transform.sax;
 
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/src.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/src.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/src.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/src.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/template.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/template.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/template.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/template.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tigertest-in.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/tigertest-in.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tigertest-in.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/tigertest-in.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tigertest.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/tigertest.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tigertest.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/tigertest.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tmp.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/tmp.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tmp.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/tmp.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/toys.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/toys.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/toys.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/transform.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/transform.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/transform.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/transform.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/upload-media-form.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/upload-media-form.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/upload-media-form.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/upload-media-form.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/upload-media.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/upload-media.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/upload-media.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/upload-media.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/util.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/util.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/DOMUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/DOMUtil.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java
index 1881299a7c6..988da74f834 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/DOMUtil.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform.util;
+package transform.util;
 
 import java.io.InputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/SAXUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/SAXUtil.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java
index fd7421c23ff..9e257ebf9a6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/SAXUtil.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,19 +21,20 @@
  * questions.
  */
 
-package javax.xml.transform.util;
+package transform.util;
 
 import java.io.InputStream;
 
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
-import javax.xml.transform.VersionDefaultHandler;
 import javax.xml.transform.sax.SAXResult;
 import javax.xml.transform.sax.SAXSource;
 
 import org.testng.Assert;
 import org.xml.sax.InputSource;
 
+import transform.VersionDefaultHandler;
+
 public class SAXUtil extends TransformerUtil {
 
     private static SAXUtil instance = null;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StAXUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StAXUtil.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java
index 6c17ffa7829..26374d76ab0 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StAXUtil.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform.util;
+package transform.util;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -34,13 +34,14 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
-import javax.xml.transform.TransformerUtilFactory;
-import javax.xml.transform.VersionEventWriter;
 import javax.xml.transform.stax.StAXResult;
 import javax.xml.transform.stax.StAXSource;
 
 import org.testng.Assert;
 
+import transform.TransformerUtilFactory;
+import transform.VersionEventWriter;
+
 public class StAXUtil extends TransformerUtil {
 
     private static StAXUtil instance = null;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StreamUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StreamUtil.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java
index 7bbf93f4359..019c2f16b1e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StreamUtil.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform.util;
+package transform.util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,13 +33,14 @@ import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
-import javax.xml.transform.VersionDefaultHandler;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
 import org.w3c.dom.Document;
 
+import transform.VersionDefaultHandler;
+
 public class StreamUtil extends TransformerUtil {
 
     DocumentBuilder docBuilder = null;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/TransformerUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/TransformerUtil.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java
index 5a92fe77069..61d7bfe09db 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/TransformerUtil.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.transform.util;
+package transform.util;
 
 import java.io.InputStream;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/6773084.policy b/jaxp/test/javax/xml/jaxp/unittest/validation/6773084.policy
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/6773084.policy
rename to jaxp/test/javax/xml/jaxp/unittest/validation/6773084.policy
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/AnyElementTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/AnyElementTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java
index f37f0bfab28..a1218b1616e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/AnyElementTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package javax.xml.validation;
+package validation;
 
 /*
  * @bug 8080907
@@ -31,6 +31,8 @@ import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
 import java.net.URISyntaxException;
 
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966232.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966232.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java
index 925bf2c9123..1e9d473fb5c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966232.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.dom.DOMSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java
index 6d1f0ad2374..e081f37f072 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969042.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969042.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java
index 71ad30d61c9..d04395e6615 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969042.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969089.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969089.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java
index 32477a246b5..4b7f0b53078 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969089.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969110.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969110.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java
index f9fb0f4adb9..ace534e2c53 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969110.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.ValidatorHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969689.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969689.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java
index 6790321bdbf..85cc249fefb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969689.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.SchemaFactory;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969692.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969692.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java
index e19372242a3..2e146123869 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969692.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969693.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969693.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java
index 026da4a3ebf..18512dde195 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969693.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969695.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969695.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java
index 39ea1b7be03..db6941673d5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969695.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.SchemaFactory;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969732.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969732.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java
index 5f298af454d..3fe2dcfb9bf 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969732.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970380.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970380.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java
index b9a0656b002..b9d055547e5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970380.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.ValidatorHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970383.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970383.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java
index 3ac15277ec4..f53615333c4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970383.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.ValidatorHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970400.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970400.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java
index d0c57b20765..c4575679ca5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970400.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.ValidatorHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970402.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970402.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java
index 55f3d1d9d3d..e66e01062ed 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970402.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970951.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970951.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java
index 4f986a8920a..e033d499078 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970951.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971605.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971605.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java
index 09cd588489a..566f17c0c1a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971605.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971607.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971607.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java
index e33b040a778..870e7a7bc38 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971607.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.ValidatorHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4972882.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4972882.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java
index 8e84e840626..8b3ce663eca 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4972882.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java
index 73049545f24..f98f6d5b768 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.SchemaFactory;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4987574.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4987574.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java
index a56806a61c8..d479455524a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4987574.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java
index 4c372f5ad7a..ef57585545d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.SchemaFactory;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java
index d99960674b0..0005f17e51c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.SchemaFactory;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java
index 9ca25216ec6..b7b889b90fb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.SchemaFactory;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java
index e381e65f59c..4ea0afe938e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.net.URL;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4997818.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4997818.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java
index 7330d49358b..b46bf36eea7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4997818.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5011500.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5011500.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java
index bc65b4de23b..6d79fb2cc7b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5011500.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java
index 327a387e51a..9769d1dc8f3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6378043.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6378043.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java
index 6078724f89c..c561bb12ecf 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6378043.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java
index ca24b94281f..3b797edc0b3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package javax.xml.validation;
+package validation;
 
 import javax.xml.XMLConstants;
 import javax.xml.validation.SchemaFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6457662.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6457662.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java
index 84bfa2681f3..3518a0e7267 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6457662.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java
index 76cf2a30699..4ebce561e3f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 import java.io.IOException;
@@ -38,6 +38,9 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6483188.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6483188.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java
index 848a545bec8..f5947130ee7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6483188.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.net.URL;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java
index 5034d3d29f6..2da6c45a1fb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6509668.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6509668.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java
index 094c8a6eac9..2c9906c9711 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6509668.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java
index dfbf550e560..e737d7514fc 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6531160.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6531160.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java
index 7c682dbd4fb..53cea01f5d8 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6531160.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java
index fde9fb2e420..e70dbff8a11 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.IOException;
 
@@ -30,6 +30,9 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.dom.DOMSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_1.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_1.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_1.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_1.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_10.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_10.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_10.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_10.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_11.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_11.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_11.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_11.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_12.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_12.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_12.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_12.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_13.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_13.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_13.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_13.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_14.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_14.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_14.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_14.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_15.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_15.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_15.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_15.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_16.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_16.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_16.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_16.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_17.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_17.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_17.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_17.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_18.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_18.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_18.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_18.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_19.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_19.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_19.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_19.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_2.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_20.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_20.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_20.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_20.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_21.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_21.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_21.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_21.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_22.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_22.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_22.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_22.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_23.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_23.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_23.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_23.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_24.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_24.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_24.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_24.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_25.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_25.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_25.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_25.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_3.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_3.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_3.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_3.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_4.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_4.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_4.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_4.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_5.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_5.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_5.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_5.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_6.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_6.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_6.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_6.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_7.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_7.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_7.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_7.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_8.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_8.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_8.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_8.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_9.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_9.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_9.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_9.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java
index 41103d20b13..98737edebaf 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -38,6 +38,9 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6859210.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6859210.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java
index 322a7dc4fa2..1bb0d046499 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6859210.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6925531Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6925531Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java
index 03b2efd3a53..b3fad32adb0 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6925531Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -35,6 +35,9 @@ import java.security.PrivilegedAction;
 import javax.xml.XMLConstants;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java
index b93c1ac8f62..5f0b19d50dc 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -31,6 +31,8 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738_Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738_Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java
index da5bb1a4cab..5118754af73 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738_Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,12 +21,15 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.IOException;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6708840Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6708840Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java
index 932c8fb43b8..7c9b0bd83e1 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6708840Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -33,6 +33,9 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.stax.StAXSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.java b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java
index 7ef779eb0a9..26a239b2854 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CREMAS01.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CREMAS01.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CREMAS01.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CREMAS01.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ErrorHandlerImpl.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ErrorHandlerImpl.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java
index 6fbd8570d88..95806ed3f21 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ErrorHandlerImpl.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java
index 9301f3bd6b8..e1753f06817 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30.java b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java
index afde0f092a4..765fa1329c5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-error.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-error.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize-error.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize-error.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue43Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue43Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java
index 5a451ca7a6e..e590b221330 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue43Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.FileInputStream;
 import java.util.ArrayList;
@@ -34,6 +34,9 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.java b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java
index 85522e9503d..aec363119a1 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.FileInputStream;
 
@@ -33,6 +33,9 @@ import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/LargeMaxOccursTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/LargeMaxOccursTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java
index 4a4e06235d2..d78322723c7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/LargeMaxOccursTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,14 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 
 import javax.xml.XMLConstants;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java
index 7f0dbddebee..014e8af7dad 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursUnboundedTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursUnboundedTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java
index 8d7d5163756..b6069c26a3b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursUnboundedTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java
index be3ed12bf0f..0cb9177760c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursUnboundedTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursUnboundedTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java
index 47d1ba9af91..df0e07829dd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursUnboundedTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java
index 36b21cdf8bd..36b97cf9361 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardUnbounded.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardUnbounded.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java
index e11fa92fd47..b454db97b22 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardUnbounded.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesId005Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesId005Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java
index 429ea2d9d83..74169f4af09 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesId005Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesIg004Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java
similarity index 88%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesIg004Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java
index c1618505e34..2fe1a305e2a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesIg004Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,14 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 
 import javax.xml.XMLConstants;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesQ013Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesQ013Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java
index ef589d13847..33e73d5ce80 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesQ013Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-lax-error.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-lax-error.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-lax-error.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-lax-error.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/TCKGroupA008Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java
similarity index 89%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/TCKGroupA008Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java
index e097422fbdf..c88c09b85f5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/TCKGroupA008Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,14 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ValidatorTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ValidatorTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java
index 5a84c5211a7..9dd421a4a26 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ValidatorTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,6 +34,9 @@ import javax.xml.stream.XMLOutputFactory;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.stax.StAXResult;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLDocBuilder.java b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLDocBuilder.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java
index f0513bb3683..de9b0d935e4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLDocBuilder.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLSchemaValidator.java b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLSchemaValidator.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java
index c1722a190e5..beb05e56afb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLSchemaValidator.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation;
+package validation;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths-invalid.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths-invalid.xml
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths-invalid.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/gMonths-invalid.xml
index a3071b50bab..ce13a8848a3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths-invalid.xml
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths-invalid.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xml
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xml
index 65020ee63d9..93f823b70dd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths.xml
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xsd
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xsd
index c18b5dc7518..e8f22d219fd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths.xsd
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/groupA008.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/groupA008.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/groupA008.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/groupA008.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/groupA008ea.red b/jaxp/test/javax/xml/jaxp/unittest/validation/groupA008ea.red
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/groupA008ea.red
rename to jaxp/test/javax/xml/jaxp/unittest/validation/groupA008ea.red
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/groupA008eb.red b/jaxp/test/javax/xml/jaxp/unittest/validation/groupA008eb.red
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/groupA008eb.red
rename to jaxp/test/javax/xml/jaxp/unittest/validation/groupA008eb.red
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/hello_literal.wsdl b/jaxp/test/javax/xml/jaxp/unittest/validation/hello_literal.wsdl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/hello_literal.wsdl
rename to jaxp/test/javax/xml/jaxp/unittest/validation/hello_literal.wsdl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idI009.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/idI009.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idI009.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/idI009.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idIimp.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/idIimp.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idIimp.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/idIimp.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idIxpns.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/idIxpns.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idIxpns.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/idIxpns.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idIxpns1.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/idIxpns1.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idIxpns1.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/idIxpns1.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/mgG014.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/mgG014.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/mgG014.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/mgG014.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/mgJ014.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/mgJ014.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/mgJ014.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/mgJ014.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-error-max.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-max.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-error-max.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-max.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-error-min-max.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-min-max.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-error-min-max.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-min-max.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-error-min.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-min.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-error-min.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-min.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-unbounded-error-min.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-error-min.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-unbounded-error-min.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-error-min.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-unbounded-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-unbounded-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-unbounded.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-unbounded.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-error-max.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-max.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-error-max.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-max.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-error-min-max.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-min-max.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-error-min-max.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-min-max.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-error-min.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-min.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-error-min.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-min.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-unbounded-error-min.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded-error-min.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-unbounded-error-min.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded-error-min.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-unbounded-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-unbounded-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-unbounded.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-unbounded.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-wildcard-unbounded.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-wildcard-unbounded.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-wildcard-unbounded.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-wildcard-unbounded.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-wildcard.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-wildcard.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-wildcard.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-wildcard.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesId005.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesId005.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesId005.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesId005.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesId005.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesId005.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesId005.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesId005.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesIe003.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesIe003.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesIe003.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesIe003.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesIg004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesIg004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesIg004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesIg004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesOptimize.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesOptimize.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesOptimize.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesOptimize.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesQ013.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesQ013.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesQ013.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesQ013.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesQ013.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesQ013.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesQ013.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesQ013.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesR005.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesR005.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesR005.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesR005.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2_stub.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2_stub.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2_stub.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2_stub.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2a.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2a.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2a.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2a.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/byte_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/byte_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/byte_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/byte_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/int_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/int_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/int_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/int_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/integer_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/integer_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/integer_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/integer_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/long_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/long_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/long_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/long_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/short_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/short_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/short_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/short_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java
index c9de30f5d49..67dbb9a4b80 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation.tck;
+package validation.tck;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963124.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963124.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963124Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963124Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java
index fc1f3286e02..1734c536359 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963124Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation.tck;
+package validation.tck;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java
index 59fab2b21c4..269d7b36192 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation.tck;
+package validation.tck;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6964720.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6964720.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6964720Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6964720Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java
index 4c287f77f35..ca0b6509498 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6964720Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation.tck;
+package validation.tck;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/RegexTest_1258.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/RegexTest_1258.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/RegexTest_1258.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/RegexTest_1258.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reD10.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD10.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reD10.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD10.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reD11.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD11.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reD11.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD11.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reD12.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD12.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reD12.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD12.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reE9.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reE9.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reE9.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reE9.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java
index 6f9a81998ce..66d2e0bb254 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation.tck;
+package validation.tck;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java
index 6daab87a8a2..460989a2877 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation.tck;
+package validation.tck;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890_1.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890_1.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890_1.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890_1.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java
index 0d20968ae0a..89e1c3d8ef4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation.tck;
+package validation.tck;
 
 import java.io.IOException;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190_v.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190_v.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190_v.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190_v.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java
index 0b4f7e53678..f2248a4fc16 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation.tck;
+package validation.tck;
 
 import java.io.IOException;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF025.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF025.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF025.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF025.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF037.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF037.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF037.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF037.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF041.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF041.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF041.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF041.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF045.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF045.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF045.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF045.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF049.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF049.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF049.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF049.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java
index 8149e386d50..2a5f557a81a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation.tck;
+package validation.tck;
 
 import java.io.File;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA2.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA2.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA2.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA3.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA3.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA3.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA3.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA4.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA4.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA4.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA4.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA5.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA5.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA5.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA5.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA6.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA6.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA6.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA6.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java
index 2b886fdc06a..f5b6e497838 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation.tck;
+package validation.tck;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java
index 82cdf3fabc4..94682bb15d1 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation.tck;
+package validation.tck;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug7014246.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug7014246.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug7014246Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug7014246Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java
index 0da53f664e3..f6316c962fa 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug7014246Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.validation.tck;
+package validation.tck;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/test-element.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/test-element.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/test-element.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/test-element.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/test-sequence.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/test-sequence.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/test-sequence.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/test-sequence.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/test.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/test.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/test.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/test.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/toys.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/toys.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/toys.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/toys.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/toys.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/toys.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/toys.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/types.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/types.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/types.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/types.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4991857.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4991857.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java
index 9c71f1929b2..aa37ec70959 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4991857.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.xpath;
+package xpath;
 
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4991939.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4991939.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java
index 55ad3df3763..206c6aa1b2a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4991939.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.xpath;
+package xpath;
 
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992788.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992788.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java
index 3fe5f923b27..2b4f9c29078 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992788.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.xpath;
+package xpath;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992793.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992793.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java
index 8552559019e..5810cd6f59b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992793.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.xpath;
+package xpath;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992805.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992805.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java
index 71ab8d6c298..b847febc112 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992805.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.xpath;
+package xpath;
 
 import java.io.StringReader;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/ClassLoaderTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/ClassLoaderTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java
index 3ae3585ec16..9a3a66a6b2f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/ClassLoaderTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.xpath;
+package xpath;
 
 import javax.xml.xpath.XPathFactory;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/MyClassLoader.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/MyClassLoader.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java
index 73b86547214..d333e7053a6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/MyClassLoader.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package javax.xml.xpath;
+package xpath;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/SecureProcessingTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/SecureProcessingTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java
index 50eea2738ed..cbd44e920f0 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/SecureProcessingTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package javax.xml.xpath;
+package xpath;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,6 +34,13 @@ import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import javax.xml.xpath.XPathFactoryConfigurationException;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionException;
+import javax.xml.xpath.XPathFunctionResolver;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/SecureProcessingTest.xml b/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/SecureProcessingTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathAnyTypeTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathAnyTypeTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java
index ef56ca90d6d..c42101a334a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathAnyTypeTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java
@@ -20,12 +20,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package javax.xml.xpath;
+package xpath;
 
 import java.io.File;
-import javax.xml.xpath.*;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathNodes;
+import javax.xml.xpath.XPathEvaluationResult;
+import javax.xml.xpath.XPathExpressionException;
+
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
+
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathExpAnyTypeTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathExpAnyTypeTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java
index 0eb8047d14a..ab9750732bd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathExpAnyTypeTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java
@@ -21,12 +21,19 @@
  * questions.
  */
 
-package javax.xml.xpath;
+package xpath;
 
 import java.io.File;
-import javax.xml.xpath.*;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathNodes;
+import javax.xml.xpath.XPathEvaluationResult;
+
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
+
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTest.java
similarity index 89%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTest.java
index 34fe8e3c4bb..ee6687949b3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,9 +21,11 @@
  * questions.
  */
 
-package javax.xml.xpath;
+package xpath;
 
 import javax.xml.namespace.NamespaceContext;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathFactory;
 
 import org.testng.annotations.Test;
 
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathTestBase.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTestBase.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathTestBase.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTestBase.java
index 0f0624216c8..4d9666afd0a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathTestBase.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTestBase.java
@@ -20,17 +20,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package javax.xml.xpath;
+package xpath;
 
 import java.io.ByteArrayInputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
+
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathFactory;
+import static javax.xml.xpath.XPathConstants.BOOLEAN;
+import static javax.xml.xpath.XPathConstants.NUMBER;
+import static javax.xml.xpath.XPathConstants.STRING;
+import static javax.xml.xpath.XPathConstants.NODE;
+import static javax.xml.xpath.XPathConstants.NODESET;
+import javax.xml.xpath.XPathNodes;
+import javax.xml.xpath.XPathEvaluationResult;
+
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
+
 import org.testng.annotations.DataProvider;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 5db1d6583b2..4344d1a61ed 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -322,3 +322,4 @@ f5911c6155c29ac24b6f9068273207e5ebd3a3df jdk9-b69
 6232472e51418757f7b2bf05332678ea78096e6b jdk9-b74
 086bcd5e4a531a350c84668c8dc019461588ee3d jdk9-b75
 55bb88306dc57d07f2c854803465f6d9a7eb4aba jdk9-b76
+bd6ece68cf8aca34c8d992569892060c82cfd3f1 jdk9-b77
diff --git a/jdk/make/data/tzdata/VERSION b/jdk/make/data/tzdata/VERSION
index d6f6f158d1d..4bb2351d627 100644
--- a/jdk/make/data/tzdata/VERSION
+++ b/jdk/make/data/tzdata/VERSION
@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2015e
+tzdata2015f
diff --git a/jdk/make/data/tzdata/africa b/jdk/make/data/tzdata/africa
index 049861192cc..00150c68ef0 100644
--- a/jdk/make/data/tzdata/africa
+++ b/jdk/make/data/tzdata/africa
@@ -561,7 +561,7 @@ Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 
 # From Alex Krivenyshev (2008-07-11):
 # Seems that English language article "The revival of daylight saving
-# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally
+# time: Energy conservation?"- No. 16578 (07/11/2008) was originally
 # published on Monday, June 30, 2008...
 #
 # I guess that article in French "Le gouvernement avance l'introduction
@@ -693,7 +693,7 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
 # Here is a link to official document from Royaume du Maroc Premier Ministre,
 # Ministère de la Modernisation des Secteurs Publics
 #
-# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
+# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 June 1967)
 # concerning the amendment of the legal time, the Ministry of Modernization of
 # Public Sectors announced that the official time in the Kingdom will be
 # advanced 60 minutes from Sunday 31 May 2009 at midnight.
diff --git a/jdk/make/data/tzdata/asia b/jdk/make/data/tzdata/asia
index fa4f2461cbb..8a1f75fe7c0 100644
--- a/jdk/make/data/tzdata/asia
+++ b/jdk/make/data/tzdata/asia
@@ -29,7 +29,7 @@
 # tz@iana.org for general use in the future).  For more, please see
 # the file CONTRIBUTING in the tz distribution.
 
-# From Paul Eggert (2014-10-31):
+# From Paul Eggert (2015-08-08):
 #
 # Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -66,7 +66,7 @@
 #	2:00 EET  EEST	Eastern European Time
 #	2:00 IST  IDT	Israel
 #	3:00 AST  ADT	Arabia*
-#	3:30 IRST IRDT	Iran
+#	3:30 IRST IRDT	Iran*
 #	4:00 GST	Gulf*
 #	5:30 IST	India
 #	7:00 ICT	Indochina, most times and locations*
@@ -75,10 +75,11 @@
 #	8:00 CST	China
 #	8:00 IDT	Indochina, 1943-45, 1947-55, 1960-75 (some locations)*
 #	8:00 JWST	Western Standard Time (Japan, 1896/1937)*
+#	8:30 KST  KDT	Korea when at +0830*
 #	9:00 JCST	Central Standard Time (Japan, 1896/1937)
 #	9:00 WIT	east Indonesia (Waktu Indonesia Timur)
 #	9:00 JST  JDT	Japan
-#	9:00 KST  KDT	Korea
+#	9:00 KST  KDT	Korea when at +09
 #	9:30 ACST	Australian Central Standard Time
 #
 # See the 'europe' file for Russia and Turkey in Asia.
@@ -1050,7 +1051,7 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
 #
 # From Roozbeh Pournader (2007-11-05):
 # This is quoted from Official Gazette of the Islamic Republic of
-# Iran, Volume 63, Number 18242, dated Tuesday 1386/6/24
+# Iran, Volume 63, No. 18242, dated Tuesday 1386/6/24
 # [2007-10-16]. I am doing the best translation I can:...
 # The official time of the country will be moved forward for one hour
 # on the 24 hours of the first day of the month of Farvardin and will
@@ -1580,7 +1581,7 @@ Zone	Asia/Amman	2:23:44 -	LMT	1931
 # - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00.
 # - Oral switched from +5:00 to +4:00 in spring 1989.
 
-# From Kazakhstan Embassy's News Bulletin #11
+# From Kazakhstan Embassy's News Bulletin No. 11
 # <http://www.kazsociety.org.uk/news/2005/03/30.htm> (2005-03-21):
 # The Government of Kazakhstan passed a resolution March 15 abolishing
 # daylight saving time citing lack of economic benefits and health
@@ -1734,6 +1735,17 @@ Rule	ROK	1987	1988	-	Oct	Sun>=8	3:00	0	S
 #
 # For Pyongyang we have no information; guess no changes since World War II.
 
+# From Steffen Thorsen (2015-08-07):
+# According to many news sources, North Korea is going to change to
+# the 8:30 time zone on August 15, one example:
+# http://www.bbc.com/news/world-asia-33815049
+#
+# From Paul Eggert (2015-08-07):
+# No transition time is specified; assume 00:00.
+# There is no common English-language abbreviation for this time zone.
+# Use %z rather than invent one.  We can't assume %z works everywhere yet,
+# so for now substitute its output manually.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Seoul	8:27:52	-	LMT	1908 Apr  1
 			8:30	-	KST	1912 Jan  1
@@ -1746,7 +1758,8 @@ Zone	Asia/Pyongyang	8:23:00 -	LMT	1908 Apr  1
 			8:30	-	KST	1912 Jan  1
 			9:00	-	JCST	1937 Oct  1
 			9:00	-	JST	1945 Aug 24
-			9:00	-	KST
+			9:00	-	KST	2015 Aug 15
+			8:30	-	KST
 
 ###############################################################################
 
diff --git a/jdk/make/data/tzdata/europe b/jdk/make/data/tzdata/europe
index 7cee9a81527..b3a9854fc4f 100644
--- a/jdk/make/data/tzdata/europe
+++ b/jdk/make/data/tzdata/europe
@@ -216,11 +216,14 @@
 #	republished in Finest Hour (Spring 2002) 1(114):26
 #	http://www.winstonchurchill.org/images/finesthour/Vol.01%20No.114.pdf
 
-# From Paul Eggert (1996-09-03):
+# From Paul Eggert (2015-08-08):
 # The OED Supplement says that the English originally said "Daylight Saving"
 # when they were debating the adoption of DST in 1908; but by 1916 this
 # term appears only in quotes taken from DST's opponents, whereas the
 # proponents (who eventually won the argument) are quoted as using "Summer".
+# The term "Summer Time" was introduced by Herbert Samuel, Home Secretary; see:
+# Viscount Samuel. Leisure in a Democracy. Cambridge University Press
+# ISBN 978-1-107-49471-8 (1949, reissued 2015), p 8.
 
 # From Arthur David Olson (1989-01-19):
 # A source at the British Information Office in New York avers that it's
@@ -366,7 +369,7 @@
 
 # From an anonymous contributor (1996-06-02):
 # The law governing time in Ireland is under Statutory Instrument SI 395/94,
-# which gives force to European Union 7th Council Directive # 94/21/EC.
+# which gives force to European Union 7th Council Directive No. 94/21/EC.
 # Under this directive, the Minister for Justice in Ireland makes appropriate
 # regulations. I spoke this morning with the Secretary of the Department of
 # Justice (tel +353 1 678 9711) who confirmed to me that the correct name is
@@ -615,11 +618,11 @@ Rule	Russia	1921	only	-	Feb	14	23:00	1:00	MSD
 Rule	Russia	1921	only	-	Mar	20	23:00	2:00	MSM  # Midsummer
 Rule	Russia	1921	only	-	Sep	 1	 0:00	1:00	MSD
 Rule	Russia	1921	only	-	Oct	 1	 0:00	0	-
-# Act No.925 of the Council of Ministers of the USSR (1980-10-24):
+# Act No. 925 of the Council of Ministers of the USSR (1980-10-24):
 Rule	Russia	1981	1984	-	Apr	 1	 0:00	1:00	S
 Rule	Russia	1981	1983	-	Oct	 1	 0:00	0	-
-# Act No.967 of the Council of Ministers of the USSR (1984-09-13), repeated in
-# Act No.227 of the Council of Ministers of the USSR (1989-03-14):
+# Act No. 967 of the Council of Ministers of the USSR (1984-09-13), repeated in
+# Act No. 227 of the Council of Ministers of the USSR (1989-03-14):
 Rule	Russia	1984	1991	-	Sep	lastSun	 2:00s	0	-
 Rule	Russia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
 #
@@ -851,7 +854,7 @@ Zone	Europe/Brussels	0:17:30 -	LMT	1880
 # Bulgaria
 #
 # From Plamen Simenov via Steffen Thorsen (1999-09-09):
-# A document of Government of Bulgaria (No.94/1997) says:
+# A document of Government of Bulgaria (No. 94/1997) says:
 # EET -> EETDST is in 03:00 Local time in last Sunday of March ...
 # EETDST -> EET is in 04:00 Local time in last Sunday of October
 #
@@ -868,7 +871,7 @@ Zone	Europe/Sofia	1:33:16 -	LMT	1880
 			1:00	C-Eur	CE%sT	1945
 			1:00	-	CET	1945 Apr  2  3:00
 			2:00	-	EET	1979 Mar 31 23:00
-			2:00	Bulg	EE%sT	1982 Sep 26  2:00
+			2:00	Bulg	EE%sT	1982 Sep 26  3:00
 			2:00	C-Eur	EE%sT	1991
 			2:00	E-Eur	EE%sT	1997
 			2:00	EU	EE%sT
@@ -1085,8 +1088,8 @@ Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik air base
 # after that.
 
 # From Mart Oruaas (2000-01-29):
-# Regulation no. 301 (1999-10-12) obsoletes previous regulation
-# no. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
+# Regulation No. 301 (1999-10-12) obsoletes previous regulation
+# No. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
 # the year round.  The regulation is effective 1999-11-01.
 
 # From Toomas Soome (2002-02-21):
@@ -1107,7 +1110,7 @@ Zone	Europe/Tallinn	1:39:00	-	LMT	1880
 			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
 			2:00	1:00	EEST	1989 Sep 24  2:00s
 			2:00	C-Eur	EE%sT	1998 Sep 22
-			2:00	EU	EE%sT	1999 Nov  1
+			2:00	EU	EE%sT	1999 Oct 31  4:00
 			2:00	-	EET	2002 Feb 21
 			2:00	EU	EE%sT
 
@@ -1550,21 +1553,21 @@ Link	Europe/Rome	Europe/San_Marino
 # correct data in juridical acts and I found some juridical documents about
 # changes in the counting of time in Latvia from 1981....
 #
-# Act No.35 of the Council of Ministers of Latvian SSR of 1981-01-22 ...
-# according to the Act No.925 of the Council of Ministers of USSR of 1980-10-24
+# Act No. 35 of the Council of Ministers of Latvian SSR of 1981-01-22 ...
+# according to the Act No. 925 of the Council of Ministers of USSR of 1980-10-24
 # ...: all year round the time of 2nd time zone + 1 hour, in addition turning
 # the hands of the clock 1 hour forward on 1 April at 00:00 (GMT 31 March 21:00)
 # and 1 hour backward on the 1 October at 00:00 (GMT 30 September 20:00).
 #
-# Act No.592 of the Council of Ministers of Latvian SSR of 1984-09-24 ...
-# according to the Act No.967 of the Council of Ministers of USSR of 1984-09-13
+# Act No. 592 of the Council of Ministers of Latvian SSR of 1984-09-24 ...
+# according to the Act No. 967 of the Council of Ministers of USSR of 1984-09-13
 # ...: all year round the time of 2nd time zone + 1 hour, in addition turning
 # the hands of the clock 1 hour forward on the last Sunday of March at 02:00
 # (GMT 23:00 on the previous day) and 1 hour backward on the last Sunday of
 # September at 03:00 (GMT 23:00 on the previous day).
 #
-# Act No.81 of the Council of Ministers of Latvian SSR of 1989-03-22 ...
-# according to the Act No.227 of the Council of Ministers of USSR of 1989-03-14
+# Act No. 81 of the Council of Ministers of Latvian SSR of 1989-03-22 ...
+# according to the Act No. 227 of the Council of Ministers of USSR of 1989-03-14
 # ...: since the last Sunday of March 1989 in Lithuanian SSR, Latvian SSR,
 # Estonian SSR and Kaliningrad region of Russian Federation all year round the
 # time of 2nd time zone (Moscow time minus one hour). On the territory of Latvia
@@ -1581,7 +1584,7 @@ Link	Europe/Rome	Europe/San_Marino
 # From Andrei Ivanov (2000-03-06):
 # This year Latvia will not switch to Daylight Savings Time (as specified in
 # The Regulations of the Cabinet of Ministers of the Rep. of Latvia of
-# 29-Feb-2000 (#79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
+# 29-Feb-2000 (No. 79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
 # in Latvian for subscribers only).
 
 # From RFE/RL Newsline
@@ -1786,6 +1789,18 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2  0:00s # Valletta
 # News from Moldova (in russian):
 # http://ru.publika.md/link_317061.html
 
+# From Roman Tudos (2015-07-02):
+# http://lex.justice.md/index.php?action=view&view=doc&lang=1&id=355077
+# From Paul Eggert (2015-07-01):
+# The abovementioned official link to IGO1445-868/2014 states that
+# 2014-10-26's fallback transition occurred at 03:00 local time.  Also,
+# http://www.trm.md/en/social/la-30-martie-vom-trece-la-ora-de-vara
+# says the 2014-03-30 spring-forward transition was at 02:00 local time.
+# Guess that since 1997 Moldova has switched one hour before the EU.
+
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Moldova	1997	max	-	Mar	lastSun	 2:00	1:00	S
+Rule	Moldova	1997	max	-	Oct	lastSun	 3:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Chisinau	1:55:20 -	LMT	1880
@@ -1800,7 +1815,7 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
 			2:00	Russia	EE%sT	1992
 			2:00	E-Eur	EE%sT	1997
 # See Romania commentary for the guessed 1997 transition to EU rules.
-			2:00	EU	EE%sT
+			2:00	Moldova	EE%sT
 
 # Monaco
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
@@ -2146,7 +2161,7 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 # Russia
 
 # From Alexander Krivenyshev (2011-09-15):
-# Based on last Russian Government Decree # 725 on August 31, 2011
+# Based on last Russian Government Decree No. 725 on August 31, 2011
 # (Government document
 # http://www.government.ru/gov/results/16355/print/
 # in Russian)
@@ -2156,7 +2171,7 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 # http://www.worldtimezone.com/dst_news/dst_news_russia36.htm
 
 # From Sanjeev Gupta (2011-09-27):
-# Scans of [Decree #23 of January 8, 1992] are available at:
+# Scans of [Decree No. 23 of January 8, 1992] are available at:
 # http://government.consultant.ru/page.aspx?1223966
 # They are in Cyrillic letters (presumably Russian).
 
@@ -2167,19 +2182,19 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 # One source is
 # http://government.ru/gov/results/16355/
 # which, according to translate.google.com, begins "Decree of August 31,
-# 2011 No 725" and contains no other dates or "effective date" information.
+# 2011 No. 725" and contains no other dates or "effective date" information.
 #
 # Another source is
 # http://www.rg.ru/2011/09/06/chas-zona-dok.html
 # which, according to translate.google.com, begins "Resolution of the
 # Government of the Russian Federation on August 31, 2011 N 725" and also
 # contains "Date first official publication: September 6, 2011 Posted on:
-# in the 'RG' - Federal Issue number 5573 September 6, 2011" but which
+# in the 'RG' - Federal Issue No. 5573 September 6, 2011" but which
 # does not contain any "effective date" information.
 #
 # Another source is
 # http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7
-# which, in note 8, contains "Resolution #725 of August 31, 2011...
+# which, in note 8, contains "Resolution No. 725 of August 31, 2011...
 # Effective as of after 7 days following the day of the official publication"
 # but which does not contain any reference to September 6, 2011.
 #
@@ -2387,7 +2402,7 @@ Zone Europe/Simferopol	 2:16:24 -	LMT	1880
 # changed in May.
 			 2:00	E-Eur	EE%sT	1994 May
 # From IATA SSIM (1994/1997), which also says that Kerch is still like Kiev.
-			 3:00	E-Eur	MSK/MSD	1996 Mar 31  3:00s
+			 3:00	E-Eur	MSK/MSD	1996 Mar 31  0:00s
 			 3:00	1:00	MSD	1996 Oct 27  3:00s
 # IATA SSIM (1997-09) says Crimea switched to EET/EEST.
 # Assume it happened in March by not changing the clocks.
@@ -2522,7 +2537,7 @@ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
 # from current Russia Zone 6 - Krasnoyarsk Time Zone (KRA) UTC +0700
 # to Russia Zone 5 - Novosibirsk Time Zone (NOV) UTC +0600
 #
-# This is according to Government of Russia decree # 740, on September
+# This is according to Government of Russia decree No. 740, on September
 # 14, 2009 "Application in the territory of the Kemerovo region the Fifth
 # time zone." ("Russia Zone 5" or old "USSR Zone 5" is GMT +0600)
 #
@@ -2945,7 +2960,7 @@ Zone	Africa/Ceuta	-0:21:16 -	LMT	1901
 Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
 			-1:00	-	CANT	1946 Sep 30  1:00 # Canaries T
 			 0:00	-	WET	1980 Apr  6  0:00s
-			 0:00	1:00	WEST	1980 Sep 28  0:00s
+			 0:00	1:00	WEST	1980 Sep 28  1:00u
 			 0:00	EU	WE%sT
 # IATA SSIM (1996-09) says the Canaries switch at 2:00u, not 1:00u.
 # Ignore this for now, as the Canaries are part of the EU.
@@ -3235,7 +3250,7 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
 # From Igor Karpov, who works for the Ukrainian Ministry of Justice,
 # via Garrett Wollman (2003-01-27):
 # BTW, I've found the official document on this matter. It's government
-# regulations number 509, May 13, 1996. In my poor translation it says:
+# regulations No. 509, May 13, 1996. In my poor translation it says:
 # "Time in Ukraine is set to second timezone (Kiev time). Each last Sunday
 # of March at 3am the time is changing to 4am and each last Sunday of
 # October the time at 4am is changing to 3am"
@@ -3244,7 +3259,7 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
 # On September 20, 2011 the deputies of the Verkhovna Rada agreed to
 # abolish the transfer clock to winter time.
 #
-# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
+# Bill No. 8330 of MP from the Party of Regions Oleg Nadoshi got
 # approval from 266 deputies.
 #
 # Ukraine abolishes transfer back to the winter time (in Russian)
diff --git a/jdk/make/data/tzdata/leapseconds b/jdk/make/data/tzdata/leapseconds
index 9b0a2278433..de698eaa562 100644
--- a/jdk/make/data/tzdata/leapseconds
+++ b/jdk/make/data/tzdata/leapseconds
@@ -79,5 +79,5 @@ Leap	2008	Dec	31	23:59:60	+	S
 Leap	2012	Jun	30	23:59:60	+	S
 Leap	2015	Jun	30	23:59:60	+	S
 
-#	Updated through IERS Bulletin C49
-#	File expires on:  28 December 2015
+#	Updated through IERS Bulletin C50
+#	File expires on:  28 June 2016
diff --git a/jdk/make/data/tzdata/northamerica b/jdk/make/data/tzdata/northamerica
index 09b1b7fad9f..f8197462426 100644
--- a/jdk/make/data/tzdata/northamerica
+++ b/jdk/make/data/tzdata/northamerica
@@ -1258,10 +1258,19 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	1884 # Happy Valley-Goose Bay
 
 # west Labrador, Nova Scotia, Prince Edward I
 
-# From Paul Eggert (2006-03-22):
+# From Brian Inglis (2015-07-20):
+# From the historical weather station records available at:
+# https://weatherspark.com/history/28351/1971/Sydney-Nova-Scotia-Canada
+# Sydney shares the same time history as Glace Bay, so was
+# likely to be the same across the island....
+# Sydney, as the capital and most populous location, or Cape Breton, would
+# have been better names for the zone had we known this in 1996.
+
+# From Paul Eggert (2015-07-20):
 # Shanks & Pottenger write that since 1970 most of this region has been like
 # Halifax.  Many locales did not observe peacetime DST until 1972;
-# Glace Bay, NS is the largest that we know of.
+# the Cape Breton area, represented by Glace Bay, is the largest we know of
+# (Glace Bay was perhaps not the best name choice but no point changing now).
 # Shanks & Pottenger also write that Liverpool, NS was the only town
 # in Canada to observe DST in 1971 but not 1970; for now we'll assume
 # this is a typo.
@@ -1819,13 +1828,13 @@ Zone America/Edmonton	-7:33:52 -	LMT	1906 Sep
 # Exact date in October unknown; Sunday October 1 is a reasonable guess.
 # 3. June 1918: switch to Pacific Daylight Time (GMT-7)
 # Exact date in June unknown; Sunday June 2 is a reasonable guess.
-# note#1:
+# note 1:
 # On Oct 27/1918 when daylight saving ended in the rest of Canada,
 # Creston did not change its clocks.
-# note#2:
+# note 2:
 # During WWII when the Federal Government legislated a mandatory clock change,
 # Creston did not oblige.
-# note#3:
+# note 3:
 # There is no guarantee that Creston will remain on Mountain Standard Time
 # (UTC-7) forever.
 # The subject was debated at least once this year by the town Council.
diff --git a/jdk/make/data/tzdata/southamerica b/jdk/make/data/tzdata/southamerica
index 6cf0b2bff37..082018691d6 100644
--- a/jdk/make/data/tzdata/southamerica
+++ b/jdk/make/data/tzdata/southamerica
@@ -154,7 +154,7 @@ Rule	Arg	2000	only	-	Mar	3	0:00	0	-
 # Timezone Law (which never was effectively applied) will (would?) be
 # in effect.... The article is at
 # http://ar.clarin.com/diario/2001-06-06/e-01701.htm
-# ... The Law itself is "Ley No 25155", sanctioned on 1999-08-25, enacted
+# ... The Law itself is "Ley No. 25155", sanctioned on 1999-08-25, enacted
 # 1999-09-17, and published 1999-09-21.  The official publication is at:
 # http://www.boletin.jus.gov.ar/BON/Primera/1999/09-Septiembre/21/PDF/BO21-09-99LEG.PDF
 # Regretfully, you have to subscribe (and pay) for the on-line version....
@@ -198,15 +198,11 @@ Rule	Arg	2000	only	-	Mar	3	0:00	0	-
 # http://www.worldtimezone.com/dst_news/dst_news_argentina03.html
 # http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
 
-# From Rodrigo Severo (2008-10-06):
-# Here is some info available at a Gentoo bug related to TZ on Argentina's DST:
-# ...
-# ------- Comment #1 from [jmdocile]  2008-10-06 16:28 0000 -------
-# Hi, there is a problem with timezone-data-2008e and maybe with
-# timezone-data-2008f
-# Argentinian law [Number] 25.155 is no longer valid.
+# From Juan Manuel Docile in https://bugs.gentoo.org/240339 (2008-10-07)
+# via Rodrigo Severo:
+# Argentinian law No. 25.155 is no longer valid.
 # http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm
-# The new one is law [Number] 26.350
+# The new one is law No. 26.350
 # http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm
 # So there is no summer time in Argentina for now.
 
@@ -794,7 +790,7 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 #	 [ and in a second message (same day): ]
 # I found the decree.
 #
-# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
+# DECRETO No. 7.584, DE 13 DE OUTUBRO DE 2011
 # Link :
 # http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
 
@@ -1148,7 +1144,7 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # Conflicts between [1] and [2] were resolved as follows:
 #
 #  - [1] says the 1910 transition was Jan 1, [2] says Jan 10 and cites
-#    Boletín Nº 1, Aviso Nº 1 (1910).  Go with [2].
+#    Boletín No. 1, Aviso No. 1 (1910).  Go with [2].
 #
 #  - [1] says SMT was -4:42:45, [2] says Chile's official time from
 #    1916 to 1919 was -4:42:46.3, the meridian of Chile's National
@@ -1156,7 +1152,7 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 #    Quinta Normal in Santiago.  Go with [2], rounding it to -4:42:46.
 #
 #  - [1] says the 1918 transition was Sep 1, [2] says Sep 10 and cites
-#    Boletín Nº 22, Aviso Nº 129/1918 (1918-08-23).  Go with [2].
+#    Boletín No. 22, Aviso No. 129/1918 (1918-08-23).  Go with [2].
 #
 #  - [1] does not give times for transitions; assume they occur
 #    at midnight mainland time, the current common practice.  However,
@@ -1556,7 +1552,7 @@ Rule	Para	1997	only	-	Feb	lastSun	0:00	0	-
 # (1999-09) reports no date; go with above sources and Gerd Knops (2001-02-27).
 Rule	Para	1998	2001	-	Mar	Sun>=1	0:00	0	-
 # From Rives McDow (2002-02-28):
-# A decree was issued in Paraguay (no. 16350) on 2002-02-26 that changed the
+# A decree was issued in Paraguay (No. 16350) on 2002-02-26 that changed the
 # dst method to be from the first Sunday in September to the first Sunday in
 # April.
 Rule	Para	2002	2004	-	Apr	Sun>=1	0:00	0	-
@@ -1736,8 +1732,19 @@ Rule	Uruguay	2005	only	-	Oct	 9	 2:00	1:00	S
 Rule	Uruguay	2006	only	-	Mar	12	 2:00	0	-
 # From Jesper Nørgaard Welen (2006-09-06):
 # http://www.presidencia.gub.uy/_web/decretos/2006/09/CM%20210_08%2006%202006_00001.PDF
-Rule	Uruguay	2006	max	-	Oct	Sun>=1	 2:00	1:00	S
-Rule	Uruguay	2007	max	-	Mar	Sun>=8	 2:00	0	-
+#
+# From Steffen Thorsen (2015-06-30):
+# ... it looks like they will not be using DST the coming summer:
+# http://www.elobservador.com.uy/gobierno-resolvio-que-no-habra-cambio-horario-verano-n656787
+# http://www.republica.com.uy/este-ano-no-se-modificara-el-huso-horario-en-uruguay/523760/
+# From Paul Eggert (2015-06-30):
+# Apparently restaurateurs complained that DST caused people to go to the beach
+# instead of out to dinner.
+# From Pablo Camargo (2015-07-13):
+# http://archivo.presidencia.gub.uy/sci/decretos/2015/06/cons_min_201.pdf
+# [dated 2015-06-29; repeals Decree 311/006 dated 2006-09-04]
+Rule	Uruguay	2006	2014	-	Oct	Sun>=1	 2:00	1:00	S
+Rule	Uruguay	2007	2015	-	Mar	Sun>=8	 2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
 			-3:44:44 -	MMT	1920 May  1 # Montevideo MT
@@ -1746,6 +1753,10 @@ Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
 
 # Venezuela
 #
+# From Paul Eggert (2015-07-28):
+# For the 1965 transition see Gaceta Oficial No. 27.619 (1964-12-15), p 205.533
+# http://www.pgr.gob.ve/dmdocuments/1964/27619.pdf
+#
 # From John Stainforth (2007-11-28):
 # ... the change for Venezuela originally expected for 2007-12-31 has
 # been brought forward to 2007-12-09.  The official announcement was
@@ -1757,6 +1768,6 @@ Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Caracas	-4:27:44 -	LMT	1890
 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
-			-4:30	-	VET	1965        # Venezuela Time
+			-4:30	-	VET	1965 Jan  1  0:00 # Venezuela T.
 			-4:00	-	VET	2007 Dec  9  3:00
 			-4:30	-	VET
diff --git a/jdk/make/data/tzdata/zone.tab b/jdk/make/data/tzdata/zone.tab
index ffb6469676e..3fe4a3f2b57 100644
--- a/jdk/make/data/tzdata/zone.tab
+++ b/jdk/make/data/tzdata/zone.tab
@@ -129,8 +129,8 @@ BW	-2439+02555	Africa/Gaborone
 BY	+5354+02734	Europe/Minsk
 BZ	+1730-08812	America/Belize
 CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (peninsula), PEI
+CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia (Cape Breton)
 CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
 CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
 CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
diff --git a/jdk/src/java.base/aix/native/libjava/ProcessHandleImpl_aix.c b/jdk/src/java.base/aix/native/libjava/ProcessHandleImpl_aix.c
new file mode 100644
index 00000000000..93347bd8c20
--- /dev/null
+++ b/jdk/src/java.base/aix/native/libjava/ProcessHandleImpl_aix.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "jni.h"
+
+#include "ProcessHandleImpl_unix.h"
+
+#include <sys/procfs.h>
+
+/*
+ * Implementation of native ProcessHandleImpl functions for AIX.
+ * See ProcessHandleImpl_unix.c for more details.
+ */
+
+void os_initNative(JNIEnv *env, jclass clazz) {}
+
+jint os_getChildren(JNIEnv *env, jlong jpid, jlongArray jarray,
+                    jlongArray jparentArray, jlongArray jstimesArray) {
+    return unix_getChildren(env, jpid, jarray, jparentArray, jstimesArray);
+}
+
+pid_t os_getParentPidAndTimings(JNIEnv *env, pid_t pid, jlong *total, jlong *start) {
+    return unix_getParentPidAndTimings(env, pid, total, start);
+}
+
+void os_getCmdlineAndUserInfo(JNIEnv *env, jobject jinfo, pid_t pid) {
+    unix_getCmdlineAndUserInfo(env, jinfo, pid);
+}
diff --git a/jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c b/jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c
new file mode 100644
index 00000000000..dcd6db86865
--- /dev/null
+++ b/jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "jni.h"
+#include "jni_util.h"
+#include "java_lang_ProcessHandleImpl.h"
+#include "java_lang_ProcessHandleImpl_Info.h"
+
+#include "ProcessHandleImpl_unix.h"
+
+
+#include <fcntl.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <string.h>
+#include <ctype.h>
+
+/*
+ * Implementation of native ProcessHandleImpl functions for Linux.
+ * See ProcessHandleImpl_unix.c for more details.
+ */
+
+/* Signatures for internal OS specific functions. */
+static long long getBoottime(JNIEnv *env);
+
+/* A static offset in milliseconds since boot. */
+static long long bootTime_ms;
+static long clock_ticks_per_second;
+static int pageSize;
+
+void os_initNative(JNIEnv *env, jclass clazz) {
+    bootTime_ms = getBoottime(env);
+    clock_ticks_per_second = sysconf(_SC_CLK_TCK);
+    pageSize = sysconf(_SC_PAGESIZE);
+}
+
+jint os_getChildren(JNIEnv *env, jlong jpid, jlongArray jarray,
+                    jlongArray jparentArray, jlongArray jstimesArray) {
+    return unix_getChildren(env, jpid, jarray, jparentArray, jstimesArray);
+}
+
+/**
+ * Read /proc/<pid>/stat and return the ppid, total cputime and start time.
+ * -1 is fail;  >=  0 is parent pid
+ * 'total' will contain the running time of 'pid' in nanoseconds.
+ * 'start' will contain the start time of 'pid' in milliseconds since epoch.
+ */
+pid_t os_getParentPidAndTimings(JNIEnv *env, pid_t pid,
+                                jlong *totalTime, jlong* startTime) {
+    FILE* fp;
+    char buffer[2048];
+    int statlen;
+    char fn[32];
+    char* s;
+    int parentPid;
+    long unsigned int utime = 0;      // clock tics
+    long unsigned int stime = 0;      // clock tics
+    long long unsigned int start = 0; // microseconds
+
+    /*
+     * Try to stat and then open /proc/%d/stat
+     */
+    snprintf(fn, sizeof fn, "/proc/%d/stat", pid);
+
+    fp = fopen(fn, "r");
+    if (fp == NULL) {
+        return -1;              // fail, no such /proc/pid/stat
+    }
+
+    /*
+     * The format is: pid (command) state ppid ...
+     * As the command could be anything we must find the right most
+     * ")" and then skip the white spaces that follow it.
+     */
+    statlen = fread(buffer, 1, (sizeof buffer - 1), fp);
+    fclose(fp);
+    if (statlen < 0) {
+        return -1;               // parent pid is not available
+    }
+
+    buffer[statlen] = '\0';
+    s = strchr(buffer, '(');
+    if (s == NULL) {
+        return -1;               // parent pid is not available
+    }
+    // Found start of command, skip to end
+    s++;
+    s = strrchr(s, ')');
+    if (s == NULL) {
+        return -1;               // parent pid is not available
+    }
+    s++;
+
+    // Scan the needed fields from status, retaining only ppid(4),
+    // utime (14), stime(15), starttime(22)
+    if (4 != sscanf(s, " %*c %d %*d %*d %*d %*d %*d %*u %*u %*u %*u %lu %lu %*d %*d %*d %*d %*d %*d %llu",
+            &parentPid, &utime, &stime, &start)) {
+        return 0;              // not all values parsed; return error
+    }
+
+    *totalTime = (utime + stime) * (jlong)(1000000000 / clock_ticks_per_second);
+
+    *startTime = bootTime_ms + ((start * 1000) / clock_ticks_per_second);
+
+    return parentPid;
+}
+
+void os_getCmdlineAndUserInfo(JNIEnv *env, jobject jinfo, pid_t pid) {
+    int fd;
+    int cmdlen = 0;
+    char *cmdline = NULL, *cmdEnd = NULL; // used for command line args and exe
+    char *args = NULL;
+    jstring cmdexe = NULL;
+    char fn[32];
+    struct stat stat_buf;
+
+    /*
+     * Try to open /proc/<pid>/cmdline
+     */
+    snprintf(fn, sizeof fn, "/proc/%d/cmdline", pid);
+    if ((fd = open(fn, O_RDONLY)) < 0) {
+        return;
+    }
+
+    if (fstat(fd, &stat_buf) == 0) {
+        unix_getUserInfo(env, jinfo, stat_buf.st_uid);
+    }
+
+    do {                // Block to break out of on errors
+        int i, truncated = 0;
+        int count;
+        char *s;
+
+        /*
+         * The path name read by readlink() is limited to PATH_MAX characters.
+         * The content of /proc/<pid>/cmdline is limited to PAGE_SIZE characters.
+         */
+        cmdline = (char*)malloc((PATH_MAX > pageSize ? PATH_MAX : pageSize) + 1);
+        if (cmdline == NULL) {
+            break;
+        }
+
+        /*
+         * On Linux, the full path to the executable command is the link in
+         * /proc/<pid>/exe. But it is only readable for processes we own.
+         */
+        snprintf(fn, sizeof fn, "/proc/%d/exe", pid);
+        if ((cmdlen = readlink(fn, cmdline, PATH_MAX)) > 0) {
+            // null terminate and create String to store for command
+            cmdline[cmdlen] = '\0';
+            cmdexe = JNU_NewStringPlatform(env, cmdline);
+            (*env)->ExceptionClear(env);        // unconditionally clear any exception
+        }
+
+        /*
+         * The command-line arguments appear as a set of strings separated by
+         * null bytes ('\0'), with a further null byte after the last
+         * string. The last string is only null terminated if the whole command
+         * line is not exceeding (PAGE_SIZE - 1) characters.
+         */
+        cmdlen = 0;
+        s = cmdline;
+        while ((count = read(fd, s, pageSize - cmdlen)) > 0) {
+            cmdlen += count;
+            s += count;
+        }
+        if (count < 0) {
+            break;
+        }
+        // We have to null-terminate because the process may have changed argv[]
+        // or because the content in /proc/<pid>/cmdline is truncated.
+        cmdline[cmdlen] = '\0';
+        if (cmdlen == pageSize && cmdline[pageSize - 1] != '\0') {
+            truncated = 1;
+        } else if (cmdlen == 0) {
+            // /proc/<pid>/cmdline was empty. This usually happens for kernel processes
+            // like '[kthreadd]'. We could try to read /proc/<pid>/comm in the future.
+        }
+        if (cmdlen > 0 && (cmdexe == NULL || truncated)) {
+            // We have no exact command or the arguments are truncated.
+            // In this case we save the command line from /proc/<pid>/cmdline.
+            args = (char*)malloc(pageSize + 1);
+            if (args != NULL) {
+                memcpy(args, cmdline, cmdlen + 1);
+                for (i = 0; i < cmdlen; i++) {
+                    if (args[i] == '\0') {
+                        args[i] = ' ';
+                    }
+                }
+            }
+        }
+        i = 0;
+        if (!truncated) {
+            // Count the arguments
+            cmdEnd = &cmdline[cmdlen];
+            for (s = cmdline; *s != '\0' && (s < cmdEnd); i++) {
+                s += strnlen(s, (cmdEnd - s)) + 1;
+            }
+        }
+        unix_fillArgArray(env, jinfo, i, cmdline, cmdEnd, cmdexe, args);
+    } while (0);
+
+    if (cmdline != NULL) {
+        free(cmdline);
+    }
+    if (args != NULL) {
+        free(args);
+    }
+    if (fd >= 0) {
+        close(fd);
+    }
+}
+
+/**
+ * Read the boottime from /proc/stat.
+ */
+static long long getBoottime(JNIEnv *env) {
+    FILE *fp;
+    char *line = NULL;
+    size_t len = 0;
+    long long bootTime = 0;
+
+    fp = fopen("/proc/stat", "r");
+    if (fp == NULL) {
+        return -1;
+    }
+
+    while (getline(&line, &len, fp) != -1) {
+        if (sscanf(line, "btime %llu", &bootTime) == 1) {
+            break;
+        }
+    }
+    free(line);
+
+    if (fp != 0) {
+        fclose(fp);
+    }
+
+    return bootTime * 1000;
+}
diff --git a/jdk/src/java.base/macosx/native/libjava/ProcessHandleImpl_macosx.c b/jdk/src/java.base/macosx/native/libjava/ProcessHandleImpl_macosx.c
index 98f62b3e8f1..bc64cd1ae62 100644
--- a/jdk/src/java.base/macosx/native/libjava/ProcessHandleImpl_macosx.c
+++ b/jdk/src/java.base/macosx/native/libjava/ProcessHandleImpl_macosx.c
@@ -28,6 +28,8 @@
 #include "java_lang_ProcessHandleImpl.h"
 #include "java_lang_ProcessHandleImpl_Info.h"
 
+#include "ProcessHandleImpl_unix.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>
@@ -38,144 +40,15 @@
 #include <sys/sysctl.h>
 
 /**
- * Implementations of ProcessHandleImpl functions for MAC OS X;
- * are NOT common to all Unix variants.
+ * Implementation of native ProcessHandleImpl functions for MAC OS X.
+ * See ProcessHandleImpl_unix.c for more details.
  */
 
-static void getStatInfo(JNIEnv *env, jobject jinfo, pid_t pid);
-static void getCmdlineInfo(JNIEnv *env, jobject jinfo, pid_t pid);
-
-/*
- * Common Unix function to lookup the uid and return the user name.
- */
-extern jstring uidToUser(JNIEnv* env, uid_t uid);
-
-/* Field id for jString 'command' in java.lang.ProcessHandle.Info */
-static jfieldID ProcessHandleImpl_Info_commandID;
-
-/* Field id for jString[] 'arguments' in java.lang.ProcessHandle.Info */
-static jfieldID ProcessHandleImpl_Info_argumentsID;
-
-/* Field id for jlong 'totalTime' in java.lang.ProcessHandle.Info */
-static jfieldID ProcessHandleImpl_Info_totalTimeID;
-
-/* Field id for jlong 'startTime' in java.lang.ProcessHandle.Info */
-static jfieldID ProcessHandleImpl_Info_startTimeID;
-
-/* Field id for jString 'user' in java.lang.ProcessHandleImpl.Info */
-static jfieldID ProcessHandleImpl_Info_userID;
-
-/* static value for clock ticks per second. */
-static long clock_ticks_per_second;
-
-/**************************************************************
- * Static method to initialize field IDs and the ticks per second rate.
- *
- * Class:     java_lang_ProcessHandleImpl_Info
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL
-Java_java_lang_ProcessHandleImpl_00024Info_initIDs(JNIEnv *env, jclass clazz) {
-    CHECK_NULL(ProcessHandleImpl_Info_commandID =
-            (*env)->GetFieldID(env, clazz, "command", "Ljava/lang/String;"));
-    CHECK_NULL(ProcessHandleImpl_Info_argumentsID =
-            (*env)->GetFieldID(env, clazz, "arguments", "[Ljava/lang/String;"));
-    CHECK_NULL(ProcessHandleImpl_Info_totalTimeID =
-            (*env)->GetFieldID(env, clazz, "totalTime", "J"));
-    CHECK_NULL(ProcessHandleImpl_Info_startTimeID =
-            (*env)->GetFieldID(env, clazz, "startTime", "J"));
-    CHECK_NULL(ProcessHandleImpl_Info_userID =
-            (*env)->GetFieldID(env, clazz, "user", "Ljava/lang/String;"));
-}
-/**************************************************************
- * Static method to initialize the ticks per second rate.
- *
- * Class:     java_lang_ProcessHandleImpl
- * Method:    initNative
- * Signature: ()V
- */
-JNIEXPORT void JNICALL
-Java_java_lang_ProcessHandleImpl_initNative(JNIEnv *env, jclass clazz) {
-      clock_ticks_per_second = sysconf(_SC_CLK_TCK);
-}
-
-/*
- * Check if a process is alive.
- * Return the start time (ms since 1970) if it is available.
- * If the start time is not available return 0.
- * If the pid is invalid, return -1.
- *
- * Class:     java_lang_ProcessHandleImpl
- * Method:    isAlive0
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL
-Java_java_lang_ProcessHandleImpl_isAlive0(JNIEnv *env, jobject obj, jlong jpid) {
-    pid_t pid = (pid_t) jpid;
-    struct kinfo_proc kp;
-    size_t bufSize = sizeof kp;
-
-    // Read the process info for the specific pid
-    int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, pid};
-
-    if (sysctl(mib, 4, &kp, &bufSize, NULL, 0) < 0) {
-        return  (errno == EINVAL) ? -1 : 0;
-    } else {
-        return (bufSize == 0) ?  -1 :
-                                 (jlong) (kp.kp_proc.p_starttime.tv_sec * 1000
-                                        + kp.kp_proc.p_starttime.tv_usec / 1000);
-    }
-}
-
-/*
- * Returns the parent pid of the requested pid.
- *
- * Class:     java_lang_ProcessHandleImpl
- * Method:    parent0
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL
-Java_java_lang_ProcessHandleImpl_parent0(JNIEnv *env,
-                                         jobject obj,
-                                         jlong jpid,
-                                         jlong startTime) {
-    pid_t pid = (pid_t) jpid;
-    pid_t ppid = -1;
-
-    if (pid == getpid()) {
-        ppid = getppid();
-    } else {
-        const pid_t pid = (pid_t) jpid;
-        struct kinfo_proc kp;
-        size_t bufSize = sizeof kp;
-
-        // Read the process info for the specific pid
-        int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, pid};
-        if (sysctl(mib, 4, &kp, &bufSize, NULL, 0) < 0) {
-            JNU_ThrowByNameWithLastError(env,
-                "java/lang/RuntimeException", "sysctl failed");
-            return -1;
-        }
-        // If the buffer is full and for the pid requested then check the start
-        if (bufSize > 0 && kp.kp_proc.p_pid == pid) {
-            jlong start = (jlong) (kp.kp_proc.p_starttime.tv_sec * 1000
-                                   + kp.kp_proc.p_starttime.tv_usec / 1000);
-            if (start == startTime || start == 0 || startTime == 0) {
-                ppid = kp.kp_eproc.e_ppid;
-            }
-        }
-    }
-    return (jlong) ppid;
-}
+void os_initNative(JNIEnv *env, jclass clazz) {}
 
 /*
  * Returns the children of the requested pid and optionally each parent.
  *
- * Class:     java_lang_ProcessHandleImpl
- * Method:    getProcessPids0
- * Signature: (J[J[J)I
- *
  * Use sysctl to accumulate any process whose parent pid is zero or matches.
  * The resulting pids are stored into the array of longs.
  * The number of pids is returned if they all fit.
@@ -183,13 +56,8 @@ Java_java_lang_ProcessHandleImpl_parent0(JNIEnv *env,
  * If the array is too short, excess pids are not stored and
  * the desired length is returned.
  */
-JNIEXPORT jint JNICALL
-Java_java_lang_ProcessHandleImpl_getProcessPids0(JNIEnv *env,
-                                                 jclass clazz,
-                                                 jlong jpid,
-                                                 jlongArray jarray,
-                                                 jlongArray jparentArray,
-                                                 jlongArray jstimesArray) {
+jint os_getChildren(JNIEnv *env, jlong jpid, jlongArray jarray,
+                    jlongArray jparentArray, jlongArray jstimesArray) {
     jlong* pids = NULL;
     jlong* ppids = NULL;
     jlong* stimes = NULL;
@@ -303,35 +171,17 @@ Java_java_lang_ProcessHandleImpl_getProcessPids0(JNIEnv *env,
     return count;
 }
 
-/**************************************************************
- * Implementation of ProcessHandleImpl_Info native methods.
- */
-
-/*
- * Fill in the Info object from the OS information about the process.
- *
- * Class:     java_lang_ProcessHandleImpl
- * Method:    info0
- * Signature: (J)I
- */
-JNIEXPORT void JNICALL
-Java_java_lang_ProcessHandleImpl_00024Info_info0(JNIEnv *env,
-                                                 jobject jinfo,
-                                                 jlong jpid) {
-    pid_t pid = (pid_t) jpid;
-    getStatInfo(env, jinfo, pid);
-    getCmdlineInfo(env, jinfo, pid);
-}
-
 /**
- * Read /proc/<pid>/stat and fill in the fields of the Info object.
- * The executable name, plus the user, system, and start times are gathered.
+ * Use sysctl and return the ppid, total cputime and start time.
+ * Return: -1 is fail;  >=  0 is parent pid
+ * 'total' will contain the running time of 'pid' in nanoseconds.
+ * 'start' will contain the start time of 'pid' in milliseconds since epoch.
  */
-static void getStatInfo(JNIEnv *env, jobject jinfo, pid_t jpid) {
-    jlong totalTime;                    // nanoseconds
-    unsigned long long startTime;       // milliseconds
+pid_t os_getParentPidAndTimings(JNIEnv *env, pid_t jpid,
+                                jlong *totalTime, jlong *startTime) {
 
     const pid_t pid = (pid_t) jpid;
+    pid_t ppid = -1;
     struct kinfo_proc kp;
     size_t bufSize = sizeof kp;
 
@@ -339,92 +189,70 @@ static void getStatInfo(JNIEnv *env, jobject jinfo, pid_t jpid) {
     int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, pid};
 
     if (sysctl(mib, 4, &kp, &bufSize, NULL, 0) < 0) {
-        if (errno == EINVAL) {
-            return;
-        } else {
-            JNU_ThrowByNameWithLastError(env,
-                "java/lang/RuntimeException", "sysctl failed");
-        }
-        return;
+        JNU_ThrowByNameWithLastError(env,
+            "java/lang/RuntimeException", "sysctl failed");
+        return -1;
+    }
+    if (bufSize > 0 && kp.kp_proc.p_pid == pid) {
+        *startTime = (jlong) (kp.kp_proc.p_starttime.tv_sec * 1000 +
+                              kp.kp_proc.p_starttime.tv_usec / 1000);
+        ppid = kp.kp_eproc.e_ppid;
     }
-
-    // Convert the UID to the username
-    jstring name = NULL;
-    CHECK_NULL((name = uidToUser(env, kp.kp_eproc.e_ucred.cr_uid)));
-    (*env)->SetObjectField(env, jinfo, ProcessHandleImpl_Info_userID, name);
-    JNU_CHECK_EXCEPTION(env);
-
-    startTime = kp.kp_proc.p_starttime.tv_sec * 1000 +
-                kp.kp_proc.p_starttime.tv_usec / 1000;
-
-    (*env)->SetLongField(env, jinfo, ProcessHandleImpl_Info_startTimeID, startTime);
-    JNU_CHECK_EXCEPTION(env);
 
     // Get cputime if for current process
     if (pid == getpid()) {
         struct rusage usage;
-        if (getrusage(RUSAGE_SELF, &usage) != 0) {
-            return;
+        if (getrusage(RUSAGE_SELF, &usage) == 0) {
+          jlong microsecs =
+              usage.ru_utime.tv_sec * 1000 * 1000 + usage.ru_utime.tv_usec +
+              usage.ru_stime.tv_sec * 1000 * 1000 + usage.ru_stime.tv_usec;
+          *totalTime = microsecs * 1000;
         }
-        jlong microsecs =
-            usage.ru_utime.tv_sec * 1000 * 1000 + usage.ru_utime.tv_usec +
-            usage.ru_stime.tv_sec * 1000 * 1000 + usage.ru_stime.tv_usec;
-        totalTime = microsecs * 1000;
-        (*env)->SetLongField(env, jinfo, ProcessHandleImpl_Info_totalTimeID, totalTime);
-        JNU_CHECK_EXCEPTION(env);
     }
+
+    return ppid;
+
 }
 
 /**
- * Construct the argument array by parsing the arguments from the sequence of arguments.
+ * Return the uid of a process or -1 on error
  */
-static int fillArgArray(JNIEnv *env, jobject jinfo, int nargs,
-                        const char *cp, const char *argsEnd) {
-    jstring str = NULL;
-    jobject argsArray;
-    int i;
+static uid_t getUID(pid_t pid) {
+    struct kinfo_proc kp;
+    size_t bufSize = sizeof kp;
 
-    if (nargs < 1) {
-        return 0;
-    }
-    // Create a String array for nargs-1 elements
-    CHECK_NULL_RETURN((argsArray = (*env)->NewObjectArray(env,
-            nargs - 1, JNU_ClassString(env), NULL)), -1);
+    // Read the process info for the specific pid
+    int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, pid};
 
-    for (i = 0; i < nargs - 1; i++) {
-        // skip to the next argument; omits arg[0]
-        cp += strnlen(cp, (argsEnd - cp)) + 1;
-
-        if (cp > argsEnd || *cp == '\0') {
-            return -2;  // Off the end pointer or an empty argument is an error
+    if (sysctl(mib, 4, &kp, &bufSize, NULL, 0) == 0) {
+        if (bufSize > 0 && kp.kp_proc.p_pid == pid) {
+            return kp.kp_eproc.e_ucred.cr_uid;
         }
-
-        CHECK_NULL_RETURN((str = JNU_NewStringPlatform(env, cp)), -1);
-
-        (*env)->SetObjectArrayElement(env, argsArray, i, str);
-        JNU_CHECK_EXCEPTION_RETURN(env, -3);
     }
-    (*env)->SetObjectField(env, jinfo, ProcessHandleImpl_Info_argumentsID, argsArray);
-    JNU_CHECK_EXCEPTION_RETURN(env, -4);
-    return 0;
+    return (uid_t)-1;
 }
 
 /**
  * Retrieve the command and arguments for the process and store them
  * into the Info object.
  */
-static void getCmdlineInfo(JNIEnv *env, jobject jinfo, pid_t pid) {
+void os_getCmdlineAndUserInfo(JNIEnv *env, jobject jinfo, pid_t pid) {
     int mib[3], maxargs, nargs, i;
     size_t size;
     char *args, *cp, *sp, *np;
 
+    // Get the UID first. This is done here because it is cheap to do it here
+    // on other platforms like Linux/Solaris/AIX where the uid comes from the
+    // same source like the command line info.
+    unix_getUserInfo(env, jinfo, getUID(pid));
+
     // Get the maximum size of the arguments
     mib[0] = CTL_KERN;
     mib[1] = KERN_ARGMAX;
     size = sizeof(maxargs);
     if (sysctl(mib, 2, &maxargs, &size, NULL, 0) == -1) {
             JNU_ThrowByNameWithLastError(env,
-                    "java/lang/RuntimeException", "sysctl failed");
+                "java/lang/RuntimeException", "sysctl failed");
         return;
     }
 
@@ -437,7 +265,7 @@ static void getCmdlineInfo(JNIEnv *env, jobject jinfo, pid_t pid) {
 
     do {            // a block to break out of on error
         char *argsEnd;
-        jstring str = NULL;
+        jstring cmdexe = NULL;
 
         mib[0] = CTL_KERN;
         mib[1] = KERN_PROCARGS2;
@@ -445,7 +273,7 @@ static void getCmdlineInfo(JNIEnv *env, jobject jinfo, pid_t pid) {
         size = (size_t) maxargs;
         if (sysctl(mib, 3, args, &size, NULL, 0) == -1) {
             if (errno != EINVAL) {
-            JNU_ThrowByNameWithLastError(env,
+                JNU_ThrowByNameWithLastError(env,
                     "java/lang/RuntimeException", "sysctl failed");
             }
             break;
@@ -456,11 +284,7 @@ static void getCmdlineInfo(JNIEnv *env, jobject jinfo, pid_t pid) {
         argsEnd = &args[size];
 
         // Store the command executable path
-        if ((str = JNU_NewStringPlatform(env, cp)) == NULL) {
-            break;
-        }
-        (*env)->SetObjectField(env, jinfo, ProcessHandleImpl_Info_commandID, str);
-        if ((*env)->ExceptionCheck(env)) {
+        if ((cmdexe = JNU_NewStringPlatform(env, cp)) == NULL) {
             break;
         }
 
@@ -471,7 +295,7 @@ static void getCmdlineInfo(JNIEnv *env, jobject jinfo, pid_t pid) {
             }
         }
 
-        fillArgArray(env, jinfo, nargs, cp, argsEnd);
+        unix_fillArgArray(env, jinfo, nargs, cp, argsEnd, cmdexe, NULL);
     } while (0);
     // Free the arg buffer
     free(args);
diff --git a/jdk/src/java.base/share/classes/java/lang/ProcessHandle.java b/jdk/src/java.base/share/classes/java/lang/ProcessHandle.java
index 983d855cfda..980870c5bb7 100644
--- a/jdk/src/java.base/share/classes/java/lang/ProcessHandle.java
+++ b/jdk/src/java.base/share/classes/java/lang/ProcessHandle.java
@@ -224,9 +224,35 @@ public interface ProcessHandle extends Comparable<ProcessHandle> {
          */
         public Optional<String> command();
 
+        /**
+         * Returns the command line of the process.
+         * <p>
+         * If {@link #command command()} and  {@link #arguments arguments()} return
+         * non-empty optionals, this is simply a convenience method which concatenates
+         * the values of the two functions separated by spaces. Otherwise it will return a
+         * best-effort, platform dependent representation of the command line.
+         *
+         * @apiNote Note that the returned executable pathname and the
+         *          arguments may be truncated on some platforms due to system
+         *          limitations.
+         *          <p>
+         *          The executable pathname may contain only the
+         *          name of the executable without the full path information.
+         *          It is undecideable whether white space separates different
+         *          arguments or is part of a single argument.
+         *
+         * @return an {@code Optional<String>} of the command line
+         *         of the process
+         */
+        public Optional<String> commandLine();
+
         /**
          * Returns an array of Strings of the arguments of the process.
          *
+         * @apiNote On some platforms, native applications are free to change
+         *          the arguments array after startup and this method may only
+         *          show the changed values.
+         *
          * @return an {@code Optional<String[]>} of the arguments of the process
          */
         public Optional<String[]> arguments();
diff --git a/jdk/src/java.base/share/classes/java/lang/ProcessHandleImpl.java b/jdk/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
index b7295bc5971..b3d03683e4a 100644
--- a/jdk/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
+++ b/jdk/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
@@ -472,7 +472,7 @@ final class ProcessHandleImpl implements ProcessHandle {
     /**
      * Implementation of ProcessHandle.Info.
      * Information snapshot about a process.
-     * The attributes of a process vary by operating system and not available
+     * The attributes of a process vary by operating system and are not available
      * in all implementations.  Additionally, information about other processes
      * is limited by the operating system privileges of the process making the request.
      * If a value is not available, either a {@code null} or {@code -1} is stored.
@@ -496,6 +496,7 @@ final class ProcessHandleImpl implements ProcessHandle {
         private native void info0(long pid);
 
         String command;
+        String commandLine;
         String[] arguments;
         long startTime;
         long totalTime;
@@ -503,6 +504,7 @@ final class ProcessHandleImpl implements ProcessHandle {
 
         Info() {
             command = null;
+            commandLine = null;
             arguments = null;
             startTime = -1L;
             totalTime = -1L;
@@ -538,6 +540,15 @@ final class ProcessHandleImpl implements ProcessHandle {
             return Optional.ofNullable(command);
         }
 
+        @Override
+        public Optional<String> commandLine() {
+            if (command != null && arguments != null) {
+                return Optional.of(command + " " + String.join(" ", arguments));
+            } else {
+                return Optional.ofNullable(commandLine);
+            }
+        }
+
         @Override
         public Optional<String[]> arguments() {
             return Optional.ofNullable(arguments);
@@ -580,6 +591,11 @@ final class ProcessHandleImpl implements ProcessHandle {
                 sb.append("args: ");
                 sb.append(Arrays.toString(arguments));
             }
+            if (commandLine != null) {
+                if (sb.length() != 0) sb.append(", ");
+                sb.append("cmdLine: ");
+                sb.append(commandLine);
+            }
             if (startTime > 0) {
                 if (sb.length() != 0) sb.append(", ");
                 sb.append("startTime: ");
diff --git a/jdk/src/java.base/share/classes/java/net/InetSocketAddress.java b/jdk/src/java.base/share/classes/java/net/InetSocketAddress.java
index 87fce160fb2..2bdfdc25102 100644
--- a/jdk/src/java.base/share/classes/java/net/InetSocketAddress.java
+++ b/jdk/src/java.base/share/classes/java/net/InetSocketAddress.java
@@ -206,7 +206,7 @@ public class InetSocketAddress
      * @param   hostname the Host name
      * @param   port    The port number
      * @throws IllegalArgumentException if the port parameter is outside the range
-     * of valid port values, or if the hostname parameter is <TT>null</TT>.
+     * of valid port values, or if the hostname parameter is {@code null}.
      * @throws SecurityException if a security manager is present and
      *                           permission to resolve the host name is
      *                           denied.
@@ -244,7 +244,7 @@ public class InetSocketAddress
      * @param   port    The port number
      * @throws IllegalArgumentException if the port parameter is outside
      *                  the range of valid port values, or if the hostname
-     *                  parameter is <TT>null</TT>.
+     *                  parameter is {@code null}.
      * @see     #isUnresolved()
      * @return  a {@code InetSocketAddress} representing the unresolved
      *          socket address
diff --git a/jdk/src/java.base/share/classes/java/net/spi/package-info.java b/jdk/src/java.base/share/classes/java/net/spi/package-info.java
index 3be4ac8231f..06ddeccb00d 100644
--- a/jdk/src/java.base/share/classes/java/net/spi/package-info.java
+++ b/jdk/src/java.base/share/classes/java/net/spi/package-info.java
@@ -24,7 +24,7 @@
  */
 
 /**
- * Service-provider classes for the <tt>{@link java.net}</tt> package.
+ * Service-provider classes for the {@link java.net} package.
  *
  * <p> Only developers who are defining new URL stream handler providers
  * should need to make direct use of this package.
diff --git a/jdk/src/java.base/share/classes/java/util/Formatter.java b/jdk/src/java.base/share/classes/java/util/Formatter.java
index 14909eca9ad..d8fc7e60ecd 100644
--- a/jdk/src/java.base/share/classes/java/util/Formatter.java
+++ b/jdk/src/java.base/share/classes/java/util/Formatter.java
@@ -273,6 +273,10 @@ import sun.misc.FormattedFloatingDecimal;
  *
  * </ol>
  *
+ * <p> For category <i>General</i>, <i>Character</i>, <i>Numberic</i>,
+ * <i>Integral</i> and <i>Date/Time</i> conversion, unless otherwise specified,
+ * if the argument <i>arg</i> is {@code null}, then the result is "{@code null}".
+ *
  * <p> The following table summarizes the supported conversions.  Conversions
  * denoted by an upper-case character (i.e. {@code 'B'}, {@code 'H'},
  * {@code 'S'}, {@code 'C'}, {@code 'X'}, {@code 'E'}, {@code 'G'},
@@ -301,14 +305,12 @@ import sun.misc.FormattedFloatingDecimal;
  *
  * <tr><td valign="top"> {@code 'h'}, {@code 'H'}
  *     <td valign="top"> general
- *     <td> If the argument <i>arg</i> is {@code null}, then the result is
- *     "{@code null}".  Otherwise, the result is obtained by invoking
+ *     <td> The result is obtained by invoking
  *     {@code Integer.toHexString(arg.hashCode())}.
  *
  * <tr><td valign="top"> {@code 's'}, {@code 'S'}
  *     <td valign="top"> general
- *     <td> If the argument <i>arg</i> is {@code null}, then the result is
- *     "{@code null}".  If <i>arg</i> implements {@link Formattable}, then
+ *     <td> If <i>arg</i> implements {@link Formattable}, then
  *     {@link Formattable#formatTo arg.formatTo} is invoked. Otherwise, the
  *     result is obtained by invoking {@code arg.toString()}.
  *
@@ -683,6 +685,10 @@ import sun.misc.FormattedFloatingDecimal;
  * methods such as {@link String#format(String,Object...) String.format} and
  * {@link java.io.PrintStream#printf(String,Object...) PrintStream.printf}.
  *
+ * <p> For category <i>General</i>, <i>Character</i>, <i>Numberic</i>,
+ * <i>Integral</i> and <i>Date/Time</i> conversion, unless otherwise specified,
+ * if the argument <i>arg</i> is {@code null}, then the result is "{@code null}".
+ *
  * <p> Conversions denoted by an upper-case character (i.e. {@code 'B'},
  * {@code 'H'}, {@code 'S'}, {@code 'C'}, {@code 'X'}, {@code 'E'},
  * {@code 'G'}, {@code 'A'}, and {@code 'T'}) are the same as those for the
@@ -722,9 +728,8 @@ import sun.misc.FormattedFloatingDecimal;
  *     <td valign="top"> <code>'&#92;u0068'</code>
  *     <td> Produces a string representing the hash code value of the object.
  *
- *     <p> If the argument, <i>arg</i> is {@code null}, then the
- *     result is "{@code null}".  Otherwise, the result is obtained
- *     by invoking {@code Integer.toHexString(arg.hashCode())}.
+ *     <p> The result is obtained by invoking
+ *     {@code Integer.toHexString(arg.hashCode())}.
  *
  *     <p> If the {@code '#'} flag is given, then a {@link
  *     FormatFlagsConversionMismatchException} will be thrown.
@@ -737,8 +742,7 @@ import sun.misc.FormattedFloatingDecimal;
  *     <td valign="top"> <code>'&#92;u0073'</code>
  *     <td> Produces a string.
  *
- *     <p> If the argument is {@code null}, then the result is
- *     "{@code null}".  If the argument implements {@link Formattable}, then
+ *     <p> If the argument implements {@link Formattable}, then
  *     its {@link Formattable#formatTo formatTo} method is invoked.
  *     Otherwise, the result is obtained by invoking the argument's
  *     {@code toString()} method.
diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java
index ebdae178fd8..e5bd2b78259 100644
--- a/jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java
@@ -39,7 +39,7 @@ import sun.security.jca.GetInstance;
  * <p> Every implementation of the Java platform is required to support the
  * following standard {@code SSLContext} protocol:
  * <ul>
- * <li><tt>TLSv1</tt></li>
+ * <li>{@code TLSv1}</li>
  * </ul>
  * This protocol is described in the <a href=
  * "{@docRoot}/../technotes/guides/security/StandardNames.html#SSLContext">
diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLException.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLException.java
index 98d8bd3cbf6..f5a1a87423f 100644
--- a/jdk/src/java.base/share/classes/javax/net/ssl/SSLException.java
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/SSLException.java
@@ -53,13 +53,13 @@ class SSLException extends IOException
     }
 
     /**
-     * Creates a <code>SSLException</code> with the specified
+     * Creates a {@code SSLException} with the specified
      * detail message and cause.
      *
      * @param message the detail message (which is saved for later retrieval
      *          by the {@link #getMessage()} method).
      * @param cause the cause (which is saved for later retrieval by the
-     *          {@link #getCause()} method).  (A <tt>null</tt> value is
+     *          {@link #getCause()} method).  (A {@code null} value is
      *          permitted, and indicates that the cause is nonexistent or
      *          unknown.)
      * @since 1.5
@@ -70,13 +70,13 @@ class SSLException extends IOException
     }
 
     /**
-     * Creates a <code>SSLException</code> with the specified cause
-     * and a detail message of <tt>(cause==null ? null : cause.toString())</tt>
+     * Creates a {@code SSLException} with the specified cause
+     * and a detail message of {@code (cause==null ? null : cause.toString())}
      * (which typically contains the class and detail message of
-     * <tt>cause</tt>).
+     * {@code cause}).
      *
      * @param cause the cause (which is saved for later retrieval by the
-     *          {@link #getCause()} method).  (A <tt>null</tt> value is
+     *          {@link #getCause()} method).  (A {@code null} value is
      *          permitted, and indicates that the cause is nonexistent or
      *          unknown.)
      * @since 1.5
diff --git a/jdk/src/java.base/share/classes/sun/net/ftp/FtpClientProvider.java b/jdk/src/java.base/share/classes/sun/net/ftp/FtpClientProvider.java
index 06deae65817..bbdb1cde5bd 100644
--- a/jdk/src/java.base/share/classes/sun/net/ftp/FtpClientProvider.java
+++ b/jdk/src/java.base/share/classes/sun/net/ftp/FtpClientProvider.java
@@ -52,7 +52,7 @@ public abstract class FtpClientProvider {
      * Initializes a new instance of this class.
      *
      * @throws SecurityException if a security manager is installed and it denies
-     *         {@link RuntimePermission}<tt>("ftpClientProvider")</tt>
+     *         {@link RuntimePermission}{@code ("ftpClientProvider")}
      */
     protected FtpClientProvider() {
         SecurityManager sm = System.getSecurityManager();
@@ -108,7 +108,7 @@ public abstract class FtpClientProvider {
      * <ol>
      *
      *   <li><p> If the system property
-     *   <tt>java.net.FtpClientProvider</tt> is defined then it is
+     *   {@code java.net.FtpClientProvider} is defined then it is
      *   taken to be the fully-qualified name of a concrete provider class.
      *   The class is loaded and instantiated; if this process fails then an
      *   unspecified unchecked error or exception is thrown.  </p></li>
@@ -116,8 +116,8 @@ public abstract class FtpClientProvider {
      *   <li><p> If a provider class has been installed in a jar file that is
      *   visible to the system class loader, and that jar file contains a
      *   provider-configuration file named
-     *   <tt>java.net.FtpClientProvider</tt> in the resource
-     *   directory <tt>META-INF/services</tt>, then the first class name
+     *   {@code java.net.FtpClientProvider} in the resource
+     *   directory {@code META-INF/services}, then the first class name
      *   specified in that file is taken.  The class is loaded and
      *   instantiated; if this process fails then an unspecified unchecked error or exception is
      *   thrown.  </p></li>
diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java
index 35b0b64d4a2..8bc31826c67 100644
--- a/jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java
+++ b/jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java
@@ -319,18 +319,17 @@ public final class RSAPadding {
             }
             // generate non-zero padding bytes
             // use a buffer to reduce calls to SecureRandom
-            byte[] r = new byte[64];
-            int i = -1;
-            while (psSize-- > 0) {
-                int b;
-                do {
-                    if (i < 0) {
-                        random.nextBytes(r);
-                        i = r.length - 1;
+            while (psSize > 0) {
+                // extra bytes to avoid zero bytes,
+                // number of zero bytes <= 4 in 98% cases
+                byte[] r = new byte[psSize + 4];
+                random.nextBytes(r);
+                for (int i = 0; i < r.length && psSize > 0; i++) {
+                    if (r[i] != 0) {
+                        padded[k++] = r[i];
+                        psSize--;
                     }
-                    b = r[i--] & 0xff;
-                } while (b == 0);
-                padded[k++] = (byte)b;
+                }
             }
         }
         return padded;
diff --git a/jdk/src/java.base/share/classes/sun/util/PreHashedMap.java b/jdk/src/java.base/share/classes/sun/util/PreHashedMap.java
index 1bb05705c04..724af5412ef 100644
--- a/jdk/src/java.base/share/classes/sun/util/PreHashedMap.java
+++ b/jdk/src/java.base/share/classes/sun/util/PreHashedMap.java
@@ -56,7 +56,7 @@ import java.util.NoSuchElementException;
  *
  * }</pre></blockquote>
  *
- * <p> The <tt>init</tt> method is invoked by the <tt>PreHashedMap</tt>
+ * <p> The {@code init} method is invoked by the {@code PreHashedMap}
  * constructor with an object array long enough for the map's rows.  The method
  * must construct the hash chain for each row and store it in the appropriate
  * element of the array.
@@ -73,7 +73,7 @@ import java.util.NoSuchElementException;
  * methods in the {@link java.util.Collections} utility class.
  *
  * <p> In the JDK build, subclasses of this class are typically created via the
- * <tt>Hasher</tt> program in the <tt>make/tools/Hasher</tt> directory.
+ * {@code Hasher} program in the {@code make/tools/Hasher} directory.
  *
  * @author Mark Reinhold
  * @since 1.5
@@ -95,7 +95,7 @@ public abstract class PreHashedMap<V>
      * Creates a new map.
      *
      * <p> This constructor invokes the {@link #init init} method, passing it a
-     * newly-constructed row array that is <tt>rows</tt> elements long.
+     * newly-constructed row array that is {@code rows} elements long.
      *
      * @param rows
      *        The number of rows in the map
diff --git a/jdk/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c b/jdk/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c
index baf22f9f2b3..f63653cd120 100644
--- a/jdk/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c
+++ b/jdk/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c
@@ -24,368 +24,28 @@
  */
 
 #include "jni.h"
-#include "jni_util.h"
-#include "java_lang_ProcessHandleImpl.h"
-#include "java_lang_ProcessHandleImpl_Info.h"
 
+#include "ProcessHandleImpl_unix.h"
 
-#include <stdio.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <procfs.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <limits.h>
-
-/**
- * Implementations of ProcessHandleImpl functions that are
- * NOT common to all Unix variants:
- * - getProcessPids0(pid, pidArray)
- *
- * Implementations of ProcessHandleImpl_Info
- * - totalTime, startTime
- * - Command
- * - Arguments
- */
 
 /*
- * Signatures for internal OS specific functions.
+ * Implementation of native ProcessHandleImpl functions for Solaris.
+ * See ProcessHandleImpl_unix.c for more details.
  */
-static pid_t getStatInfo(JNIEnv *env, pid_t pid,
-                                     jlong *totalTime, jlong* startTime,
-                                     uid_t *uid);
-static void getCmdlineInfo(JNIEnv *env, jobject jinfo, pid_t pid);
 
-extern jstring uidToUser(JNIEnv* env, uid_t uid);
+void os_initNative(JNIEnv *env, jclass clazz) {}
 
-/* Field id for jString 'command' in java.lang.ProcessHandle.Info */
-static jfieldID ProcessHandleImpl_Info_commandID;
-
-/* Field id for jString[] 'arguments' in java.lang.ProcessHandle.Info */
-static jfieldID ProcessHandleImpl_Info_argumentsID;
-
-/* Field id for jlong 'totalTime' in java.lang.ProcessHandle.Info */
-static jfieldID ProcessHandleImpl_Info_totalTimeID;
-
-/* Field id for jlong 'startTime' in java.lang.ProcessHandle.Info */
-static jfieldID ProcessHandleImpl_Info_startTimeID;
-
-/* Field id for jString 'user' in java.lang.ProcessHandleImpl.Info */
-static jfieldID ProcessHandleImpl_Info_userID;
-
-/* static value for clock ticks per second. */
-static long clock_ticks_per_second;
-
-/**************************************************************
- * Static method to initialize field IDs and the ticks per second rate.
- *
- * Class:     java_lang_ProcessHandleImpl_Info
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL
-Java_java_lang_ProcessHandleImpl_00024Info_initIDs(JNIEnv *env, jclass clazz) {
-    CHECK_NULL(ProcessHandleImpl_Info_commandID = (*env)->GetFieldID(env,
-        clazz, "command", "Ljava/lang/String;"));
-    CHECK_NULL(ProcessHandleImpl_Info_argumentsID = (*env)->GetFieldID(env,
-        clazz, "arguments", "[Ljava/lang/String;"));
-    CHECK_NULL(ProcessHandleImpl_Info_totalTimeID = (*env)->GetFieldID(env,
-        clazz, "totalTime", "J"));
-    CHECK_NULL(ProcessHandleImpl_Info_startTimeID = (*env)->GetFieldID(env,
-        clazz, "startTime", "J"));
-    CHECK_NULL(ProcessHandleImpl_Info_userID = (*env)->GetFieldID(env,
-        clazz, "user", "Ljava/lang/String;"));
+jint os_getChildren(JNIEnv *env, jlong jpid, jlongArray jarray,
+                    jlongArray jparentArray, jlongArray jstimesArray) {
+    return unix_getChildren(env, jpid, jarray, jparentArray, jstimesArray);
 }
 
-/**************************************************************
- * Static method to initialize the ticks per second rate.
- *
- * Class:     java_lang_ProcessHandleImpl
- * Method:    initNative
- * Signature: ()V
- */
-JNIEXPORT void JNICALL
-Java_java_lang_ProcessHandleImpl_initNative(JNIEnv *env, jclass clazz) {
-    clock_ticks_per_second = sysconf(_SC_CLK_TCK);
+pid_t os_getParentPidAndTimings(JNIEnv *env, pid_t pid, jlong *total, jlong *start) {
+    return unix_getParentPidAndTimings(env, pid, total, start);
 }
 
-/*
- * Check if a process is alive.
- * Return the start time (ms since 1970) if it is available.
- * If the start time is not available return 0.
- * If the pid is invalid, return -1.
- *
- * Class:     java_lang_ProcessHandleImpl
- * Method:    isAlive0
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL
-Java_java_lang_ProcessHandleImpl_isAlive0(JNIEnv *env, jobject obj, jlong jpid) {
-    pid_t pid = (pid_t) jpid;
-    jlong startTime = 0L;
-    jlong totalTime = 0L;
-    uid_t uid = -1;
-    pid_t ppid = getStatInfo(env, pid, &totalTime, &startTime, &uid);
-    return (ppid < 0) ? -1 : startTime;
-}
-
-/*
- * Returns the parent pid of the requested pid.
- *
- * Class:     java_lang_ProcessHandleImpl
- * Method:    parent0
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL
-Java_java_lang_ProcessHandleImpl_parent0(JNIEnv *env,
-                                         jobject obj,
-                                         jlong jpid,
-                                         jlong startTime) {
-    pid_t pid = (pid_t) jpid;
-    pid_t ppid = -1;
-
-    if (pid == getpid()) {
-        ppid = getppid();
-    } else {
-        jlong start = 0L;
-        jlong total = 0L;
-        uid_t uid = -1;
-
-        pid_t ppid = getStatInfo(env, pid, &total, &start, &uid);
-        if (start != startTime
-            && start != 0
-            && startTime != 0) {
-            ppid = -1;
-        }
-    }
-    return (jlong) ppid;
-}
-
-/*
- * Returns the children of the requested pid and optionally each parent.
- *
- * Class:     java_lang_ProcessHandleImpl
- * Method:    getChildPids
- * Signature: (J[J)I
- *
- * Reads /proc and accumulates any process who parent pid matches.
- * The resulting pids are stored into the array of longs.
- * The number of pids is returned if they all fit.
- * If the array is too short, the desired length is returned.
- */
-JNIEXPORT jint JNICALL
-Java_java_lang_ProcessHandleImpl_getProcessPids0(JNIEnv *env,
-                                                 jclass clazz,
-                                                 jlong jpid,
-                                                 jlongArray jarray,
-                                                 jlongArray jparentArray,
-                                                 jlongArray jstimesArray) {
-    DIR* dir;
-    struct dirent* ptr;
-    pid_t pid = (pid_t) jpid;
-    jlong* pids = NULL;
-    jlong* ppids = NULL;
-    jlong* stimes = NULL;
-    jsize parentArraySize = 0;
-    jsize arraySize = 0;
-    jsize stimesSize = 0;
-    jsize count = 0;
-    char procname[32];
-
-    arraySize = (*env)->GetArrayLength(env, jarray);
-    JNU_CHECK_EXCEPTION_RETURN(env, 0);
-    if (jparentArray != NULL) {
-        parentArraySize = (*env)->GetArrayLength(env, jparentArray);
-        JNU_CHECK_EXCEPTION_RETURN(env, 0);
-
-        if (arraySize != parentArraySize) {
-            JNU_ThrowIllegalArgumentException(env, "array sizes not equal");
-            return 0;
-        }
-    }
-    if (jstimesArray != NULL) {
-        stimesSize = (*env)->GetArrayLength(env, jstimesArray);
-        JNU_CHECK_EXCEPTION_RETURN(env, -1);
-
-        if (arraySize != stimesSize) {
-            JNU_ThrowIllegalArgumentException(env, "array sizes not equal");
-            return 0;
-        }
-    }
-
-    /*
-     * To locate the children we scan /proc looking for files that have a
-     * positive integer as a filename.
-     */
-    if ((dir = opendir("/proc")) == NULL) {
-        JNU_ThrowByNameWithLastError(env,
-            "java/lang/Runtime", "Unable to open /proc");
-        return 0;
-    }
-
-    do { // Block to break out of on Exception
-        pids = (*env)->GetLongArrayElements(env, jarray, NULL);
-        if (pids == NULL) {
-            break;
-        }
-        if (jparentArray != NULL) {
-            ppids  = (*env)->GetLongArrayElements(env, jparentArray, NULL);
-            if (ppids == NULL) {
-                break;
-            }
-        }
-        if (jstimesArray != NULL) {
-            stimes  = (*env)->GetLongArrayElements(env, jstimesArray, NULL);
-            if (stimes == NULL) {
-                break;
-            }
-        }
-
-        while ((ptr = readdir(dir)) != NULL) {
-            pid_t ppid = 0;
-            jlong totalTime = 0L;
-            jlong startTime = 0L;
-            uid_t uid; // value unused
-
-            /* skip files that aren't numbers */
-            pid_t childpid = (pid_t) atoi(ptr->d_name);
-            if ((int) childpid <= 0) {
-                continue;
-            }
-
-            // Read /proc/pid/stat and get the parent pid, and start time
-            ppid = getStatInfo(env, childpid, &totalTime, &startTime, &uid);
-            if (ppid >= 0 && (pid == 0 || ppid == pid)) {
-                if (count < arraySize) {
-                    // Only store if it fits
-                    pids[count] = (jlong) childpid;
-
-                    if (ppids != NULL) {
-                        // Store the parent Pid
-                        ppids[count] = (jlong) ppid;
-                    }
-                    if (stimes != NULL) {
-                        // Store the process start time
-                        stimes[count] = startTime;
-                    }
-                }
-                count++; // Count to tabulate size needed
-            }
-        }
-    } while (0);
-
-    if (pids != NULL) {
-        (*env)->ReleaseLongArrayElements(env, jarray, pids, 0);
-    }
-    if (ppids != NULL) {
-        (*env)->ReleaseLongArrayElements(env, jparentArray, ppids, 0);
-    }
-    if (stimes != NULL) {
-        (*env)->ReleaseLongArrayElements(env, jstimesArray, stimes, 0);
-    }
-
-    closedir(dir);
-    // If more pids than array had size for; count will be greater than array size
-    return count;
-}
-
-/**************************************************************
- * Implementation of ProcessHandleImpl_Info native methods.
- */
-
-/*
- * Fill in the Info object from the OS information about the process.
- *
- * Class:     java_lang_ProcessHandleImpl_Info
- * Method:    info0
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL
-Java_java_lang_ProcessHandleImpl_00024Info_info0(JNIEnv *env,
-                                                 jobject jinfo,
-                                                  jlong jpid) {
-    pid_t pid = (pid_t) jpid;
-    jlong startTime = 0L;
-    jlong totalTime = 0L;
-    uid_t uid = -1;
-    pid_t ppid = getStatInfo(env, pid, &totalTime, &startTime, &uid);
-
-    getCmdlineInfo(env, jinfo, pid);
-
-    if (ppid > 0) {
-        jstring str;
-        (*env)->SetLongField(env, jinfo, ProcessHandleImpl_Info_startTimeID, startTime);
-        JNU_CHECK_EXCEPTION(env);
-
-        (*env)->SetLongField(env, jinfo, ProcessHandleImpl_Info_totalTimeID, totalTime);
-        JNU_CHECK_EXCEPTION(env);
-
-        CHECK_NULL((str = uidToUser(env, uid)));
-        (*env)->SetObjectField(env, jinfo, ProcessHandleImpl_Info_userID, str);
-        JNU_CHECK_EXCEPTION(env);
-    }
-}
-
-/**
- * Read /proc/<pid>/status and return the ppid, total cputime and start time.
- * Return: -1 is fail;  zero is unknown; >  0 is parent pid
- */
-static pid_t getStatInfo(JNIEnv *env, pid_t pid,
-                                      jlong *totalTime, jlong* startTime,
-                                      uid_t* uid) {
-    FILE* fp;
-    psinfo_t psinfo;
-    char fn[32];
-    int ret;
-
-    /*
-     * Try to open /proc/%d/status
-     */
-    snprintf(fn, sizeof fn, "/proc/%d/psinfo", pid);
-    fp = fopen(fn, "r");
-    if (fp == NULL) {
-        return -1;
-    }
-
-    ret = fread(&psinfo, 1, (sizeof psinfo), fp);
-    fclose(fp);
-    if (ret < (sizeof psinfo)) {
-        return -1;
-    }
-
-    *totalTime = psinfo.pr_time.tv_sec * 1000000000L + psinfo.pr_time.tv_nsec;
-
-    *startTime = psinfo.pr_start.tv_sec * (jlong)1000 +
-                 psinfo.pr_start.tv_nsec / 1000000;
-
-    *uid = psinfo.pr_uid;
-
-    return (pid_t) psinfo.pr_ppid;
-}
-
-static void getCmdlineInfo(JNIEnv *env, jobject jinfo, pid_t pid) {
-    char fn[32];
-    char exePath[PATH_MAX];
-    jstring str = NULL;
-    int ret;
-
-    /*
-     * The path to the executable command is the link in /proc/<pid>/paths/a.out.
-     */
-    snprintf(fn, sizeof fn, "/proc/%d/path/a.out", pid);
-    if ((ret = readlink(fn, exePath, PATH_MAX - 1)) < 0) {
-        return;
-    }
-
-    // null terminate and create String to store for command
-    exePath[ret] = '\0';
-    CHECK_NULL(str = JNU_NewStringPlatform(env, exePath));
-    (*env)->SetObjectField(env, jinfo, ProcessHandleImpl_Info_commandID, str);
-    JNU_CHECK_EXCEPTION(env);
+void os_getCmdlineAndUserInfo(JNIEnv *env, jobject jinfo, pid_t pid) {
+    unix_getCmdlineAndUserInfo(env, jinfo, pid);
 }
 
diff --git a/jdk/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java b/jdk/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java
index 4fa76ae6df4..ce280dc455a 100644
--- a/jdk/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java
+++ b/jdk/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java
@@ -116,8 +116,8 @@ public class Handler extends URLStreamHandler {
      * Compares the host components of two URLs.
      * @param u1 the URL of the first host to compare
      * @param u2 the URL of the second host to compare
-     * @return  <tt>true</tt> if and only if they
-     * are equal, <tt>false</tt> otherwise.
+     * @return  {@code true} if and only if they
+     * are equal, {@code false} otherwise.
      */
     protected boolean hostsEqual(URL u1, URL u2) {
         /*
diff --git a/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c b/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c
index 9e772366477..afbe1e275ee 100644
--- a/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c
+++ b/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c
@@ -28,31 +28,87 @@
 #include "java_lang_ProcessHandleImpl.h"
 #include "java_lang_ProcessHandleImpl_Info.h"
 
+#include "ProcessHandleImpl_unix.h"
+
 
 #include <stdio.h>
-
 #include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
+#include <dirent.h>
+#include <ctype.h>
+#include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include <string.h>
-#include <dirent.h>
-#include <ctype.h>
+#ifdef _AIX
+#include <sys/procfs.h>
+#endif
+#ifdef __solaris__
+#include <procfs.h>
+#endif
 
 /**
- * Implementations of ProcessHandleImpl functions that are common to all
- * Unix variants:
- * - waitForProcessExit0(pid, reap)
- * - getCurrentPid0()
- * - destroy0(pid, force)
+ * This file contains the implementation of the native ProcessHandleImpl
+ * functions which are common to all Unix variants.
+ *
+ * The currently supported Unix variants are Solaris, Linux, MaxOS X and AIX.
+ * The various similarities and differences between these systems make it hard
+ * to find a clear boundary between platform specific and shared code.
+ *
+ * In order to ease code sharing between the platforms while still keeping the
+ * code as clean as possible (i.e. free of preprocessor macros) we use the
+ * following source code layout (remember that ProcessHandleImpl_unix.c will
+ * be compiled on EVERY Unix platform while ProcessHandleImpl_<os>.c will be
+ * only compiled on the specific OS):
+ *
+ * - all the JNI wrappers for the ProcessHandleImpl functions go into this file
+ * - if their implementation is common on ALL the supported Unix platforms it
+ *   goes right into the JNI wrappers
+ * - if the whole function or substantial parts of it are platform dependent,
+ *   the implementation goes into os_<function_name> functions in
+ *   ProcessHandleImpl_<os>.c
+ * - if at least two platforms implement an os_<function_name> function in the
+ *   same way, this implementation is factored out into unix_<function_name>,
+ *   placed into this file and called from the corresponding os_<function_name>
+ *   function.
+ * - For convenience, all the os_ and unix_ functions are declared in
+ *   ProcessHandleImpl_unix.h which is included into every
+ *   ProcessHandleImpl_<os>.c file.
+ *
+ * Example 1:
+ * ----------
+ * The implementation of Java_java_lang_ProcessHandleImpl_initNative()
+ * is the same on all platforms except on Linux where it initilizes one
+ * additional field. So we place the implementation right into
+ * Java_java_lang_ProcessHandleImpl_initNative() but add call to
+ * os_init() at the end of the function which is empty on all platforms
+ * except Linux where it performs the additionally initializations.
+ *
+ * Example 2:
+ * ----------
+ * The implementation of Java_java_lang_ProcessHandleImpl_00024Info_info0 is the
+ * same on Solaris and AIX but different on Linux and MacOSX. We therefore simply
+ * call the helpers os_getParentPidAndTimings() and os_getCmdlineAndUserInfo().
+ * The Linux and MaxOS X versions of these functions (in the corresponding files
+ * ProcessHandleImpl_linux.c and ProcessHandleImpl_macosx.c) directly contain
+ * the platform specific implementations while the Solaris and AIX
+ * implementations simply call back to unix_getParentPidAndTimings() and
+ * unix_getCmdlineAndUserInfo() which are implemented right in this file.
+ *
+ * The term "same implementation" is still a question of interpretation. It my
+ * be acceptable to have a few ifdef'ed lines if that allows the sharing of a
+ * huge function. On the other hand, if the platform specific code in a shared
+ * function grows over a certain limit, it may be better to refactor that
+ * functionality into corresponding, platform-specific os_ functions.
  */
 
+
 #ifndef WIFEXITED
 #define WIFEXITED(status) (((status)&0xFF) == 0)
 #endif
@@ -69,6 +125,19 @@
 #define WTERMSIG(status) ((status)&0x7F)
 #endif
 
+#ifdef __solaris__
+/* The child exited because of a signal.
+ * The best value to return is 0x80 + signal number,
+ * because that is what all Unix shells do, and because
+ * it allows callers to distinguish between process exit and
+ * process death by signal.
+ * Unfortunately, the historical behavior on Solaris is to return
+ * the signal number, and we preserve this for compatibility. */
+#define WTERMSIG_RETURN(status) WTERMSIG(status)
+#else
+#define WTERMSIG_RETURN(status) (WTERMSIG(status) + 0x80)
+#endif
+
 #define RESTARTABLE(_cmd, _result) do { \
   do { \
     _result = _cmd; \
@@ -81,21 +150,83 @@
   } while((_result == NULL) && (errno == EINTR)); \
 } while(0)
 
-#ifdef __solaris__
-    #define STAT_FILE "/proc/%d/status"
-#else
-    #define STAT_FILE "/proc/%d/stat"
-#endif
+
+/* Field id for jString 'command' in java.lang.ProcessHandleImpl.Info */
+jfieldID ProcessHandleImpl_Info_commandID;
+
+/* Field id for jString 'commandLine' in java.lang.ProcessHandleImpl.Info */
+jfieldID ProcessHandleImpl_Info_commandLineID;
+
+/* Field id for jString[] 'arguments' in java.lang.ProcessHandleImpl.Info */
+jfieldID ProcessHandleImpl_Info_argumentsID;
+
+/* Field id for jlong 'totalTime' in java.lang.ProcessHandleImpl.Info */
+jfieldID ProcessHandleImpl_Info_totalTimeID;
+
+/* Field id for jlong 'startTime' in java.lang.ProcessHandleImpl.Info */
+jfieldID ProcessHandleImpl_Info_startTimeID;
+
+/* Field id for jString 'user' in java.lang.ProcessHandleImpl.Info */
+jfieldID ProcessHandleImpl_Info_userID;
+
+/* Size of password or group entry when not available via sysconf */
+#define ENT_BUF_SIZE   1024
+/* The value for the size of the buffer used by getpwuid_r(). The result of */
+/* sysconf(_SC_GETPW_R_SIZE_MAX) if available or ENT_BUF_SIZE otherwise. */
+static long getpw_buf_size;
+
+/**************************************************************
+ * Static method to initialize field IDs and the ticks per second rate.
+ *
+ * Class:     java_lang_ProcessHandleImpl_Info
+ * Method:    initIDs
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL
+Java_java_lang_ProcessHandleImpl_00024Info_initIDs(JNIEnv *env, jclass clazz) {
+
+    CHECK_NULL(ProcessHandleImpl_Info_commandID =
+            (*env)->GetFieldID(env, clazz, "command", "Ljava/lang/String;"));
+    CHECK_NULL(ProcessHandleImpl_Info_commandLineID =
+            (*env)->GetFieldID(env, clazz, "commandLine", "Ljava/lang/String;"));
+    CHECK_NULL(ProcessHandleImpl_Info_argumentsID =
+            (*env)->GetFieldID(env, clazz, "arguments", "[Ljava/lang/String;"));
+    CHECK_NULL(ProcessHandleImpl_Info_totalTimeID =
+            (*env)->GetFieldID(env, clazz, "totalTime", "J"));
+    CHECK_NULL(ProcessHandleImpl_Info_startTimeID =
+            (*env)->GetFieldID(env, clazz, "startTime", "J"));
+    CHECK_NULL(ProcessHandleImpl_Info_userID =
+            (*env)->GetFieldID(env, clazz, "user", "Ljava/lang/String;"));
+}
+
+/***********************************************************
+ * Static method to initialize platform dependent constants.
+ *
+ * Class:     java_lang_ProcessHandleImpl
+ * Method:    initNative
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL
+Java_java_lang_ProcessHandleImpl_initNative(JNIEnv *env, jclass clazz) {
+    getpw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);
+    if (getpw_buf_size == -1) {
+        getpw_buf_size = ENT_BUF_SIZE;
+    }
+    os_initNative(env, clazz);
+}
 
 /* Block until a child process exits and return its exit code.
  * Note, can only be called once for any given pid if reapStatus = true.
+ *
+ * Class:     java_lang_ProcessHandleImpl
+ * Method:    waitForProcessExit0
+ * Signature: (JZ)I
  */
 JNIEXPORT jint JNICALL
 Java_java_lang_ProcessHandleImpl_waitForProcessExit0(JNIEnv* env,
                                                      jclass junk,
                                                      jlong jpid,
-                                                     jboolean reapStatus)
-{
+                                                     jboolean reapStatus) {
     pid_t pid = (pid_t)jpid;
     errno = 0;
 
@@ -117,18 +248,7 @@ Java_java_lang_ProcessHandleImpl_waitForProcessExit0(JNIEnv* env,
         if (WIFEXITED(status)) {
             return WEXITSTATUS(status);
         } else if (WIFSIGNALED(status)) {
-            /* The child exited because of a signal.
-             * The best value to return is 0x80 + signal number,
-             * because that is what all Unix shells do, and because
-             * it allows callers to distinguish between process exit and
-             * process death by signal.
-             * Unfortunately, the historical behavior on Solaris is to return
-             * the signal number, and we preserve this for compatibility. */
-#ifdef __solaris__
-            return WTERMSIG(status);
-#else
-            return 0x80 + WTERMSIG(status);
-#endif
+            return WTERMSIG_RETURN(status);
         } else {
             return status;
         }
@@ -156,18 +276,7 @@ Java_java_lang_ProcessHandleImpl_waitForProcessExit0(JNIEnv* env,
               */
              return siginfo.si_status;
         } else if (siginfo.si_code == CLD_KILLED || siginfo.si_code == CLD_DUMPED) {
-             /* The child exited because of a signal.
-              * The best value to return is 0x80 + signal number,
-              * because that is what all Unix shells do, and because
-              * it allows callers to distinguish between process exit and
-              * process death by signal.
-              * Unfortunately, the historical behavior on Solaris is to return
-              * the signal number, and we preserve this for compatibility. */
- #ifdef __solaris__
-             return WTERMSIG(siginfo.si_status);
- #else
-             return 0x80 + WTERMSIG(siginfo.si_status);
- #endif
+             return WTERMSIG_RETURN(siginfo.si_status);
         } else {
              /*
               * Unknown exit code; pass it through.
@@ -191,7 +300,7 @@ Java_java_lang_ProcessHandleImpl_getCurrentPid0(JNIEnv *env, jclass clazz) {
 /*
  * Class:     java_lang_ProcessHandleImpl
  * Method:    destroy0
- * Signature: (Z)Z
+ * Signature: (JJZ)Z
  */
 JNIEXPORT jboolean JNICALL
 Java_java_lang_ProcessHandleImpl_destroy0(JNIEnv *env,
@@ -210,119 +319,52 @@ Java_java_lang_ProcessHandleImpl_destroy0(JNIEnv *env,
     }
 }
 
-/**
- * Size of password or group entry when not available via sysconf
+/*
+ * Returns the children of the requested pid and optionally each parent and
+ * start time.
+ * Accumulates any process who parent pid matches.
+ * The resulting pids are stored into the array of longs.
+ * The number of pids is returned if they all fit.
+ * If the array is too short, the negative of the desired length is returned.
+ * Class:     java_lang_ProcessHandleImpl
+ * Method:    getProcessPids0
+ * Signature: (J[J[J[J)I
  */
-#define ENT_BUF_SIZE   1024
-
-/**
- * Return a strong username for the uid_t or null.
- */
-jstring uidToUser(JNIEnv* env, uid_t uid) {
-    int result = 0;
-    int buflen;
-    char* pwbuf;
-    jstring name = NULL;
-
-    /* allocate buffer for password record */
-    buflen = (int)sysconf(_SC_GETPW_R_SIZE_MAX);
-    if (buflen == -1)
-        buflen = ENT_BUF_SIZE;
-    pwbuf = (char*)malloc(buflen);
-    if (pwbuf == NULL) {
-        JNU_ThrowOutOfMemoryError(env, "Unable to open getpwent");
-    } else {
-        struct passwd pwent;
-        struct passwd* p = NULL;
-
-#ifdef __solaris__
-        RESTARTABLE_RETURN_PTR(getpwuid_r(uid, &pwent, pwbuf, (size_t)buflen), p);
-#else
-        RESTARTABLE(getpwuid_r(uid, &pwent, pwbuf, (size_t)buflen, &p), result);
-#endif
-
-        // Return the Java String if a name was found
-        if (result == 0 && p != NULL &&
-            p->pw_name != NULL && *(p->pw_name) != '\0') {
-            name = JNU_NewStringPlatform(env, p->pw_name);
-        }
-        free(pwbuf);
-    }
-    return name;
+JNIEXPORT jint JNICALL
+Java_java_lang_ProcessHandleImpl_getProcessPids0(JNIEnv *env,
+                                                 jclass clazz,
+                                                 jlong jpid,
+                                                 jlongArray jarray,
+                                                 jlongArray jparentArray,
+                                                 jlongArray jstimesArray) {
+    return os_getChildren(env, jpid, jarray, jparentArray, jstimesArray);
 }
 
-/**
- * Implementations of ProcessHandleImpl functions that are common to
- * (some) Unix variants:
- * - getProcessPids0(pid, pidArray, parentArray)
- */
-
-#if defined(__linux__) || defined(__AIX__)
-
 /*
- * Signatures for internal OS specific functions.
- */
-static pid_t getStatInfo(JNIEnv *env, pid_t pid,
-                                     jlong *totalTime, jlong* startTime);
-static void getCmdlineInfo(JNIEnv *env, pid_t pid, jobject jinfo);
-static long long getBoottime(JNIEnv *env);
-
-jstring uidToUser(JNIEnv* env, uid_t uid);
-
-/* Field id for jString 'command' in java.lang.ProcessHandleImpl.Info */
-static jfieldID ProcessHandleImpl_Info_commandID;
-
-/* Field id for jString[] 'arguments' in java.lang.ProcessHandleImpl.Info */
-static jfieldID ProcessHandleImpl_Info_argumentsID;
-
-/* Field id for jlong 'totalTime' in java.lang.ProcessHandleImpl.Info */
-static jfieldID ProcessHandleImpl_Info_totalTimeID;
-
-/* Field id for jlong 'startTime' in java.lang.ProcessHandleImpl.Info */
-static jfieldID ProcessHandleImpl_Info_startTimeID;
-
-/* Field id for jString 'user' in java.lang.ProcessHandleImpl.Info */
-static jfieldID ProcessHandleImpl_Info_userID;
-
-/* static value for clock ticks per second. */
-static long clock_ticks_per_second;
-
-/* A static offset in milliseconds since boot. */
-static long long bootTime_ms;
-
-/**************************************************************
- * Static method to initialize field IDs and the ticks per second rate.
+ * Fill in the Info object from the OS information about the process.
  *
  * Class:     java_lang_ProcessHandleImpl_Info
- * Method:    initIDs
- * Signature: ()V
+ * Method:    info0
+ * Signature: (Ljava/lang/ProcessHandle/Info;J)I
  */
 JNIEXPORT void JNICALL
-Java_java_lang_ProcessHandleImpl_00024Info_initIDs(JNIEnv *env, jclass clazz) {
+Java_java_lang_ProcessHandleImpl_00024Info_info0(JNIEnv *env,
+                                                 jobject jinfo,
+                                                 jlong jpid) {
+    pid_t pid = (pid_t) jpid;
+    pid_t ppid;
+    jlong totalTime = -1L;
+    jlong startTime = -1L;
 
-    CHECK_NULL(ProcessHandleImpl_Info_commandID = (*env)->GetFieldID(env,
-        clazz, "command", "Ljava/lang/String;"));
-    CHECK_NULL(ProcessHandleImpl_Info_argumentsID = (*env)->GetFieldID(env,
-        clazz, "arguments", "[Ljava/lang/String;"));
-    CHECK_NULL(ProcessHandleImpl_Info_totalTimeID = (*env)->GetFieldID(env,
-        clazz, "totalTime", "J"));
-    CHECK_NULL(ProcessHandleImpl_Info_startTimeID = (*env)->GetFieldID(env,
-        clazz, "startTime", "J"));
-    CHECK_NULL(ProcessHandleImpl_Info_userID = (*env)->GetFieldID(env,
-        clazz, "user", "Ljava/lang/String;"));
-}
+    ppid = os_getParentPidAndTimings(env, pid,  &totalTime, &startTime);
+    if (ppid >= 0) {
+        (*env)->SetLongField(env, jinfo, ProcessHandleImpl_Info_totalTimeID, totalTime);
+        JNU_CHECK_EXCEPTION(env);
 
-/**************************************************************
- * Static method to initialize the ticks per second rate.
- *
- * Class:     java_lang_ProcessHandleImpl
- * Method:    initNative
- * Signature: ()V
- */
-JNIEXPORT void JNICALL
-Java_java_lang_ProcessHandleImpl_initNative(JNIEnv *env, jclass clazz) {
-    clock_ticks_per_second = sysconf(_SC_CLK_TCK);
-    bootTime_ms = getBoottime(env);
+        (*env)->SetLongField(env, jinfo, ProcessHandleImpl_Info_startTimeID, startTime);
+        JNU_CHECK_EXCEPTION(env);
+    }
+    os_getCmdlineAndUserInfo(env, jinfo, pid);
 }
 
 /*
@@ -340,8 +382,8 @@ Java_java_lang_ProcessHandleImpl_isAlive0(JNIEnv *env, jobject obj, jlong jpid)
     pid_t pid = (pid_t) jpid;
     jlong startTime = 0L;
     jlong totalTime = 0L;
-    pid_t ppid = getStatInfo(env, pid, &totalTime, &startTime);
-    return (ppid <= 0) ? -1 : startTime;
+    pid_t ppid = os_getParentPidAndTimings(env, pid, &totalTime, &startTime);
+    return (ppid < 0) ? -1 : startTime;
 }
 
 /*
@@ -350,7 +392,7 @@ Java_java_lang_ProcessHandleImpl_isAlive0(JNIEnv *env, jobject obj, jlong jpid)
  *
  * Class:     java_lang_ProcessHandleImpl
  * Method:    parent0
- * Signature: (J)J
+ * Signature: (JJ)J
  */
 JNIEXPORT jlong JNICALL
 Java_java_lang_ProcessHandleImpl_parent0(JNIEnv *env,
@@ -360,13 +402,12 @@ Java_java_lang_ProcessHandleImpl_parent0(JNIEnv *env,
     pid_t pid = (pid_t) jpid;
     pid_t ppid;
 
-    pid_t mypid = getpid();
-    if (pid == mypid) {
+    if (pid == getpid()) {
         ppid = getppid();
     } else {
-        jlong start = 0L;;
+        jlong start = 0L;
         jlong total = 0L;        // unused
-        ppid = getStatInfo(env, pid, &total, &start);
+        ppid = os_getParentPidAndTimings(env, pid, &total, &start);
         if (start != startTime && start != 0 && startTime != 0) {
             ppid = -1;
         }
@@ -374,24 +415,94 @@ Java_java_lang_ProcessHandleImpl_parent0(JNIEnv *env,
     return (jlong) ppid;
 }
 
+/**
+ * Construct the argument array by parsing the arguments from the sequence
+ * of arguments.
+ */
+void unix_fillArgArray(JNIEnv *env, jobject jinfo, int nargs, char *cp,
+                       char *argsEnd, jstring cmdexe, char *cmdline) {
+    jobject argsArray;
+    int i;
+
+    (*env)->SetObjectField(env, jinfo, ProcessHandleImpl_Info_commandID, cmdexe);
+    JNU_CHECK_EXCEPTION(env);
+
+    if (nargs >= 1) {
+        // Create a String array for nargs-1 elements
+        argsArray = (*env)->NewObjectArray(env, nargs - 1, JNU_ClassString(env), NULL);
+        CHECK_NULL(argsArray);
+
+        for (i = 0; i < nargs - 1; i++) {
+            jstring str = NULL;
+
+            cp += strlen(cp) + 1;
+            if (cp > argsEnd || *cp == '\0') {
+                return;  // Off the end pointer or an empty argument is an error
+            }
+
+            CHECK_NULL((str = JNU_NewStringPlatform(env, cp)));
+
+            (*env)->SetObjectArrayElement(env, argsArray, i, str);
+            JNU_CHECK_EXCEPTION(env);
+        }
+        (*env)->SetObjectField(env, jinfo, ProcessHandleImpl_Info_argumentsID, argsArray);
+        JNU_CHECK_EXCEPTION(env);
+    }
+    if (cmdline != NULL) {
+        jstring commandLine = NULL;
+        CHECK_NULL((commandLine = JNU_NewStringPlatform(env, cmdline)));
+        (*env)->SetObjectField(env, jinfo, ProcessHandleImpl_Info_commandLineID, commandLine);
+        JNU_CHECK_EXCEPTION(env);
+    }
+}
+
+void unix_getUserInfo(JNIEnv* env, jobject jinfo, uid_t uid) {
+    int result = 0;
+    char* pwbuf;
+    jstring name = NULL;
+
+    /* allocate buffer for password record */
+    pwbuf = (char*)malloc(getpw_buf_size);
+    if (pwbuf == NULL) {
+        JNU_ThrowOutOfMemoryError(env, "Unable to open getpwent");
+    } else {
+        struct passwd pwent;
+        struct passwd* p = NULL;
+
+#ifdef __solaris__
+        RESTARTABLE_RETURN_PTR(getpwuid_r(uid, &pwent, pwbuf, (size_t)getpw_buf_size), p);
+#else
+        RESTARTABLE(getpwuid_r(uid, &pwent, pwbuf, (size_t)getpw_buf_size, &p), result);
+#endif
+
+        // Create the Java String if a name was found
+        if (result == 0 && p != NULL &&
+            p->pw_name != NULL && *(p->pw_name) != '\0') {
+            name = JNU_NewStringPlatform(env, p->pw_name);
+        }
+        free(pwbuf);
+    }
+    if (name != NULL) {
+        (*env)->SetObjectField(env, jinfo, ProcessHandleImpl_Info_userID, name);
+    }
+}
+
 /*
- * Returns the children of the requested pid and optionally each parent.
+ * The following functions are common on Solaris, Linux and AIX.
+ */
+
+#if defined(__solaris__) || defined (__linux__) || defined(_AIX)
+
+/*
+ * Returns the children of the requested pid and optionally each parent and
+ * start time.
  * Reads /proc and accumulates any process who parent pid matches.
  * The resulting pids are stored into the array of longs.
  * The number of pids is returned if they all fit.
- * If the array is too short, the negative of the desired length is returned. *
- * Class:     java_lang_ProcessHandleImpl
- * Method:    getChildPids
- * Signature: (J[J[J)I
+ * If the array is too short, the negative of the desired length is returned.
  */
-JNIEXPORT jint JNICALL
-Java_java_lang_ProcessHandleImpl_getProcessPids0(JNIEnv *env,
-                                                 jclass clazz,
-                                                 jlong jpid,
-                                                 jlongArray jarray,
-                                                 jlongArray jparentArray,
-                                                 jlongArray jstimesArray) {
-
+jint unix_getChildren(JNIEnv *env, jlong jpid, jlongArray jarray,
+                      jlongArray jparentArray, jlongArray jstimesArray) {
     DIR* dir;
     struct dirent* ptr;
     pid_t pid = (pid_t) jpid;
@@ -462,9 +573,10 @@ Java_java_lang_ProcessHandleImpl_getProcessPids0(JNIEnv *env,
             if ((int) childpid <= 0) {
                 continue;
             }
-            // Read /proc/pid/stat and get the parent pid, and start time
-            ppid = getStatInfo(env, childpid, &totalTime, &startTime);
-            if (ppid > 0 && (pid == 0 || ppid == pid)) {
+
+            // Get the parent pid, and start time
+            ppid = os_getParentPidAndTimings(env, childpid, &totalTime, &startTime);
+            if (ppid >= 0 && (pid == 0 || ppid == pid)) {
                 if (count < arraySize) {
                     // Only store if it fits
                     pids[count] = (jlong) childpid;
@@ -498,293 +610,110 @@ Java_java_lang_ProcessHandleImpl_getProcessPids0(JNIEnv *env,
     return count;
 }
 
-
-/**************************************************************
- * Implementation of ProcessHandleImpl_Info native methods.
- */
+#endif // defined(__solaris__) || defined (__linux__) || defined(_AIX)
 
 /*
- * Fill in the Info object from the OS information about the process.
- *
- * Class:     java_lang_ProcessHandleImpl_Info
- * Method:    info0
- * Signature: (JLjava/lang/ProcessHandle/Info;)I
+ * The following functions are common on Solaris and AIX.
  */
-JNIEXPORT void JNICALL
-Java_java_lang_ProcessHandleImpl_00024Info_info0(JNIEnv *env,
-                                                 jobject jinfo,
-                                                 jlong jpid) {
-    pid_t pid = (pid_t) jpid;
-    pid_t ppid;
-    jlong totalTime = 0L;
-    jlong startTime = -1L;
 
-    ppid = getStatInfo(env, pid,  &totalTime, &startTime);
-    if (ppid > 0) {
-        (*env)->SetLongField(env, jinfo, ProcessHandleImpl_Info_totalTimeID, totalTime);
-        JNU_CHECK_EXCEPTION(env);
-
-        (*env)->SetLongField(env, jinfo, ProcessHandleImpl_Info_startTimeID, startTime);
-        JNU_CHECK_EXCEPTION(env);
-
-        getCmdlineInfo(env, pid, jinfo);
-    }
-}
+#if defined(__solaris__) || defined(_AIX)
 
 /**
- * Read /proc/<pid>/stat and return the ppid, total cputime and start time.
- * -1 is fail;  zero is unknown; >  0 is parent pid
+ * Helper function to get the 'psinfo_t' data from "/proc/%d/psinfo".
+ * Returns 0 on success and -1 on error.
  */
-static pid_t getStatInfo(JNIEnv *env, pid_t pid,
-                                     jlong *totalTime, jlong* startTime) {
+static int getPsinfo(pid_t pid, psinfo_t *psinfo) {
     FILE* fp;
-    char buffer[2048];
-    int statlen;
     char fn[32];
-    char* s;
-    int parentPid;
-    long unsigned int utime = 0;      // clock tics
-    long unsigned int stime = 0;      // clock tics
-    long long unsigned int start = 0; // microseconds
+    int ret;
 
     /*
-     * Try to stat and then open /proc/%d/stat
+     * Try to open /proc/%d/psinfo
      */
-    snprintf(fn, sizeof fn, STAT_FILE, pid);
-
+    snprintf(fn, sizeof fn, "/proc/%d/psinfo", pid);
     fp = fopen(fn, "r");
-    if (fp == NULL) {
-        return -1;              // fail, no such /proc/pid/stat
-    }
-
-    /*
-     * The format is: pid (command) state ppid ...
-     * As the command could be anything we must find the right most
-     * ")" and then skip the white spaces that follow it.
-     */
-    statlen = fread(buffer, 1, (sizeof buffer - 1), fp);
-    fclose(fp);
-    if (statlen < 0) {
-        return 0;               // parent pid is not available
-    }
-
-    buffer[statlen] = '\0';
-    s = strchr(buffer, '(');
-    if (s == NULL) {
-        return 0;               // parent pid is not available
-    }
-    // Found start of command, skip to end
-    s++;
-    s = strrchr(s, ')');
-    if (s == NULL) {
-        return 0;               // parent pid is not available
-    }
-    s++;
-
-    // Scan the needed fields from status, retaining only ppid(4),
-    // utime (14), stime(15), starttime(22)
-    if (4 != sscanf(s, " %*c %d %*d %*d %*d %*d %*d %*u %*u %*u %*u %lu %lu %*d %*d %*d %*d %*d %*d %llu",
-            &parentPid, &utime, &stime, &start)) {
-        return 0;              // not all values parsed; return error
-    }
-
-    *totalTime = (utime + stime) * (jlong)(1000000000 / clock_ticks_per_second);
-
-    *startTime = bootTime_ms + ((start * 1000) / clock_ticks_per_second);
-
-    return parentPid;
-}
-
-/**
- * Construct the argument array by parsing the arguments from the sequence
- * of arguments. The zero'th arg is the command executable
- */
-static int fillArgArray(JNIEnv *env, jobject jinfo,
-                        int nargs, char *cp, char *argsEnd, jstring cmdexe) {
-    jobject argsArray;
-    int i;
-
-    if (nargs < 1) {
-        return 0;
-    }
-
-    if (cmdexe == NULL) {
-        // Create a string from arg[0]
-        CHECK_NULL_RETURN((cmdexe = JNU_NewStringPlatform(env, cp)), -1);
-    }
-    (*env)->SetObjectField(env, jinfo, ProcessHandleImpl_Info_commandID, cmdexe);
-    JNU_CHECK_EXCEPTION_RETURN(env, -3);
-
-    // Create a String array for nargs-1 elements
-    argsArray = (*env)->NewObjectArray(env, nargs - 1, JNU_ClassString(env), NULL);
-    CHECK_NULL_RETURN(argsArray, -1);
-
-    for (i = 0; i < nargs - 1; i++) {
-        jstring str = NULL;
-
-        cp += strnlen(cp, (argsEnd - cp)) + 1;
-        if (cp > argsEnd || *cp == '\0') {
-            return -2;  // Off the end pointer or an empty argument is an error
-        }
-
-        CHECK_NULL_RETURN((str = JNU_NewStringPlatform(env, cp)), -1);
-
-        (*env)->SetObjectArrayElement(env, argsArray, i, str);
-        JNU_CHECK_EXCEPTION_RETURN(env, -3);
-    }
-    (*env)->SetObjectField(env, jinfo, ProcessHandleImpl_Info_argumentsID, argsArray);
-    JNU_CHECK_EXCEPTION_RETURN(env, -4);
-    return 0;
-}
-
-
-static void getCmdlineInfo(JNIEnv *env, pid_t pid, jobject jinfo) {
-    int fd;
-    int cmdlen = 0;
-    char *cmdline = NULL, *cmdEnd;  // used for command line args and exe
-    jstring cmdexe = NULL;
-    char fn[32];
-    struct stat stat_buf;
-
-    /*
-     * Try to open /proc/%d/cmdline
-     */
-    snprintf(fn, sizeof fn, "/proc/%d/cmdline", pid);
-    if ((fd = open(fn, O_RDONLY)) < 0) {
-        return;
-    }
-
-    do {                // Block to break out of on errors
-        int i;
-        char *s;
-
-        cmdline = (char*)malloc(PATH_MAX);
-        if (cmdline == NULL) {
-            break;
-        }
-
-        /*
-         * The path to the executable command is the link in /proc/<pid>/exe.
-         */
-        snprintf(fn, sizeof fn, "/proc/%d/exe", pid);
-        if ((cmdlen = readlink(fn, cmdline, PATH_MAX - 1)) > 0) {
-            // null terminate and create String to store for command
-            cmdline[cmdlen] = '\0';
-            cmdexe = JNU_NewStringPlatform(env, cmdline);
-            (*env)->ExceptionClear(env);        // unconditionally clear any exception
-        }
-
-        /*
-         * The buffer format is the arguments nul terminated with an extra nul.
-         */
-        cmdlen = read(fd, cmdline, PATH_MAX-1);
-        if (cmdlen < 0) {
-            break;
-        }
-
-        // Terminate the buffer and count the arguments
-        cmdline[cmdlen] = '\0';
-        cmdEnd = &cmdline[cmdlen + 1];
-        for (s = cmdline,i = 0; *s != '\0' && (s < cmdEnd); i++) {
-            s += strnlen(s, (cmdEnd - s)) + 1;
-        }
-
-        if (fillArgArray(env, jinfo, i, cmdline, cmdEnd, cmdexe) < 0) {
-            break;
-        }
-
-        // Get and store the user name
-        if (fstat(fd, &stat_buf) == 0) {
-            jstring name = uidToUser(env, stat_buf.st_uid);
-            if (name != NULL) {
-                (*env)->SetObjectField(env, jinfo, ProcessHandleImpl_Info_userID, name);
-            }
-        }
-    } while (0);
-
-    if (cmdline != NULL) {
-        free(cmdline);
-    }
-    if (fd >= 0) {
-        close(fd);
-    }
-}
-
-/**
- * Read the boottime from /proc/stat.
- */
-static long long getBoottime(JNIEnv *env) {
-    FILE *fp;
-    char *line = NULL;
-    size_t len = 0;
-    long long bootTime = 0;
-
-    fp = fopen("/proc/stat", "r");
     if (fp == NULL) {
         return -1;
     }
 
-    while (getline(&line, &len, fp) != -1) {
-        if (sscanf(line, "btime %llu", &bootTime) == 1) {
-            break;
-        }
+    ret = fread(psinfo, 1, sizeof(psinfo_t), fp);
+    fclose(fp);
+    if (ret < sizeof(psinfo_t)) {
+        return -1;
     }
-    free(line);
-
-    if (fp != 0) {
-        fclose(fp);
-    }
-
-    return bootTime * 1000;
+    return 0;
 }
 
-#endif  //  defined(__linux__) || defined(__AIX__)
+/**
+ * Read /proc/<pid>/psinfo and return the ppid, total cputime and start time.
+ * Return: -1 is fail;  >=  0 is parent pid
+ * 'total' will contain the running time of 'pid' in nanoseconds.
+ * 'start' will contain the start time of 'pid' in milliseconds since epoch.
+ */
+pid_t unix_getParentPidAndTimings(JNIEnv *env, pid_t pid,
+                                  jlong *totalTime, jlong* startTime) {
+    psinfo_t psinfo;
 
-
-/* Block until a child process exits and return its exit code.
-   Note, can only be called once for any given pid. */
-JNIEXPORT jint JNICALL
-Java_java_lang_ProcessImpl_waitForProcessExit(JNIEnv* env,
-                                              jobject junk,
-                                              jint pid)
-{
-    /* We used to use waitid() on Solaris, waitpid() on Linux, but
-     * waitpid() is more standard, so use it on all POSIX platforms. */
-    int status;
-    /* Wait for the child process to exit.  This returns immediately if
-       the child has already exited. */
-    while (waitpid(pid, &status, 0) < 0) {
-        switch (errno) {
-        case ECHILD: return 0;
-        case EINTR: break;
-        default: return -1;
-        }
+    if (getPsinfo(pid, &psinfo) < 0) {
+        return -1;
     }
 
-    if (WIFEXITED(status)) {
-        /*
-         * The child exited normally; get its exit code.
-         */
-        return WEXITSTATUS(status);
-    } else if (WIFSIGNALED(status)) {
-        /* The child exited because of a signal.
-         * The best value to return is 0x80 + signal number,
-         * because that is what all Unix shells do, and because
-         * it allows callers to distinguish between process exit and
-         * process death by signal.
-         * Unfortunately, the historical behavior on Solaris is to return
-         * the signal number, and we preserve this for compatibility. */
-#ifdef __solaris__
-        return WTERMSIG(status);
-#else
-        return 0x80 + WTERMSIG(status);
+    *totalTime = psinfo.pr_time.tv_sec * 1000000000L + psinfo.pr_time.tv_nsec;
+
+    *startTime = psinfo.pr_start.tv_sec * (jlong)1000 +
+                 psinfo.pr_start.tv_nsec / 1000000;
+
+    return (pid_t) psinfo.pr_ppid;
+}
+
+void unix_getCmdlineAndUserInfo(JNIEnv *env, jobject jinfo, pid_t pid) {
+    psinfo_t psinfo;
+    char fn[32];
+    char exePath[PATH_MAX];
+    char prargs[PRARGSZ + 1];
+    jstring cmdexe = NULL;
+    int ret;
+
+    /*
+     * On Solaris, the full path to the executable command is the link in
+     * /proc/<pid>/paths/a.out. But it is only readable for processes we own.
+     */
+#if defined(__solaris__)
+    snprintf(fn, sizeof fn, "/proc/%d/path/a.out", pid);
+    if ((ret = readlink(fn, exePath, PATH_MAX - 1)) > 0) {
+        // null terminate and create String to store for command
+        exePath[ret] = '\0';
+        CHECK_NULL(cmdexe = JNU_NewStringPlatform(env, exePath));
+    }
 #endif
-    } else {
-        /*
-         * Unknown exit code; pass it through.
-         */
-        return status;
+
+    /*
+     * Now try to open /proc/%d/psinfo
+     */
+    if (getPsinfo(pid, &psinfo) < 0) {
+        unix_fillArgArray(env, jinfo, 0, NULL, NULL, cmdexe, NULL);
+        return;
     }
+
+    unix_getUserInfo(env, jinfo, psinfo.pr_uid);
+
+    /*
+     * Now read psinfo.pr_psargs which contains the first PRARGSZ characters of the
+     * argument list (i.e. arg[0] arg[1] ...). Unfortunately, PRARGSZ is usually set
+     * to 80 characters only. Nevertheless it's better than nothing :)
+     */
+    strncpy(prargs, psinfo.pr_psargs, PRARGSZ);
+    prargs[PRARGSZ] = '\0';
+    if (prargs[0] == '\0') {
+        /* If psinfo.pr_psargs didn't contain any strings, use psinfo.pr_fname
+         * (which only contains the last component of exec()ed pathname) as a
+         * last resort. This is true for AIX kernel processes for example.
+         */
+        strncpy(prargs, psinfo.pr_fname, PRARGSZ);
+        prargs[PRARGSZ] = '\0';
+    }
+    unix_fillArgArray(env, jinfo, 0, NULL, NULL, cmdexe,
+                      prargs[0] == '\0' ? NULL : prargs);
 }
 
-
+#endif // defined(__solaris__) || defined(_AIX)
diff --git a/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h b/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h
new file mode 100644
index 00000000000..a77f8ab5fc7
--- /dev/null
+++ b/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <sys/types.h>
+
+/*
+ * Declaration of ProcessHandleImpl functions common on all Unix platforms.
+ * 'unix_' functions have a single implementation in ProcessHandleImpl_unix.c
+ * 'os_' prefixed functions have different, os-specific implementations in the
+ * various ProcessHandleImpl_{linux,macosx,solaris,aix}.c files.
+ * See ProcessHandleImpl_unix.c for more details.
+ */
+
+/* Field id for jString 'command' in java.lang.ProcessHandleImpl.Info */
+extern jfieldID ProcessHandleImpl_Info_commandID;
+
+/* Field id for jString 'commandLine' in java.lang.ProcessHandleImpl.Info */
+extern jfieldID ProcessHandleImpl_Info_commandLineID;
+
+/* Field id for jString[] 'arguments' in java.lang.ProcessHandleImpl.Info */
+extern jfieldID ProcessHandleImpl_Info_argumentsID;
+
+/* Field id for jlong 'totalTime' in java.lang.ProcessHandleImpl.Info */
+extern jfieldID ProcessHandleImpl_Info_totalTimeID;
+
+/* Field id for jlong 'startTime' in java.lang.ProcessHandleImpl.Info */
+extern jfieldID ProcessHandleImpl_Info_startTimeID;
+
+/* Field id for jString 'user' in java.lang.ProcessHandleImpl.Info */
+extern jfieldID ProcessHandleImpl_Info_userID;
+
+/**
+ * Return: -1 is fail;  >=  0 is parent pid
+ * 'total' will contain the running time of 'pid' in nanoseconds.
+ * 'start' will contain the start time of 'pid' in milliseconds since epoch.
+ */
+extern pid_t unix_getParentPidAndTimings(JNIEnv *env, pid_t pid,
+                                         jlong *total, jlong *start);
+extern pid_t os_getParentPidAndTimings(JNIEnv *env, pid_t pid,
+                                       jlong *total, jlong *start);
+
+extern void unix_getCmdlineAndUserInfo(JNIEnv *env, jobject jinfo, pid_t pid);
+extern void os_getCmdlineAndUserInfo(JNIEnv *env, jobject jinfo, pid_t pid);
+
+extern jint unix_getChildren(JNIEnv *env, jlong jpid, jlongArray array,
+                             jlongArray jparentArray, jlongArray jstimesArray);
+extern jint os_getChildren(JNIEnv *env, jlong jpid, jlongArray array,
+                           jlongArray jparentArray, jlongArray jstimesArray);
+
+extern void unix_getUserInfo(JNIEnv* env, jobject jinfo, uid_t uid);
+extern void unix_fillArgArray(JNIEnv *env, jobject jinfo, int nargs, char *cp,
+                              char *argsEnd, jstring cmdexe, char *cmdline);
+
+extern void os_initNative(JNIEnv *env, jclass clazz);
diff --git a/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java b/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java
index 8ec417fd6e2..18626a76462 100644
--- a/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java
+++ b/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java
@@ -59,8 +59,8 @@ public class Win32ErrorMode {
      * Invoke at VM initialization time to disable the critical error message box.
      * <p>
      * The critial error message box is disabled unless the system property
-     * <tt>sun.io.allowCriticalErrorMessageBox</tt> is set to something other than
-     * <code>false</code>. This includes the empty string.
+     * {@code sun.io.allowCriticalErrorMessageBox} is set to something other than
+     * {@code false}. This includes the empty string.
      * <p>
      * This method does nothing if invoked after VM and class library initialization
      * has completed.
diff --git a/jdk/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java b/jdk/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java
index 8a5531268de..c2cb1d17f5d 100644
--- a/jdk/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java
+++ b/jdk/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java
@@ -134,8 +134,8 @@ public class Handler extends URLStreamHandler {
      * Compares the host components of two URLs.
      * @param u1 the URL of the first host to compare
      * @param u2 the URL of the second host to compare
-     * @return  <tt>true</tt> if and only if they
-     * are equal, <tt>false</tt> otherwise.
+     * @return  {@code true} if and only if they
+     * are equal, {@code false} otherwise.
      */
     protected boolean hostsEqual(URL u1, URL u2) {
         /*
diff --git a/jdk/src/java.base/windows/native/libjava/ProcessHandleImpl_win.c b/jdk/src/java.base/windows/native/libjava/ProcessHandleImpl_win.c
index 028a0565172..4885ddbc9db 100644
--- a/jdk/src/java.base/windows/native/libjava/ProcessHandleImpl_win.c
+++ b/jdk/src/java.base/windows/native/libjava/ProcessHandleImpl_win.c
@@ -45,6 +45,9 @@ static void procToUser(JNIEnv *env, HANDLE handle, jobject jinfo);
 /* Field id for jString 'command' in java.lang.ProcessHandle.Info */
 static jfieldID ProcessHandleImpl_Info_commandID;
 
+/* Field id for jString 'commandLine' in java.lang.ProcessHandleImpl.Info */
+static jfieldID ProcessHandleImpl_Info_commandLineID;
+
 /* Field id for jString[] 'arguments' in java.lang.ProcessHandle.Info */
 static jfieldID ProcessHandleImpl_Info_argumentsID;
 
@@ -69,6 +72,8 @@ Java_java_lang_ProcessHandleImpl_00024Info_initIDs(JNIEnv *env, jclass clazz) {
 
     CHECK_NULL(ProcessHandleImpl_Info_commandID = (*env)->GetFieldID(env,
         clazz, "command", "Ljava/lang/String;"));
+    CHECK_NULL(ProcessHandleImpl_Info_commandLineID = (*env)->GetFieldID(env,
+        clazz, "commandLine", "Ljava/lang/String;"));
     CHECK_NULL(ProcessHandleImpl_Info_argumentsID = (*env)->GetFieldID(env,
         clazz, "arguments", "[Ljava/lang/String;"));
     CHECK_NULL(ProcessHandleImpl_Info_totalTimeID = (*env)->GetFieldID(env,
diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java
index 69cc7b45523..9f8414a9573 100644
--- a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java
+++ b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java
@@ -56,7 +56,7 @@ public class RemoteToCorba implements StateFactory {
      * @param name Ignored
      * @param ctx The non-null CNCtx whose ORB to use.
      * @param env Ignored
-     * @return The CORBA object for <tt>orig</tt> or null.
+     * @return The CORBA object for {@code orig} or null.
      * @exception ConfigurationException If the CORBA object cannot be obtained
      *    due to configuration problems, for instance, if RMI-IIOP not available.
      * @exception NamingException If some other problem prevented a CORBA
diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java b/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
index 2fa43bca79e..122c9df57f5 100644
--- a/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
+++ b/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
@@ -76,7 +76,7 @@ public class CorbaUtils {
       *
       * @param remoteObj The non-null remote object for
       * @param orb       The non-null ORB to connect the remote object to
-      * @return The CORBA Object for remoteObj; null if <tt>remoteObj</tt>
+      * @return The CORBA Object for remoteObj; null if {@code remoteObj}
       *                 is a JRMP implementation or JRMP stub.
       * @exception ConfigurationException The CORBA Object cannot be obtained
       *         because of configuration problems.
diff --git a/jdk/src/java.rmi/share/classes/java/rmi/RemoteException.java b/jdk/src/java.rmi/share/classes/java/rmi/RemoteException.java
index b125932c41e..b32558bc05f 100644
--- a/jdk/src/java.rmi/share/classes/java/rmi/RemoteException.java
+++ b/jdk/src/java.rmi/share/classes/java/rmi/RemoteException.java
@@ -26,11 +26,11 @@
 package java.rmi;
 
 /**
- * A <code>RemoteException</code> is the common superclass for a number of
+ * A {@code RemoteException} is the common superclass for a number of
  * communication-related exceptions that may occur during the execution of a
  * remote method call.  Each method of a remote interface, an interface that
- * extends <code>java.rmi.Remote</code>, must list
- * <code>RemoteException</code> in its throws clause.
+ * extends {@code java.rmi.Remote}, must list
+ * {@code RemoteException} in its throws clause.
  *
  * <p>As of release 1.4, this exception has been retrofitted to conform to
  * the general purpose exception-chaining mechanism.  The "wrapped remote
@@ -40,7 +40,7 @@ package java.rmi;
  * the aforementioned "legacy field."
  *
  * <p>Invoking the method {@link Throwable#initCause(Throwable)} on an
- * instance of <code>RemoteException</code> always throws {@link
+ * instance of {@code RemoteException} always throws {@link
  * IllegalStateException}.
  *
  * @author  Ann Wollrath
@@ -63,14 +63,14 @@ public class RemoteException extends java.io.IOException {
     public Throwable detail;
 
     /**
-     * Constructs a <code>RemoteException</code>.
+     * Constructs a {@code RemoteException}.
      */
     public RemoteException() {
         initCause(null);  // Disallow subsequent initCause
     }
 
     /**
-     * Constructs a <code>RemoteException</code> with the specified
+     * Constructs a {@code RemoteException} with the specified
      * detail message.
      *
      * @param s the detail message
@@ -81,9 +81,9 @@ public class RemoteException extends java.io.IOException {
     }
 
     /**
-     * Constructs a <code>RemoteException</code> with the specified detail
+     * Constructs a {@code RemoteException} with the specified detail
      * message and cause.  This constructor sets the {@link #detail}
-     * field to the specified <code>Throwable</code>.
+     * field to the specified {@code Throwable}.
      *
      * @param s the detail message
      * @param cause the cause
@@ -113,7 +113,7 @@ public class RemoteException extends java.io.IOException {
      * Returns the cause of this exception.  This method returns the value
      * of the {@link #detail} field.
      *
-     * @return  the cause, which may be <tt>null</tt>.
+     * @return  the cause, which may be {@code null}.
      * @since   1.4
      */
     public Throwable getCause() {
diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationException.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationException.java
index 7ac8bf7994d..5fc7323f529 100644
--- a/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationException.java
+++ b/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationException.java
@@ -36,7 +36,7 @@ package java.rmi.activation;
  * the aforementioned "legacy field."
  *
  * <p>Invoking the method {@link Throwable#initCause(Throwable)} on an
- * instance of <code>ActivationException</code> always throws {@link
+ * instance of {@code ActivationException} always throws {@link
  * IllegalStateException}.
  *
  * @author      Ann Wollrath
@@ -59,14 +59,14 @@ public class ActivationException extends Exception {
     private static final long serialVersionUID = -4320118837291406071L;
 
     /**
-     * Constructs an <code>ActivationException</code>.
+     * Constructs an {@code ActivationException}.
      */
     public ActivationException() {
         initCause(null);  // Disallow subsequent initCause
     }
 
     /**
-     * Constructs an <code>ActivationException</code> with the specified
+     * Constructs an {@code ActivationException} with the specified
      * detail message.
      *
      * @param s the detail message
@@ -77,9 +77,9 @@ public class ActivationException extends Exception {
     }
 
     /**
-     * Constructs an <code>ActivationException</code> with the specified
+     * Constructs an {@code ActivationException} with the specified
      * detail message and cause.  This constructor sets the {@link #detail}
-     * field to the specified <code>Throwable</code>.
+     * field to the specified {@code Throwable}.
      *
      * @param s the detail message
      * @param cause the cause
@@ -109,7 +109,7 @@ public class ActivationException extends Exception {
      * Returns the cause of this exception.  This method returns the value
      * of the {@link #detail} field.
      *
-     * @return  the cause, which may be <tt>null</tt>.
+     * @return  the cause, which may be {@code null}.
      * @since   1.4
      */
     public Throwable getCause() {
diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/ServerCloneException.java b/jdk/src/java.rmi/share/classes/java/rmi/server/ServerCloneException.java
index b93c56588ad..f48bd0d092f 100644
--- a/jdk/src/java.rmi/share/classes/java/rmi/server/ServerCloneException.java
+++ b/jdk/src/java.rmi/share/classes/java/rmi/server/ServerCloneException.java
@@ -26,8 +26,8 @@
 package java.rmi.server;
 
 /**
- * A <code>ServerCloneException</code> is thrown if a remote exception occurs
- * during the cloning of a <code>UnicastRemoteObject</code>.
+ * A {@code ServerCloneException} is thrown if a remote exception occurs
+ * during the cloning of a {@code UnicastRemoteObject}.
  *
  * <p>As of release 1.4, this exception has been retrofitted to conform to
  * the general purpose exception-chaining mechanism.  The "nested exception"
@@ -37,7 +37,7 @@ package java.rmi.server;
  * the aforementioned "legacy field."
  *
  * <p>Invoking the method {@link Throwable#initCause(Throwable)} on an
- * instance of <code>ServerCloneException</code> always throws {@link
+ * instance of {@code ServerCloneException} always throws {@link
  * IllegalStateException}.
  *
  * @author  Ann Wollrath
@@ -61,7 +61,7 @@ public class ServerCloneException extends CloneNotSupportedException {
     private static final long serialVersionUID = 6617456357664815945L;
 
     /**
-     * Constructs a <code>ServerCloneException</code> with the specified
+     * Constructs a {@code ServerCloneException} with the specified
      * detail message.
      *
      * @param s the detail message.
@@ -72,7 +72,7 @@ public class ServerCloneException extends CloneNotSupportedException {
     }
 
     /**
-     * Constructs a <code>ServerCloneException</code> with the specified
+     * Constructs a {@code ServerCloneException} with the specified
      * detail message and cause.
      *
      * @param s the detail message.
@@ -103,7 +103,7 @@ public class ServerCloneException extends CloneNotSupportedException {
      * Returns the cause of this exception.  This method returns the value
      * of the {@link #detail} field.
      *
-     * @return  the cause, which may be <tt>null</tt>.
+     * @return  the cause, which may be {@code null}.
      * @since   1.4
      */
     public Throwable getCause() {
diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/package.html b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/package.html
index 00096524051..5945c539e56 100644
--- a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/package.html
+++ b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/package.html
@@ -26,51 +26,51 @@
 <!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
-                                    
+
   <meta http-equiv="Content-Type"
  content="text/html; charset=iso-8859-1">
   <title>com.sun.rowset Package</title>
 </head>
   <body bgcolor="#ffffff">
-Provides five standard implementations of the standard JDBC <tt>RowSet</tt> implementation 
-interface definitions. These reference implementations are included with the J2SE version 
-1.5 platform and represent the benchmark standard <tt>RowSet</tt> implementations as verified 
+Provides five standard implementations of the standard JDBC <code>RowSet</code> implementation
+interface definitions. These reference implementations are included with the J2SE version
+1.5 platform and represent the benchmark standard <code>RowSet</code> implementations as verified
 by the Test Compatibility Kit (TCK) as mandated by the Java Community Process.
- <br>
-   
+<br>
+
 <h3>1.0 Available JDBC RowSet Reference Implementations </h3>
-  The following implementations are provided:<br>
-           
-<blockquote><tt><b>JdbcRowSetImpl</b></tt> - The <tt>javax.sql.rowset.JdbcRowSet</tt>
+The following implementations are provided:<br>
+
+<blockquote><code><b>JdbcRowSetImpl</b></code> - The <code>javax.sql.rowset.JdbcRowSet</code>
 interface reference implementation. <br>
 <br>
-<tt><b>CachedRowSetImpl </b></tt>- The <tt>javax.sql.rowset.CachedRowSet</tt> interface
+<code><b>CachedRowSetImpl</b></code> - The <code>javax.sql.rowset.CachedRowSet</code> interface
 reference implementation.<br>
 <br>
-<tt><b>WebRowSetImpl</b></tt> - The <tt>javax.sql.rowset.WebRowSet</tt> interface
+<code><b>WebRowSetImpl</b></code> - The <code>javax.sql.rowset.WebRowSet</code> interface
 reference implementation.<br>
 <br>
-<tt><b>FilteredRowSetImpl</b></tt> - The <tt>javax.sql.rowset.FilteredRowSet</tt>
+<code><b>FilteredRowSetImpl</b></code> - The <code>javax.sql.rowset.FilteredRowSet</code>
 interface reference implementation.<br>
 <br>
-<tt><b>JoinRowSetImpl</b></tt> - The <tt>javax.sql.rowset.JoinRowSet</tt> interface
+<code><b>JoinRowSetImpl</b></code> - The <code>javax.sql.rowset.JoinRowSet</code> interface
 reference implementation.<br>
 </blockquote>
 
-All details on their expected behavior, including their interactions with the <tt>SyncProvider</tt>
-SPI and helper classes are provided in the interface definitions in the <tt>javax.sql.rowset</tt>
+All details on their expected behavior, including their interactions with the <code>SyncProvider</code>
+SPI and helper classes are provided in the interface definitions in the <code>javax.sql.rowset</code>
 package specification.<br>
-   
+
 <h3>2.0 Usage</h3>
 The reference implementations represent robust implementations of the standard
-<code>RowSet</code> interfaces defined in the <code>javax.sql.rowset</code> package. 
-All disconnected <code>RowSet</code> implementations, such as the <tt>CachedRowSetImpl</tt>
-and <tt>WebRowSetImpl</tt>, are flexible enough to use the <tt>SyncFactory</tt> SPIs to 
-leverage non-reference implementation <tt>SyncProvider</tt> implementations to obtain
-differing synchronization semantics. Furthermore, developers and vendors alike are free 
+<code>RowSet</code> interfaces defined in the <code>javax.sql.rowset</code> package.
+All disconnected <code>RowSet</code> implementations, such as the <code>CachedRowSetImpl</code>
+and <code>WebRowSetImpl</code>, are flexible enough to use the <code>SyncFactory</code> SPIs to
+leverage non-reference implementation <code>SyncProvider</code> implementations to obtain
+differing synchronization semantics. Furthermore, developers and vendors alike are free
 to use these implementations and integrate them into their products just as they
 can with to other components of the Java platform.<br>
-   
+
 <h3>3.0 Extending the JDBC RowSet Implementations</h3>
 
 The JDBC <code>RowSet</code> reference implementations are provided as non-final
@@ -81,6 +81,6 @@ set to their their particular needs. The website for JDBC Technology will
 provider a portal where implementations can be listed, similar to the way it
 provides a site for JDBC drivers.
 <br>
- <br>
+<br>
 </body>
 </html>
diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/package.html b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/package.html
index 7e7ff315b52..1910541538d 100644
--- a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/package.html
+++ b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/package.html
@@ -1,10 +1,10 @@
 <!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
-                    
+
   <meta http-equiv="Content-Type"
  content="text/html; charset=iso-8859-1">
-                    
+
   <meta name="GENERATOR"
  content="Mozilla/4.79 [en] (Windows NT 5.0; U) [Netscape]">
      <!--
@@ -35,21 +35,21 @@ questions.
   <title>javax.sql.rowset.providers Package</title>
 </head>
   <body bgcolor="#ffffff">
-  Repository for the <tt>RowSet</tt> reference implementations of the 
- <tt>SyncProvider</tt> abstract class. These implementations provide a 
- disconnected <code>RowSet</code>
- object with the ability to synchronize the data in the underlying data 
- source with its data.  These implementations are provided as
-the default <tt>SyncProvider</tt> implementations and are accessible via the
-<tt>SyncProvider</tt> SPI managed by the <tt>SyncFactory</tt>.  
+Repository for the <code>RowSet</code> reference implementations of the
+<code>SyncProvider</code> abstract class. These implementations provide a
+disconnected <code>RowSet</code>
+object with the ability to synchronize the data in the underlying data
+source with its data.  These implementations are provided as
+the default <code>SyncProvider</code> implementations and are accessible via the
+<code>SyncProvider</code> SPI managed by the <code>SyncFactory</code>.
 
 <h3>1.0 <code>SyncProvider</code> Reference Implementations</h3>
-  The main job of a <tt>SyncProvider</tt> implementation is to manage
+  The main job of a <code>SyncProvider</code> implementation is to manage
 the reader and writer mechanisms.
- The <tt>SyncProvider</tt> SPI, as specified in the <tt>javax.sql.rowset.spi</tt>
-package, provides a pluggable mechanism by which <tt>javax.sql.RowSetReader</tt>
-and <tt>javax.sql.RowSetWriter</tt> implementations can be supplied to a disconnected
-<tt>RowSet</tt> object.
+ The <code>SyncProvider</code> SPI, as specified in the <code>javax.sql.rowset.spi</code>
+package, provides a pluggable mechanism by which <code>javax.sql.RowSetReader</code>
+and <code>javax.sql.RowSetWriter</code> implementations can be supplied to a disconnected
+<code>RowSet</code> object.
 <P>
  A reader, a <code>javax.sql.RowSetReader</code>
 object, does the work necessary to populate a <code>RowSet</code> object with data.
@@ -100,24 +100,24 @@ implementations of the <code>SyncProvider</code> class:
    
 <UL>
 <LI>
-<b><tt>RIOptimisticProvider </tt></b>- provides the <tt>javax.sql.RowSetReader</tt>
- and <tt>javax.sql.RowSetWriter</tt> interface implementations and provides
+<b><code>RIOptimisticProvider</code></b> - provides the <code>javax.sql.RowSetReader</code>
+and <code>javax.sql.RowSetWriter</code> interface implementations and provides
 an optimistic concurrency model for synchronization. This model assumes that there
 will be few conflicts and therefore uses a relatively low grade of synchronization.
 If no other provider is available, this is the default provider that the 
 <code>SyncFactory</code> will supply to a <code>RowSet</code> object.
     <br>
 <LI>
-    <b><tt>RIXMLProvider </tt></b>- provides the <tt>XmlReader</tt> (an extension
-of  the <tt>javax.sql.RowSetReader</tt> interface) and the <tt>XmlWriter</tt>
-(an extension of the <tt>javax.sql.RowSetWriter</tt> interface) to enable
-  <tt>WebRowSet</tt> objects to write their state to a
-well formed XML document according to the <tt>WebRowSet</tt> XML schema
+<b><code>RIXMLProvider</code></b> - provides the <code>XmlReader</code> (an extension
+of the <code>javax.sql.RowSetReader</code> interface) and the <code>XmlWriter</code>
+(an extension of the <code>javax.sql.RowSetWriter</code> interface) to enable
+<code>WebRowSet</code> objects to write their state to a
+well formed XML document according to the <code>WebRowSet</code> XML schema
 definition.<br>
 </UL>
    
 <h3>2.0 Basics in RowSet Population &amp; Synchronization</h3>
-  A rowset's first task is to populate itself with rows of column values.
+A rowset's first task is to populate itself with rows of column values.
 Generally,   these rows will come from a relational database, so a rowset
 has properties   that supply what is necessary for making a connection to
 a database and executing  a query. A rowset that does not need to establish
@@ -127,28 +127,28 @@ properties set. The vast  majority of RowSets, however, do need to set these
 properties. The general  rule is that a RowSet is required to set only the
 properties that it uses.<br>
     <br>
-    The <tt>command</tt> property contains the query that determines what 
+The <code>command</code> property contains the query that determines what 
 data  a <code>RowSet</code> will contain. Rowsets have methods for setting a query's 
 parameter(s),  which means that a query can be executed multiple times with 
 different parameters  to produce different result sets. Or the query can be
 changed to something  completely new to get a new result set.           
-<p>Once a rowset contains the rows from a <tt>ResultSet</tt> object or some
-  other data source, its column values can be updated, and its rows can be
- inserted or deleted. Any method that causes a change in the rowset's values
- or cursor position also notifies any object that has been registered as
-a  listener with the rowset. So, for example, a table that displays the rowset's
- data in an applet can be notified of changes and make updates as they
- occur.<br>
+<p>Once a rowset contains the rows from a <code>ResultSet</code> object or some
+other data source, its column values can be updated, and its rows can be
+inserted or deleted. Any method that causes a change in the rowset's values
+or cursor position also notifies any object that has been registered as
+a listener with the rowset. So, for example, a table that displays the rowset's
+data in an applet can be notified of changes and make updates as they
+occur.<br>
     <br>
-  The changes made to a rowset can be propagated back to the original data
-  source to keep the rowset and its data source synchronized. Although this
-  involves many operations behind the scenes, it is completely transparent 
- to the application programmer and remains the concern of the RowSet provider 
-  developer. All an application has to do is invoke the method <tt>acceptChanges</tt>, 
-  and the data source backing the rowset will be updated to match the current 
-  values in the rowset. </p>
-       
-<p>A disconnected rowset, such as a <tt>CachedRowSet</tt> or <tt>WebRowSet</tt>
+The changes made to a rowset can be propagated back to the original data
+source to keep the rowset and its data source synchronized. Although this
+involves many operations behind the scenes, it is completely transparent 
+to the application programmer and remains the concern of the RowSet provider 
+developer. All an application has to do is invoke the method <code>acceptChanges</code>, 
+and the data source backing the rowset will be updated to match the current 
+values in the rowset. </p>
+
+<p>A disconnected rowset, such as a <code>CachedRowSet</code> or <code>WebRowSet</code>
  object, establishes a connection to populate itself with data from a database 
  and then closes the connection. The <code>RowSet</code> object will remain 
  disconnected until it wants to propagate changes back to its database table, 
@@ -156,9 +156,9 @@ a  listener with the rowset. So, for example, a table that displays the rowset's
  the database), the rowset establishes a connection, write the changes, and then 
  once again disconnects itself.<br>
   </p>
-      
+
 <h3> 3.0 Other Possible Implementations</h3>
- There are many other possible implementations of the <tt>SyncProvider</tt> abstract
+ There are many other possible implementations of the <code>SyncProvider</code> abstract
  class. One possibility is to employ a more robust synchronization model, which
  would give a <code>RowSet</code> object increased trust in the provider's
  ability to get any updates back to the original data source. Another possibility 
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html
index b84eb293aad..1d9bf523cd5 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html
@@ -1,7 +1,7 @@
 <!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
-                                    
+
   <meta http-equiv="Content-Type"
  content="text/html; charset=iso-8859-1">
 <!--
@@ -53,40 +53,40 @@ This package specifies five standard JDBC <code>RowSet</code> interfaces.
  All five extend the 
 <a href="../RowSet.html">RowSet</a> interface described in the JDBC 3.0
 specification.  It is anticipated that additional definitions
-of more specialized JDBC <code>RowSet</code> types will emerge as this technology 
-matures. Future definitions <i>should</i> be specified as subinterfaces using 
+of more specialized JDBC <code>RowSet</code> types will emerge as this technology
+matures. Future definitions <i>should</i> be specified as subinterfaces using
 inheritance similar to the way it is used in this specification.
 <p>
 <i>Note:</i> The interface definitions provided in this package form the basis for
 all compliant JDBC <code>RowSet</code> implementations. Vendors and more advanced
-developers who intend to provide their own compliant <code>RowSet</code> implementations 
+developers who intend to provide their own compliant <code>RowSet</code> implementations
 should pay particular attention to the assertions detailed in specification
 interfaces. 
 
 <h3><a name="stdrowset">2.0 Standard RowSet Definitions</a></h3>
 <ul>
-<li><a href="JdbcRowSet.html"><b><code>JdbcRowSet</code></b></a> - A wrapper around 
-a <tt>ResultSet</tt> object that makes it possible to use the result set as a 
+<li><a href="JdbcRowSet.html"><b><code>JdbcRowSet</code></b></a> - A wrapper around
+a <code>ResultSet</code> object that makes it possible to use the result set as a
 JavaBeans&trade; component. Thus,
-a <tt>JdbcRowSet</tt> object can be a Bean that any tool
+a <code>JdbcRowSet</code> object can be a Bean that any tool
 makes available for assembling an application as part of a component based
-architecture . A <tt>JdbcRowSet</tt> object is a connected <code>RowSet</code>
+architecture. A <code>JdbcRowSet</code> object is a connected <code>RowSet</code>
 object, that is, it 
 <b>must</b> continually maintain its connection to its data source using a JDBC
 technology-enabled driver ("JDBC driver"). In addition, a <code>JdbcRowSet</code>
-object provides a fully updatable and scrollable tabular 
+object provides a fully updatable and scrollable tabular
 data structure as defined in the JDBC 3.0 specification.
 
 <li><a href="CachedRowSet.html">
 <b><code>CachedRowSet</code>&trade;</b></a>
- - A <tt>CachedRowSet</tt> object is a JavaBeans&trade;
+ - A <code>CachedRowSet</code> object is a JavaBeans&trade;
  component that is scrollable, updatable, serializable, and generally disconnected from
- the source of its data. A <tt>CachedRowSet</tt> object
+ the source of its data. A <code>CachedRowSet</code> object
 typically contains rows from a result set, but it can also contain rows from any
-file with a tabular format, such as a spreadsheet. <tt>CachedRowSet</tt> implementations 
-<b>must</b> use the <tt>SyncFactory</tt> to manage and obtain pluggable
+file with a tabular format, such as a spreadsheet. <code>CachedRowSet</code> implementations
+<b>must</b> use the <code>SyncFactory</code> to manage and obtain pluggable
 <code>SyncProvider</code> objects to provide synchronization between the
-disconnected <code>RowSet</code> object and the originating data source. 
+disconnected <code>RowSet</code> object and the originating data source.
 Typically a <code>SyncProvider</code> implementation relies upon a JDBC
 driver to obtain connectivity to a particular data source.
 Further details on this mechanism are discussed in the <a
@@ -94,13 +94,13 @@ href="spi/package-summary.html"><code>javax.sql.rowset.spi</code></a> package
 specification.
 
 <li><a href="WebRowSet.html"><b><code>WebRowSet</code></b></a> - A 
-<code>WebRowSet</code> object is an extension of <tt>CachedRowSet</tt>
+<code>WebRowSet</code> object is an extension of <code>CachedRowSet</code>
 that can read and write a <code>RowSet</code> object in a well formed XML format.
-This class calls an <a href="spi/XmlReader.html"><code>XmlReader</code></a> object 
+This class calls an <a href="spi/XmlReader.html"><code>XmlReader</code></a> object
 (an extension of the <a href="../RowSetReader.html"><code>RowSetReader</code></a>
 interface) to read a rowset in XML format. It calls an 
-<a href="spi/XmlWriter.html"><code>XmlWriter</code></a> object (an extension of the 
-<a href="../RowSetWriter.html"><code>RowSetWriter</code></a> interface) 
+<a href="spi/XmlWriter.html"><code>XmlWriter</code></a> object (an extension of the
+<a href="../RowSetWriter.html"><code>RowSetWriter</code></a> interface)
 to write a rowset in XML format. The reader and writer required by
 <code>WebRowSet</code> objects are provided by the
 <code>SyncFactory</code> in the form of <code>SyncProvider</code>
@@ -110,14 +110,14 @@ Schema is defined and published at
 <code>http://java.sun.com/xml/ns/jdbc/webrowset.xsd</code></a>.
 
 <li><a href="FilteredRowSet.html"><b><code>FilteredRowSet</code></b></a> - A
-<tt>FilteredRowSet</tt> object provides filtering functionality in a programmatic
-and extensible way. There are many instances when a <tt>RowSet</tt> <code>object</code>
+<code>FilteredRowSet</code> object provides filtering functionality in a programmatic
+and extensible way. There are many instances when a <code>RowSet</code> <code>object</code>
 has a need to provide filtering in its contents without sacrificing the disconnected
 environment, thus saving the expense of having to create a connection to the data source.
 Solutions to this need vary from providing heavyweight full scale 
 SQL query abilities, to portable components, to more lightweight 
 approaches. A <code>FilteredRowSet</code> object consumes
-an implementation of the <a href="Predicate.html"><code>Predicate</code></a> 
+an implementation of the <a href="Predicate.html"><code>Predicate</code></a>
 interface, which <b>may</b> define a filter at run time. In turn, a
 <code>FilteredRowSet</code> object is tasked with enforcing the set filter for both
 inbound and outbound read and write operations. That is, all filters can be
@@ -125,19 +125,19 @@ considered as bi-directional. No standard filters are defined;
 however, sufficient mechanics are specified to permit any required filter to be
 implemented.
 
-<li><a href="JoinRowSet.html"><b><code>JoinRowSet</code></b></a> - The <tt>JoinRowSet</tt>
-interface  describes a mechanism by which relationships can be established between 
-two or more standard <code>RowSet</code> implementations. Any number of <tt>RowSet</tt>
- objects can be added to a <tt>JoinRowSet</tt> object provided  the <tt>RowSet</tt>objects 
-can be related  in a SQL <tt>JOIN</tt> like fashion. By definition, the SQL <tt>JOIN</tt> 
+<li><a href="JoinRowSet.html"><b><code>JoinRowSet</code></b></a> - The <code>JoinRowSet</code>
+interface  describes a mechanism by which relationships can be established between
+two or more standard <code>RowSet</code> implementations. Any number of <code>RowSet</code>
+ objects can be added to a <code>JoinRowSet</code> object provided  the <code>RowSet</code>objects
+can be related  in a SQL <code>JOIN</code> like fashion. By definition, the SQL <code>JOIN</code>
 statement  is used to combine the data contained in two (<i>or more</i>) relational
 database tables based upon a common attribute. By establishing and then enforcing
-column matches, a <tt>JoinRowSet</tt> object establishes relationships between
-<tt>RowSet</tt> instances without the need to touch the originating data source.     
+column matches, a <code>JoinRowSet</code> object establishes relationships between
+<code>RowSet</code> instances without the need to touch the originating data source.
 </ul>
 
 <h3><a name="impl">3.0 Implementer's Guide</a></h3>
-Compliant implementations of JDBC <code>RowSet</code> Implementations 
+Compliant implementations of JDBC <code>RowSet</code> Implementations
 <b>must</b> follow the assertions described in this specification. In accordance
 with the terms of the <a href="http://www.jcp.org">Java Community Process</a>, a
 Test Compatibility Kit (TCK) can be licensed to ensure compatibility with the
@@ -155,24 +155,24 @@ no-argument constructor.
 </li>
 <li><b>3.2 Role of the <code>BaseRowSet</code> Class</b>
 <p>
-A compliant JDBC <code>RowSet</code> implementation <b>must</b> implement one or more 
-standard interfaces specified in this package and <b>may</b> extend the 
-<a href="BaseRowSet.html"><code>BaseRowSet</code></a> abstract class. For example, a 
+A compliant JDBC <code>RowSet</code> implementation <b>must</b> implement one or more
+standard interfaces specified in this package and <b>may</b> extend the
+<a href="BaseRowSet.html"><code>BaseRowSet</code></a> abstract class. For example, a
 <code>CachedRowSet</code> implementation must implement the <code>CachedRowSet</code>
 interface and extend the <code>BaseRowSet</code> abstract class. The
 <code>BaseRowSet</code> class provides the standard architecture on which all
 <code>RowSet</code> implementations should be built, regardless of whether the
 <code>RowSet</code> objects exist in a connected or disconnected environment.
-The <tt>BaseRowSet</tt> abstract class provides any <tt>RowSet</tt> implementation
+The <code>BaseRowSet</code> abstract class provides any <code>RowSet</code> implementation
 with its base functionality, including property manipulation and event notification
-that is fully compliant with <a href="http://java.sun.com/products/javabeans">JavaBeans</a> 
+that is fully compliant with <a href="http://java.sun.com/products/javabeans">JavaBeans</a>
 component requirements. As an example, all implementations provided in the
-reference implementations (contained in the <tt>com.sun.rowset</tt> package) use
-the <tt>BaseRowSet</tt> class as a basis for their implementations.            
+reference implementations (contained in the <code>com.sun.rowset</code> package) use
+the <code>BaseRowSet</code> class as a basis for their implementations.
 <P>
 The following table illustrates the features that the <code>BaseRowSet</code>
 abstract class provides.
-  <blockquote>                    
+  <blockquote>
     <table cellpadding="2" cellspacing="2" border="1" width="75%">
           <tbody>
             <tr>
@@ -185,8 +185,8 @@ abstract class provides.
               <td valign="top">Properties<br>
               </td>
               <td valign="top">Provides standard JavaBeans property manipulation
-  mechanisms to allow applications to get and set <code>RowSet</code> command and
-property  values. Refer to the   documentation of the <tt>javax.sql.RowSet</tt>
+mechanisms to allow applications to get and set <code>RowSet</code> command and
+property  values. Refer to the   documentation of the <code>javax.sql.RowSet</code>
 interface  (available in the JDBC 3.0 specification) for more details on
 the standard  <code>RowSet</code> properties.<br>
               </td>
@@ -195,9 +195,9 @@ the standard  <code>RowSet</code> properties.<br>
               <td valign="top">Event notification<br>
               </td>
               <td valign="top">Provides standard JavaBeans event notifications
-  to registered event listeners. Refer to the documentation of <tt>javax.sql.RowSetEvent
-           </tt> interface (available in the JDBC 3.0 specification) for
-more  details on how  to register and handle standard RowSet events generated
+to registered event listeners. Refer to the documentation of <code>javax.sql.RowSetEvent</code>
+interface (available in the JDBC 3.0 specification) for
+more details on how  to register and handle standard RowSet events generated
 by  compliant implementations.<br>
               </td>
             </tr>
@@ -223,8 +223,8 @@ by  compliant implementations.<br>
 <p>
 The <code>JdbcRowSet</code> describes a <code>RowSet</code> object that <b>must</b> always
 be connected to the originating data source. Implementations of the <code>JdbcRowSet</code>
-should ensure that this connection is provided solely by a JDBC driver. 
-Furthermore, <code>RowSet</code> objects that are implementations of the 
+should ensure that this connection is provided solely by a JDBC driver.
+Furthermore, <code>RowSet</code> objects that are implementations of the
 <code>JdbcRowSet</code> interface and are therefore operating in a connected environment
 do not use the <code>SyncFactory</code> to obtain a <code>RowSetReader</code> object
 or a <code>RowSetWriter</code> object. They can safely rely on the JDBC driver to
@@ -234,24 +234,24 @@ supply their needs by virtue of the presence of an underlying updatable and scro
 <li>
 <b>3.4 Disconnected RowSet Requirements</b>
 <p> 
-A disconnected <code>RowSet</code> object, such as a <code>CachedRowSet</code> object, 
+A disconnected <code>RowSet</code> object, such as a <code>CachedRowSet</code> object,
 <b>should</b> delegate  
-connection management to a <code>SyncProvider</code> object provided by the 
-<code>SyncFactory</code>. To ensure fully disconnected semantics, all 
+connection management to a <code>SyncProvider</code> object provided by the
+<code>SyncFactory</code>. To ensure fully disconnected semantics, all
 disconnected <code>RowSet</code> objects <b>must</b> ensure
-that the original connection made to the data source to populate the <code>RowSet</code> 
+that the original connection made to the data source to populate the <code>RowSet</code>
 object is closed to permit the garbage collector to recover and release resources. The
-<code>SyncProvider</code> object ensures that the critical JDBC properties are 
-maintained in order to re-establish a connection to the data source when a 
-synchronization is required. A disconnected <code>RowSet</code> object should 
-therefore ensure that no 
+<code>SyncProvider</code> object ensures that the critical JDBC properties are
+maintained in order to re-establish a connection to the data source when a
+synchronization is required. A disconnected <code>RowSet</code> object should
+therefore ensure that no
 extraneous references remain on the <code>Connection</code> object.
 
 <li><b>3.5 Role of RowSetMetaDataImpl</b>
 <p>
 The <code>RowsetMetaDataImpl</code> class is a utility class that provides an implementation of the
 <a href="../RowSetMetaData.html">RowSetMetaData</a> interface, supplying standard setter
-method implementations for metadata for both connected and disconnected 
+method implementations for metadata for both connected and disconnected
 <code>RowSet</code> objects. All implementations are free to use this standard
 implementation but are not required to do so.
 
@@ -261,10 +261,10 @@ The <code>RowSetWarning</code> class provides warnings that can be set
 on <code>RowSet</code> implementations.
 Similar to <a href="../../../java/sql/SQLWarning.html">SQLWarning</a> objects,
 <code>RowSetWarning</code>  objects are silently chained to the object whose method
-caused the warning to be thrown. All <code>RowSet</code> implementations <b>should</b>  
+caused the warning to be thrown. All <code>RowSet</code> implementations <b>should</b>
 ensure that this chaining occurs if a warning is generated and also ensure that the
 warnings are available via the <code>getRowSetWarnings</code> method defined in either
-the <code>JdbcRowSet</code> interface or the <code>CachedRowSet</code> interface. 
+the <code>JdbcRowSet</code> interface or the <code>CachedRowSet</code> interface.
 After a warning has been retrieved with one of the
 <code>getRowSetWarnings</code> methods, the <code>RowSetWarning</code> method
 <code>getNextWarning</code> can be called on it to retrieve any warnings that might
@@ -273,10 +273,10 @@ on it, and so on until there are no more warnings.
 
 <li><b>3.7 The Joinable Interface</b>
 <P>
-The <code>Joinable</code> interface provides both connected and disconnected 
-<code>RowSet</code> objects with the capability to be added to a 
+The <code>Joinable</code> interface provides both connected and disconnected
+<code>RowSet</code> objects with the capability to be added to a
 <code>JoinRowSet</code> object in an SQL <code>JOIN</code> operation.
-A <code>RowSet</code> object that has  implemented the <code>Joinable</code> 
+A <code>RowSet</code> object that has  implemented the <code>Joinable</code>
 interface can set a match column, retrieve a match column, or unset a match column.
 A <code>JoinRowSet</code> object can then use the <code>RowSet</code> object's
 match column as a basis for adding the <code>RowSet</code> object.
@@ -298,7 +298,7 @@ match column as a basis for adding the <code>RowSet</code> object.
 <h3><a name="reldocs">5.0 Related Documentation</a></h3>
 <ul>
 <li><a href="http://docs.oracle.com/javase/tutorial/jdbc/basics/rowset.html">
-JDBC RowSet Tutorial</a>      
+JDBC RowSet Tutorial</a>
 </ul>
 </body>
 </html>
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html
index 5e44c8f8faa..055fa6052aa 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html
@@ -1,10 +1,10 @@
 <!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
-                
+
   <meta http-equiv="Content-Type"
  content="text/html; charset=iso-8859-1">
-                
+
   <meta name="GENERATOR"
  content="Mozilla/4.79 [en] (Windows NT 5.0; U) [Netscape]">
 <!--
@@ -36,52 +36,52 @@ questions.
 <body bgcolor="#ffffff">
 Provides utility classes to allow serializable mappings between SQL types
 and data types in the Java programming language.
-<p> Standard JDBC <code>RowSet</code> implementations may use these utility 
+<p> Standard JDBC <code>RowSet</code> implementations may use these utility
 classes to
-assist in the serialization of disconnected <code>RowSet</code> objects. 
+assist in the serialization of disconnected <code>RowSet</code> objects.
 This is useful
-when  transmitting a disconnected <tt>RowSet</tt> object over the wire to
+when  transmitting a disconnected <code>RowSet</code> object over the wire to
 a different VM or across layers within an application.<br>
 </p>
 
 <h3>1.0 SerialArray</h3>
-A serializable mapping in the Java programming language of an SQL ARRAY 
+A serializable mapping in the Java programming language of an SQL ARRAY
 value. <br>
 <br>
-The <tt>SerialArray </tt>class provides a constructor for creating a <tt>SerialArray
-</tt>instance from an Array object, methods for getting the base type and
+The <code>SerialArray</code> class provides a constructor for creating a <code>SerialArray</code>
+instance from an Array object, methods for getting the base type and
 the SQL name for the base type, and methods for copying all or part of a
-<tt>SerialArray </tt>object. <br>
+<code>SerialArray</code> object. <br>
 
 <h3>2.0 SerialBlob</h3>
 A serializable mapping in the Java programming language of an SQL BLOB
 value.  <br>
 <br>
-The <tt>SerialBlob </tt>class provides a constructor for creating an instance
+The <code>SerialBlob</code>class provides a constructor for creating an instance
 from a Blob object. Note that the Blob object should have brought the SQL
-BLOB value's data over to the client before a <tt>SerialBlob </tt>object
+BLOB value's data over to the client before a <code>SerialBlob</code>object
 is constructed from it. The data of an SQL BLOB value can be materialized
-on the client as an array of bytes (using the method <tt>Blob.getBytes</tt>)
-or as a stream of uninterpreted bytes (using the method <tt>Blob.getBinaryStream</tt>).
+on the client as an array of bytes (using the method <code>Blob.getBytes</code>)
+or as a stream of uninterpreted bytes (using the method <code>Blob.getBinaryStream</code>).
 <br>
 <br>
-<tt>SerialBlob </tt>methods make it possible to make a copy of a <tt>SerialBlob
-</tt>object as an array of bytes or as a stream. They also make it possible
-to locate a given pattern of bytes or a <tt>Blob </tt>object within a <tt>SerialBlob
-</tt>object. <br>
+<code>SerialBlob</code> methods make it possible to make a copy of a <code>SerialBlob</code>
+object as an array of bytes or as a stream. They also make it possible
+to locate a given pattern of bytes or a <code>Blob</code> object within a <code>SerialBlob</code>
+object. <br>
 
 <h3>3.0 SerialClob</h3>
 A serializable mapping in the Java programming language of an SQL CLOB
 value.  <br>
 <br>
-The <tt>SerialClob </tt>class provides a constructor for creating an instance
-from a <tt>Clob </tt>object. Note that the <tt>Clob </tt>object should have
-brought the SQL CLOB value's data over to the client before a <tt>SerialClob
-</tt>object is constructed from it. The data of an SQL CLOB value can be
+The <code>SerialClob</code> class provides a constructor for creating an instance
+from a <code>Clob</code> object. Note that the <code>Clob</code> object should have
+brought the SQL CLOB value's data over to the client before a <code>SerialClob</code>
+object is constructed from it. The data of an SQL CLOB value can be
 materialized on the client as a stream of Unicode characters. <br>
 <br>
-<tt>SerialClob </tt>methods make it possible to get a substring from a 
-<tt>SerialClob </tt>object or to locate the start of a pattern of characters. 
+<code>SerialClob</code> methods make it possible to get a substring from a
+<code>SerialClob</code> object or to locate the start of a pattern of characters.
 <br>
 
 <h3>5.0 SerialDatalink</h3>
@@ -89,11 +89,11 @@ A serializable mapping in the Java programming language of an SQL DATALINK
 value. A DATALINK value references a file outside of the underlying data source
 that the originating data source manages. <br>
 <br>
-<code>RowSet</code> implementations can use the method <tt>RowSet.getURL() </tt>to retrieve
+<code>RowSet</code> implementations can use the method <code>RowSet.getURL()</code> to retrieve
 a <code>java.net.URL</code> object, which can be used to manipulate the external data.
 <br>
 <br>
-&nbsp;&nbsp;<tt>&nbsp;&nbsp;&nbsp; java.net.URL url = rowset.getURL(1);</tt><br>
+&nbsp;&nbsp;<code>&nbsp;&nbsp;&nbsp; java.net.URL url = rowset.getURL(1);</code><br>
 
 <h3>6.0 SerialJavaObject</h3>
 A serializable mapping in the Java programming language of an SQL JAVA_OBJECT
@@ -103,16 +103,16 @@ this simply wraps the serialization process. <br>
 If however, the serialization is not possible in the case where the Java
 object is not immediately serializable, this class will attempt to serialize
 all non static members to permit the object instance state to be serialized.
-Static or transient fields cannot be serialized and attempting to do so 
-will result in a <tt>SerialException </tt>being thrown. <br>
+Static or transient fields cannot be serialized and attempting to do so
+will result in a <code>SerialException</code> being thrown. <br>
 
 <h3>7.0 SerialRef</h3>
 A serializable mapping between the SQL REF type and the Java programming
 language. <br>
 <br>
-The <tt>SerialRef </tt>class provides a constructor for creating a <tt>SerialRef
-</tt>instance from a <tt>Ref</tt> type and provides methods for getting
-and setting the <tt>Ref</tt> object type. <br>
+The <code>SerialRef</code> class provides a constructor for creating a <code>SerialRef</code>
+instance from a <code>Ref</code> type and provides methods for getting
+and setting the <code>Ref</code> object type. <br>
 
 <h3>8.0 SerialStruct</h3>
 A serializable mapping in the Java programming language of an SQL structured
@@ -121,58 +121,58 @@ form, and if an attribute is itself a structured type, each of its attributes
 that is not already serializable is mapped to a serializable form. <br>
 <br>
 In addition, if a <code>Map</code> object is passed to one of the constructors or
-to the method <code>getAttributes</code>, the structured type is custom mapped 
+to the method <code>getAttributes</code>, the structured type is custom mapped
 according to the mapping specified in the <code>Map</code> object.
-  <br>
-  The <tt>SerialStruct </tt>class provides a constructor for creating an
-instance  from a <tt>Struct</tt> object, a method for retrieving the SQL
+<br>
+The <code>SerialStruct</code> class provides a constructor for creating an
+instance  from a <code>Struct</code> object, a method for retrieving the SQL
 type name of the SQL structured type in the database, and methods for retrieving
 its attribute values. <br>
-   
+
 <h3>9.0 SQLInputImpl</h3>
-  An input stream used for custom mapping user-defined types (UDTs). An 
-  <tt>SQLInputImpl</tt> object is an input stream that contains a stream of 
+  An input stream used for custom mapping user-defined types (UDTs). An
+  <code>SQLInputImpl</code> object is an input stream that contains a stream of
   values that are
 the attributes of a UDT. This class is used by the driver behind the scenes
-when the method <tt>getObject</tt> is called on an SQL structured or distinct
-type that has a custom mapping; a programmer never invokes <tt>SQLInputImpl
-</tt> methods directly. <br>
+when the method <code>getObject</code> is called on an SQL structured or distinct
+type that has a custom mapping; a programmer never invokes <code>SQLInputImpl</code>
+methods directly. <br>
   <br>
-  The <tt>SQLInputImpl</tt> class provides a set of reader methods
- analogous to the <tt>ResultSet</tt> getter methods. These methods make it
- possible to read the values in an <tt>SQLInputImpl</tt> object. The method
+The <code>SQLInputImpl</code> class provides a set of reader methods
+analogous to the <code>ResultSet</code> getter methods. These methods make it
+possible to read the values in an <code>SQLInputImpl</code> object. The method
 <code>wasNull</code> is used to determine whether the last value read was SQL NULL.
+<br>
  <br>
-  <br>
-  When a constructor or getter method that takes a <code>Map</code> object is called, 
+When a constructor or getter method that takes a <code>Map</code> object is called,
 the JDBC driver calls the method
-<tt>SQLData.getSQLType</tt> to determine the SQL type of the UDT being custom
+<code>SQLData.getSQLType</code> to determine the SQL type of the UDT being custom
 mapped. The driver  creates an instance of <code>SQLInputImpl</code>, populating it with
 the attributes of  the UDT. The driver then passes the input stream to the
-method <tt>SQLData.readSQL</tt>,  which in turn calls the <tt>SQLInputImpl</tt>
+method <code>SQLData.readSQL</code>,  which in turn calls the <code>SQLInputImpl</code>
 methods to read the  attributes from the input stream. <br>
-   
+
 <h3>10.0 SQLOutputImpl</h3>
   The output stream for writing the attributes of a custom mapped user-defined
  type (UDT) back to the database. The driver uses this interface internally,
  and its methods are never directly invoked by an application programmer.
 <br>
   <br>
-  When an application calls the method <tt>PreparedStatement.setObject, </tt>the
- driver checks to see whether the value to be written is a UDT with a custom
- mapping. If it is, there will be an entry in a type map containing the Class
- object for the class that implements <tt>SQLData </tt>for this UDT. If the
- value to be written is an instance of <tt>SQLData</tt>, the driver will
-create  an instance of <code>SQLOutputImpl</code> and pass it to the method 
-<tt>SQLData.writeSQL</tt>.
- The method <code>writeSQL</code> in turn calls the appropriate <tt>SQLOutputImpl</tt>
-writer methods to write data from the <code>SQLData</code> object to the 
+When an application calls the method <code>PreparedStatement.setObject</code>, the
+driver checks to see whether the value to be written is a UDT with a custom
+mapping. If it is, there will be an entry in a type map containing the Class
+object for the class that implements <code>SQLData</code> for this UDT. If the
+value to be written is an instance of <code>SQLData</code>, the driver will
+create  an instance of <code>SQLOutputImpl</code> and pass it to the method
+<code>SQLData.writeSQL</code>.
+The method <code>writeSQL</code> in turn calls the appropriate <code>SQLOutputImpl</code>
+writer methods to write data from the <code>SQLData</code> object to the
 <code>SQLOutputImpl</code>
-output  stream as the representation of an SQL user-defined type.       
-   
+output  stream as the representation of an SQL user-defined type.
+
 <h3>Custom Mapping</h3>
-The JDBC API provides mechanisms for mapping an SQL structured type or DISTINCT 
-type to the Java programming language.  Typically, a structured type is mapped 
+The JDBC API provides mechanisms for mapping an SQL structured type or DISTINCT
+type to the Java programming language.  Typically, a structured type is mapped
 to a class, and its attributes are mapped to fields in the class.
 (A DISTINCT type can thought of as having one attribute.)  However, there are
 many other possibilities, and there may be any number of different mappings.
@@ -181,7 +181,7 @@ A programmer defines the mapping by implementing the interface <code>SQLData</co
 For example, if an SQL structured type named AUTHORS has the attributes NAME,
 TITLE, and PUBLISHER, it could be mapped to a Java class named Authors.  The
 Authors class could have the fields name, title, and publisher, to which the
-attributes of AUTHORS are mapped.  In such a case, the implementation of 
+attributes of AUTHORS are mapped.  In such a case, the implementation of
 <code>SQLData</code> could look like the following:
 <PRE>
    public class Authors implements SQLData {
@@ -213,27 +213,27 @@ attributes of AUTHORS are mapped.  In such a case, the implementation of
 A <code>java.util.Map</code> object is used to associate the SQL structured
 type with its mapping to the class <code>Authors</code>. The following code fragment shows
 how a <code>Map</code> object might be created and given an entry associating
-<code>AUTHORS</code> and <code>Authors</code>.  
+<code>AUTHORS</code> and <code>Authors</code>.
 <PRE>
     java.util.Map map = new java.util.HashMap();
     map.put("SCHEMA_NAME.AUTHORS", Class.forName("Authors");
 </PRE>
- 
-The <code>Map</code> object <i>map</i> now contains an entry with the 
+
+The <code>Map</code> object <i>map</i> now contains an entry with the
 fully qualified name of the SQL structured type and the <code>Class</code>
  object for the class <code>Authors</code>.  It can be passed to a method
-to tell the driver how to map <code>AUTHORS</code> to <code>Authors</code>.  
+to tell the driver how to map <code>AUTHORS</code> to <code>Authors</code>.
 <P>
 For a disconnected <code>RowSet</code> object, custom mapping can be done
 only when a <code>Map</code> object is passed to the method or constructor
 that will be doing the custom mapping.  The situation is different for
 connected <code>RowSet</code> objects because they maintain a connection
-with the data source.  A method that does custom mapping and is called by 
+with the data source.  A method that does custom mapping and is called by
 a disconnected <code>RowSet</code> object may use the <code>Map</code>
 object that is associated with the <code>Connection</code> object being
-used. So, in other words, if no map is specified, the connection's type 
+used. So, in other words, if no map is specified, the connection's type
 map can be used by default.
-     
+
 <br>
 </body>
 </html>
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html
index c54def4e151..b5aada863b4 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html
@@ -37,14 +37,14 @@ questions.
   <body bgcolor="#ffffff">
 
 The standard classes and interfaces that a third party vendor has to
-use in its implementation of a synchronization provider. These classes and 
-interfaces are referred to as the Service Provider Interface (SPI). A vendor may 
+use in its implementation of a synchronization provider. These classes and
+interfaces are referred to as the Service Provider Interface (SPI). A vendor may
 have its implementation included on the JDBC web page that lists available
 <code>SyncProvider</code> implementations by sending email to <code>jdbc@sun.com</code>.
 Doing this helps make developers aware of the implementation. To make it possible
 for a <code>RowSet</code> object to use an implementation, the vendor must register
 it with the <code>SyncFactory</code> singleton. (See the class comment for
-<code>SyncProvider</code> for a full explanation of the registration process and 
+<code>SyncProvider</code> for a full explanation of the registration process and
 the naming convention to be used.)
 
 <h2>Table of Contents</h2>
@@ -81,10 +81,10 @@ A <code>SyncProvider</code> implementation provides a disconnected <code>RowSet<
 object with the mechanisms for reading data into it and for writing data that has been
 modified in it
 back to the underlying data source.  A <i>reader</i>, a <code>RowSetReader</code> or
-<code>XMLReader</code> object, reads data into a <code>RowSet</code> object when the 
-<code>CachedRowSet</code> methods <code>execute</code> or <code>populate</code> 
+<code>XMLReader</code> object, reads data into a <code>RowSet</code> object when the
+<code>CachedRowSet</code> methods <code>execute</code> or <code>populate</code>
 are called.  A <i>writer</i>, a <code>RowSetWriter</code> or <code>XMLWriter</code>
-object, writes changes back to the underlying data source when the 
+object, writes changes back to the underlying data source when the
 <code>CachedRowSet</code> method <code>acceptChanges</code> is called.
 <P>
 The process of writing changes in a <code>RowSet</code> object to its data source
@@ -96,9 +96,9 @@ referred to as <i>grades</i>.
 The lower grades of synchronization are
 known as <i>optimistic</i> concurrency levels because they optimistically
 assume that there will be no conflicts or very few conflicts.  A conflict exists when
-the same data modified in the <code>RowSet</code> object has also been modified 
+the same data modified in the <code>RowSet</code> object has also been modified
 in the data source. Using the optimistic concurrency model means that if there
-is a conflict, modifications to either the data source or the <code>RowSet</code> 
+is a conflict, modifications to either the data source or the <code>RowSet</code>
 object will be lost.
 <P>
 Higher grades of synchronization are called <i>pessimistic</i> because they assume
@@ -106,7 +106,7 @@ that others will be accessing the data source and making modifications.  These
 grades set varying levels of locks to increase the chances that no conflicts
 occur.
 <P>
-The lowest level of synchronization is simply writing any changes made to the 
+The lowest level of synchronization is simply writing any changes made to the
 <code>RowSet</code> object to its underlying data source.  The writer does
 nothing to check for conflicts. 
 If there is a conflict and the data
@@ -116,69 +116,69 @@ source are lost.
 The <code>RIXMLProvider</code> implementation uses the lowest level 
 of synchronization and just writes <code>RowSet</code> changes to the data source.
 This is true because  typically XML data sources do not enable transaction
-techniques for maintaining the integrity of data. However, specific standards 
+techniques for maintaining the integrity of data. However, specific standards
 groups have considered offering XML-based synchronization.  For details, see
 <PRE>
      <a href="http://www.syncml.org">http://www.syncml.org</a>
 </PRE>
 <P>
 For the next level up, the
-writer checks to see if there are any conflicts, and if there are, 
+writer checks to see if there are any conflicts, and if there are,
 it does not write anything to the data source.  The problem with this concurrency
-level is that if another party has modified the corresponding data in the data source 
+level is that if another party has modified the corresponding data in the data source
 since the <code>RowSet</code> object got its data,
 the changes made to the <code>RowSet</code> object are lost. The
 <code>RIOptimisticProvider</code> implementation uses this level of synchronization.
 <P>
 At higher levels of synchronization, referred to as pessimistic concurrency,
 the writer take steps to avoid conflicts by setting locks. Setting locks
-can vary from setting a lock on a single row to setting a lock on a table 
-or the entire data source. The level of synchronization is therefore a tradeoff 
+can vary from setting a lock on a single row to setting a lock on a table
+or the entire data source. The level of synchronization is therefore a tradeoff
 between the ability of users to access the data source concurrently and the  ability
 of the writer to keep the data in the <code>RowSet</code> object and its data source
 synchronized.
 <P>
-It is a requirement that all disconnected <code>RowSet</code> objects 
-(<code>CachedRowSet</code>, <code>FilteredRowSet</code>, <code>JoinRowSet</code>, 
+It is a requirement that all disconnected <code>RowSet</code> objects
+(<code>CachedRowSet</code>, <code>FilteredRowSet</code>, <code>JoinRowSet</code>,
 and <code>WebRowSet</code> objects) obtain their <code>SyncProvider</code> objects
 from the <code>SyncFactory</code> mechanism.  
 <P>
 The reference implementation (RI) provides two synchronization providers.
-	<UL>
-       <LI><b><tt>RIOptimisticProvider</tt></b> <br>
+    <UL>
+       <LI><b><code>RIOptimisticProvider</code></b> <br>
            The default provider that the <code>SyncFactory</code> instance will
            supply to a disconnected <code>RowSet</code> object when no provider
            implementation is specified.<BR>
            This synchronization provider uses an optimistic concurrency model,
-           assuming that there will be few conflicts among users 
+           assuming that there will be few conflicts among users
            who are accessing the same data in a database.  It avoids
            using locks; rather, it checks to see if there is a conflict
            before trying to synchronize the <code>RowSet</code> object and the
            data source. If there is a conflict, it does nothing, meaning that
            changes to the <code>RowSet</code> object are not persisted to the data
            source.
-       <LI><B><tt>RIXMLProvider</tt></B> <BR>
+       <LI><B><code>RIXMLProvider</code></B> <BR>
             A synchronization provider that can be used with a
-            <code>WebRowSet</code> object, which is a rowset that can be written 
-            in XML format or read from XML format. The 
+            <code>WebRowSet</code> object, which is a rowset that can be written
+            in XML format or read from XML format. The
             <code>RIXMLProvider</code> implementation does no checking at all for
             conflicts and simply writes any updated data in the
             <code>WebRowSet</code> object to the underlying data source.
             <code>WebRowSet</code> objects use this provider when they are 
             dealing with XML data.
-	</UL>
+    </UL>
 
 These <code>SyncProvider</code> implementations
 are bundled with the reference implementation, which makes them always available to
-<code>RowSet</code> implementations. 
+<code>RowSet</code> implementations.
 <code>SyncProvider</code> implementations make themselves available by being
-registered with the <code>SyncFactory</code> singleton.  When a <code>RowSet</code> 
+registered with the <code>SyncFactory</code> singleton.  When a <code>RowSet</code>
 object requests a provider, by specifying it in the constructor or as an argument to the
-<code>CachedRowSet</code> method <code>setSyncProvider</code>, 
+<code>CachedRowSet</code> method <code>setSyncProvider</code>,
 the <code>SyncFactory</code> singleton
 checks to see if the requested provider has been registered with it.
 If it has, the <code>SyncFactory</code> creates an instance of it and passes it to the
-requesting <code>RowSet</code> object.  
+requesting <code>RowSet</code> object.
 If the <code>SyncProvider</code> implementation that is specified has not been registered,
 the <code>SyncFactory</code> singleton causes a <code>SyncFactoryException</code> object
 to be thrown.  If no provider is specified,
@@ -189,18 +189,18 @@ and pass it to the requesting <code>RowSet</code> object.
 <P>
 If a <code>WebRowSet</code> object does not specify a provider in its constructor, the
 <code>SyncFactory</code> will give it an instance of <code>RIOptimisticProvider</code>.
-However, the constructor for <code>WebRowSet</code> is implemented to set the provider 
+However, the constructor for <code>WebRowSet</code> is implemented to set the provider
 to the <code>RIXMLProvider</code>, which reads and writes a <code>RowSet</code> object
 in XML format.
 <P>
 See the <a href="SyncProvider.html">SyncProvider</a> class
 specification for further details.
 <p>
-Vendors may develop a <tt>SyncProvider</tt> implementation with any one of the possible
+Vendors may develop a <code>SyncProvider</code> implementation with any one of the possible
 levels of synchronization, thus giving <code>RowSet</code> objects a choice of
-synchronization mechanisms.  A vendor can make its implementation available by 
+synchronization mechanisms.  A vendor can make its implementation available by
 registering the fully qualified class name with Oracle Corporation at
-<code>jdbc@sun.com</code>. This process is discussed in further detail below. 
+<code>jdbc@sun.com</code>. This process is discussed in further detail below.
 
 <h3><a name="arch">2.0 Service Provider Interface Architecture</a></h3>
 <b>2.1 Overview</b>
@@ -208,7 +208,7 @@ registering the fully qualified class name with Oracle Corporation at
 The Service Provider Interface provides a pluggable mechanism by which
 <code>SyncProvider</code> implementations can be registered and then generated when
 required. The lazy reference mechanism employed by the <code>SyncFactory</code> limits
-unnecessary resource consumption by not creating an instance until it is 
+unnecessary resource consumption by not creating an instance until it is
 required by a disconnected
 <code>RowSet</code> object. The <code>SyncFactory</code> class also provides
 a standard API to configure logging options and streams that <b>may</b> be provided
@@ -216,11 +216,11 @@ by a particular <code>SyncProvider</code> implementation.
 <p>
 <b>2.2 Registering with the <code>SyncFactory</code></b>
 <p>
-A third party <code>SyncProvider</code> implementation must be registered with the 
-<code>SyncFactory</code> in order for a disconnected <code>RowSet</code> object 
-to obtain it and thereby use its <code>javax.sql.RowSetReader</code> and 
+A third party <code>SyncProvider</code> implementation must be registered with the
+<code>SyncFactory</code> in order for a disconnected <code>RowSet</code> object
+to obtain it and thereby use its <code>javax.sql.RowSetReader</code> and
 <code>javax.sql.RowSetWriter</code>
-implementations. The following registration mechanisms are available to all 
+implementations. The following registration mechanisms are available to all
 <code>SyncProvider</code> implementations:
 <ul>
 <li><b>System properties</b> - Properties set at the command line. These
@@ -235,9 +235,9 @@ reference implementation of this technology includes a standard property
 file than can be edited to add additional <code>SyncProvider</code> objects.
 
 <li><b>JNDI Context</b> - Available providers can be registered on a JNDI
-context. The <tt>SyncFactory</tt> will attempt to load <tt>SyncProvider</tt>
+context. The <code>SyncFactory</code> will attempt to load <code>SyncProvider</code>
 objects bound to the context and register them with the factory. This
-context must be supplied to the <code>SyncFactory</code> for the mechanism to 
+context must be supplied to the <code>SyncFactory</code> for the mechanism to
 function correctly.
 </ul>
 <p>
@@ -250,11 +250,11 @@ and how to configure the JNDI Context are explained in detail in the
 The <code>SyncFactory</code> generates a requested <code>SyncProvider</code>
 object if the provider has been correctly registered.  The
 following policies are adhered to when either a disconnected <code>RowSet</code> object
-is instantiated with a specified <code>SyncProvider</code> implementation or is 
+is instantiated with a specified <code>SyncProvider</code> implementation or is
 reconfigured at runtime with an alternative <code>SyncProvider</code> object.
 <ul>
 <li> If a <code>SyncProvider</code> object is specified and the <code>SyncFactory</code>
-contains <i>no</i> reference to the provider, a <code>SyncFactoryException</code> is 
+contains <i>no</i> reference to the provider, a <code>SyncFactoryException</code> is
 thrown.
 
 <li> If a <code>SyncProvider</code> object is specified and the <code>SyncFactory</code>
@@ -294,13 +294,13 @@ object. These grades are listed from the lowest quality of service to the highes
 <li><b>GRADE_NONE</b> - No synchronization with the originating data source is
 provided. A <code>SyncProvider</code> implementation returning this grade will simply
 attempt to write any data that has changed in the <code>RowSet</code> object to the
-underlying data source, overwriting whatever is there. No attempt is made to compare 
-original values with current values to see if there is a conflict. The 
+underlying data source, overwriting whatever is there. No attempt is made to compare
+original values with current values to see if there is a conflict. The
 <code>RIXMLProvider</code> is implemented with this grade.
 
 <li><b>GRADE_CHECK_MODIFIED_AT_COMMIT</b> - A low grade of optimistic synchronization.
 A <code>SyncProvider</code> implementation returning this grade
-will check for conflicts in rows that have changed between the last synchronization 
+will check for conflicts in rows that have changed between the last synchronization
 and the current synchronization under way. Any changes in the originating data source
 that have been modified will not be reflected in the disconnected <code>RowSet</code>
 object. If there are no conflicts, changes in the <code>RowSet</code> object will be
@@ -333,16 +333,16 @@ placed on a <code>RowSet</code> object's underlying data source and, if so,
 on which constructs the locks are placed.  These locks will remain on the data
 source while the <code>RowSet</code> object is disconnected from the data source.
 <P>
-These constants <b>should</b> be considered complementary to the 
+These constants <b>should</b> be considered complementary to the
 grade constants. The default setting for the majority of grade settings requires
-that no data source locks remain when a <code>RowSet</code> object is disconnected 
+that no data source locks remain when a <code>RowSet</code> object is disconnected
 from its data source.
 The grades <code>GRADE_LOCK_WHEN_MODIFIED</code> and
 <code>GRADE_LOCK_WHEN_LOADED</code> allow a disconnected <code>RowSet</code> object
 to have a fine-grained control over the degree of locking.
 <ul>
-<li><b>DATASOURCE_NO_LOCK</b> - No locks remain on the originating data source. 
-This is the default lock setting for all <code>SyncProvider</code> implementations 
+<li><b>DATASOURCE_NO_LOCK</b> - No locks remain on the originating data source.
+This is the default lock setting for all <code>SyncProvider</code> implementations
 unless otherwise directed by a <code>RowSet</code> object.
 
 <li><b>DATASOURCE_ROW_LOCK</b> - A lock is placed on the rows that are touched by
@@ -364,26 +364,26 @@ update data in the table or tables from which the <code>VIEW</code> was derived.
 <ul>
 <li><b>UPDATABLE_VIEW_SYNC</b>
 Indicates that a <code>SyncProvider</code> implementation  supports synchronization
-to the table or tables from which the SQL <code>VIEW</code> used to populate  a
+to the table or tables from which the SQL <code>VIEW</code> used to populate
 a <code>RowSet</code> object is derived.
 
 <li><b>NONUPDATABLE_VIEW_SYNC</b>
 Indicates that a <code>SyncProvider</code> implementation  does <b>not</b> support
-synchronization to the table or tables from which the SQL <code>VIEW</code> 
+synchronization to the table or tables from which the SQL <code>VIEW</code>
 used to populate  a <code>RowSet</code> object is derived.
 </ul>
 <p>
 <b>3.5 Usage of <code>SyncProvider</code> Grading and Locking</b>
 <p>
-In the example below, the reference <tt>CachedRowSetImpl</tt> implementation
-reconfigures its current <tt>SyncProvider</tt> object by calling the 
-<tt>setSyncProvider</tt> method.<br>
+In the example below, the reference <code>CachedRowSetImpl</code> implementation
+reconfigures its current <code>SyncProvider</code> object by calling the
+<code>setSyncProvider</code> method.<br>
 
 <PRE>
     CachedRowSetImpl crs = new CachedRowSetImpl();
     crs.setSyncProvider("com.foo.bar.HASyncProvider");
 </PRE>
-    An application can retrieve the <tt>SyncProvider</tt> object currently in use
+    An application can retrieve the <code>SyncProvider</code> object currently in use
 by a disconnected <code>RowSet</code> object. It can also retrieve the
 grade of synchronization with which the provider was implemented and the degree of
 locking currently in use.  In addition, an application has the flexibility to set
@@ -396,14 +396,14 @@ synchronization.  These operation are shown in the following code fragment.
     case: SyncProvider.GRADE_CHECK_ALL_AT_COMMIT
          //A high grade of optimistic synchronization
     break;
-    case: SyncProvider.GRADE_CHECK_MODIFIED_AT_COMMIT 
-         //A low grade of optimistic synchronization 
+    case: SyncProvider.GRADE_CHECK_MODIFIED_AT_COMMIT
+         //A low grade of optimistic synchronization
     break;
-    case: SyncProvider.GRADE_LOCK_WHEN_LOADED 
-         // A pessimistic synchronization grade 
+    case: SyncProvider.GRADE_LOCK_WHEN_LOADED
+         // A pessimistic synchronization grade
     break;
-    case: SyncProvider.GRADE_LOCK_WHEN_MODIFIED 
-         // A pessimistic synchronization grade 
+    case: SyncProvider.GRADE_LOCK_WHEN_MODIFIED
+         // A pessimistic synchronization grade
     break;
     case: SyncProvider.GRADE_NONE 
       // No synchronization with the originating data source provided
@@ -421,13 +421,13 @@ synchronization.  These operation are shown in the following code fragment.
       break;
 
       case: SyncProvider.DATASOURCE_ROW_LOCK
-       // A lock is placed on the rows that are  touched by the original 
+       // A lock is placed on the rows that are  touched by the original
        // SQL statement used to populate
        // the RowSet object that is using the SyncProvider
        break;
 
       case: DATASOURCE_TABLE_LOCK
-       // A lock is placed on  all tables that are touched by the original 
+       // A lock is placed on  all tables that are touched by the original
        // SQL statement used to populated
        // the RowSet object that is using the SyncProvider
        break;
@@ -450,12 +450,12 @@ method <code>acceptChanges</code> finishes and has detected one or more conflict
 it throws a <code>SyncProviderException</code> object.  An application can
 catch the exception and
 have it retrieve a <code>SyncResolver</code> object by calling the method
-<code>SyncProviderException.getSyncResolver()</code>. 
+<code>SyncProviderException.getSyncResolver()</code>.
 <P>
-A <code>SyncResolver</code> object, which is a special kind of 
+A <code>SyncResolver</code> object, which is a special kind of
 <code>CachedRowSet</code> object or
-a <code>JdbcRowSet</code> object that has implemented the <code>SyncResolver</code> 
-interface,  examines the conflicts row by row. It is a duplicate of the 
+a <code>JdbcRowSet</code> object that has implemented the <code>SyncResolver</code>
+interface,  examines the conflicts row by row. It is a duplicate of the
 <code>RowSet</code> object being synchronized except that it contains only the data
 from the data source this is causing a conflict. All of the other column values are
 set to <code>null</code>. To navigate from one conflict value to another, a
@@ -472,18 +472,18 @@ provides methods for doing the following:
      to be changed
 </UL>
 <P>
-When the <code>CachedRowSet</code> method <code>acceptChanges</code> is called, it 
+When the <code>CachedRowSet</code> method <code>acceptChanges</code> is called, it
 delegates to the <code>RowSet</code> object's  <code>SyncProvider</code> object.
 How the writer provided by that <code>SyncProvider</code> object is implemented
-determines what level (grade) of checking for conflicts will be done.  After all 
+determines what level (grade) of checking for conflicts will be done.  After all
 checking for conflicts is completed and one or more conflicts has been found, the method
 <code>acceptChanges</code> throws a <code>SyncProviderException</code> object. The
-application can catch the exception and use it to obtain a <code>SyncResolver</code> object.  
+application can catch the exception and use it to obtain a <code>SyncResolver</code> object.
 <P>
 The application can then use <code>SyncResolver</code> methods to get information
 about each conflict and decide what to do.  If the application logic or the user
 decides that a value in the <code>RowSet</code> object should be the one to
-persist, the application or user can overwrite the data source value with it.  
+persist, the application or user can overwrite the data source value with it.
 <P>
 The comment for the <code>SyncResolver</code> interface has more detail.
 
diff --git a/jdk/src/java.sql/share/classes/java/sql/Timestamp.java b/jdk/src/java.sql/share/classes/java/sql/Timestamp.java
index dac08f5fe19..ed2b99e8671 100644
--- a/jdk/src/java.sql/share/classes/java/sql/Timestamp.java
+++ b/jdk/src/java.sql/share/classes/java/sql/Timestamp.java
@@ -31,43 +31,43 @@ import sun.misc.SharedSecrets;
 import sun.misc.JavaLangAccess;
 
 /**
- * <P>A thin wrapper around <code>java.util.Date</code> that allows
- * the JDBC API to identify this as an SQL <code>TIMESTAMP</code> value.
+ * <P>A thin wrapper around {@code java.util.Date} that allows
+ * the JDBC API to identify this as an SQL {@code TIMESTAMP} value.
  * It adds the ability
- * to hold the SQL <code>TIMESTAMP</code> fractional seconds value, by allowing
+ * to hold the SQL {@code TIMESTAMP} fractional seconds value, by allowing
  * the specification of fractional seconds to a precision of nanoseconds.
  * A Timestamp also provides formatting and
  * parsing operations to support the JDBC escape syntax for timestamp values.
  *
  * <p>The precision of a Timestamp object is calculated to be either:
  * <ul>
- * <li><code>19 </code>, which is the number of characters in yyyy-mm-dd hh:mm:ss
- * <li> <code> 20 + s </code>, which is the number
- * of characters in the yyyy-mm-dd hh:mm:ss.[fff...] and <code>s</code> represents  the scale of the given Timestamp,
+ * <li>{@code 19 }, which is the number of characters in yyyy-mm-dd hh:mm:ss
+ * <li> {@code  20 + s }, which is the number
+ * of characters in the yyyy-mm-dd hh:mm:ss.[fff...] and {@code s} represents  the scale of the given Timestamp,
  * its fractional seconds precision.
  *</ul>
  *
- * <P><B>Note:</B> This type is a composite of a <code>java.util.Date</code> and a
+ * <P><B>Note:</B> This type is a composite of a {@code java.util.Date} and a
  * separate nanoseconds value. Only integral seconds are stored in the
- * <code>java.util.Date</code> component. The fractional seconds - the nanos - are
- * separate.  The <code>Timestamp.equals(Object)</code> method never returns
- * <code>true</code> when passed an object
- * that isn't an instance of <code>java.sql.Timestamp</code>,
+ * {@code java.util.Date} component. The fractional seconds - the nanos - are
+ * separate.  The {@code Timestamp.equals(Object)} method never returns
+ * {@code true} when passed an object
+ * that isn't an instance of {@code java.sql.Timestamp},
  * because the nanos component of a date is unknown.
- * As a result, the <code>Timestamp.equals(Object)</code>
+ * As a result, the {@code Timestamp.equals(Object)}
  * method is not symmetric with respect to the
- * <code>java.util.Date.equals(Object)</code>
- * method.  Also, the <code>hashCode</code> method uses the underlying
- * <code>java.util.Date</code>
+ * {@code java.util.Date.equals(Object)}
+ * method.  Also, the {@code hashCode} method uses the underlying
+ * {@code java.util.Date}
  * implementation and therefore does not include nanos in its computation.
  * <P>
- * Due to the differences between the <code>Timestamp</code> class
- * and the <code>java.util.Date</code>
+ * Due to the differences between the {@code Timestamp} class
+ * and the {@code java.util.Date}
  * class mentioned above, it is recommended that code not view
- * <code>Timestamp</code> values generically as an instance of
- * <code>java.util.Date</code>.  The
- * inheritance relationship between <code>Timestamp</code>
- * and <code>java.util.Date</code> really
+ * {@code Timestamp} values generically as an instance of
+ * {@code java.util.Date}.  The
+ * inheritance relationship between {@code Timestamp}
+ * and {@code java.util.Date} really
  * denotes implementation inheritance, and not type inheritance.
  */
 public class Timestamp extends java.util.Date {
@@ -75,7 +75,7 @@ public class Timestamp extends java.util.Date {
     private static final JavaLangAccess jla = SharedSecrets.getJavaLangAccess();
 
     /**
-     * Constructs a <code>Timestamp</code> object initialized
+     * Constructs a {@code Timestamp} object initialized
      * with the given values.
      *
      * @param year the year minus 1900
@@ -85,7 +85,7 @@ public class Timestamp extends java.util.Date {
      * @param minute 0 to 59
      * @param second 0 to 59
      * @param nano 0 to 999,999,999
-     * @deprecated instead use the constructor <code>Timestamp(long millis)</code>
+     * @deprecated instead use the constructor {@code Timestamp(long millis)}
      * @exception IllegalArgumentException if the nano argument is out of bounds
      */
     @Deprecated
@@ -99,11 +99,11 @@ public class Timestamp extends java.util.Date {
     }
 
     /**
-     * Constructs a <code>Timestamp</code> object
+     * Constructs a {@code Timestamp} object
      * using a milliseconds time value. The
      * integral seconds are stored in the underlying date value; the
-     * fractional seconds are stored in the <code>nanos</code> field of
-     * the <code>Timestamp</code> object.
+     * fractional seconds are stored in the {@code nanos} field of
+     * the {@code Timestamp} object.
      *
      * @param time milliseconds since January 1, 1970, 00:00:00 GMT.
      *        A negative number is the number of milliseconds before
@@ -120,8 +120,8 @@ public class Timestamp extends java.util.Date {
     }
 
     /**
-     * Sets this <code>Timestamp</code> object to represent a point in time that is
-     * <tt>time</tt> milliseconds after January 1, 1970 00:00:00 GMT.
+     * Sets this {@code Timestamp} object to represent a point in time that is
+     * {@code time} milliseconds after January 1, 1970 00:00:00 GMT.
      *
      * @param time   the number of milliseconds.
      * @see #getTime
@@ -139,7 +139,7 @@ public class Timestamp extends java.util.Date {
 
     /**
      * Returns the number of milliseconds since January 1, 1970, 00:00:00 GMT
-     * represented by this <code>Timestamp</code> object.
+     * represented by this {@code Timestamp} object.
      *
      * @return  the number of milliseconds since January 1, 1970, 00:00:00 GMT
      *          represented by this date.
@@ -157,16 +157,16 @@ public class Timestamp extends java.util.Date {
     private int nanos;
 
     /**
-     * Converts a <code>String</code> object in JDBC timestamp escape format to a
-     * <code>Timestamp</code> value.
+     * Converts a {@code String} object in JDBC timestamp escape format to a
+     * {@code Timestamp} value.
      *
-     * @param s timestamp in format <code>yyyy-[m]m-[d]d hh:mm:ss[.f...]</code>.  The
-     * fractional seconds may be omitted. The leading zero for <code>mm</code>
-     * and <code>dd</code> may also be omitted.
+     * @param s timestamp in format {@code yyyy-[m]m-[d]d hh:mm:ss[.f...]}.  The
+     * fractional seconds may be omitted. The leading zero for {@code mm}
+     * and {@code dd} may also be omitted.
      *
-     * @return corresponding <code>Timestamp</code> value
+     * @return corresponding {@code Timestamp} value
      * @exception java.lang.IllegalArgumentException if the given argument
-     * does not have the format <code>yyyy-[m]m-[d]d hh:mm:ss[.f...]</code>
+     * does not have the format {@code yyyy-[m]m-[d]d hh:mm:ss[.f...]}
      */
     public static Timestamp valueOf(String s) {
         final int YEAR_LENGTH = 4;
@@ -258,11 +258,11 @@ public class Timestamp extends java.util.Date {
 
     /**
      * Formats a timestamp in JDBC timestamp escape format.
-     *         <code>yyyy-mm-dd hh:mm:ss.fffffffff</code>,
-     * where <code>ffffffffff</code> indicates nanoseconds.
+     *         {@code yyyy-mm-dd hh:mm:ss.fffffffff},
+     * where {@code ffffffffff} indicates nanoseconds.
      *
-     * @return a <code>String</code> object in
-     *           <code>yyyy-mm-dd hh:mm:ss.fffffffff</code> format
+     * @return a {@code String} object in
+     *           {@code yyyy-mm-dd hh:mm:ss.fffffffff} format
      */
     @SuppressWarnings("deprecation")
     public String toString() {
@@ -315,9 +315,9 @@ public class Timestamp extends java.util.Date {
     }
 
     /**
-     * Gets this <code>Timestamp</code> object's <code>nanos</code> value.
+     * Gets this {@code Timestamp} object's {@code nanos} value.
      *
-     * @return this <code>Timestamp</code> object's fractional seconds component
+     * @return this {@code Timestamp} object's fractional seconds component
      * @see #setNanos
      */
     public int getNanos() {
@@ -325,7 +325,7 @@ public class Timestamp extends java.util.Date {
     }
 
     /**
-     * Sets this <code>Timestamp</code> object's <code>nanos</code> field
+     * Sets this {@code Timestamp} object's {@code nanos} field
      * to the given value.
      *
      * @param n the new fractional seconds component
@@ -341,13 +341,13 @@ public class Timestamp extends java.util.Date {
     }
 
     /**
-     * Tests to see if this <code>Timestamp</code> object is
-     * equal to the given <code>Timestamp</code> object.
+     * Tests to see if this {@code Timestamp} object is
+     * equal to the given {@code Timestamp} object.
      *
-     * @param ts the <code>Timestamp</code> value to compare with
-     * @return <code>true</code> if the given <code>Timestamp</code>
-     *         object is equal to this <code>Timestamp</code> object;
-     *         <code>false</code> otherwise
+     * @param ts the {@code Timestamp} value to compare with
+     * @return {@code true} if the given {@code Timestamp}
+     *         object is equal to this {@code Timestamp} object;
+     *         {@code false} otherwise
      */
     public boolean equals(Timestamp ts) {
         if (super.equals(ts)) {
@@ -362,22 +362,22 @@ public class Timestamp extends java.util.Date {
     }
 
     /**
-     * Tests to see if this <code>Timestamp</code> object is
+     * Tests to see if this {@code Timestamp} object is
      * equal to the given object.
      *
-     * This version of the method <code>equals</code> has been added
+     * This version of the method {@code equals} has been added
      * to fix the incorrect
-     * signature of <code>Timestamp.equals(Timestamp)</code> and to preserve backward
+     * signature of {@code Timestamp.equals(Timestamp)} and to preserve backward
      * compatibility with existing class files.
      *
      * Note: This method is not symmetric with respect to the
-     * <code>equals(Object)</code> method in the base class.
+     * {@code equals(Object)} method in the base class.
      *
-     * @param ts the <code>Object</code> value to compare with
-     * @return <code>true</code> if the given <code>Object</code> is an instance
-     *         of a <code>Timestamp</code> that
-     *         is equal to this <code>Timestamp</code> object;
-     *         <code>false</code> otherwise
+     * @param ts the {@code Object} value to compare with
+     * @return {@code true} if the given {@code Object} is an instance
+     *         of a {@code Timestamp} that
+     *         is equal to this {@code Timestamp} object;
+     *         {@code false} otherwise
      */
     public boolean equals(java.lang.Object ts) {
       if (ts instanceof Timestamp) {
@@ -388,40 +388,40 @@ public class Timestamp extends java.util.Date {
     }
 
     /**
-     * Indicates whether this <code>Timestamp</code> object is
-     * earlier than the given <code>Timestamp</code> object.
+     * Indicates whether this {@code Timestamp} object is
+     * earlier than the given {@code Timestamp} object.
      *
-     * @param ts the <code>Timestamp</code> value to compare with
-     * @return <code>true</code> if this <code>Timestamp</code> object is earlier;
-     *        <code>false</code> otherwise
+     * @param ts the {@code Timestamp} value to compare with
+     * @return {@code true} if this {@code Timestamp} object is earlier;
+     *        {@code false} otherwise
      */
     public boolean before(Timestamp ts) {
         return compareTo(ts) < 0;
     }
 
     /**
-     * Indicates whether this <code>Timestamp</code> object is
-     * later than the given <code>Timestamp</code> object.
+     * Indicates whether this {@code Timestamp} object is
+     * later than the given {@code Timestamp} object.
      *
-     * @param ts the <code>Timestamp</code> value to compare with
-     * @return <code>true</code> if this <code>Timestamp</code> object is later;
-     *        <code>false</code> otherwise
+     * @param ts the {@code Timestamp} value to compare with
+     * @return {@code true} if this {@code Timestamp} object is later;
+     *        {@code false} otherwise
      */
     public boolean after(Timestamp ts) {
         return compareTo(ts) > 0;
     }
 
     /**
-     * Compares this <code>Timestamp</code> object to the given
-     * <code>Timestamp</code> object.
+     * Compares this {@code Timestamp} object to the given
+     * {@code Timestamp} object.
      *
-     * @param   ts   the <code>Timestamp</code> object to be compared to
-     *                this <code>Timestamp</code> object
-     * @return  the value <code>0</code> if the two <code>Timestamp</code>
-     *          objects are equal; a value less than <code>0</code> if this
-     *          <code>Timestamp</code> object is before the given argument;
-     *          and a value greater than <code>0</code> if this
-     *          <code>Timestamp</code> object is after the given argument.
+     * @param   ts   the {@code Timestamp} object to be compared to
+     *                this {@code Timestamp} object
+     * @return  the value {@code 0} if the two {@code Timestamp}
+     *          objects are equal; a value less than {@code 0} if this
+     *          {@code Timestamp} object is before the given argument;
+     *          and a value greater than {@code 0} if this
+     *          {@code Timestamp} object is after the given argument.
      * @since   1.4
      */
     public int compareTo(Timestamp ts) {
@@ -439,16 +439,16 @@ public class Timestamp extends java.util.Date {
     }
 
     /**
-     * Compares this <code>Timestamp</code> object to the given
-     * <code>Date</code> object.
+     * Compares this {@code Timestamp} object to the given
+     * {@code Date} object.
      *
-     * @param o the <code>Date</code> to be compared to
-     *          this <code>Timestamp</code> object
-     * @return  the value <code>0</code> if this <code>Timestamp</code> object
-     *          and the given object are equal; a value less than <code>0</code>
-     *          if this  <code>Timestamp</code> object is before the given argument;
-     *          and a value greater than <code>0</code> if this
-     *          <code>Timestamp</code> object is after the given argument.
+     * @param o the {@code Date} to be compared to
+     *          this {@code Timestamp} object
+     * @return  the value {@code 0} if this {@code Timestamp} object
+     *          and the given object are equal; a value less than {@code 0}
+     *          if this  {@code Timestamp} object is before the given argument;
+     *          and a value greater than {@code 0} if this
+     *          {@code Timestamp} object is after the given argument.
      *
      * @since   1.5
      */
diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java
index d5e934a6e2d..a9a9a56fdb5 100644
--- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java
+++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java
@@ -35,7 +35,7 @@ import java.io.IOException;
 /**
  * A Java virtual machine.
  *
- * <p> A <code>VirtualMachine</code> represents a Java virtual machine to which this
+ * <p> A {@code VirtualMachine} represents a Java virtual machine to which this
  * Java virtual machine has attached. The Java virtual machine to which it is
  * attached is sometimes called the <i>target virtual machine</i>, or <i>target VM</i>.
  * An application (typically a tool such as a managemet console or profiler) uses a
@@ -47,7 +47,7 @@ import java.io.IOException;
  * with an identifier that identifies the target virtual machine. The identifier is
  * implementation-dependent but is typically the process identifier (or pid) in
  * environments where each Java virtual machine runs in its own operating system process.
- * Alternatively, a <code>VirtualMachine</code> instance is obtained by invoking the
+ * Alternatively, a {@code VirtualMachine} instance is obtained by invoking the
  * {@link #attach(VirtualMachineDescriptor) attach} method with a {@link
  * com.sun.tools.attach.VirtualMachineDescriptor VirtualMachineDescriptor} obtained
  * from the list of virtual machine descriptors returned by the {@link #list list} method.
@@ -66,7 +66,7 @@ import java.io.IOException;
  * <p> In addition to loading agents a VirtualMachine provides read access to the
  * {@link java.lang.System#getProperties() system properties} in the target VM.
  * This can be useful in some environments where properties such as
- * <code>java.home</code>, <code>os.name</code>, or <code>os.arch</code> are
+ * {@code java.home}, {@code os.name}, or {@code os.arch} are
  * used to construct the path to agent that will be loaded into the target VM.
  *
  * <p> The following example demonstrates how VirtualMachine may be used:</p>
@@ -87,7 +87,7 @@ import java.io.IOException;
  * </pre>
  *
  * <p> In this example we attach to a Java virtual machine that is identified by
- * the process identifier <code>2177</code>. Then the JMX management agent is
+ * the process identifier {@code 2177}. Then the JMX management agent is
  * started in the target process using the supplied arguments. Finally, the
  * client detaches from the target VM. </p>
  *
@@ -111,7 +111,7 @@ public abstract class VirtualMachine {
      *          The abstract identifier that identifies the Java virtual machine.
      *
      * @throws  NullPointerException
-     *          If <code>provider</code> or <code>id</code> is <code>null</code>.
+     *          If {@code provider} or {@code id} is {@code null}.
      */
     protected VirtualMachine(AttachProvider provider, String id) {
         if (provider == null) {
@@ -160,10 +160,10 @@ public abstract class VirtualMachine {
      * attachVirtualMachine} method in turn. If a provider successfully
      * attaches then the iteration terminates, and the VirtualMachine created
      * by the provider that successfully attached is returned by this method.
-     * If the <code>attachVirtualMachine</code> method of all providers throws
+     * If the {@code attachVirtualMachine} method of all providers throws
      * {@link com.sun.tools.attach.AttachNotSupportedException AttachNotSupportedException}
-     * then this method also throws <code>AttachNotSupportedException</code>.
-     * This means that <code>AttachNotSupportedException</code> is thrown when
+     * then this method also throws {@code AttachNotSupportedException}.
+     * This means that {@code AttachNotSupportedException} is thrown when
      * the identifier provided to this method is invalid, or the identifier
      * corresponds to a Java virtual machine that does not exist, or none
      * of the providers can attach to it. This exception is also thrown if
@@ -178,19 +178,19 @@ public abstract class VirtualMachine {
      * @throws  SecurityException
      *          If a security manager has been installed and it denies
      *          {@link com.sun.tools.attach.AttachPermission AttachPermission}
-     *          <tt>("attachVirtualMachine")</tt>, or another permission
+     *          {@code ("attachVirtualMachine")}, or another permission
      *          required by the implementation.
      *
      * @throws  AttachNotSupportedException
-     *          If the <code>attachVirtualmachine</code> method of all installed
-     *          providers throws <code>AttachNotSupportedException</code>, or
+     *          If the {@code attachVirtualmachine} method of all installed
+     *          providers throws {@code AttachNotSupportedException}, or
      *          there aren't any providers installed.
      *
      * @throws  IOException
      *          If an I/O error occurs
      *
      * @throws  NullPointerException
-     *          If <code>id</code> is <code>null</code>.
+     *          If {@code id} is {@code null}.
      */
     public static VirtualMachine attach(String id)
         throws AttachNotSupportedException, IOException
@@ -231,18 +231,18 @@ public abstract class VirtualMachine {
      * @throws  SecurityException
      *          If a security manager has been installed and it denies
      *          {@link com.sun.tools.attach.AttachPermission AttachPermission}
-     *          <tt>("attachVirtualMachine")</tt>, or another permission
+     *          {@code ("attachVirtualMachine")}, or another permission
      *          required by the implementation.
      *
      * @throws  AttachNotSupportedException
-     *          If the attach provider's <code>attachVirtualmachine</code>
-     *          throws <code>AttachNotSupportedException</code>.
+     *          If the attach provider's {@code attachVirtualmachine}
+     *          throws {@code AttachNotSupportedException}.
      *
      * @throws  IOException
      *          If an I/O error occurs
      *
      * @throws  NullPointerException
-     *          If <code>vmd</code> is <code>null</code>.
+     *          If {@code vmd} is {@code null}.
      */
     public static VirtualMachine attach(VirtualMachineDescriptor vmd)
         throws AttachNotSupportedException, IOException
@@ -259,7 +259,7 @@ public abstract class VirtualMachine {
      * loadAgent} for example) is in progress when this method is invoked then
      * the behaviour is implementation dependent. In other words, it is
      * implementation specific if the operation completes or throws
-     * <tt>IOException</tt>.
+     * {@code IOException}.
      *
      * <p> If already detached from the virtual machine then invoking this
      * method has no effect. </p>
@@ -296,26 +296,26 @@ public abstract class VirtualMachine {
      * platform equivalent of a dynamic library. Alternatively, it may be statically linked into the VM.
      * This method causes the given agent library to be loaded into the target
      * VM (if not already loaded or if not statically linked into the VM).
-     * It then causes the target VM to invoke the <code>Agent_OnAttach</code> function
-     * or, for a statically linked agent named 'L', the <code>Agent_OnAttach_L</code> function
+     * It then causes the target VM to invoke the {@code Agent_OnAttach} function
+     * or, for a statically linked agent named 'L', the {@code Agent_OnAttach_L} function
      * as specified in the
      * <a href="../../../../../../../../technotes/guides/jvmti/index.html"> JVM Tools
-     * Interface</a> specification. Note that the <code>Agent_OnAttach[_L]</code>
+     * Interface</a> specification. Note that the {@code Agent_OnAttach[_L]}
      * function is invoked even if the agent library was loaded prior to invoking
      * this method.
      *
      * <p> The agent library provided is the name of the agent library. It is interpreted
      * in the target virtual machine in an implementation-dependent manner. Typically an
      * implementation will expand the library name into an operating system specific file
-     * name. For example, on UNIX systems, the name <tt>L</tt> might be expanded to
-     * <tt>libL.so</tt>, and located using the search path specified by the
-     * <tt>LD_LIBRARY_PATH</tt> environment variable. If the agent named 'L' is
+     * name. For example, on UNIX systems, the name {@code L} might be expanded to
+     * {@code libL.so}, and located using the search path specified by the
+     * {@code LD_LIBRARY_PATH} environment variable. If the agent named 'L' is
      * statically linked into the VM then the VM must export a function named
-     * <code>Agent_OnAttach_L</code>.</p>
+     * {@code Agent_OnAttach_L}.</p>
      *
-     * <p> If the <code>Agent_OnAttach[_L]</code> function in the agent library returns
+     * <p> If the {@code Agent_OnAttach[_L]} function in the agent library returns
      * an error then an {@link com.sun.tools.attach.AgentInitializationException} is
-     * thrown. The return value from the <code>Agent_OnAttach[_L]</code> can then be
+     * thrown. The return value from the {@code Agent_OnAttach[_L]} can then be
      * obtained by invoking the {@link
      * com.sun.tools.attach.AgentInitializationException#returnValue() returnValue}
      * method on the exception. </p>
@@ -324,8 +324,8 @@ public abstract class VirtualMachine {
      *          The name of the agent library.
      *
      * @param   options
-     *          The options to provide to the <code>Agent_OnAttach[_L]</code>
-     *          function (can be <code>null</code>).
+     *          The options to provide to the {@code Agent_OnAttach[_L]}
+     *          function (can be {@code null}).
      *
      * @throws  AgentLoadException
      *          If the agent library does not exist, the agent library is not
@@ -333,13 +333,13 @@ public abstract class VirtualMachine {
      *          loaded for another reason.
      *
      * @throws  AgentInitializationException
-     *          If the <code>Agent_OnAttach[_L]</code> function returns an error.
+     *          If the {@code Agent_OnAttach[_L]} function returns an error.
      *
      * @throws  IOException
      *          If an I/O error occurs
      *
      * @throws  NullPointerException
-     *          If <code>agentLibrary</code> is <code>null</code>.
+     *          If {@code agentLibrary} is {@code null}.
      *
      * @see     com.sun.tools.attach.AgentInitializationException#returnValue()
      */
@@ -351,9 +351,9 @@ public abstract class VirtualMachine {
      *
      * <p> This convenience method works as if by invoking:
      *
-     * <blockquote><tt>
+     * <blockquote><code>
      * {@link #loadAgentLibrary(String, String) loadAgentLibrary}(agentLibrary,&nbsp;null);
-     * </tt></blockquote>
+     * </code></blockquote>
      *
      * @param   agentLibrary
      *          The name of the agent library.
@@ -364,13 +364,13 @@ public abstract class VirtualMachine {
      *          loaded for another reason.
      *
      * @throws  AgentInitializationException
-     *          If the <code>Agent_OnAttach[_L]</code> function returns an error.
+     *          If the {@code Agent_OnAttach[_L]} function returns an error.
      *
      * @throws  IOException
      *          If an I/O error occurs
      *
      * @throws  NullPointerException
-     *          If <code>agentLibrary</code> is <code>null</code>.
+     *          If {@code agentLibrary} is {@code null}.
      */
     public void loadAgentLibrary(String agentLibrary)
         throws AgentLoadException, AgentInitializationException, IOException
@@ -389,18 +389,18 @@ public abstract class VirtualMachine {
      * linked with the VM. The parsing of the agentPath parameter into
      * a statically linked library name is done in a platform
      * specific manner in the VM. For example, in UNIX, an agentPath parameter
-     * of <code>/a/b/libL.so</code> would name a library 'L'.
+     * of {@code /a/b/libL.so} would name a library 'L'.
      *
      * See the JVM TI Specification for more details.
      *
      * This method causes the given agent library to be loaded into the target
      * VM (if not already loaded or if not statically linked into the VM).
-     * It then causes the target VM to invoke the <code>Agent_OnAttach</code>
+     * It then causes the target VM to invoke the {@code Agent_OnAttach}
      * function or, for a statically linked agent named 'L', the
-     * <code>Agent_OnAttach_L</code> function as specified in the
+     * {@code Agent_OnAttach_L} function as specified in the
      * <a href="../../../../../../../../technotes/guides/jvmti/index.html"> JVM Tools
      * Interface</a> specification.
-     * Note that the <code>Agent_OnAttach[_L]</code>
+     * Note that the {@code Agent_OnAttach[_L]}
      * function is invoked even if the agent library was loaded prior to invoking
      * this method.
      *
@@ -408,9 +408,9 @@ public abstract class VirtualMachine {
      * agent library. Unlike {@link #loadAgentLibrary loadAgentLibrary}, the library name
      * is not expanded in the target virtual machine. </p>
      *
-     * <p> If the <code>Agent_OnAttach[_L]</code> function in the agent library returns
+     * <p> If the {@code Agent_OnAttach[_L]} function in the agent library returns
      * an error then an {@link com.sun.tools.attach.AgentInitializationException} is
-     * thrown. The return value from the <code>Agent_OnAttach[_L]</code> can then be
+     * thrown. The return value from the {@code Agent_OnAttach[_L]} can then be
      * obtained by invoking the {@link
      * com.sun.tools.attach.AgentInitializationException#returnValue() returnValue}
      * method on the exception. </p>
@@ -419,8 +419,8 @@ public abstract class VirtualMachine {
      *          The full path of the agent library.
      *
      * @param   options
-     *          The options to provide to the <code>Agent_OnAttach[_L]</code>
-     *          function (can be <code>null</code>).
+     *          The options to provide to the {@code Agent_OnAttach[_L]}
+     *          function (can be {@code null}).
      *
      * @throws  AgentLoadException
      *          If the agent library does not exist, the agent library is not
@@ -428,13 +428,13 @@ public abstract class VirtualMachine {
      *          loaded for another reason.
      *
      * @throws  AgentInitializationException
-     *          If the <code>Agent_OnAttach[_L]</code> function returns an error.
+     *          If the {@code Agent_OnAttach[_L]} function returns an error.
      *
      * @throws  IOException
      *          If an I/O error occurs
      *
      * @throws  NullPointerException
-     *          If <code>agentPath</code> is <code>null</code>.
+     *          If {@code agentPath} is {@code null}.
      *
      * @see     com.sun.tools.attach.AgentInitializationException#returnValue()
      */
@@ -446,9 +446,9 @@ public abstract class VirtualMachine {
      *
      * <p> This convenience method works as if by invoking:
      *
-     * <blockquote><tt>
+     * <blockquote><code>
      * {@link #loadAgentPath(String, String) loadAgentPath}(agentLibrary,&nbsp;null);
-     * </tt></blockquote>
+     * </code></blockquote>
      *
      * @param   agentPath
      *          The full path to the agent library.
@@ -459,13 +459,13 @@ public abstract class VirtualMachine {
      *          loaded for another reason.
      *
      * @throws  AgentInitializationException
-     *          If the <code>Agent_OnAttach[_L]</code> function returns an error.
+     *          If the {@code Agent_OnAttach[_L]} function returns an error.
      *
      * @throws  IOException
      *          If an I/O error occurs
      *
      * @throws  NullPointerException
-     *          If <code>agentPath</code> is <code>null</code>.
+     *          If {@code agentPath} is {@code null}.
      */
     public void loadAgentPath(String agentPath)
        throws AgentLoadException, AgentInitializationException, IOException
@@ -482,29 +482,29 @@ public abstract class VirtualMachine {
      * machine where it is interpreted. The target virtual machine attempts to start
      * the agent as specified by the {@link java.lang.instrument} specification.
      * That is, the specified JAR file is added to the system class path (of the target
-     * virtual machine), and the <code>agentmain</code> method of the agent class, specified
-     * by the <code>Agent-Class</code> attribute in the JAR manifest, is invoked. This
-     * method completes when the <code>agentmain</code> method completes.
+     * virtual machine), and the {@code agentmain} method of the agent class, specified
+     * by the {@code Agent-Class} attribute in the JAR manifest, is invoked. This
+     * method completes when the {@code agentmain} method completes.
      *
      * @param   agent
      *          Path to the JAR file containing the agent.
      *
      * @param   options
-     *          The options to provide to the agent's <code>agentmain</code>
-     *          method (can be <code>null</code>).
+     *          The options to provide to the agent's {@code agentmain}
+     *          method (can be {@code null}).
      *
      * @throws  AgentLoadException
      *          If the agent does not exist, or cannot be started in the manner
      *          specified in the {@link java.lang.instrument} specification.
      *
      * @throws  AgentInitializationException
-     *          If the <code>agentmain</code> throws an exception
+     *          If the {@code agentmain} throws an exception
      *
      * @throws  IOException
      *          If an I/O error occurs
      *
      * @throws  NullPointerException
-     *          If <code>agent</code> is <code>null</code>.
+     *          If {@code agent} is {@code null}.
      */
     public abstract void loadAgent(String agent, String options)
         throws AgentLoadException, AgentInitializationException, IOException;
@@ -514,9 +514,9 @@ public abstract class VirtualMachine {
      *
      * <p> This convenience method works as if by invoking:
      *
-     * <blockquote><tt>
+     * <blockquote><code>
      * {@link #loadAgent(String, String) loadAgent}(agent,&nbsp;null);
-     * </tt></blockquote>
+     * </code></blockquote>
      *
      * @param   agent
      *          Path to the JAR file containing the agent.
@@ -526,13 +526,13 @@ public abstract class VirtualMachine {
      *          specified in the {@link java.lang.instrument} specification.
      *
      * @throws  AgentInitializationException
-     *          If the <code>agentmain</code> throws an exception
+     *          If the {@code agentmain} throws an exception
      *
      * @throws  IOException
      *          If an I/O error occurs
      *
      * @throws  NullPointerException
-     *          If <code>agent</code> is <code>null</code>.
+     *          If {@code agent} is {@code null}.
      */
     public void loadAgent(String agent)
         throws AgentLoadException, AgentInitializationException, IOException
@@ -544,16 +544,16 @@ public abstract class VirtualMachine {
      * Returns the current system properties in the target virtual machine.
      *
      * <p> This method returns the system properties in the target virtual
-     * machine. Properties whose key or value is not a <tt>String</tt> are
+     * machine. Properties whose key or value is not a {@code String} are
      * omitted. The method is approximately equivalent to the invocation of the
      * method {@link java.lang.System#getProperties System.getProperties}
      * in the target virtual machine except that properties with a key or
-     * value that is not a <tt>String</tt> are not included.
+     * value that is not a {@code String} are not included.
      *
      * <p> This method is typically used to decide which agent to load into
      * the target virtual machine with {@link #loadAgent loadAgent}, or
      * {@link #loadAgentLibrary loadAgentLibrary}. For example, the
-     * <code>java.home</code> or <code>user.dir</code> properties might be
+     * {@code java.home} or {@code user.dir} properties might be
      * use to create the path to the agent library or JAR file.
      *
      * @return  The system properties
@@ -586,7 +586,7 @@ public abstract class VirtualMachine {
      * agent might create an agent property for its transport address.
      *
      * <p> This method returns the agent properties whose key and value is a
-     * <tt>String</tt>. Properties whose key or value is not a <tt>String</tt>
+     * {@code String}. Properties whose key or value is not a {@code String}
      * are omitted. If there are no agent properties maintained in the target
      * virtual machine then an empty property list is returned.
      *
@@ -686,7 +686,7 @@ public abstract class VirtualMachine {
      * Tests this VirtualMachine for equality with another object.
      *
      * <p> If the given object is not a VirtualMachine then this
-     * method returns <tt>false</tt>. For two VirtualMachines to
+     * method returns {@code false}. For two VirtualMachines to
      * be considered equal requires that they both reference the same
      * provider, and their {@link VirtualMachineDescriptor#id() identifiers} are equal. </p>
      *
@@ -695,7 +695,7 @@ public abstract class VirtualMachine {
      *
      * @param   ob   The object to which this object is to be compared
      *
-     * @return  <tt>true</tt> if, and only if, the given object is
+     * @return  {@code true} if, and only if, the given object is
      *                a VirtualMachine that is equal to this
      *                VirtualMachine.
      */
@@ -715,7 +715,7 @@ public abstract class VirtualMachine {
     }
 
     /**
-     * Returns the string representation of the <code>VirtualMachine</code>.
+     * Returns the string representation of the {@code VirtualMachine}.
      */
     public String toString() {
         return provider.toString() + ": " + id;
diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java
index 21df7e67a64..b8d4ad6be3c 100644
--- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java
+++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java
@@ -30,7 +30,7 @@ import com.sun.tools.attach.spi.AttachProvider;
 /**
  * Describes a Java virtual machine.
  *
- * <p> A <code>VirtualMachineDescriptor</code> is a container class used to
+ * <p> A {@code VirtualMachineDescriptor} is a container class used to
  * describe a Java virtual machine. It encapsulates an identifier that identifies
  * a target virtual machine, and a reference to the {@link
  * com.sun.tools.attach.spi.AttachProvider AttachProvider} that should be used
@@ -39,15 +39,15 @@ import com.sun.tools.attach.spi.AttachProvider;
  * environments where each Java virtual machine runs in its own operating system
  * process. </p>
  *
- * <p> A <code>VirtualMachineDescriptor</code> also has a {@link #displayName() displayName}.
+ * <p> A {@code VirtualMachineDescriptor} also has a {@link #displayName() displayName}.
  * The display name is typically a human readable string that a tool might
  * display to a user. For example, a tool that shows a list of Java
  * virtual machines running on a system might use the display name rather
- * than the identifier. A <code>VirtualMachineDescriptor</code> may be
+ * than the identifier. A {@code VirtualMachineDescriptor} may be
  * created without a <i>display name</i>. In that case the identifier is
  * used as the <i>display name</i>.
  *
- * <p> <code>VirtualMachineDescriptor</code> instances are typically created by
+ * <p> {@code VirtualMachineDescriptor} instances are typically created by
  * invoking the {@link com.sun.tools.attach.VirtualMachine#list VirtualMachine.list()}
  * method. This returns the complete list of descriptors to describe the
  * Java virtual machines known to all installed {@link
@@ -72,7 +72,7 @@ public class VirtualMachineDescriptor {
      * @param   displayName   The display name.
      *
      * @throws  NullPointerException
-     *          If any of the arguments are <code>null</code>
+     *          If any of the arguments are {@code null}
      */
     public VirtualMachineDescriptor(AttachProvider provider, String id, String displayName) {
         if (provider == null) {
@@ -95,10 +95,10 @@ public class VirtualMachineDescriptor {
      * <p> This convenience constructor works as if by invoking the
      * three-argument constructor as follows:
      *
-     * <blockquote><tt>
+     * <blockquote><code>
      * new&nbsp;{@link #VirtualMachineDescriptor(AttachProvider, String, String)
      * VirtualMachineDescriptor}(provider, &nbsp;id, &nbsp;id);
-     * </tt></blockquote>
+     * </code></blockquote>
      *
      * <p> That is, it creates a virtual machine descriptor such that
      * the <i>display name</i> is the same as the virtual machine
@@ -108,16 +108,16 @@ public class VirtualMachineDescriptor {
      * @param   id            The virtual machine identifier.
      *
      * @throws  NullPointerException
-     *          If <tt>provider</tt> or <tt>id</tt> is <tt>null</tt>.
+     *          If {@code provider} or {@code id} is {@code null}.
      */
     public VirtualMachineDescriptor(AttachProvider provider, String id) {
         this(provider, id, id);
     }
 
     /**
-     * Return the <code>AttachProvider</code> that this descriptor references.
+     * Return the {@code AttachProvider} that this descriptor references.
      *
-     * @return The <code>AttachProvider</code> that this descriptor references.
+     * @return The {@code AttachProvider} that this descriptor references.
      */
     public AttachProvider provider() {
         return provider;
@@ -161,7 +161,7 @@ public class VirtualMachineDescriptor {
      * Tests this VirtualMachineDescriptor for equality with another object.
      *
      * <p> If the given object is not a VirtualMachineDescriptor then this
-     * method returns <tt>false</tt>. For two VirtualMachineDescriptors to
+     * method returns {@code false}. For two VirtualMachineDescriptors to
      * be considered equal requires that they both reference the same
      * provider, and their {@link #id() identifiers} are equal. </p>
      *
@@ -170,7 +170,7 @@ public class VirtualMachineDescriptor {
      *
      * @param   ob   The object to which this object is to be compared
      *
-     * @return  <tt>true</tt> if, and only if, the given object is
+     * @return  {@code true} if, and only if, the given object is
      *                a VirtualMachineDescriptor that is equal to this
      *                VirtualMachineDescriptor.
      */
@@ -190,7 +190,7 @@ public class VirtualMachineDescriptor {
     }
 
     /**
-     * Returns the string representation of the <code>VirtualMachineDescriptor</code>.
+     * Returns the string representation of the {@code VirtualMachineDescriptor}.
      */
     public String toString() {
         String s = provider.toString() + ": " + id;
diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
index f4e53b305d0..c838bd5a28d 100644
--- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
+++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
@@ -142,7 +142,7 @@ public abstract class HttpServerProvider {
      *   visible to the system class loader, and that jar file contains a
      *   provider-configuration file named
      *   {@code com.sun.net.httpserver.HttpServerProvider} in the resource
-     *   directory <tt>META-INF/services</tt>, then the first class name
+     *   directory {@code META-INF/services}, then the first class name
      *   specified in that file is taken.  The class is loaded and
      *   instantiated; if this process fails then an unspecified unchecked error
      *   or exception is thrown.  </p></li>
diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java
index 55eb042fefc..dbde25bd19b 100644
--- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java
@@ -197,8 +197,8 @@ import java.io.IOException;
  * in a jar file that is visible to the defining class loader of
  * the {@link com.sun.jdi.connect.Connector} type,
  * and that jar file contains a provider configuration file named
- * <tt>com.sun.jdi.connect.Connector</tt> in the resource directory
- * <tt>META-INF/services</tt>, and the provider configuration file
+ * {@code com.sun.jdi.connect.Connector} in the resource directory
+ * {@code META-INF/services}, and the provider configuration file
  * lists the full-qualified class name of the Connector
  * implementation. A Connector is a class that implements the
  * {@link com.sun.jdi.connect.Connector Connector} interface. More
@@ -209,7 +209,7 @@ import java.io.IOException;
  * LaunchingConnector}. The format of the provider configuration file
  * is one fully-qualified class name per line. Space and tab characters
  * surrounding each class, as well as blank lines are ignored. The
- * comment character is <tt>'#'</tt> (<tt>0x23</tt>), and on each
+ * comment character is {@code '#'} ({@code 0x23}), and on each
  * line all characters following the first comment character are
  * ignored. The file must be encoded in UTF-8.
  *
@@ -227,8 +227,8 @@ import java.io.IOException;
  * visible to the defining class loader for the
  * {@link com.sun.jdi.connect.spi.TransportService} type, and that jar
  * file contains a provider configuration file named
- * <tt>com.sun.jdi.connect.spi.TransportService</tt> in the resource
- * directory <tt>META-INF/services</tt>, and the provider
+ * {@code com.sun.jdi.connect.spi.TransportService} in the resource
+ * directory {@code META-INF/services}, and the provider
  * configuration file lists the full-qualified class name of the
  * TransportService implementation. A TransportService is a concrete
  * sub-class of {@link com.sun.jdi.connect.spi.TransportService
@@ -245,12 +245,12 @@ import java.io.IOException;
  * com.sun.jdi.connect.Transport Transport} that in turn
  * encapsulates the TransportService.
  * The AttachingConnector will be named based on the name of the
- * transport service concatenated with the string <tt>Attach</tt>.
+ * transport service concatenated with the string {@code Attach}.
  * For example, if the transport service {@link
  * com.sun.jdi.connect.spi.TransportService#name() name()} method
- * returns <tt>telepathic</tt> then the AttachingConnector will
- * be named <tt>telepathicAttach</tt>. Similiarly the ListeningConnector
- * will be named with the string <tt>Listen</tt> tagged onto the
+ * returns {@code telepathic} then the AttachingConnector will
+ * be named {@code telepathicAttach}. Similiarly the ListeningConnector
+ * will be named with the string {@code Listen} tagged onto the
  * name of the transport service. The {@link
  * com.sun.jdi.connect.Connector#description() description()} method
  * of both the AttachingConnector, and the ListeningConnector, will
@@ -259,10 +259,10 @@ import java.io.IOException;
  * the AttachingConnector and the ListeningConnector will have two
  * Connector {@link com.sun.jdi.connect.Connector$Argument Arguments}.
  * A {@link com.sun.jdi.connect.Connector$StringArgument StringArgument}
- * named <tt>address</tt> is the connector argument to specify the
+ * named {@code address} is the connector argument to specify the
  * address to attach too, or to listen on. A
  * {@link com.sun.jdi.connect.Connector$IntegerArgument IntegerArgument}
- * named <tt>timeout</tt> is the connector argument to specify the
+ * named {@code timeout} is the connector argument to specify the
  * timeout when attaching, or accepting. The timeout connector may be
  * ignored depending on if the transport service supports an attach
  * timeout or accept timeout.
@@ -372,13 +372,13 @@ public interface VirtualMachineManager {
       * A Connector can then use this method to create a virtual machine
       * mirror to represent the composite state of the target VM.
       *
-      * <p> The <tt>process</tt> argument specifies the
+      * <p> The {@code process} argument specifies the
       * {@link java.lang.Process} object for the taget VM. It may be
-      * specified as <tt>null</tt>. If the target VM is launched
+      * specified as {@code null}. If the target VM is launched
       * by a {@link com.sun.jdi.connect.LaunchingConnector
-      * LaunchingConnector} the <tt>process</tt> argument should be
+      * LaunchingConnector} the {@code process} argument should be
       * specified, otherwise calling {@link com.sun.jdi.VirtualMachine#process()}
-      * on the created virtual machine will return <tt>null</tt>.
+      * on the created virtual machine will return {@code null}.
       *
       * <p> This method exists so that Connectors may create
       * a virtual machine mirror when a connection is established
@@ -391,7 +391,7 @@ public interface VirtualMachineManager {
       *
       * @param  process
       *         If launched, the {@link java.lang.Process} object for
-      *         the target VM. <tt>null</tt> if not launched.
+      *         the target VM. {@code null} if not launched.
       *
       * @return new virtual machine representing the target VM.
       *
@@ -413,7 +413,7 @@ public interface VirtualMachineManager {
       *
       * <p> This convenience method works as if by invoking {@link
       * #createVirtualMachine(Connection, Process)} method and
-      * specifying <tt>null</tt> as the <tt>process</tt> argument.
+      * specifying {@code null} as the {@code process} argument.
       *
       * <p> This method exists so that Connectors may create
       * a virtual machine mirror when a connection is established
diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java
index 1ede92bc55e..2a13567af76 100644
--- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java
@@ -58,7 +58,7 @@ package com.sun.jdi.connect;
 public class TransportTimeoutException extends java.io.IOException {
     private static final long serialVersionUID = 4107035242623365074L;
     /**
-     * Constructs a <tt>TransportTimeoutException</tt> with no detail
+     * Constructs a {@code TransportTimeoutException} with no detail
      * message.
      */
     public TransportTimeoutException() {
@@ -66,7 +66,7 @@ public class TransportTimeoutException extends java.io.IOException {
 
 
     /**
-     * Constructs a <tt>TransportTimeoutException</tt> with the
+     * Constructs a {@code TransportTimeoutException} with the
      * specified detail message.
      *
      * @param message the detail message pertaining to this exception.
diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java
index a324bc35185..009128b7214 100644
--- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java
@@ -49,14 +49,14 @@ package com.sun.jdi.connect.spi;
 public class ClosedConnectionException extends java.io.IOException {
     private static final long serialVersionUID = 3877032124297204774L;
     /**
-     * Constructs a <tt>ClosedConnectionException</tt> with no detail
+     * Constructs a {@code ClosedConnectionException} with no detail
      * message.
      */
     public ClosedConnectionException() {
     }
 
     /**
-     * Constructs a <tt>ClosedConnectionException</tt> with the
+     * Constructs a {@code ClosedConnectionException} with the
      * specified detail message.
      *
      * @param message the detail message pertaining to this exception.
diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java
index f589424afc4..f51c762911a 100644
--- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java
@@ -105,7 +105,7 @@ public abstract class TransportService {
          * multiple concurrent connections to a single address that
          * it is listening on.
          *
-         * @return  <tt>true</tt> if, and only if, this transport
+         * @return  {@code true} if, and only if, this transport
          *          service supports multiple connections.
          */
         public abstract boolean supportsMultipleConnections();
@@ -115,7 +115,7 @@ public abstract class TransportService {
          * Tell whether or not this transport service supports a timeout
          * when attaching to a target VM.
          *
-         * @return      <tt>true</tt> if, and only if, this transport
+         * @return      {@code true} if, and only if, this transport
          *              service supports attaching with a timeout.
          *
          * @see #attach(String,long,long)
@@ -126,7 +126,7 @@ public abstract class TransportService {
          * Tell whether or not this transport service supports a
          * timeout while waiting for a target VM to connect.
          *
-         * @return  <tt>true</tt> if, and only if, this transport
+         * @return  {@code true} if, and only if, this transport
          *          service supports timeout while waiting for
          *          a target VM to connect.
          *
@@ -138,7 +138,7 @@ public abstract class TransportService {
          * Tells whether or not this transport service supports a
          * timeout when handshaking with the target VM.
          *
-         * @return  <tt>true</tt> if, and only if, this transport
+         * @return  {@code true} if, and only if, this transport
          *          service supports a timeout while handshaking
          *          with the target VM.
          *
@@ -176,15 +176,15 @@ public abstract class TransportService {
      *
      * @param   attachTimeout
      *          If this transport service supports an attach timeout,
-     *          and if <tt>attachTimeout</tt> is positive, then it specifies
+     *          and if {@code attachTimeout} is positive, then it specifies
      *          the timeout, in milliseconds (more or less), to use
      *          when attaching to the target VM.  If the transport service
-     *          does not support an attach timeout, or if <tt>attachTimeout</tt>
+     *          does not support an attach timeout, or if {@code attachTimeout}
      *          is specified as zero then attach without any timeout.
      *
      * @param   handshakeTimeout
      *          If this transport service supports a handshake timeout,
-     *          and if <tt>handshakeTimeout</tt> is positive, then it
+     *          and if {@code handshakeTimeout} is positive, then it
      *          specifies the timeout, in milliseconds (more or less), to
      *          use when handshaking with the target VM. The exact
      *          usage of the timeout are specific to the transport service.
@@ -195,7 +195,7 @@ public abstract class TransportService {
      *          use the handshakeTimeout as a timeout for the duration of the
      *          handshake exchange.
      *          If the transport service does not support a handshake
-     *          timeout, or if <tt>handshakeTimeout</tt> is specified
+     *          timeout, or if {@code handshakeTimeout} is specified
      *          as zero then the handshake does not timeout if there
      *          isn't a response from the target VM.
      *
@@ -221,9 +221,9 @@ public abstract class TransportService {
     /**
      * A <i>listen key</i>.
      *
-     * <p> A <tt>TransportService</tt> may listen on multiple, yet
+     * <p> A {@code TransportService} may listen on multiple, yet
      * different, addresses at the same time. To uniquely identify
-     * each <tt>listener</tt> a listen key is created each time that
+     * each {@code listener} a listen key is created each time that
      * {@link #startListening startListening} is called. The listen
      * key is used in calls to the {@link #accept accept} method
      * to accept inbound connections to that listener. A listen
@@ -250,7 +250,7 @@ public abstract class TransportService {
      *
      * @param   address
      *          The address to start listening for connections,
-     *          or <tt>null</tt> to listen on an address chosen
+     *          or {@code null} to listen on an address chosen
      *          by the transport service.
      *
      * @return  a listen key to be used in subsequent calls to be
@@ -268,8 +268,8 @@ public abstract class TransportService {
     /**
      * Listens on an address chosen by the transport service.
      *
-     * <p> This convenience method works as if by invoking {@link
-     * #startListening(String) startListening(<tt>null</tt>)}. </p>
+     * <p> This convenience method works as if by invoking
+     * {@link #startListening(String) startListening(null)}.
      *
      * @return  a listen key to be used in subsequent calls to be
      *          {@link #accept accept} or {@link #stopListening
@@ -327,16 +327,16 @@ public abstract class TransportService {
      *
      * @param   acceptTimeout
      *          if this transport service supports an accept timeout, and
-     *          if <tt>acceptTimeout</tt> is positive then block for up to
-     *          <tt>acceptTimeout</tt> milliseconds, more or less, while waiting
+     *          if {@code acceptTimeout} is positive then block for up to
+     *          {@code acceptTimeout} milliseconds, more or less, while waiting
      *          for the target VM to connect.
      *          If the transport service does not support an accept timeout
-     *          or if <tt>acceptTimeout</tt> is zero then block indefinitely
+     *          or if {@code acceptTimeout} is zero then block indefinitely
      *          for a target VM to connect.
      *
      * @param   handshakeTimeout
      *          If this transport service supports a handshake timeout,
-     *          and if <tt>handshakeTimeout</tt> is positive, then it
+     *          and if {@code handshakeTimeout} is positive, then it
      *          specifies the timeout, in milliseconds (more or less), to
      *          use when handshaking with the target VM. The exact
      *          usage of the timeout is specific to the transport service.
@@ -347,7 +347,7 @@ public abstract class TransportService {
      *          use the timeout as a timeout for the duration of the
      *          handshake exchange.
      *          If the transport service does not support a handshake
-     *          timeout, of if <tt>handshakeTimeout</tt> is specified
+     *          timeout, of if {@code handshakeTimeout} is specified
      *          as zero then the handshake does not timeout if there
      *          isn't a response from the target VM.
      *
diff --git a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/HostIdentifier.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/HostIdentifier.java
index 86935d10741..2af043618a9 100644
--- a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/HostIdentifier.java
+++ b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/HostIdentifier.java
@@ -42,26 +42,26 @@ import java.net.*;
  * to the string <em>local://localhost</em>. The components of the
  * HostIdentifier are:
  * <ul>
- *   <li><p><tt>protocol</tt> - The communications protocol. If omitted,
+ *   <li><p>{@code protocol} - The communications protocol. If omitted,
  *          and a hostname is not specified, then default local protocol,
  *          <em>local:</em>, is assumed. If the protocol is omitted and a
  *          hostname is specified then the default remote protocol,
  *          <em>rmi:</em> is assumed.
  *       </p></li>
- *   <li><p><tt>hostname</tt> - The hostname. If omitted, then
+ *   <li><p>{@code hostname} - The hostname. If omitted, then
  *          <em>localhost</em> is assumed. If the protocol is also omitted,
  *          then default local protocol <em>local:</em> is also assumed.
  *          If the hostname is not omitted but the protocol is omitted,
  *          then the default remote protocol, <em>rmi:</em> is assumed.
  *       </p></li>
- *   <li><p><tt>port</tt> - The port for the communications protocol.
- *          Treatment of the <tt>port</tt> parameter is implementation
+ *   <li><p>{@code port} - The port for the communications protocol.
+ *          Treatment of the {@code port} parameter is implementation
  *          (protocol) specific. It is unused by the default local protocol,
  *          <em>local:</em>. For the default remote protocol, <em>rmi:</em>,
- *          <tt>port</tt> indicates the port number of the <em>rmiregistry</em>
+ *          {@code port} indicates the port number of the <em>rmiregistry</em>
  *          on the target host and defaults to port 1099.
  *       </p></li>
- *   <li><p><tt>servername</tt> - The treatment of the Path, Query, and
+ *   <li><p>{@code servername} - The treatment of the Path, Query, and
  *          Fragment components of the HostIdentifier are implementation
  *          (protocol) dependent. These components are ignored by the
  *          default local protocol, <em>local:</em>. For the default remote
diff --git a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHost.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHost.java
index 037f49e53f6..b119a004520 100644
--- a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHost.java
+++ b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHost.java
@@ -94,7 +94,7 @@ public abstract class MonitoredHost {
 
     /**
      * Factory method to construct MonitoredHost instances to manage
-     * connections to the host indicated by <tt>hostIdString</tt>
+     * connections to the host indicated by {@code hostIdString}
      *
      * @param hostIdString a String representation of a {@link HostIdentifier}
      * @return MonitoredHost - the MonitoredHost instance for communicating
@@ -113,7 +113,7 @@ public abstract class MonitoredHost {
 
     /**
      * Factory method to construct a MonitoredHost instance to manage the
-     * connection to the Java Virtual Machine indicated by <tt>vmid</tt>.
+     * connection to the Java Virtual Machine indicated by {@code vmid}.
      *
      * This method provide a convenient short cut for attaching to a specific
      * instrumented Java Virtual Machine. The information in the VmIdentifier
@@ -142,7 +142,7 @@ public abstract class MonitoredHost {
 
     /**
      * Factory method to construct a MonitoredHost instance to manage the
-     * connection to the host indicated by <tt>hostId</tt>.
+     * connection to the host indicated by {@code hostId}.
      *
      * @param hostId the identifier for the target host.
      * @return MonitoredHost - The MonitoredHost object needed to attach to
@@ -269,7 +269,7 @@ public abstract class MonitoredHost {
      * Get the last exception encountered while polling this MonitoredHost.
      *
      * @return Exception - the last exception occurred while polling this
-     *                     MonitoredHost, or <tt>null</tt> if no exception
+     *                     MonitoredHost, or {@code null} if no exception
      *                     has occurred or the exception has been cleared,
      */
     public Exception getLastException() {
diff --git a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHostService.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHostService.java
index 27607a990cd..5c981a91ad1 100644
--- a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHostService.java
+++ b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHostService.java
@@ -29,7 +29,7 @@ public interface MonitoredHostService {
 
     /**
      * Construct a MonitoredHost instance to manage the
-     * connection to the host indicated by <tt>hostId</tt>.
+     * connection to the host indicated by {@code hostId}.
      *
      * @param hostId the identifier for the target host.
      * @return MonitoredHost - The MonitoredHost object needed to attach to
diff --git a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVm.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVm.java
index 86c2d4fa15e..a1614914794 100644
--- a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVm.java
+++ b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVm.java
@@ -55,12 +55,12 @@ public interface MonitoredVm {
      * instrumentation exported by this Java Virtual Machine. If an
      * instrumentation object with the given name exists, a Monitor interface
      * to that object will be return. Otherwise, the method returns
-     * <tt>null</tt>.
+     * {@code null}.
      *
      * @param name the name of the Instrumentation object to find.
      * @return Monitor - the {@link Monitor} object that can be used to
      *                   monitor the named instrumentation object, or
-     *                   <tt>null</tt> if the named object doesn't exist.
+     *                   {@code null} if the named object doesn't exist.
      * @throws MonitorException Thrown if an error occurs while communicating
      *                          with the target Java Virtual Machine.
      */
@@ -99,7 +99,7 @@ public interface MonitoredVm {
     /* ---- Methods to support polled MonitoredVm Implementations ---- */
 
     /**
-     * Set the polling interval to <code>interval</code> milliseconds.
+     * Set the polling interval to {@code interval} milliseconds.
      *
      * Polling based monitoring implementations need to refresh the
      * instrumentation data on a periodic basis. This interface allows
@@ -136,10 +136,10 @@ public interface MonitoredVm {
      * Get the last exception encountered while polling this MonitoredVm.
      *
      * Returns the last exception observed by the implementation dependent
-     * polling task or <tt>null</tt> if no such error has occurred.
+     * polling task or {@code null} if no such error has occurred.
      *
      * @return Exception - the last exception that occurred during polling
-     *                     or <tt>null</tt> if no error condition exists.
+     *                     or {@code null} if no error condition exists.
      * @see #isErrored
      * @see #setLastException
      */
diff --git a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java
index 8863a4eb695..7a5e9998bc9 100644
--- a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java
+++ b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java
@@ -87,12 +87,12 @@ public abstract class AbstractPerfDataBuffer {
      * instrumentation exported by this Java Virtual Machine. If an
      * instrumentation object with the given name exists, a Monitor interface
      * to that object will be return. Otherwise, the method returns
-     * <tt>null</tt>.
+     * {@code null}.
      *
      * @param name the name of the Instrumentation object to find.
      * @return Monitor - the {@link Monitor} object that can be used to
      *                   monitor the named instrumentation object, or
-     *                   <tt>null</tt> if the named object doesn't exist.
+     *                   {@code null} if the named object doesn't exist.
      * @throws MonitorException Thrown if an error occurs while communicating
      *                          with the target Java Virtual Machine.
      */
diff --git a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java
index b2414a37b21..f335b237513 100644
--- a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java
+++ b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java
@@ -98,7 +98,7 @@ public class PerfByteArrayMonitor extends AbstractMonitor
      * Get the current value of an element of the byte array instrument.
      *
      * @return byte - a copy of the current value of the element at index
-     *                <tt>index</tt> of the byte array instrument.
+     *                {@code index} of the byte array instrument.
      */
     public byte byteAt(int index) {
         bb.position(index);
diff --git a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java
index edc024a6660..c83b802306d 100644
--- a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java
+++ b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java
@@ -222,7 +222,7 @@ public abstract class PerfDataBufferImpl {
      * instrumentation exported by this Java Virtual Machine. If an
      * instrumentation object with the given name exists, a Monitor interface
      * to that object will be return. Otherwise, the method returns
-     * <tt>null</tt>. The method will map requests for instrumention objects
+     * {@code null}. The method will map requests for instrumention objects
      * using old names to their current names, if applicable.
      *
      *
@@ -230,7 +230,7 @@ public abstract class PerfDataBufferImpl {
      * @param name the name of the Instrumentation object to find.
      * @return Monitor - the {@link Monitor} object that can be used to
      *                   monitor the named instrumentation object, or
-     *                   <tt>null</tt> if the named object doesn't exist.
+     *                   {@code null} if the named object doesn't exist.
      * @throws MonitorException Thrown if an error occurs while communicating
      *                          with the target Java Virtual Machine.
      */
diff --git a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java
index 110c598b6e6..eeea51469a1 100644
--- a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java
+++ b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java
@@ -66,7 +66,7 @@ public class MonitoredHostProvider extends MonitoredHost {
      * {@inheritDoc}.
      * <p>
      * Note - the <em>file:</em> protocol silently ignores the
-     * <tt>interval</tt> parameter.
+     * {@code interval} parameter.
      */
     public MonitoredVm getMonitoredVm(VmIdentifier vmid, int interval)
                        throws MonitorException {
diff --git a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java
index 62c64795b1c..d7e839ef4fa 100644
--- a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java
+++ b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java
@@ -84,7 +84,7 @@ public class PerfDataFile {
      * for the JVM identified by the given local Vm Identifier.
      * <p>
      * This method looks for the most up to date backing store file for
-     * the given <tt>lvmid</tt>. It will search all the user specific
+     * the given {@code lvmid}. It will search all the user specific
      * directories in the temporary directory for the host operating
      * system, which may be influenced by platform specific environment
      * variables.
diff --git a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html
index 3f7bac94a38..3855d4748f2 100644
--- a/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html
+++ b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html
@@ -40,7 +40,7 @@ The <em>local:</em> protocol is the default protocol for the PerfData
 implementation. It utilizes a name shared memory mechanism, identified
 by a backing store file in the file system name space. The location of
 the backing store file is platform specific and is dictated primarily by
-the JVM implementation. However, the <tt>java.io.tmpdir</em> system
+the JVM implementation. However, the <code>java.io.tmpdir</code> system
 property generally contains the location of the files, with the exception
 of the Solaris implementation, as the SDK and HotSpot JVM use different
 locations for their temporary file storage. The HotSpot JVM uses the
diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectorMXBean.java b/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectorMXBean.java
index b4cf2147a9c..4963eac61c4 100644
--- a/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectorMXBean.java
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectorMXBean.java
@@ -44,16 +44,16 @@ public interface GarbageCollectorMXBean
     /**
      * Returns the GC information about the most recent GC.
      * This method returns a {@link GcInfo}.
-     * If no GC information is available, <tt>null</tt> is returned.
+     * If no GC information is available, {@code null} is returned.
      * The collector-specific attributes, if any, can be obtained
      * via the {@link CompositeData CompositeData} interface.
      * <p>
      * <b>MBeanServer access:</b>
-     * The mapped type of <tt>GcInfo</tt> is <tt>CompositeData</tt>
+     * The mapped type of {@code GcInfo} is {@code CompositeData}
      * with attributes specified in {@link GcInfo#from GcInfo}.
      *
-     * @return a <tt>GcInfo</tt> object representing
-     * the most GC information; or <tt>null</tt> if no GC
+     * @return a {@code GcInfo} object representing
+     * the most GC information; or {@code null} if no GC
      * information available.
      */
     public GcInfo getLastGcInfo();
diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java b/jdk/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
index 0fd641e0612..1d64ae0b452 100644
--- a/jdk/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
@@ -33,10 +33,10 @@ import java.lang.management.PlatformManagedObject;
  * <p>The diagnostic MBean is registered to the platform MBeanServer
  * as are other platform MBeans.
  *
- * <p>The <tt>ObjectName</tt> for uniquely identifying the diagnostic
+ * <p>The {@code ObjectName} for uniquely identifying the diagnostic
  * MXBean within an MBeanServer is:
  * <blockquote>
- *    <tt>com.sun.management:type=HotSpotDiagnostic</tt>
+ *    {@code com.sun.management:type=HotSpotDiagnostic}
  * </blockquote>
 .*
  * It can be obtained by calling the
@@ -50,22 +50,22 @@ import java.lang.management.PlatformManagedObject;
 @jdk.Exported
 public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
     /**
-     * Dumps the heap to the <tt>outputFile</tt> file in the same
+     * Dumps the heap to the {@code outputFile} file in the same
      * format as the hprof heap dump.
      * <p>
      * If this method is called remotely from another process,
-     * the heap dump output is written to a file named <tt>outputFile</tt>
+     * the heap dump output is written to a file named {@code outputFile}
      * on the machine where the target VM is running.  If outputFile is
      * a relative path, it is relative to the working directory where
      * the target VM was started.
      *
      * @param  outputFile the system-dependent filename
-     * @param  live if <tt>true</tt> dump only <i>live</i> objects
+     * @param  live if {@code true} dump only <i>live</i> objects
      *         i.e. objects that are reachable from others
-     * @throws IOException if the <tt>outputFile</tt>
+     * @throws IOException if the {@code outputFile}
      *                     cannot be created, opened, or written to.
      * @throws UnsupportedOperationException if this operation is not supported.
-     * @throws NullPointerException if <tt>outputFile</tt> is <tt>null</tt>.
+     * @throws NullPointerException if {@code outputFile} is {@code null}.
      * @throws SecurityException
      *         If a security manager exists and its {@link
      *         java.lang.SecurityManager#checkWrite(java.lang.String)}
@@ -75,21 +75,21 @@ public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
     public void dumpHeap(String outputFile, boolean live) throws java.io.IOException;
 
     /**
-     * Returns a list of <tt>VMOption</tt> objects for all diagnostic options.
+     * Returns a list of {@code VMOption} objects for all diagnostic options.
      * A diagnostic option is a {@link VMOption#isWriteable writeable}
      * VM option that can be set dynamically mainly for troubleshooting
      * and diagnosis.
      *
-     * @return a list of <tt>VMOption</tt> objects for all diagnostic options.
+     * @return a list of {@code VMOption} objects for all diagnostic options.
      */
     public java.util.List<VMOption> getDiagnosticOptions();
 
     /**
-     * Returns a <tt>VMOption</tt> object for a VM option of the given
+     * Returns a {@code VMOption} object for a VM option of the given
      * name.
      *
-     * @return a <tt>VMOption</tt> object for a VM option of the given name.
-     * @throws NullPointerException if name is <tt>null</tt>.
+     * @return a {@code VMOption} object for a VM option of the given name.
+     * @throws NullPointerException if name is {@code null}.
      * @throws IllegalArgumentException if a VM option of the given name
      *                                     does not exist.
      */
@@ -97,10 +97,10 @@ public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
 
     /**
      * Sets a VM option of the given name to the specified value.
-     * The new value will be reflected in a new <tt>VMOption</tt>
+     * The new value will be reflected in a new {@code VMOption}
      * object returned by the {@link #getVMOption} method or
      * the {@link #getDiagnosticOptions} method.  This method does
-     * not change the value of this <tt>VMOption</tt> object.
+     * not change the value of this {@code VMOption} object.
      *
      * @param name Name of a VM option
      * @param value New value of the VM option to be set
@@ -109,7 +109,7 @@ public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
      *                                     does not exist.
      * @throws IllegalArgumentException if the new value is invalid.
      * @throws IllegalArgumentException if the VM option is not writable.
-     * @throws NullPointerException if name or value is <tt>null</tt>.
+     * @throws NullPointerException if name or value is {@code null}.
      *
      * @throws  java.lang.SecurityException
      *     if a security manager exists and the caller does not have
diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java b/jdk/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java
index 3b928aa7b0f..edee07f1d21 100644
--- a/jdk/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java
@@ -30,7 +30,7 @@ package com.sun.management;
  * on which the Java virtual machine is running.
  *
  * <p>
- * The <tt>OperatingSystemMXBean</tt> object returned by
+ * The {@code OperatingSystemMXBean} object returned by
  * {@link java.lang.management.ManagementFactory#getOperatingSystemMXBean()}
  * is an instance of the implementation class of this interface
  * or {@link UnixOperatingSystemMXBean} interface depending on
@@ -46,11 +46,11 @@ public interface OperatingSystemMXBean extends
     /**
      * Returns the amount of virtual memory that is guaranteed to
      * be available to the running process in bytes,
-     * or <tt>-1</tt> if this operation is not supported.
+     * or {@code -1} if this operation is not supported.
      *
      * @return the amount of virtual memory that is guaranteed to
      * be available to the running process in bytes,
-     * or <tt>-1</tt> if this operation is not supported.
+     * or {@code -1} if this operation is not supported.
      */
     public long getCommittedVirtualMemorySize();
 
@@ -72,11 +72,11 @@ public interface OperatingSystemMXBean extends
      * Returns the CPU time used by the process on which the Java
      * virtual machine is running in nanoseconds.  The returned value
      * is of nanoseconds precision but not necessarily nanoseconds
-     * accuracy.  This method returns <tt>-1</tt> if the
+     * accuracy.  This method returns {@code -1} if the
      * the platform does not support this operation.
      *
      * @return the CPU time used by the process in nanoseconds,
-     * or <tt>-1</tt> if this operation is not supported.
+     * or {@code -1} if this operation is not supported.
      */
     public long getProcessCpuTime();
 
diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java
index ee118b8bd24..3038f6fc49e 100644
--- a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java
+++ b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java
@@ -125,7 +125,7 @@ public class DnsContext extends ComponentDirContext {
      * Returns a clone of a DNS context.  The context's modifiable
      * private state is independent of the original's (so closing one
      * context, for example, won't close the other).  The two contexts
-     * share <tt>environment</tt>, but it's copy-on-write so there's
+     * share {@code environment}, but it's copy-on-write so there's
      * no conflict.
      */
     private DnsContext(DnsContext ctx) {
diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsName.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsName.java
index 68bb9a12214..4bd2b06d877 100644
--- a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsName.java
+++ b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsName.java
@@ -34,7 +34,7 @@ import javax.naming.*;
 
 
 /**
- * <tt>DnsName</tt> implements compound names for DNS as specified by
+ * {@code DnsName} implements compound names for DNS as specified by
  * RFCs 1034 and 1035, and as updated and clarified by RFCs 1123 and 2181.
  *
  * <p> The labels in a domain name correspond to JNDI atomic names.
@@ -57,45 +57,45 @@ import javax.naming.*;
  * <p> DNS does not specify an encoding (such as UTF-8) to use for
  * octets with non-ASCII values.  As of this writing there is some
  * work going on in this area, but it is not yet finalized.
- * <tt>DnsName</tt> currently converts any non-ASCII octets into
+ * {@code DnsName} currently converts any non-ASCII octets into
  * characters using ISO-LATIN-1 encoding, in effect taking the
  * value of each octet and storing it directly into the low-order byte
  * of a Java character and <i>vice versa</i>.  As a consequence, no
  * character in a DNS name will ever have a non-zero high-order byte.
  * When the work on internationalizing domain names has stabilized
- * (see for example <i>draft-ietf-idn-idna-10.txt</i>), <tt>DnsName</tt>
+ * (see for example <i>draft-ietf-idn-idna-10.txt</i>), {@code DnsName}
  * may be updated to conform to that work.
  *
- * <p> Backslash (<tt>\</tt>) is used as the escape character in the
+ * <p> Backslash ({@code \}) is used as the escape character in the
  * textual representation of a domain name.  The character sequence
- * `<tt>\DDD</tt>', where <tt>DDD</tt> is a 3-digit decimal number
+ * `{@code \DDD}', where {@code DDD} is a 3-digit decimal number
  * (with leading zeros if needed), represents the octet whose value
- * is <tt>DDD</tt>.  The character sequence `<tt>\C</tt>', where
- * <tt>C</tt> is a character other than <tt>'0'</tt> through
- * <tt>'9'</tt>, represents the octet whose value is that of
- * <tt>C</tt> (again using ISO-LATIN-1 encoding); this is particularly
- * useful for escaping <tt>'.'</tt> or backslash itself.  Backslash is
+ * is {@code DDD}.  The character sequence `{@code \C}', where
+ * {@code C} is a character other than {@code '0'} through
+ * {@code '9'}, represents the octet whose value is that of
+ * {@code C} (again using ISO-LATIN-1 encoding); this is particularly
+ * useful for escaping {@code '.'} or backslash itself.  Backslash is
  * otherwise not allowed in a domain name.  Note that escape characters
  * are interpreted when a name is parsed.  So, for example, the character
- * sequences `<tt>S</tt>', `<tt>\S</tt>', and `<tt>\083</tt>' each
- * represent the same one-octet name.  The <tt>toString()</tt> method
+ * sequences `{@code S}', `{@code \S}', and `{@code \083}' each
+ * represent the same one-octet name.  The {@code toString()} method
  * does not generally insert escape sequences except where necessary.
- * If, however, the <tt>DnsName</tt> was constructed using unneeded
- * escapes, those escapes may appear in the <tt>toString</tt> result.
+ * If, however, the {@code DnsName} was constructed using unneeded
+ * escapes, those escapes may appear in the {@code toString} result.
  *
  * <p> Atomic names passed as parameters to methods of
- * <tt>DnsName</tt>, and those returned by them, are unescaped.  So,
- * for example, <tt>(new&nbsp;DnsName()).add("a.b")</tt> creates an
- * object representing the one-label domain name <tt>a\.b</tt>, and
- * calling <tt>get(0)</tt> on this object returns <tt>"a.b"</tt>.
+ * {@code DnsName}, and those returned by them, are unescaped.  So,
+ * for example, <code>(new&nbsp;DnsName()).add("a.b")</code> creates an
+ * object representing the one-label domain name {@code a\.b}, and
+ * calling {@code get(0)} on this object returns {@code "a.b"}.
  *
  * <p> While DNS names are case-preserving, comparisons between them
  * are case-insensitive.  When comparing names containing non-ASCII
- * octets, <tt>DnsName</tt> uses case-insensitive comparison
+ * octets, {@code DnsName} uses case-insensitive comparison
  * between pairs of ASCII values, and exact binary comparison
  * otherwise.
 
- * <p> A <tt>DnsName</tt> instance is not synchronized against
+ * <p> A {@code DnsName} instance is not synchronized against
  * concurrent access by multiple threads.
  *
  * @author Scott Seligman
@@ -119,16 +119,16 @@ public final class DnsName implements Name {
 
 
     /**
-     * Constructs a <tt>DnsName</tt> representing the empty domain name.
+     * Constructs a {@code DnsName} representing the empty domain name.
      */
     public DnsName() {
     }
 
     /**
-     * Constructs a <tt>DnsName</tt> representing a given domain name.
+     * Constructs a {@code DnsName} representing a given domain name.
      *
      * @param   name    the domain name to parse
-     * @throws InvalidNameException if <tt>name</tt> does not conform
+     * @throws InvalidNameException if {@code name} does not conform
      *          to DNS syntax.
      */
     public DnsName(String name) throws InvalidNameException {
diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/NameNode.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/NameNode.java
index 07cdde53ee4..95c3b521259 100644
--- a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/NameNode.java
+++ b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/NameNode.java
@@ -38,7 +38,7 @@ import java.util.Hashtable;
  * <p> A node may be addressed from another by giving a DnsName
  * consisting of the sequence of labels from one node to the other.
  *
- * <p> Each node also has an <tt>isZoneCut</tt> flag, used to indicate
+ * <p> Each node also has an {@code isZoneCut} flag, used to indicate
  * if the node is a zone cut.  A zone cut is a node with an NS record
  * that is contained in one zone, but that actually belongs to a child zone.
  *
@@ -115,7 +115,7 @@ class NameNode {
     /*
      * Returns the node at the end of a path, or null if the
      * node does not exist.
-     * The path is specified by the labels of <tt>name</tt>, beginning
+     * The path is specified by the labels of {@code name}, beginning
      * at index idx.
      */
     NameNode get(DnsName name, int idx) {
@@ -129,7 +129,7 @@ class NameNode {
     /*
      * Returns the node at the end of a path, creating it and any
      * intermediate nodes as needed.
-     * The path is specified by the labels of <tt>name</tt>, beginning
+     * The path is specified by the labels of {@code name}, beginning
      * at index idx.
      */
     NameNode add(DnsName name, int idx) {
diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Resolver.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Resolver.java
index ec4e0b9ca42..a02825f646f 100644
--- a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Resolver.java
+++ b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Resolver.java
@@ -160,7 +160,7 @@ class Resolver {
     }
 
     /*
-     * Finds the name servers of a zone.  <tt>zone</tt> is a fully-qualified
+     * Finds the name servers of a zone.  {@code zone} is a fully-qualified
      * domain name at the top of a zone.
      * If recursion is true, recursion is requested on the query.
      */
diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ZoneNode.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ZoneNode.java
index f676d553ff1..352f15df916 100644
--- a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ZoneNode.java
+++ b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ZoneNode.java
@@ -154,7 +154,7 @@ class ZoneNode extends NameNode {
     }
 
     /*
-     * Set this zone's data to expire in <tt>secsToExpiration</tt> seconds.
+     * Set this zone's data to expire in {@code secsToExpiration} seconds.
      */
     private void setExpiration(long secsToExpiration) {
         expiration = new Date(System.currentTimeMillis() +
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 10be3c68111..67724532e40 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -353,6 +353,10 @@ com/sun/jdi/GetLocalVariables4Test.sh				windows-all
 # 8062512
 java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java generic-all
 
+# 8029453
+java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java linux-all
+
+
 ############################################################################
 
 # jdk_instrument
diff --git a/jdk/test/java/lang/ProcessHandle/InfoTest.java b/jdk/test/java/lang/ProcessHandle/InfoTest.java
index 5efc99062d3..3a6f39ac1d4 100644
--- a/jdk/test/java/lang/ProcessHandle/InfoTest.java
+++ b/jdk/test/java/lang/ProcessHandle/InfoTest.java
@@ -136,7 +136,17 @@ public class InfoTest {
                         }
                     }
 
-
+                    if (Platform.isAix()) {
+                        // Unfortunately, on AIX the usr/sys times reported through
+                        // /proc/<pid>/psinfo which are used by ProcessHandle.Info
+                        // are running slow compared to the corresponding times reported
+                        // by the times()/getrusage() system calls which are used by
+                        // OperatingSystemMXBean.getProcessCpuTime() and returned by
+                        // the JavaChild for the "cputime" command.
+                        // This is because /proc/<pid>/status is only updated once a second.
+                        // So we better wait a little bit to get plausible values here.
+                        Thread.sleep(1000);
+                    }
                     ProcessHandle.Info info = p1.info();
                     System.out.printf(" info: %s%n", info);
 
@@ -160,19 +170,10 @@ public class InfoTest {
                     if (info.arguments().isPresent()) {
                         String[] args = info.arguments().get();
 
-                        if (Platform.isLinux() || Platform.isOSX()) {
-                            int offset = args.length - extraArgs.length;
-                            for (int i = 0; i < extraArgs.length; i++) {
-                                Assert.assertEquals(args[offset + i], extraArgs[i],
-                                        "Actual argument mismatch, index: " + i);
-                            }
-                        } else if (Platform.isSolaris()) {
-                            Assert.assertEquals(args.length, 1,
-                                    "Expected argument list length: 1");
-                            Assert.assertNotNull(args[0],
-                                    "Expected an argument");
-                        } else {
-                            System.out.printf("No argument test for OS: %s%n", Platform.getOsName());
+                        int offset = args.length - extraArgs.length;
+                        for (int i = 0; i < extraArgs.length; i++) {
+                            Assert.assertEquals(args[offset + i], extraArgs[i],
+                                                "Actual argument mismatch, index: " + i);
                         }
 
                         // Now check that the first argument is not the same as the executed command
@@ -183,6 +184,46 @@ public class InfoTest {
                         }
                     }
 
+                    if (command.isPresent() && info.arguments().isPresent()) {
+                        // If both, 'command' and 'arguments' are present,
+                        // 'commandLine' is just the concatenation of the two.
+                        Assert.assertTrue(info.commandLine().isPresent(),
+                                          "commandLine() must be available");
+
+                        String javaExe = System.getProperty("test.jdk") +
+                                File.separator + "bin" + File.separator + "java";
+                        String expected = Platform.isWindows() ? javaExe + ".exe" : javaExe;
+                        Path expectedPath = Paths.get(expected);
+                        String commandLine = info.commandLine().get();
+                        String commandLineCmd = commandLine.split(" ")[0];
+                        Path commandLineCmdPath = Paths.get(commandLineCmd);
+                        Assert.assertTrue(Files.isSameFile(commandLineCmdPath, expectedPath),
+                                          "commandLine() should start with: " + expectedPath +
+                                          " but starts with " + commandLineCmdPath);
+
+                        List<String> allArgs = p1.getArgs();
+                        for (int i = 0; i < allArgs.size(); i++) {
+                            Assert.assertTrue(commandLine.contains(allArgs.get(i)),
+                                              "commandLine() must contain argument: " + allArgs.get(i));
+                        }
+                    } else if (info.commandLine().isPresent()) {
+                        // If we only have the commandLine() we can only do some basic checks...
+                        String commandLine = info.commandLine().get();
+                        String javaExe = "java" + (Platform.isWindows() ? ".exe": "");
+                        int pos = commandLine.indexOf(javaExe);
+                        Assert.assertTrue(pos > 0, "commandLine() should at least contain 'java'");
+
+                        pos += javaExe.length() + 1; // +1 for the space after the command
+                        List<String> allArgs = p1.getArgs();
+                        // First argument is the command - skip it here as we've already checked that.
+                        for (int i = 1; (i < allArgs.size()) &&
+                                        (pos + allArgs.get(i).length() < commandLine.length()); i++) {
+                            Assert.assertTrue(commandLine.contains(allArgs.get(i)),
+                                              "commandLine() must contain argument: " + allArgs.get(i));
+                            pos += allArgs.get(i).length() + 1;
+                        }
+                    }
+
                     if (info.totalCpuDuration().isPresent()) {
                         Duration totalCPU = info.totalCpuDuration().get();
                         Duration epsilon = Duration.ofMillis(200L);
@@ -269,10 +310,27 @@ public class InfoTest {
     public static void test4() {
         Duration myCputime1 = ProcessUtil.MXBeanCpuTime();
 
+        if (Platform.isAix()) {
+            // Unfortunately, on AIX the usr/sys times reported through
+            // /proc/<pid>/psinfo which are used by ProcessHandle.Info
+            // are running slow compared to the corresponding times reported
+            // by the times()/getrusage() system calls which are used by
+            // OperatingSystemMXBean.getProcessCpuTime() and returned by
+            // the JavaChild for the "cputime" command.
+            // So we better wait a little bit to get plausible values here.
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ex) {}
+        }
         Optional<Duration> dur1 = ProcessHandle.current().info().totalCpuDuration();
 
         Duration myCputime2 = ProcessUtil.MXBeanCpuTime();
 
+        if (Platform.isAix()) {
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ex) {}
+        }
         Optional<Duration> dur2 = ProcessHandle.current().info().totalCpuDuration();
 
         if (dur1.isPresent() && dur2.isPresent()) {
diff --git a/jdk/test/java/lang/ProcessHandle/JavaChild.java b/jdk/test/java/lang/ProcessHandle/JavaChild.java
index 9d4a6e1f2f2..b476bf0a567 100644
--- a/jdk/test/java/lang/ProcessHandle/JavaChild.java
+++ b/jdk/test/java/lang/ProcessHandle/JavaChild.java
@@ -68,8 +68,9 @@ private static volatile int commandSeq = 0;         // Command sequence number
      * {@link #forEachOutputLine} can be used to process output from the child
      * @param delegate the process to delegate and send commands to and get responses from
      */
-    private JavaChild(Process delegate) {
-        this.delegate = delegate;
+    private JavaChild(ProcessBuilder pb) throws IOException {
+        allArgs = pb.command();
+        delegate = pb.start();
         // Initialize PrintWriter with autoflush (on println)
         inputWriter = new PrintWriter(delegate.getOutputStream(), true);
         outputReader = new BufferedReader(new InputStreamReader(delegate.getInputStream()));
@@ -119,6 +120,10 @@ private static volatile int commandSeq = 0;         // Command sequence number
         return "delegate: " + delegate.toString();
     }
 
+    public List<String> getArgs() {
+        return allArgs;
+    }
+
     public CompletableFuture<JavaChild> onJavaChildExit() {
         return onExit().thenApply(ph -> this);
     }
@@ -187,7 +192,7 @@ private static volatile int commandSeq = 0;         // Command sequence number
         }
         ProcessBuilder pb = build(stringArgs);
         pb.redirectError(ProcessBuilder.Redirect.INHERIT);
-        return new JavaChild(pb.start());
+        return new JavaChild(pb);
     }
 
     /**
@@ -236,6 +241,9 @@ private static volatile int commandSeq = 0;         // Command sequence number
                     "-classpath", absolutifyPath(classpath),
                     "JavaChild");
 
+    // Will hold the complete list of arguments which was given to Processbuilder.command()
+    private List<String> allArgs;
+
     private static String absolutifyPath(String path) {
         StringBuilder sb = new StringBuilder();
         for (String file : path.split(File.pathSeparator)) {
diff --git a/jdk/test/java/lang/ProcessHandle/OnExitTest.java b/jdk/test/java/lang/ProcessHandle/OnExitTest.java
index 5de89a3a353..b86df47ea67 100644
--- a/jdk/test/java/lang/ProcessHandle/OnExitTest.java
+++ b/jdk/test/java/lang/ProcessHandle/OnExitTest.java
@@ -126,6 +126,11 @@ public class OnExitTest extends ProcessUtil {
             } while (processes.size() < expected &&
                     Instant.now().isBefore(endTimeout));
 
+            if (processes.size() < expected) {
+                printf("WARNING: not all children have been started. Can't complete test.%n");
+                printf("         You can try to increase the timeout or%n");
+                printf("         you can try to use a faster VM (i.e. not a debug version).%n");
+            }
             children = getAllChildren(procHandle);
 
             ConcurrentHashMap<ProcessHandle, CompletableFuture<ProcessHandle>> completions =
diff --git a/jdk/test/java/lang/invoke/ExplicitCastArgumentsTest.java b/jdk/test/java/lang/invoke/ExplicitCastArgumentsTest.java
index 045ec15599e..0bc335181ba 100644
--- a/jdk/test/java/lang/invoke/ExplicitCastArgumentsTest.java
+++ b/jdk/test/java/lang/invoke/ExplicitCastArgumentsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,79 +21,583 @@
  * questions.
  */
 
-package java.lang.invoke;
-
+import com.oracle.testlibrary.jsr292.Helper;
+import java.io.File;
+import java.io.Serializable;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.WrongMethodTypeException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
 import sun.invoke.util.Wrapper;
 
-/* @test
+/*
+ * @test
+ * @bug 8060483 8066746
+ * @key randomness
+ * @library /lib/testlibrary /lib/testlibrary/jsr292
  * @summary unit tests for MethodHandles.explicitCastArguments()
- *
- * @run main/bootclasspath java.lang.invoke.ExplicitCastArgumentsTest
+ * @run main ExplicitCastArgumentsTest
+ */
+
+/**
+ * Tests for MethodHandles.explicitCastArguments().
  */
 public class ExplicitCastArgumentsTest {
-    private static final boolean VERBOSE = Boolean.getBoolean("verbose");
+
+    private static final boolean VERBOSE = Helper.IS_VERBOSE;
     private static final Class<?> THIS_CLASS = ExplicitCastArgumentsTest.class;
+    private static final Random RNG = Helper.RNG;
+    private static final Map<Wrapper, Object> RANDOM_VALUES = new HashMap<>(9);
+
+    static {
+        RANDOM_VALUES.put(Wrapper.BOOLEAN, RNG.nextBoolean());
+        RANDOM_VALUES.put(Wrapper.BYTE, (byte) RNG.nextInt());
+        RANDOM_VALUES.put(Wrapper.SHORT, (short) RNG.nextInt());
+        RANDOM_VALUES.put(Wrapper.CHAR, (char) RNG.nextInt());
+        RANDOM_VALUES.put(Wrapper.INT, RNG.nextInt());
+        RANDOM_VALUES.put(Wrapper.LONG, RNG.nextLong());
+        RANDOM_VALUES.put(Wrapper.FLOAT, RNG.nextFloat());
+        RANDOM_VALUES.put(Wrapper.DOUBLE, RNG.nextDouble());
+        RANDOM_VALUES.put(Wrapper.OBJECT, new Object());
+    }
 
     public static void main(String[] args) throws Throwable {
         testVarargsCollector();
+        testNullRef2Prim();
         testRef2Prim();
+        testPrim2Ref();
+        testPrim2Prim();
+        testNonBCPRef2NonBCPRef();
+        testBCPRef2BCPRef();
+        testNonBCPRef2BCPRef();
+        testReturnAny2Void();
+        testReturnVoid2Any();
+        testMultipleArgs();
         System.out.println("TEST PASSED");
     }
 
-    public static String[] f(String... args) { return args; }
-
-    public static void testVarargsCollector() throws Throwable {
-        MethodType mt = MethodType.methodType(String[].class, String[].class);
-        MethodHandle mh = MethodHandles.publicLookup().findStatic(THIS_CLASS, "f", mt);
-        mh = MethodHandles.explicitCastArguments(mh, MethodType.methodType(Object.class, Object.class));
-        mh.invokeWithArguments((Object)(new String[] {"str1", "str2"}));
+    /**
+     * Dummy method used in {@link #testVarargsCollector} test to form a method
+     * handle.
+     *
+     * @param args - any args
+     * @return - returns args
+     */
+    public static String[] f(String... args) {
+        return args;
     }
 
-    public static void testRef2Prim() throws Throwable {
+    /**
+     * Tests that MHs.explicitCastArguments does incorrect type checks for
+     * VarargsCollector. Bug 8066746.
+     *
+     * @throws java.lang.Throwable
+     */
+    public static void testVarargsCollector() throws Throwable {
+        MethodType mt = MethodType.methodType(String[].class, String[].class);
+        MethodHandle mh = MethodHandles.publicLookup()
+                .findStatic(THIS_CLASS, "f", mt);
+        mh = MethodHandles.explicitCastArguments(mh,
+                MethodType.methodType(Object.class, Object.class));
+        mh.invokeWithArguments((Object) (new String[]{"str1", "str2"}));
+    }
+
+    /**
+     * Tests that null wrapper reference is successfully converted to primitive
+     * types. Converted result should be zero for a primitive. Bug 8060483.
+     */
+    public static void testNullRef2Prim() {
         for (Wrapper from : Wrapper.values()) {
             for (Wrapper to : Wrapper.values()) {
-                if (from == Wrapper.VOID || to == Wrapper.VOID) continue;
-                testRef2Prim(from, to);
+                if (from == Wrapper.VOID || to == Wrapper.VOID) {
+                    continue;
+                }
+                // MHs.eCA javadoc:
+                //    If T0 is a reference and T1 a primitive, and if the reference
+                //    is null at runtime, a zero value is introduced.
+                for (TestConversionMode mode : TestConversionMode.values()) {
+                    testConversion(mode, from.wrapperType(),
+                            to.primitiveType(), null, to.zero(), false, null);
+                }
             }
         }
     }
 
-    public static void testRef2Prim(Wrapper from, Wrapper to) throws Throwable {
-        // MHs.eCA javadoc:
-        //    If T0 is a reference and T1 a primitive, and if the reference is null at runtime, a zero value is introduced.
-        test(from.wrapperType(), to.primitiveType(), null, false);
+    /**
+     * Tests that non-null wrapper reference is successfully converted to
+     * primitive types.
+     */
+    public static void testRef2Prim() {
+        for (Wrapper from : Wrapper.values()) {
+            for (Wrapper to : Wrapper.values()) {
+                if (from == Wrapper.VOID || to == Wrapper.VOID
+                        || to == Wrapper.OBJECT) {
+                    continue;
+                }
+                Object value = RANDOM_VALUES.get(from);
+                for (TestConversionMode mode : TestConversionMode.values()) {
+                    if (from != Wrapper.OBJECT) {
+                        Object convValue = to.wrap(value);
+                        testConversion(mode, from.wrapperType(),
+                                to.primitiveType(), value, convValue, false, null);
+                    } else {
+                        testConversion(mode, from.wrapperType(),
+                                to.primitiveType(), value, null,
+                                true, ClassCastException.class);
+                    }
+                }
+            }
+        }
     }
 
-    public static void test(Class<?> from, Class<?> to, Object param, boolean failureExpected) throws Throwable {
-        if (VERBOSE) System.out.printf("%-10s => %-10s: %5s: ", from.getSimpleName(), to.getSimpleName(), param);
+    /**
+     * Tests that primitive is successfully converted to wrapper reference
+     * types, to the Number type (if possible) and to the Object type.
+     */
+    public static void testPrim2Ref() {
+        for (Wrapper from : Wrapper.values()) {
+            for (Wrapper to : Wrapper.values()) {
+                if (from == Wrapper.VOID || from == Wrapper.OBJECT
+                        || to == Wrapper.VOID || to == Wrapper.OBJECT) {
+                    continue;
+                }
+                Object value = RANDOM_VALUES.get(from);
+                for (TestConversionMode mode : TestConversionMode.values()) {
+                    if (from == to) {
+                        testConversion(mode, from.primitiveType(),
+                                to.wrapperType(), value, value, false, null);
+                    } else {
+                        testConversion(mode, from.primitiveType(),
+                                to.wrapperType(), value, null, true, ClassCastException.class);
+                    }
+                    if (from != Wrapper.BOOLEAN && from != Wrapper.CHAR) {
+                        testConversion(mode, from.primitiveType(),
+                                Number.class, value, value, false, null);
+                    } else {
+                        testConversion(mode, from.primitiveType(),
+                                Number.class, value, null,
+                                true, ClassCastException.class);
+                    }
+                    testConversion(mode, from.primitiveType(),
+                            Object.class, value, value, false, null);
+                }
+            }
+        }
+    }
 
-        MethodHandle original = MethodHandles.identity(from);
-        MethodType newType = original.type().changeReturnType(to);
+    /**
+     * Tests that primitive is successfully converted to other primitive type.
+     */
+    public static void testPrim2Prim() {
+        for (Wrapper from : Wrapper.values()) {
+            for (Wrapper to : Wrapper.values()) {
+                if (from == Wrapper.VOID || to == Wrapper.VOID
+                        || from == Wrapper.OBJECT || to == Wrapper.OBJECT) {
+                    continue;
+                }
+                Object value = RANDOM_VALUES.get(from);
+                Object convValue = to.wrap(value);
+                for (TestConversionMode mode : TestConversionMode.values()) {
+                    testConversion(mode, from.primitiveType(),
+                            to.primitiveType(), value, convValue, false, null);
+                }
+            }
+        }
+    }
 
+    /**
+     * Dummy interface for {@link #testNonBCPRef2Ref} test.
+     */
+    public static interface TestInterface {}
+
+    /**
+     * Dummy class for {@link #testNonBCPRef2Ref} test.
+     */
+    public static class TestSuperClass implements TestInterface {}
+
+    /**
+     * Dummy class for {@link #testNonBCPRef2Ref} test.
+     */
+    public static class TestSubClass1 extends TestSuperClass {}
+
+    /**
+     * Dummy class for {@link #testNonBCPRef2Ref} test.
+     */
+    public static class TestSubClass2 extends TestSuperClass {}
+
+    /**
+     * Tests non-bootclasspath reference to reference conversions.
+     *
+     * @throws java.lang.Throwable
+     */
+    public static void testNonBCPRef2NonBCPRef() throws Throwable {
+        Class testInterface = TestInterface.class;
+        Class testSuperClass = TestSuperClass.class;
+        Class testSubClass1 = TestSubClass1.class;
+        Class testSubClass2 = TestSubClass2.class;
+        Object testSuperObj = new TestSuperClass();
+        Object testObj01 = new TestSubClass1();
+        Object testObj02 = new TestSubClass2();
+        Class[] parents = {testInterface, testSuperClass};
+        Class[] children = {testSubClass1, testSubClass2};
+        Object[] childInst = {testObj01, testObj02};
+        for (TestConversionMode mode : TestConversionMode.values()) {
+            for (Class parent : parents) {
+                for (int j = 0; j < children.length; j++) {
+                    // Child type to parent type non-null conversion, shoud succeed
+                    testConversion(mode, children[j], parent, childInst[j], childInst[j], false, null);
+                    // Child type to parent type null conversion, shoud succeed
+                    testConversion(mode, children[j], parent, null, null, false, null);
+                    // Parent type to child type non-null conversion with parent
+                    // type instance, should fail
+                    testConversion(mode, parent, children[j], testSuperObj, null, true, ClassCastException.class);
+                    // Parent type to child type non-null conversion with child
+                    // type instance, should succeed
+                    testConversion(mode, parent, children[j], childInst[j], childInst[j], false, null);
+                    // Parent type to child type null conversion, should succeed
+                    testConversion(mode, parent, children[j], null, null, false, null);
+                }
+                // Parent type to child type non-null conversion with sibling
+                // type instance, should fail
+                testConversion(mode, parent, testSubClass1, testObj02, null, true, ClassCastException.class);
+            }
+            // Sibling type non-null conversion, should fail
+            testConversion(mode, testSubClass1,
+                    testSubClass2, testObj01, null, true,
+                    ClassCastException.class);
+            // Sibling type null conversion, should succeed
+            testConversion(mode, testSubClass1,
+                    testSubClass2, null, null, false, null);
+        }
+    }
+
+    /**
+     * Dummy interface for {@link #testNonBCPRef2BCPRef} test.
+     */
+    public static interface TestSerializableInterface extends Serializable {}
+
+    /**
+     * Dummy class for {@link #testNonBCPRef2BCPRef} test.
+     */
+    public static class TestSerializableClass
+            implements TestSerializableInterface {}
+
+    /**
+     * Dummy class for {@link #testNonBCPRef2BCPRef} test.
+     */
+    public static class TestFileChildClass extends File
+            implements TestSerializableInterface {
+        public TestFileChildClass(String pathname) {
+            super(pathname);
+        }
+    }
+
+    /**
+     * Tests non-bootclasspath reference to bootclasspath reference conversions
+     * and vice-versa.
+     *
+     * @throws java.lang.Throwable
+     */
+    public static void testNonBCPRef2BCPRef() throws Throwable {
+        Class bcpInterface = Serializable.class;
+        Class bcpSuperClass = File.class;
+        Class nonBcpInterface = TestSerializableInterface.class;
+        Class nonBcpSuperSiblingClass = TestSerializableClass.class;
+        Class nonBcpSubClass = TestFileChildClass.class;
+        Object bcpSuperObj = new File(".");
+        Object testSuperSiblingObj = new TestSerializableClass();
+        Object testSubObj = new TestFileChildClass(".");
+        Class[] parents = {bcpInterface, bcpSuperClass};
+        for (TestConversionMode mode : TestConversionMode.values()) {
+            for (Class parent : parents) {
+                // Child type to parent type non-null conversion, shoud succeed
+                testConversion(mode, nonBcpSubClass, parent, testSubObj,
+                        testSubObj, false, null);
+                // Child type to parent type null conversion, shoud succeed
+                testConversion(mode, nonBcpSubClass, parent, null, null,
+                        false, null);
+                // Parent type to child type non-null conversion with parent
+                // type instance, should fail
+                testConversion(mode, parent, nonBcpSubClass, bcpSuperObj, null,
+                        true, ClassCastException.class);
+                // Parent type to child type non-null conversion with child
+                // type instance, should succeed
+                testConversion(mode, parent, nonBcpSubClass, testSubObj,
+                        testSubObj, false, null);
+                // Parent type to child type null conversion, should succeed
+                testConversion(mode, parent, nonBcpSubClass, null, null,
+                        false, null);
+            }
+            // Parent type to child type non-null conversion with
+            // super sibling type instance, should fail
+            testConversion(mode, bcpInterface, nonBcpSubClass,
+                    testSuperSiblingObj, null, true, ClassCastException.class);
+            Class[] siblings = {nonBcpSubClass, bcpSuperClass};
+            for (Class sibling : siblings) {
+                // Non-bcp class to bcp/non-bcp sibling class non-null
+                // conversion with nonBcpSuperSiblingClass instance, should fail
+                testConversion(mode, nonBcpSuperSiblingClass, sibling,
+                        testSuperSiblingObj, null, true, ClassCastException.class);
+                // Non-bcp class to bcp/non-bcp sibling class null conversion,
+                // should succeed
+                testConversion(mode, nonBcpSuperSiblingClass, sibling,
+                        null, null, false, null);
+                // Non-bcp interface to bcp/non-bcp sibling class non-null
+                // conversion with nonBcpSubClass instance, should succeed
+                testConversion(mode, nonBcpInterface, sibling, testSubObj,
+                        testSubObj, false, null);
+                // Non-bcp interface to bcp/non-bcp sibling class
+                // null conversion, should succeed
+                testConversion(mode, nonBcpInterface, sibling, null, null,
+                        false, null);
+                // Non-bcp interface to bcp/non-bcp sibling class non-null
+                // conversion with nonBcpSuperSiblingClass instance, should fail
+                testConversion(mode, nonBcpInterface, sibling,
+                        testSuperSiblingObj, testSubObj,
+                        true, ClassCastException.class);
+            }
+        }
+    }
+
+    /**
+     * Tests bootclasspath reference to reference conversions.
+     */
+    public static void testBCPRef2BCPRef() {
+        Class bcpInterface = CharSequence.class;
+        Class bcpSubClass1 = String.class;
+        Class bcpSubClass2 = StringBuffer.class;
+        Object testObj01 = new String("test");
+        Object testObj02 = new StringBuffer("test");
+        Class[] children = {bcpSubClass1, bcpSubClass2};
+        Object[] childInst = {testObj01, testObj02};
+        for (TestConversionMode mode : TestConversionMode.values()) {
+            for (int i = 0; i < children.length; i++) {
+                // Child type to parent type non-null conversion, shoud succeed
+                testConversion(mode, children[i], bcpInterface, childInst[i],
+                        childInst[i], false, null);
+                // Child type to parent type null conversion, shoud succeed
+                testConversion(mode, children[i], bcpInterface, null,
+                        null, false, null);
+                // Parent type to child type non-null conversion with child
+                // type instance, should succeed
+                testConversion(mode, bcpInterface,
+                        children[i], childInst[i], childInst[i], false, null);
+                // Parent type to child type null conversion, should succeed
+                testConversion(mode, bcpInterface,
+                        children[i], null, null, false, null);
+            }
+            // Sibling type non-null conversion, should fail
+            testConversion(mode, bcpSubClass1,
+                    bcpSubClass2, testObj01, null, true,
+                    ClassCastException.class);
+            // Sibling type null conversion, should succeed
+            testConversion(mode, bcpSubClass1,
+                    bcpSubClass2, null, null, false, null);
+            // Parent type to child type non-null conversion with sibling
+            // type instance, should fail
+            testConversion(mode, bcpInterface, bcpSubClass1, testObj02,
+                    null, true, ClassCastException.class);
+        }
+    }
+
+    /**
+     * Dummy method used in {@link #testReturnAny2Void} and
+     * {@link #testReturnVoid2Any} tests to form a method handle.
+     */
+    public static void retVoid() {}
+
+    /**
+     * Tests that non-null any return is successfully converted to non-type
+     * void.
+     */
+    public static void testReturnAny2Void() {
+        for (Wrapper from : Wrapper.values()) {
+            testConversion(TestConversionMode.RETURN_VALUE, from.wrapperType(),
+                    void.class, RANDOM_VALUES.get(from),
+                    null, false, null);
+            testConversion(TestConversionMode.RETURN_VALUE, from.primitiveType(),
+                    void.class, RANDOM_VALUES.get(from),
+                    null, false, null);
+        }
+    }
+
+    /**
+     * Tests that void return is successfully converted to primitive and
+     * reference. Result should be zero for primitives and null for references.
+     */
+    public static void testReturnVoid2Any() {
+        for (Wrapper to : Wrapper.values()) {
+            testConversion(TestConversionMode.RETURN_VALUE, void.class,
+                    to.primitiveType(), null,
+                    to.zero(), false, null);
+            testConversion(TestConversionMode.RETURN_VALUE, void.class,
+                    to.wrapperType(), null,
+                    null, false, null);
+        }
+    }
+
+    private static void checkForWrongMethodTypeException(MethodHandle mh, MethodType mt) {
         try {
-            MethodHandle target = MethodHandles.explicitCastArguments(original, newType);
-            Object result = target.invokeWithArguments(param);
+            MethodHandles.explicitCastArguments(mh, mt);
+            throw new AssertionError("Expected WrongMethodTypeException is not thrown");
+        } catch (WrongMethodTypeException wmte) {
+            if (VERBOSE) {
+                System.out.printf("Expected exception %s: %s\n",
+                        wmte.getClass(), wmte.getMessage());
+            }
+        }
+    }
 
+    /**
+     * Tests that MHs.eCA method works correctly with MHs with multiple arguments.
+     * @throws Throwable
+     */
+    public static void testMultipleArgs() throws Throwable {
+        int arity = 1 + RNG.nextInt(Helper.MAX_ARITY / 2 - 2);
+        int arityMinus = RNG.nextInt(arity);
+        int arityPlus = arity + RNG.nextInt(Helper.MAX_ARITY / 2 - arity) + 1;
+        MethodType mType = Helper.randomMethodTypeGenerator(arity);
+        MethodType mTypeNew = Helper.randomMethodTypeGenerator(arity);
+        MethodType mTypeNewMinus = Helper.randomMethodTypeGenerator(arityMinus);
+        MethodType mTypeNewPlus = Helper.randomMethodTypeGenerator(arityPlus);
+        Class<?> rType = mType.returnType();
+        MethodHandle original;
+        if (rType.equals(void.class)) {
+            MethodType mt = MethodType.methodType(void.class);
+            original = MethodHandles.publicLookup()
+                    .findStatic(THIS_CLASS, "retVoid", mt);
+        } else {
+            Object rValue = Helper.castToWrapper(1, rType);
+            original = MethodHandles.constant(rType, rValue);
+        }
+        original = Helper.addTrailingArgs(original, arity, mType.parameterList());
+        MethodHandle target = MethodHandles
+                    .explicitCastArguments(original, mTypeNew);
+        Object[] parList = Helper.randomArgs(mTypeNew.parameterList());
+        for (int i = 0; i < parList.length; i++) {
+            if (parList[i] instanceof String) {
+                parList[i] = null; //getting rid of Stings produced by randomArgs
+            }
+        }
+        target.invokeWithArguments(parList);
+        checkForWrongMethodTypeException(original, mTypeNewMinus);
+        checkForWrongMethodTypeException(original, mTypeNewPlus);
+    }
+
+    /**
+     * Enumeration of test conversion modes.
+     */
+    public enum TestConversionMode {
+        RETURN_VALUE,
+        ARGUMENT;
+    }
+
+    /**
+     * Tests type and value conversion. Comparing with the given expected result.
+     *
+     * @param mode - test conversion mode. See {@link #TestConversionMode}.
+     * @param from - source type.
+     * @param to - destination type.
+     * @param param - value to be converted.
+     * @param expectedResult - expected value after conversion.
+     * @param failureExpected - true if conversion failure expected.
+     * @param expectedException - expected exception class if
+     * {@code failureExpected} is true.
+     */
+    public static void testConversion(TestConversionMode mode,
+            Class<?> from, Class<?> to, Object param,
+            Object expectedResult, boolean failureExpected,
+            Class<? extends Throwable> expectedException) {
+        if (VERBOSE) {
+            System.out.printf("Testing return value conversion: "
+                    + "%-10s => %-10s: %5s: ", from.getSimpleName(),
+                    to.getSimpleName(), param);
+        }
+        MethodHandle original = null;
+        MethodType newType = null;
+        switch (mode) {
+            case RETURN_VALUE:
+                if (from.equals(void.class)) {
+                    MethodType mt = MethodType.methodType(void.class);
+                    try {
+                        original = MethodHandles.publicLookup()
+                                .findStatic(THIS_CLASS, "retVoid", mt);
+                    } catch (NoSuchMethodException | IllegalAccessException ex) {
+                        throw new Error("Unexpected issue", ex);
+                    }
+                } else {
+                    original = MethodHandles.constant(from, param);
+                }
+                newType = original.type().changeReturnType(to);
+                break;
+            case ARGUMENT:
+                if (from.equals(void.class) || to.equals(void.class)) {
+                    throw new Error("Test issue: argument conversion does not"
+                            + " work with non-type void");
+                }
+                original = MethodHandles.identity(to);
+                newType = original.type().changeParameterType(0, from);
+                break;
+            default:
+                String msg = String.format("Test issue: unknown test"
+                        + " convertion mode %s.", mode.name());
+                throw new Error(msg);
+        }
+        try {
+            MethodHandle target = MethodHandles
+                    .explicitCastArguments(original, newType);
+            Object result;
+            switch (mode) {
+                case RETURN_VALUE:
+                    result = target.invokeWithArguments();
+                    break;
+                case ARGUMENT:
+                    result = target.invokeWithArguments(param);
+                    break;
+                default:
+                    String msg = String.format("Test issue: unknown test"
+                            + " convertion mode %s.", mode.name());
+                    throw new Error(msg);
+            }
+            if (!failureExpected
+                    && (expectedResult != null && !expectedResult.equals(result)
+                    || expectedResult == null && result != null)) {
+                String msg = String.format("Conversion result %s is not equal"
+                        + " to the expected result %10s",
+                        result, expectedResult);
+                throw new AssertionError(msg);
+            }
             if (VERBOSE) {
                 String resultStr;
                 if (result != null) {
-                    resultStr = String.format("%10s (%10s)", "'"+result+"'", result.getClass().getSimpleName());
+                    resultStr = String.format("Converted value and type are"
+                            + " %10s (%10s)", "'" + result + "'",
+                            result.getClass().getSimpleName());
                 } else {
-                    resultStr = String.format("%10s", result);
+                    resultStr = String.format("Converted value is %10s", result);
                 }
                 System.out.println(resultStr);
             }
-
             if (failureExpected) {
-                String msg = String.format("No exception thrown: %s => %s; parameter: %s", from, to, param);
+                String msg = String.format("No exception thrown while testing"
+                        + " return value conversion: %10s => %10s;"
+                        + " parameter: %10s",
+                        from, to, param);
                 throw new AssertionError(msg);
             }
         } catch (AssertionError e) {
             throw e; // report test failure
         } catch (Throwable e) {
-            if (VERBOSE) System.out.printf("%s: %s\n", e.getClass(), e.getMessage());
-            if (!failureExpected) {
-                String msg = String.format("Unexpected exception was thrown: %s => %s; parameter: %s", from, to, param);
+            if (VERBOSE) {
+                System.out.printf("%s: %s\n", e.getClass(), e.getMessage());
+            }
+            if (!failureExpected || !e.getClass().equals(expectedException)) {
+                String msg = String.format("Unexpected exception was thrown"
+                        + " while testing return value conversion:"
+                        + " %s => %s; parameter: %s", from, to, param);
                 throw new AssertionError(msg, e);
             }
         }
diff --git a/jdk/test/java/lang/invoke/LFCaching/TestMethods.java b/jdk/test/java/lang/invoke/LFCaching/TestMethods.java
index 875307387a4..fe63b252d5d 100644
--- a/jdk/test/java/lang/invoke/LFCaching/TestMethods.java
+++ b/jdk/test/java/lang/invoke/LFCaching/TestMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -207,7 +207,7 @@ public enum TestMethods {
                     return MethodHandles.filterReturnValue(target, filter);
                 }
             },
-    INSERT_ARGUMENTS("insertArguments") {
+    INSERT_ARGUMENTS("insertArguments", Helper.MAX_ARITY - 3) {
                 @Override
                 public Map<String, Object> getTestCaseData() {
                     Map<String, Object> data = new HashMap<>();
@@ -610,26 +610,7 @@ public enum TestMethods {
      * @return MethodType generated randomly.
      */
     private static MethodType randomMethodTypeGenerator(int arity) {
-        final Class<?>[] CLASSES = {
-            Object.class,
-            int.class,
-            boolean.class,
-            byte.class,
-            short.class,
-            char.class,
-            long.class,
-            float.class,
-            double.class
-        };
-        if (arity > Helper.MAX_ARITY) {
-            throw new IllegalArgumentException(
-                    String.format("Arity should not exceed %d!", Helper.MAX_ARITY));
-        }
-        List<Class<?>> list = Helper.randomClasses(CLASSES, arity);
-        list = Helper.getParams(list, false, arity);
-        int i = Helper.RNG.nextInt(CLASSES.length + 1);
-        Class<?> rtype = i == CLASSES.length ? void.class : CLASSES[i];
-        return MethodType.methodType(rtype, list);
+        return Helper.randomMethodTypeGenerator(arity);
     }
 
     /**
diff --git a/jdk/test/java/util/Formatter/NullArg.java b/jdk/test/java/util/Formatter/NullArg.java
new file mode 100644
index 00000000000..79b979e36fe
--- /dev/null
+++ b/jdk/test/java/util/Formatter/NullArg.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8039390
+ * @summary Basic test for null argument
+ */
+
+import java.util.Formatter;
+import java.util.Locale;
+
+public class NullArg {
+
+    public static void main(String [] args) {
+        char[] cs = new char[] {
+            'b', 'B', 'h', 'H', 's', 'S', 'c', 'C', 'd', 'o', 'x', 'X',
+            'e', 'E', 'f', 'g', 'G', 'a', 'A', 't', 'T',
+        };
+        char[] tcs = new char[] {
+            'H', 'I', 'k', 'l', 'l', 'M', 'S', 'L', 'N', 'p', 'z', 'Z', 's',
+            'Q', 'B', 'b', 'h', 'A', 'a', 'C', 'Y', 'y', 'j', 'm', 'd', 'e',
+            'R', 'T', 'r', 'D', 'F', 'c'
+        };
+        for (char c : cs) {
+            String expected = (c == 'b' || c == 'B') ? "false" : "null";
+            if (Character.isUpperCase(c)) {
+                expected = expected.toUpperCase(Locale.ROOT);
+            }
+            if (c == 't' || c == 'T') {
+                for (char ct : tcs) {
+                    if (!String.format("%" + c + ct, null).equals(expected)) {
+                        throw new RuntimeException("%t" + ct + "null check failed.");
+                    }
+                }
+            } else {
+                if (!String.format("%" + c , null).equals(expected)) {
+                    throw new RuntimeException("%" + c + "null check failed.");
+                }
+            }
+        }
+    }
+}
diff --git a/jdk/test/lib/testlibrary/jsr292/com/oracle/testlibrary/jsr292/Helper.java b/jdk/test/lib/testlibrary/jsr292/com/oracle/testlibrary/jsr292/Helper.java
index 3d720b3507c..1f82399434a 100644
--- a/jdk/test/lib/testlibrary/jsr292/com/oracle/testlibrary/jsr292/Helper.java
+++ b/jdk/test/lib/testlibrary/jsr292/com/oracle/testlibrary/jsr292/Helper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -315,4 +315,33 @@ public class Helper {
         }
         return null;
     }
+
+    /**
+     * Routine used to obtain a randomly generated method type.
+     *
+     * @param arity Arity of returned method type.
+     * @return MethodType generated randomly.
+     */
+    public static MethodType randomMethodTypeGenerator(int arity) {
+        final Class<?>[] CLASSES = {
+            Object.class,
+            int.class,
+            boolean.class,
+            byte.class,
+            short.class,
+            char.class,
+            long.class,
+            float.class,
+            double.class
+        };
+        if (arity > MAX_ARITY) {
+            throw new IllegalArgumentException(
+                    String.format("Arity should not exceed %d!", MAX_ARITY));
+        }
+        List<Class<?>> list = randomClasses(CLASSES, arity);
+        list = getParams(list, false, arity);
+        int i = RNG.nextInt(CLASSES.length + 1);
+        Class<?> rtype = i == CLASSES.length ? void.class : CLASSES[i];
+        return MethodType.methodType(rtype, list);
+    }
 }
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
index d6f6f158d1d..4bb2351d627 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION
+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2015e
+tzdata2015f
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/africa b/jdk/test/sun/util/calendar/zi/tzdata/africa
index 049861192cc..00150c68ef0 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/africa
+++ b/jdk/test/sun/util/calendar/zi/tzdata/africa
@@ -561,7 +561,7 @@ Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 
 # From Alex Krivenyshev (2008-07-11):
 # Seems that English language article "The revival of daylight saving
-# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally
+# time: Energy conservation?"- No. 16578 (07/11/2008) was originally
 # published on Monday, June 30, 2008...
 #
 # I guess that article in French "Le gouvernement avance l'introduction
@@ -693,7 +693,7 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
 # Here is a link to official document from Royaume du Maroc Premier Ministre,
 # Ministère de la Modernisation des Secteurs Publics
 #
-# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
+# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 June 1967)
 # concerning the amendment of the legal time, the Ministry of Modernization of
 # Public Sectors announced that the official time in the Kingdom will be
 # advanced 60 minutes from Sunday 31 May 2009 at midnight.
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia
index fa4f2461cbb..8a1f75fe7c0 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/asia
+++ b/jdk/test/sun/util/calendar/zi/tzdata/asia
@@ -29,7 +29,7 @@
 # tz@iana.org for general use in the future).  For more, please see
 # the file CONTRIBUTING in the tz distribution.
 
-# From Paul Eggert (2014-10-31):
+# From Paul Eggert (2015-08-08):
 #
 # Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -66,7 +66,7 @@
 #	2:00 EET  EEST	Eastern European Time
 #	2:00 IST  IDT	Israel
 #	3:00 AST  ADT	Arabia*
-#	3:30 IRST IRDT	Iran
+#	3:30 IRST IRDT	Iran*
 #	4:00 GST	Gulf*
 #	5:30 IST	India
 #	7:00 ICT	Indochina, most times and locations*
@@ -75,10 +75,11 @@
 #	8:00 CST	China
 #	8:00 IDT	Indochina, 1943-45, 1947-55, 1960-75 (some locations)*
 #	8:00 JWST	Western Standard Time (Japan, 1896/1937)*
+#	8:30 KST  KDT	Korea when at +0830*
 #	9:00 JCST	Central Standard Time (Japan, 1896/1937)
 #	9:00 WIT	east Indonesia (Waktu Indonesia Timur)
 #	9:00 JST  JDT	Japan
-#	9:00 KST  KDT	Korea
+#	9:00 KST  KDT	Korea when at +09
 #	9:30 ACST	Australian Central Standard Time
 #
 # See the 'europe' file for Russia and Turkey in Asia.
@@ -1050,7 +1051,7 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
 #
 # From Roozbeh Pournader (2007-11-05):
 # This is quoted from Official Gazette of the Islamic Republic of
-# Iran, Volume 63, Number 18242, dated Tuesday 1386/6/24
+# Iran, Volume 63, No. 18242, dated Tuesday 1386/6/24
 # [2007-10-16]. I am doing the best translation I can:...
 # The official time of the country will be moved forward for one hour
 # on the 24 hours of the first day of the month of Farvardin and will
@@ -1580,7 +1581,7 @@ Zone	Asia/Amman	2:23:44 -	LMT	1931
 # - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00.
 # - Oral switched from +5:00 to +4:00 in spring 1989.
 
-# From Kazakhstan Embassy's News Bulletin #11
+# From Kazakhstan Embassy's News Bulletin No. 11
 # <http://www.kazsociety.org.uk/news/2005/03/30.htm> (2005-03-21):
 # The Government of Kazakhstan passed a resolution March 15 abolishing
 # daylight saving time citing lack of economic benefits and health
@@ -1734,6 +1735,17 @@ Rule	ROK	1987	1988	-	Oct	Sun>=8	3:00	0	S
 #
 # For Pyongyang we have no information; guess no changes since World War II.
 
+# From Steffen Thorsen (2015-08-07):
+# According to many news sources, North Korea is going to change to
+# the 8:30 time zone on August 15, one example:
+# http://www.bbc.com/news/world-asia-33815049
+#
+# From Paul Eggert (2015-08-07):
+# No transition time is specified; assume 00:00.
+# There is no common English-language abbreviation for this time zone.
+# Use %z rather than invent one.  We can't assume %z works everywhere yet,
+# so for now substitute its output manually.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Seoul	8:27:52	-	LMT	1908 Apr  1
 			8:30	-	KST	1912 Jan  1
@@ -1746,7 +1758,8 @@ Zone	Asia/Pyongyang	8:23:00 -	LMT	1908 Apr  1
 			8:30	-	KST	1912 Jan  1
 			9:00	-	JCST	1937 Oct  1
 			9:00	-	JST	1945 Aug 24
-			9:00	-	KST
+			9:00	-	KST	2015 Aug 15
+			8:30	-	KST
 
 ###############################################################################
 
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe
index 7cee9a81527..b3a9854fc4f 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/europe
+++ b/jdk/test/sun/util/calendar/zi/tzdata/europe
@@ -216,11 +216,14 @@
 #	republished in Finest Hour (Spring 2002) 1(114):26
 #	http://www.winstonchurchill.org/images/finesthour/Vol.01%20No.114.pdf
 
-# From Paul Eggert (1996-09-03):
+# From Paul Eggert (2015-08-08):
 # The OED Supplement says that the English originally said "Daylight Saving"
 # when they were debating the adoption of DST in 1908; but by 1916 this
 # term appears only in quotes taken from DST's opponents, whereas the
 # proponents (who eventually won the argument) are quoted as using "Summer".
+# The term "Summer Time" was introduced by Herbert Samuel, Home Secretary; see:
+# Viscount Samuel. Leisure in a Democracy. Cambridge University Press
+# ISBN 978-1-107-49471-8 (1949, reissued 2015), p 8.
 
 # From Arthur David Olson (1989-01-19):
 # A source at the British Information Office in New York avers that it's
@@ -366,7 +369,7 @@
 
 # From an anonymous contributor (1996-06-02):
 # The law governing time in Ireland is under Statutory Instrument SI 395/94,
-# which gives force to European Union 7th Council Directive # 94/21/EC.
+# which gives force to European Union 7th Council Directive No. 94/21/EC.
 # Under this directive, the Minister for Justice in Ireland makes appropriate
 # regulations. I spoke this morning with the Secretary of the Department of
 # Justice (tel +353 1 678 9711) who confirmed to me that the correct name is
@@ -615,11 +618,11 @@ Rule	Russia	1921	only	-	Feb	14	23:00	1:00	MSD
 Rule	Russia	1921	only	-	Mar	20	23:00	2:00	MSM  # Midsummer
 Rule	Russia	1921	only	-	Sep	 1	 0:00	1:00	MSD
 Rule	Russia	1921	only	-	Oct	 1	 0:00	0	-
-# Act No.925 of the Council of Ministers of the USSR (1980-10-24):
+# Act No. 925 of the Council of Ministers of the USSR (1980-10-24):
 Rule	Russia	1981	1984	-	Apr	 1	 0:00	1:00	S
 Rule	Russia	1981	1983	-	Oct	 1	 0:00	0	-
-# Act No.967 of the Council of Ministers of the USSR (1984-09-13), repeated in
-# Act No.227 of the Council of Ministers of the USSR (1989-03-14):
+# Act No. 967 of the Council of Ministers of the USSR (1984-09-13), repeated in
+# Act No. 227 of the Council of Ministers of the USSR (1989-03-14):
 Rule	Russia	1984	1991	-	Sep	lastSun	 2:00s	0	-
 Rule	Russia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
 #
@@ -851,7 +854,7 @@ Zone	Europe/Brussels	0:17:30 -	LMT	1880
 # Bulgaria
 #
 # From Plamen Simenov via Steffen Thorsen (1999-09-09):
-# A document of Government of Bulgaria (No.94/1997) says:
+# A document of Government of Bulgaria (No. 94/1997) says:
 # EET -> EETDST is in 03:00 Local time in last Sunday of March ...
 # EETDST -> EET is in 04:00 Local time in last Sunday of October
 #
@@ -868,7 +871,7 @@ Zone	Europe/Sofia	1:33:16 -	LMT	1880
 			1:00	C-Eur	CE%sT	1945
 			1:00	-	CET	1945 Apr  2  3:00
 			2:00	-	EET	1979 Mar 31 23:00
-			2:00	Bulg	EE%sT	1982 Sep 26  2:00
+			2:00	Bulg	EE%sT	1982 Sep 26  3:00
 			2:00	C-Eur	EE%sT	1991
 			2:00	E-Eur	EE%sT	1997
 			2:00	EU	EE%sT
@@ -1085,8 +1088,8 @@ Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik air base
 # after that.
 
 # From Mart Oruaas (2000-01-29):
-# Regulation no. 301 (1999-10-12) obsoletes previous regulation
-# no. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
+# Regulation No. 301 (1999-10-12) obsoletes previous regulation
+# No. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
 # the year round.  The regulation is effective 1999-11-01.
 
 # From Toomas Soome (2002-02-21):
@@ -1107,7 +1110,7 @@ Zone	Europe/Tallinn	1:39:00	-	LMT	1880
 			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
 			2:00	1:00	EEST	1989 Sep 24  2:00s
 			2:00	C-Eur	EE%sT	1998 Sep 22
-			2:00	EU	EE%sT	1999 Nov  1
+			2:00	EU	EE%sT	1999 Oct 31  4:00
 			2:00	-	EET	2002 Feb 21
 			2:00	EU	EE%sT
 
@@ -1550,21 +1553,21 @@ Link	Europe/Rome	Europe/San_Marino
 # correct data in juridical acts and I found some juridical documents about
 # changes in the counting of time in Latvia from 1981....
 #
-# Act No.35 of the Council of Ministers of Latvian SSR of 1981-01-22 ...
-# according to the Act No.925 of the Council of Ministers of USSR of 1980-10-24
+# Act No. 35 of the Council of Ministers of Latvian SSR of 1981-01-22 ...
+# according to the Act No. 925 of the Council of Ministers of USSR of 1980-10-24
 # ...: all year round the time of 2nd time zone + 1 hour, in addition turning
 # the hands of the clock 1 hour forward on 1 April at 00:00 (GMT 31 March 21:00)
 # and 1 hour backward on the 1 October at 00:00 (GMT 30 September 20:00).
 #
-# Act No.592 of the Council of Ministers of Latvian SSR of 1984-09-24 ...
-# according to the Act No.967 of the Council of Ministers of USSR of 1984-09-13
+# Act No. 592 of the Council of Ministers of Latvian SSR of 1984-09-24 ...
+# according to the Act No. 967 of the Council of Ministers of USSR of 1984-09-13
 # ...: all year round the time of 2nd time zone + 1 hour, in addition turning
 # the hands of the clock 1 hour forward on the last Sunday of March at 02:00
 # (GMT 23:00 on the previous day) and 1 hour backward on the last Sunday of
 # September at 03:00 (GMT 23:00 on the previous day).
 #
-# Act No.81 of the Council of Ministers of Latvian SSR of 1989-03-22 ...
-# according to the Act No.227 of the Council of Ministers of USSR of 1989-03-14
+# Act No. 81 of the Council of Ministers of Latvian SSR of 1989-03-22 ...
+# according to the Act No. 227 of the Council of Ministers of USSR of 1989-03-14
 # ...: since the last Sunday of March 1989 in Lithuanian SSR, Latvian SSR,
 # Estonian SSR and Kaliningrad region of Russian Federation all year round the
 # time of 2nd time zone (Moscow time minus one hour). On the territory of Latvia
@@ -1581,7 +1584,7 @@ Link	Europe/Rome	Europe/San_Marino
 # From Andrei Ivanov (2000-03-06):
 # This year Latvia will not switch to Daylight Savings Time (as specified in
 # The Regulations of the Cabinet of Ministers of the Rep. of Latvia of
-# 29-Feb-2000 (#79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
+# 29-Feb-2000 (No. 79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
 # in Latvian for subscribers only).
 
 # From RFE/RL Newsline
@@ -1786,6 +1789,18 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2  0:00s # Valletta
 # News from Moldova (in russian):
 # http://ru.publika.md/link_317061.html
 
+# From Roman Tudos (2015-07-02):
+# http://lex.justice.md/index.php?action=view&view=doc&lang=1&id=355077
+# From Paul Eggert (2015-07-01):
+# The abovementioned official link to IGO1445-868/2014 states that
+# 2014-10-26's fallback transition occurred at 03:00 local time.  Also,
+# http://www.trm.md/en/social/la-30-martie-vom-trece-la-ora-de-vara
+# says the 2014-03-30 spring-forward transition was at 02:00 local time.
+# Guess that since 1997 Moldova has switched one hour before the EU.
+
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Moldova	1997	max	-	Mar	lastSun	 2:00	1:00	S
+Rule	Moldova	1997	max	-	Oct	lastSun	 3:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Chisinau	1:55:20 -	LMT	1880
@@ -1800,7 +1815,7 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
 			2:00	Russia	EE%sT	1992
 			2:00	E-Eur	EE%sT	1997
 # See Romania commentary for the guessed 1997 transition to EU rules.
-			2:00	EU	EE%sT
+			2:00	Moldova	EE%sT
 
 # Monaco
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
@@ -2146,7 +2161,7 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 # Russia
 
 # From Alexander Krivenyshev (2011-09-15):
-# Based on last Russian Government Decree # 725 on August 31, 2011
+# Based on last Russian Government Decree No. 725 on August 31, 2011
 # (Government document
 # http://www.government.ru/gov/results/16355/print/
 # in Russian)
@@ -2156,7 +2171,7 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 # http://www.worldtimezone.com/dst_news/dst_news_russia36.htm
 
 # From Sanjeev Gupta (2011-09-27):
-# Scans of [Decree #23 of January 8, 1992] are available at:
+# Scans of [Decree No. 23 of January 8, 1992] are available at:
 # http://government.consultant.ru/page.aspx?1223966
 # They are in Cyrillic letters (presumably Russian).
 
@@ -2167,19 +2182,19 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 # One source is
 # http://government.ru/gov/results/16355/
 # which, according to translate.google.com, begins "Decree of August 31,
-# 2011 No 725" and contains no other dates or "effective date" information.
+# 2011 No. 725" and contains no other dates or "effective date" information.
 #
 # Another source is
 # http://www.rg.ru/2011/09/06/chas-zona-dok.html
 # which, according to translate.google.com, begins "Resolution of the
 # Government of the Russian Federation on August 31, 2011 N 725" and also
 # contains "Date first official publication: September 6, 2011 Posted on:
-# in the 'RG' - Federal Issue number 5573 September 6, 2011" but which
+# in the 'RG' - Federal Issue No. 5573 September 6, 2011" but which
 # does not contain any "effective date" information.
 #
 # Another source is
 # http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7
-# which, in note 8, contains "Resolution #725 of August 31, 2011...
+# which, in note 8, contains "Resolution No. 725 of August 31, 2011...
 # Effective as of after 7 days following the day of the official publication"
 # but which does not contain any reference to September 6, 2011.
 #
@@ -2387,7 +2402,7 @@ Zone Europe/Simferopol	 2:16:24 -	LMT	1880
 # changed in May.
 			 2:00	E-Eur	EE%sT	1994 May
 # From IATA SSIM (1994/1997), which also says that Kerch is still like Kiev.
-			 3:00	E-Eur	MSK/MSD	1996 Mar 31  3:00s
+			 3:00	E-Eur	MSK/MSD	1996 Mar 31  0:00s
 			 3:00	1:00	MSD	1996 Oct 27  3:00s
 # IATA SSIM (1997-09) says Crimea switched to EET/EEST.
 # Assume it happened in March by not changing the clocks.
@@ -2522,7 +2537,7 @@ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
 # from current Russia Zone 6 - Krasnoyarsk Time Zone (KRA) UTC +0700
 # to Russia Zone 5 - Novosibirsk Time Zone (NOV) UTC +0600
 #
-# This is according to Government of Russia decree # 740, on September
+# This is according to Government of Russia decree No. 740, on September
 # 14, 2009 "Application in the territory of the Kemerovo region the Fifth
 # time zone." ("Russia Zone 5" or old "USSR Zone 5" is GMT +0600)
 #
@@ -2945,7 +2960,7 @@ Zone	Africa/Ceuta	-0:21:16 -	LMT	1901
 Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
 			-1:00	-	CANT	1946 Sep 30  1:00 # Canaries T
 			 0:00	-	WET	1980 Apr  6  0:00s
-			 0:00	1:00	WEST	1980 Sep 28  0:00s
+			 0:00	1:00	WEST	1980 Sep 28  1:00u
 			 0:00	EU	WE%sT
 # IATA SSIM (1996-09) says the Canaries switch at 2:00u, not 1:00u.
 # Ignore this for now, as the Canaries are part of the EU.
@@ -3235,7 +3250,7 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
 # From Igor Karpov, who works for the Ukrainian Ministry of Justice,
 # via Garrett Wollman (2003-01-27):
 # BTW, I've found the official document on this matter. It's government
-# regulations number 509, May 13, 1996. In my poor translation it says:
+# regulations No. 509, May 13, 1996. In my poor translation it says:
 # "Time in Ukraine is set to second timezone (Kiev time). Each last Sunday
 # of March at 3am the time is changing to 4am and each last Sunday of
 # October the time at 4am is changing to 3am"
@@ -3244,7 +3259,7 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
 # On September 20, 2011 the deputies of the Verkhovna Rada agreed to
 # abolish the transfer clock to winter time.
 #
-# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
+# Bill No. 8330 of MP from the Party of Regions Oleg Nadoshi got
 # approval from 266 deputies.
 #
 # Ukraine abolishes transfer back to the winter time (in Russian)
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/leapseconds b/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
index 9b0a2278433..de698eaa562 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
+++ b/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
@@ -79,5 +79,5 @@ Leap	2008	Dec	31	23:59:60	+	S
 Leap	2012	Jun	30	23:59:60	+	S
 Leap	2015	Jun	30	23:59:60	+	S
 
-#	Updated through IERS Bulletin C49
-#	File expires on:  28 December 2015
+#	Updated through IERS Bulletin C50
+#	File expires on:  28 June 2016
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/northamerica b/jdk/test/sun/util/calendar/zi/tzdata/northamerica
index 09b1b7fad9f..f8197462426 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/northamerica
+++ b/jdk/test/sun/util/calendar/zi/tzdata/northamerica
@@ -1258,10 +1258,19 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	1884 # Happy Valley-Goose Bay
 
 # west Labrador, Nova Scotia, Prince Edward I
 
-# From Paul Eggert (2006-03-22):
+# From Brian Inglis (2015-07-20):
+# From the historical weather station records available at:
+# https://weatherspark.com/history/28351/1971/Sydney-Nova-Scotia-Canada
+# Sydney shares the same time history as Glace Bay, so was
+# likely to be the same across the island....
+# Sydney, as the capital and most populous location, or Cape Breton, would
+# have been better names for the zone had we known this in 1996.
+
+# From Paul Eggert (2015-07-20):
 # Shanks & Pottenger write that since 1970 most of this region has been like
 # Halifax.  Many locales did not observe peacetime DST until 1972;
-# Glace Bay, NS is the largest that we know of.
+# the Cape Breton area, represented by Glace Bay, is the largest we know of
+# (Glace Bay was perhaps not the best name choice but no point changing now).
 # Shanks & Pottenger also write that Liverpool, NS was the only town
 # in Canada to observe DST in 1971 but not 1970; for now we'll assume
 # this is a typo.
@@ -1819,13 +1828,13 @@ Zone America/Edmonton	-7:33:52 -	LMT	1906 Sep
 # Exact date in October unknown; Sunday October 1 is a reasonable guess.
 # 3. June 1918: switch to Pacific Daylight Time (GMT-7)
 # Exact date in June unknown; Sunday June 2 is a reasonable guess.
-# note#1:
+# note 1:
 # On Oct 27/1918 when daylight saving ended in the rest of Canada,
 # Creston did not change its clocks.
-# note#2:
+# note 2:
 # During WWII when the Federal Government legislated a mandatory clock change,
 # Creston did not oblige.
-# note#3:
+# note 3:
 # There is no guarantee that Creston will remain on Mountain Standard Time
 # (UTC-7) forever.
 # The subject was debated at least once this year by the town Council.
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/southamerica b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
index 6cf0b2bff37..082018691d6 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/southamerica
+++ b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
@@ -154,7 +154,7 @@ Rule	Arg	2000	only	-	Mar	3	0:00	0	-
 # Timezone Law (which never was effectively applied) will (would?) be
 # in effect.... The article is at
 # http://ar.clarin.com/diario/2001-06-06/e-01701.htm
-# ... The Law itself is "Ley No 25155", sanctioned on 1999-08-25, enacted
+# ... The Law itself is "Ley No. 25155", sanctioned on 1999-08-25, enacted
 # 1999-09-17, and published 1999-09-21.  The official publication is at:
 # http://www.boletin.jus.gov.ar/BON/Primera/1999/09-Septiembre/21/PDF/BO21-09-99LEG.PDF
 # Regretfully, you have to subscribe (and pay) for the on-line version....
@@ -198,15 +198,11 @@ Rule	Arg	2000	only	-	Mar	3	0:00	0	-
 # http://www.worldtimezone.com/dst_news/dst_news_argentina03.html
 # http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
 
-# From Rodrigo Severo (2008-10-06):
-# Here is some info available at a Gentoo bug related to TZ on Argentina's DST:
-# ...
-# ------- Comment #1 from [jmdocile]  2008-10-06 16:28 0000 -------
-# Hi, there is a problem with timezone-data-2008e and maybe with
-# timezone-data-2008f
-# Argentinian law [Number] 25.155 is no longer valid.
+# From Juan Manuel Docile in https://bugs.gentoo.org/240339 (2008-10-07)
+# via Rodrigo Severo:
+# Argentinian law No. 25.155 is no longer valid.
 # http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm
-# The new one is law [Number] 26.350
+# The new one is law No. 26.350
 # http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm
 # So there is no summer time in Argentina for now.
 
@@ -794,7 +790,7 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 #	 [ and in a second message (same day): ]
 # I found the decree.
 #
-# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
+# DECRETO No. 7.584, DE 13 DE OUTUBRO DE 2011
 # Link :
 # http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
 
@@ -1148,7 +1144,7 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # Conflicts between [1] and [2] were resolved as follows:
 #
 #  - [1] says the 1910 transition was Jan 1, [2] says Jan 10 and cites
-#    Boletín Nº 1, Aviso Nº 1 (1910).  Go with [2].
+#    Boletín No. 1, Aviso No. 1 (1910).  Go with [2].
 #
 #  - [1] says SMT was -4:42:45, [2] says Chile's official time from
 #    1916 to 1919 was -4:42:46.3, the meridian of Chile's National
@@ -1156,7 +1152,7 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 #    Quinta Normal in Santiago.  Go with [2], rounding it to -4:42:46.
 #
 #  - [1] says the 1918 transition was Sep 1, [2] says Sep 10 and cites
-#    Boletín Nº 22, Aviso Nº 129/1918 (1918-08-23).  Go with [2].
+#    Boletín No. 22, Aviso No. 129/1918 (1918-08-23).  Go with [2].
 #
 #  - [1] does not give times for transitions; assume they occur
 #    at midnight mainland time, the current common practice.  However,
@@ -1556,7 +1552,7 @@ Rule	Para	1997	only	-	Feb	lastSun	0:00	0	-
 # (1999-09) reports no date; go with above sources and Gerd Knops (2001-02-27).
 Rule	Para	1998	2001	-	Mar	Sun>=1	0:00	0	-
 # From Rives McDow (2002-02-28):
-# A decree was issued in Paraguay (no. 16350) on 2002-02-26 that changed the
+# A decree was issued in Paraguay (No. 16350) on 2002-02-26 that changed the
 # dst method to be from the first Sunday in September to the first Sunday in
 # April.
 Rule	Para	2002	2004	-	Apr	Sun>=1	0:00	0	-
@@ -1736,8 +1732,19 @@ Rule	Uruguay	2005	only	-	Oct	 9	 2:00	1:00	S
 Rule	Uruguay	2006	only	-	Mar	12	 2:00	0	-
 # From Jesper Nørgaard Welen (2006-09-06):
 # http://www.presidencia.gub.uy/_web/decretos/2006/09/CM%20210_08%2006%202006_00001.PDF
-Rule	Uruguay	2006	max	-	Oct	Sun>=1	 2:00	1:00	S
-Rule	Uruguay	2007	max	-	Mar	Sun>=8	 2:00	0	-
+#
+# From Steffen Thorsen (2015-06-30):
+# ... it looks like they will not be using DST the coming summer:
+# http://www.elobservador.com.uy/gobierno-resolvio-que-no-habra-cambio-horario-verano-n656787
+# http://www.republica.com.uy/este-ano-no-se-modificara-el-huso-horario-en-uruguay/523760/
+# From Paul Eggert (2015-06-30):
+# Apparently restaurateurs complained that DST caused people to go to the beach
+# instead of out to dinner.
+# From Pablo Camargo (2015-07-13):
+# http://archivo.presidencia.gub.uy/sci/decretos/2015/06/cons_min_201.pdf
+# [dated 2015-06-29; repeals Decree 311/006 dated 2006-09-04]
+Rule	Uruguay	2006	2014	-	Oct	Sun>=1	 2:00	1:00	S
+Rule	Uruguay	2007	2015	-	Mar	Sun>=8	 2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
 			-3:44:44 -	MMT	1920 May  1 # Montevideo MT
@@ -1746,6 +1753,10 @@ Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
 
 # Venezuela
 #
+# From Paul Eggert (2015-07-28):
+# For the 1965 transition see Gaceta Oficial No. 27.619 (1964-12-15), p 205.533
+# http://www.pgr.gob.ve/dmdocuments/1964/27619.pdf
+#
 # From John Stainforth (2007-11-28):
 # ... the change for Venezuela originally expected for 2007-12-31 has
 # been brought forward to 2007-12-09.  The official announcement was
@@ -1757,6 +1768,6 @@ Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Caracas	-4:27:44 -	LMT	1890
 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
-			-4:30	-	VET	1965        # Venezuela Time
+			-4:30	-	VET	1965 Jan  1  0:00 # Venezuela T.
 			-4:00	-	VET	2007 Dec  9  3:00
 			-4:30	-	VET
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
index ffb6469676e..3fe4a3f2b57 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
+++ b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
@@ -129,8 +129,8 @@ BW	-2439+02555	Africa/Gaborone
 BY	+5354+02734	Europe/Minsk
 BZ	+1730-08812	America/Belize
 CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (peninsula), PEI
+CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia (Cape Breton)
 CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
 CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
 CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
diff --git a/langtools/.hgtags b/langtools/.hgtags
index f59929a126a..8660ee4fe43 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -319,3 +319,4 @@ dc35e315436d21eab68ef44909922fb3424917f3 jdk9-b71
 02681b7c4232ba5d43ccba794492db9502211ff0 jdk9-b74
 827915d1e55eac4f2e138f9b8c79d154862c2284 jdk9-b75
 80ab772222fb6b85f8174bf97261178ee4026620 jdk9-b76
+6ec3d5cb1bfcfba135c8d18866e567f1b1ada861 jdk9-b77
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 49dbb490ba8..d3810424e4a 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -3686,10 +3686,6 @@ public class Attr extends JCTree.Visitor {
                                Env<AttrContext> env,
                                VarSymbol v,
                                boolean onlyWarning) {
-//          System.err.println(v + " " + ((v.flags() & STATIC) != 0) + " " +
-//                             tree.pos + " " + v.pos + " " +
-//                             Resolve.isStatic(env));//DEBUG
-
             // A forward reference is diagnosed if the declaration position
             // of the variable is greater than the current tree position
             // and the tree and variable definition occur in the same class
@@ -3697,14 +3693,15 @@ public class Attr extends JCTree.Visitor {
             // This check applies only to class and instance
             // variables.  Local variables follow different scope rules,
             // and are subject to definite assignment checking.
-            if ((env.info.enclVar == v || v.pos > tree.pos) &&
+            Env<AttrContext> initEnv = enclosingInitEnv(env);
+            if (initEnv != null &&
+                (initEnv.info.enclVar == v || v.pos > tree.pos) &&
                 v.owner.kind == TYP &&
-                enclosingInitEnv(env) != null &&
                 v.owner == env.info.scope.owner.enclClass() &&
                 ((v.flags() & STATIC) != 0) == Resolve.isStatic(env) &&
                 (!env.tree.hasTag(ASSIGN) ||
                  TreeInfo.skipParens(((JCAssign) env.tree).lhs) != tree)) {
-                String suffix = (env.info.enclVar == v) ?
+                String suffix = (initEnv.info.enclVar == v) ?
                                 "self.ref" : "forward.ref";
                 if (!onlyWarning || isStaticEnumField(v)) {
                     log.error(tree.pos(), "illegal." + suffix);
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTool.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTool.java
index ae5b7c67991..617d4cdc045 100644
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTool.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTool.java
@@ -31,9 +31,12 @@ import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
+import javax.tools.JavaFileManager;
 import javax.tools.JavaFileManager.Location;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
@@ -124,7 +127,7 @@ public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
     public RootDocImpl getRootDocImpl(String doclocale,
                                       String encoding,
                                       ModifierFilter filter,
-                                      List<String> javaNames,
+                                      List<String> args,
                                       List<String[]> options,
                                       Iterable<? extends JavaFileObject> fileObjects,
                                       boolean breakiterator,
@@ -144,61 +147,79 @@ public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
 
         javadocFinder.sourceCompleter = docClasses ? Completer.NULL_COMPLETER : sourceCompleter;
 
-        ListBuffer<String> names = new ListBuffer<>();
+        if (docClasses) {
+            // If -Xclasses is set, the args should be a series of class names
+            for (String arg: args) {
+                if (!isValidPackageName(arg)) // checks
+                    docenv.error(null, "main.illegal_class_name", arg);
+            }
+            if (messager.nerrors() != 0) {
+                return null;
+            }
+            return new RootDocImpl(docenv, args, options);
+        }
+
         ListBuffer<JCCompilationUnit> classTrees = new ListBuffer<>();
-        ListBuffer<JCCompilationUnit> packTrees = new ListBuffer<>();
+        Set<String> includedPackages = new LinkedHashSet<>();
 
         try {
             StandardJavaFileManager fm = docenv.fileManager instanceof StandardJavaFileManager
                     ? (StandardJavaFileManager) docenv.fileManager : null;
-            for (List<String> it = javaNames; it.nonEmpty(); it = it.tail) {
-                String name = it.head;
-                if (!docClasses && fm != null && name.endsWith(".java") && new File(name).exists()) {
-                    JavaFileObject fo = fm.getJavaFileObjects(name).iterator().next();
-                    parse(fo, classTrees, true);
-                } else if (isValidPackageName(name)) {
-                    names = names.append(name);
-                } else if (name.endsWith(".java")) {
+            Set<String> packageNames = new LinkedHashSet<>();
+            // Normally, the args should be a series of package names or file names.
+            // Parse the files and collect the package names.
+            for (String arg: args) {
+                if (fm != null && arg.endsWith(".java") && new File(arg).exists()) {
+                    parse(fm.getJavaFileObjects(arg), classTrees, true);
+                } else if (isValidPackageName(arg)) {
+                    packageNames.add(arg);
+                } else if (arg.endsWith(".java")) {
                     if (fm == null)
                         throw new IllegalArgumentException();
                     else
-                        docenv.error(null, "main.file_not_found", name);
+                        docenv.error(null, "main.file_not_found", arg);
                 } else {
-                    docenv.error(null, "main.illegal_package_name", name);
+                    docenv.error(null, "main.illegal_package_name", arg);
                 }
             }
-            for (JavaFileObject fo: fileObjects) {
-                parse(fo, classTrees, true);
+
+            // Parse file objects provide via the DocumentationTool API
+            parse(fileObjects, classTrees, true);
+
+            // Build up the complete list of any packages to be documented
+            Location location = docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH)
+                ? StandardLocation.SOURCE_PATH : StandardLocation.CLASS_PATH;
+
+            PackageTable t = new PackageTable(docenv.fileManager, location)
+                    .packages(packageNames)
+                    .subpackages(subPackages, excludedPackages);
+
+            includedPackages = t.getIncludedPackages();
+
+            // Parse the files in the packages to be documented
+            ListBuffer<JCCompilationUnit> packageTrees = new ListBuffer<>();
+            for (String packageName: includedPackages) {
+                List<JavaFileObject> files = t.getFiles(packageName);
+                docenv.notice("main.Loading_source_files_for_package", packageName);
+
+                if (files.isEmpty())
+                    messager.warning(Messager.NOPOS, "main.no_source_files_for_package", packageName);
+                parse(files, packageTrees, false);
             }
 
-            if (!docClasses) {
-                // Recursively search given subpackages.  If any packages
-                //are found, add them to the list.
-                Map<String,List<JavaFileObject>> packageFiles =
-                        searchSubPackages(subPackages, names, excludedPackages);
-
-                // Parse the packages
-                for (List<String> packs = names.toList(); packs.nonEmpty(); packs = packs.tail) {
-                    // Parse sources ostensibly belonging to package.
-                    String packageName = packs.head;
-                    parsePackageClasses(packageName, packageFiles.get(packageName), packTrees, excludedPackages);
-                }
-
-                if (messager.nerrors() != 0) return null;
-
-                // Enter symbols for all files
-                docenv.notice("main.Building_tree");
-                javadocEnter.main(classTrees.toList().appendList(packTrees.toList()));
+            if (messager.nerrors() != 0) {
+                return null;
             }
+
+            // Enter symbols for all files
+            docenv.notice("main.Building_tree");
+            javadocEnter.main(classTrees.toList().appendList(packageTrees.toList()));
         } catch (Abort ex) {}
 
         if (messager.nerrors() != 0)
             return null;
 
-        if (docClasses)
-            return new RootDocImpl(docenv, javaNames, options);
-        else
-            return new RootDocImpl(docenv, listClasses(classTrees.toList()), names.toList(), options);
+        return new RootDocImpl(docenv, listClasses(classTrees.toList()), List.from(includedPackages), options);
     }
 
     /** Is the given string a valid package name? */
@@ -211,185 +232,17 @@ public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
         return isValidClassName(s);
     }
 
-    /**
-     * search all directories in path for subdirectory name. Add all
-     * .java files found in such a directory to args.
-     */
-    private void parsePackageClasses(String name,
-            List<JavaFileObject> files,
-            ListBuffer<JCCompilationUnit> trees,
-            List<String> excludedPackages)
-            throws IOException {
-        if (excludedPackages.contains(name)) {
-            return;
-        }
-
-        docenv.notice("main.Loading_source_files_for_package", name);
-
-        if (files == null) {
-            Location location = docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH)
-                    ? StandardLocation.SOURCE_PATH : StandardLocation.CLASS_PATH;
-            ListBuffer<JavaFileObject> lb = new ListBuffer<>();
-            for (JavaFileObject fo: docenv.fileManager.list(
-                    location, name, EnumSet.of(JavaFileObject.Kind.SOURCE), false)) {
-                String binaryName = docenv.fileManager.inferBinaryName(location, fo);
-                String simpleName = getSimpleName(binaryName);
-                if (isValidClassName(simpleName)) {
-                    lb.append(fo);
-                }
-            }
-            files = lb.toList();
-        }
-        if (files.nonEmpty()) {
-            for (JavaFileObject fo : files) {
-                parse(fo, trees, false);
-            }
-        } else {
-            messager.warning(Messager.NOPOS, "main.no_source_files_for_package",
-                             name.replace(File.separatorChar, '.'));
-        }
-    }
-
-    private void parse(JavaFileObject fo, ListBuffer<JCCompilationUnit> trees,
+    private void parse(Iterable<? extends JavaFileObject> files, ListBuffer<JCCompilationUnit> trees,
                        boolean trace) {
-        if (uniquefiles.add(fo)) { // ignore duplicates
-            if (trace)
-                docenv.notice("main.Loading_source_file", fo.getName());
-            trees.append(parse(fo));
-        }
-    }
-
-    /**
-     * Recursively search all directories in path for subdirectory name.
-     * Add all packages found in such a directory to packages list.
-     */
-    private Map<String,List<JavaFileObject>> searchSubPackages(
-            List<String> subPackages,
-            ListBuffer<String> packages,
-            List<String> excludedPackages)
-            throws IOException {
-        Map<String,List<JavaFileObject>> packageFiles = new HashMap<>();
-
-        Map<String,Boolean> includedPackages = new HashMap<>();
-        includedPackages.put("", true);
-        for (String p: excludedPackages)
-            includedPackages.put(p, false);
-
-        StandardLocation path = docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH)
-                ? StandardLocation.SOURCE_PATH : StandardLocation.CLASS_PATH;
-
-        searchSubPackages(subPackages,
-                includedPackages,
-                packages, packageFiles,
-                path,
-                EnumSet.of(JavaFileObject.Kind.SOURCE));
-
-        return packageFiles;
-    }
-
-    private void searchSubPackages(List<String> subPackages,
-            Map<String,Boolean> includedPackages,
-            ListBuffer<String> packages,
-            Map<String, List<JavaFileObject>> packageFiles,
-            StandardLocation location, Set<JavaFileObject.Kind> kinds)
-            throws IOException {
-        for (String subPackage: subPackages) {
-            if (!isIncluded(subPackage, includedPackages))
-                continue;
-
-            for (JavaFileObject fo: docenv.fileManager.list(location, subPackage, kinds, true)) {
-                String binaryName = docenv.fileManager.inferBinaryName(location, fo);
-                String packageName = getPackageName(binaryName);
-                String simpleName = getSimpleName(binaryName);
-                if (isIncluded(packageName, includedPackages) && isValidClassName(simpleName)) {
-                    List<JavaFileObject> list = packageFiles.get(packageName);
-                    list = (list == null ? List.of(fo) : list.prepend(fo));
-                    packageFiles.put(packageName, list);
-                    if (!packages.contains(packageName))
-                        packages.add(packageName);
-                }
+        for (JavaFileObject fo: files) {
+            if (uniquefiles.add(fo)) { // ignore duplicates
+                if (trace)
+                    docenv.notice("main.Loading_source_file", fo.getName());
+                trees.append(parse(fo));
             }
         }
     }
 
-    private String getPackageName(String name) {
-        int lastDot = name.lastIndexOf(".");
-        return (lastDot == -1 ? "" : name.substring(0, lastDot));
-    }
-
-    private String getSimpleName(String name) {
-        int lastDot = name.lastIndexOf(".");
-        return (lastDot == -1 ? name : name.substring(lastDot + 1));
-    }
-
-    private boolean isIncluded(String packageName, Map<String,Boolean> includedPackages) {
-        Boolean b = includedPackages.get(packageName);
-        if (b == null) {
-            b = isIncluded(getPackageName(packageName), includedPackages);
-            includedPackages.put(packageName, b);
-        }
-        return b;
-    }
-
-    /**
-     * Recursively search all directories in path for subdirectory name.
-     * Add all packages found in such a directory to packages list.
-     */
-    private void searchSubPackage(String packageName,
-                                  ListBuffer<String> packages,
-                                  List<String> excludedPackages,
-                                  Collection<File> pathnames) {
-        if (excludedPackages.contains(packageName))
-            return;
-
-        String packageFilename = packageName.replace('.', File.separatorChar);
-        boolean addedPackage = false;
-        for (File pathname : pathnames) {
-            File f = new File(pathname, packageFilename);
-            String filenames[] = f.list();
-            // if filenames not null, then found directory
-            if (filenames != null) {
-                for (String filename : filenames) {
-                    if (!addedPackage
-                            && (isValidJavaSourceFile(filename) ||
-                                isValidJavaClassFile(filename))
-                            && !packages.contains(packageName)) {
-                        packages.append(packageName);
-                        addedPackage = true;
-                    } else if (isValidClassName(filename) &&
-                               (new File(f, filename)).isDirectory()) {
-                        searchSubPackage(packageName + "." + filename,
-                                         packages, excludedPackages, pathnames);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Return true if given file name is a valid class file name.
-     * @param file the name of the file to check.
-     * @return true if given file name is a valid class file name
-     * and false otherwise.
-     */
-    private static boolean isValidJavaClassFile(String file) {
-        if (!file.endsWith(".class")) return false;
-        String clazzName = file.substring(0, file.length() - ".class".length());
-        return isValidClassName(clazzName);
-    }
-
-    /**
-     * Return true if given file name is a valid Java source file name.
-     * @param file the name of the file to check.
-     * @return true if given file name is a valid Java source file name
-     * and false otherwise.
-     */
-    private static boolean isValidJavaSourceFile(String file) {
-        if (!file.endsWith(".java")) return false;
-        String clazzName = file.substring(0, file.length() - ".java".length());
-        return isValidClassName(clazzName);
-    }
-
     /** Are surrogates supported?
      */
     final static boolean surrogatesSupported = surrogatesSupported();
@@ -445,4 +298,118 @@ public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
         return result.toList();
     }
 
+    /**
+     * A table to manage included and excluded packages.
+     */
+    static class PackageTable {
+        private final Map<String, Entry> entries = new LinkedHashMap<>();
+        private final Set<String> includedPackages = new LinkedHashSet<>();
+        private final JavaFileManager fm;
+        private final Location location;
+        private final Set<JavaFileObject.Kind> sourceKinds = EnumSet.of(JavaFileObject.Kind.SOURCE);
+
+        /**
+         * Creates a table to manage included and excluded packages.
+         * @param fm The file manager used to locate source files
+         * @param locn the location used to locate source files
+         */
+        PackageTable(JavaFileManager fm, Location locn) {
+            this.fm = fm;
+            this.location = locn;
+            getEntry("").excluded = false;
+        }
+
+        PackageTable packages(Collection<String> packageNames) {
+            includedPackages.addAll(packageNames);
+            return this;
+        }
+
+        PackageTable subpackages(Collection<String> packageNames, Collection<String> excludePackageNames)
+                throws IOException {
+            for (String p: excludePackageNames) {
+                getEntry(p).excluded = true;
+            }
+
+            for (String packageName: packageNames) {
+                for (JavaFileObject fo: fm.list(location, packageName, sourceKinds, true)) {
+                    String binaryName = fm.inferBinaryName(location, fo);
+                    String pn = getPackageName(binaryName);
+                    String simpleName = getSimpleName(binaryName);
+                    Entry e = getEntry(pn);
+                    if (!e.isExcluded() && isValidClassName(simpleName)) {
+                        includedPackages.add(pn);
+                        e.files = (e.files == null ? List.of(fo) : e.files.prepend(fo));
+                    }
+                }
+            }
+            return this;
+        }
+
+        /**
+         * Returns the aggregate set of included packages.
+         * @return the aggregate set of included packages
+         */
+        Set<String> getIncludedPackages() {
+            return includedPackages;
+        }
+
+        /**
+         * Returns the set of source files for a package.
+         * @param packageName the specified package
+         * @return the set of file objects for the specified package
+         * @throws IOException if an error occurs while accessing the files
+         */
+        List<JavaFileObject> getFiles(String packageName) throws IOException {
+            Entry e = getEntry(packageName);
+            // The files may have been found as a side effect of searching for subpackages
+            if (e.files != null)
+                return e.files;
+
+            ListBuffer<JavaFileObject> lb = new ListBuffer<>();
+            for (JavaFileObject fo: fm.list(location, packageName, sourceKinds, false)) {
+                String binaryName = fm.inferBinaryName(location, fo);
+                String simpleName = getSimpleName(binaryName);
+                if (isValidClassName(simpleName)) {
+                    lb.append(fo);
+                }
+            }
+
+            return lb.toList();
+        }
+
+
+        private Entry getEntry(String name) {
+            Entry e = entries.get(name);
+            if (e == null)
+                entries.put(name, e = new Entry(name));
+            return e;
+        }
+
+        private String getPackageName(String name) {
+            int lastDot = name.lastIndexOf(".");
+            return (lastDot == -1 ? "" : name.substring(0, lastDot));
+        }
+
+        private String getSimpleName(String name) {
+            int lastDot = name.lastIndexOf(".");
+            return (lastDot == -1 ? name : name.substring(lastDot + 1));
+        }
+
+        class Entry {
+            final String name;
+            Boolean excluded;
+            List<JavaFileObject> files;
+
+            Entry(String name) {
+                this.name = name;
+            }
+
+            boolean isExcluded() {
+                if (excluded == null)
+                    excluded = getEntry(getPackageName(name)).isExcluded();
+                return excluded;
+            }
+        }
+    }
+
 }
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties
index 29604bef343..105ab1c4e58 100644
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2015, 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
@@ -91,6 +91,7 @@ main.exception_thrown=In doclet class {0},  method {1} has thrown an exception {
 main.illegal_locale_name=Locale not available: {0}
 main.malformed_locale_name=Malformed locale name: {0}
 main.file_not_found=File not found: "{0}"
+main.illegal_class_name=Illegal class name: "{0}"
 main.illegal_package_name=Illegal package name: "{0}"
 main.release.bootclasspath.conflict=option {0} cannot be used together with -release
 main.unsupported.release.version=release version {0} not supported
diff --git a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTesta.java b/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTesta.java
deleted file mode 100644
index 408f7b8f228..00000000000
--- a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTesta.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8024809
- * @summary javac, some lambda programs are rejected by flow analysis
- * @compile/fail/ref=SelfInitializerInLambdaTesta.out -XDrawDiagnostics SelfInitializerInLambdaTesta.java
- */
-
-public class SelfInitializerInLambdaTesta {
-
-    final Runnable r1 = ()->System.out.println(r1);
-
-    final Object lock = new Object();
-
-    final Runnable r2 = ()->{
-        System.out.println(r2);
-        synchronized (lock){}
-    };
-
-    final Runnable r3 = ()->{
-        synchronized (lock){
-            System.out.println(r3);
-        }
-    };
-
-    final Runnable r4 = ()->{
-        System.out.println(r4);
-    };
-
-    interface SAM {
-        int m(String s);
-    }
-
-    final SAM s1 = (String s)->{
-        System.out.println(s + s1.toString());
-        return 0;
-    };
-
-    final SAM s2 = (s)->{
-        System.out.println(s + s2.toString());
-        return 0;
-    };
-}
diff --git a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTesta.out b/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTesta.out
deleted file mode 100644
index fcf50e891a9..00000000000
--- a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTesta.out
+++ /dev/null
@@ -1,7 +0,0 @@
-SelfInitializerInLambdaTesta.java:33:48: compiler.err.illegal.self.ref
-SelfInitializerInLambdaTesta.java:38:28: compiler.err.illegal.self.ref
-SelfInitializerInLambdaTesta.java:44:32: compiler.err.illegal.self.ref
-SelfInitializerInLambdaTesta.java:49:28: compiler.err.illegal.self.ref
-SelfInitializerInLambdaTesta.java:57:32: compiler.err.illegal.self.ref
-SelfInitializerInLambdaTesta.java:62:32: compiler.err.illegal.self.ref
-6 errors
diff --git a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTestb.out b/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTestb.out
deleted file mode 100644
index ebbdcab396c..00000000000
--- a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTestb.out
+++ /dev/null
@@ -1,3 +0,0 @@
-SelfInitializerInLambdaTestb.java:35:49: compiler.err.var.might.not.have.been.initialized: r1
-SelfInitializerInLambdaTestb.java:38:37: compiler.err.var.might.not.have.been.initialized: r1
-2 errors
diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.java b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.java
new file mode 100644
index 00000000000..50d1495c4bb
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.java
@@ -0,0 +1,42 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8024809
+ * @summary javac, some lambda programs are rejected by flow analysis
+ * @compile/fail/ref=SelfInitializerInLambdaTesta.out -XDrawDiagnostics SelfInitializerInLambdaTesta.java
+ */
+
+public class SelfInitializerInLambdaTesta {
+
+    final Runnable r1 = ()->System.out.println(r1);
+
+    final Object lock = new Object();
+
+    final Runnable r2 = ()->{
+        System.out.println(r2);
+        synchronized (lock){}
+    };
+
+    final Runnable r3 = ()->{
+        synchronized (lock){
+            System.out.println(r3);
+        }
+    };
+
+    final Runnable r4 = ()->{
+        System.out.println(r4);
+    };
+
+    interface SAM {
+        int m(String s);
+    }
+
+    final SAM s1 = (String s)->{
+        System.out.println(s + s1.toString());
+        return 0;
+    };
+
+    final SAM s2 = (s)->{
+        System.out.println(s + s2.toString());
+        return 0;
+    };
+}
diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.out b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.out
new file mode 100644
index 00000000000..9c0a8356575
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.out
@@ -0,0 +1,7 @@
+SelfInitializerInLambdaTesta.java:10:48: compiler.err.illegal.self.ref
+SelfInitializerInLambdaTesta.java:15:28: compiler.err.illegal.self.ref
+SelfInitializerInLambdaTesta.java:21:32: compiler.err.illegal.self.ref
+SelfInitializerInLambdaTesta.java:26:28: compiler.err.illegal.self.ref
+SelfInitializerInLambdaTesta.java:34:32: compiler.err.illegal.self.ref
+SelfInitializerInLambdaTesta.java:39:32: compiler.err.illegal.self.ref
+6 errors
diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.java b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.java
new file mode 100644
index 00000000000..e68e42a76be
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.java
@@ -0,0 +1,17 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8024809
+ * @summary javac, some lambda programs are rejected by flow analysis
+ * @compile/fail/ref=SelfInitializerInLambdaTestb.out -XDrawDiagnostics SelfInitializerInLambdaTestb.java
+ */
+
+public class SelfInitializerInLambdaTestb {
+
+    final Runnable r1;
+
+    final Runnable r2 = ()-> System.out.println(r1);
+
+    SelfInitializerInLambdaTestb() {
+        r1 = ()->System.out.println(r1);
+    }
+}
diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.out b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.out
new file mode 100644
index 00000000000..61a2e61da47
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.out
@@ -0,0 +1,3 @@
+SelfInitializerInLambdaTestb.java:12:49: compiler.err.var.might.not.have.been.initialized: r1
+SelfInitializerInLambdaTestb.java:15:37: compiler.err.var.might.not.have.been.initialized: r1
+2 errors
diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.java b/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.java
new file mode 100644
index 00000000000..9e3e806661f
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.java
@@ -0,0 +1,26 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8053906
+ * @summary javac, some lambda programs are rejected by flow analysis
+ * @compile/fail/ref=SelfInitializerInLambdaTestc.out -XDrawDiagnostics SelfInitializerInLambdaTestc.java
+ */
+
+public class SelfInitializerInLambdaTestc {
+    interface SAM {
+        void foo();
+    }
+
+    final SAM notInitialized = ()-> {
+        SAM simpleVariable = () -> notInitialized.foo();
+    };
+
+    final SAM notInitialized2 = ()-> {
+        SAM simpleVariable1 = () -> {
+            SAM simpleVariable2 = () -> {
+                SAM simpleVariable3 = () -> {
+                    SAM simpleVariable4 = () -> notInitialized2.foo();
+                };
+            };
+        };
+    };
+}
diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.out b/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.out
new file mode 100644
index 00000000000..a220914959e
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.out
@@ -0,0 +1,3 @@
+SelfInitializerInLambdaTestc.java:14:36: compiler.err.illegal.self.ref
+SelfInitializerInLambdaTestc.java:21:49: compiler.err.illegal.self.ref
+2 errors
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index ea48c7f40f1..a68908c9cb6 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -491,6 +491,7 @@ SHARE_SRC_DIRS += \
     $(CORBA_TOPDIR)/src/$1/share/classes \
     $(JAXP_TOPDIR)/src/$1/share/classes \
     $(JAXWS_TOPDIR)/src/$1/share/classes \
+    $(NASHORN_TOPDIR)/src/$1/share/classes \
     #
 
 ALL_SRC_DIRS = \
@@ -512,8 +513,8 @@ JAVA_MODULES := $(ALL_JAVA_MODULES)
 JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER)))
 
 # Create an empty directory to set the bootclasspath to.
-EMPTY_BOOTCLASSPATH := $(SUPPORT_OUTPUTDIR)/empty-dir
-$(call MakeDir, $(EMPTY_BOOTCLASSPATH))
+EMPTY_DIR := $(SUPPORT_OUTPUTDIR)/empty-dir
+$(call MakeDir, $(EMPTY_DIR))
 
 # This macro sets up compilation of a module and declares dependencies for it.
 # Param 1 - module name
@@ -534,7 +535,7 @@ define SetupModuleCompilation
     $1_CLASSPATH := $$($1_CLASSPATH) $$(addprefix $(JDK_OUTPUTDIR)/modules/,jdk.hotspot.agent)
   endif
   $1_CLASSPATH := $$(subst $$(SPACE),$$(PATH_SEP),$$($1_CLASSPATH))
-  $1_JAVAC_FLAGS := -bootclasspath $(EMPTY_BOOTCLASSPATH) -classpath "$$($1_CLASSPATH)" $$($1_ADD_JAVAC_FLAGS)
+  $1_JAVAC_FLAGS := -bootclasspath $(EMPTY_DIR) -extdirs $(EMPTY_DIR) -endorseddirs $(EMPTY_DIR) -classpath "$$($1_CLASSPATH)" $$($1_ADD_JAVAC_FLAGS)
 
   $$(eval $$(call SetupJavaCompilation,$1, \
       SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
diff --git a/make/Images.gmk b/make/Images.gmk
index 0dfba0f509e..d3b60a22e6b 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -46,9 +46,9 @@ PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk
                jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs
 
 # tools
-TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.javadoc jdk.jcmd jdk.jconsole \
-               jdk.hotspot.agent jdk.hprof.agent jdk.jartool jdk.jdeps jdk.jdi jdk.jdwp.agent \
-               jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
+TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.scripting.nashorn.shell \
+               jdk.javadoc jdk.jcmd jdk.jconsole jdk.hotspot.agent jdk.hprof.agent jdk.jartool \
+               jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   PROVIDER_MODULES += jdk.crypto.mscapi
diff --git a/modules.xml b/modules.xml
index 5188fd4c42e..0445602d877 100644
--- a/modules.xml
+++ b/modules.xml
@@ -1799,6 +1799,25 @@
     <depend>java.base</depend>
     <depend>java.logging</depend>
     <depend>java.scripting</depend>
+    <export>
+      <name>jdk.nashorn.internal.runtime</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
+    <export>
+      <name>jdk.nashorn.internal.objects</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
+    <export>
+      <name>jdk.nashorn.tools</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
+  </module>
+  <module>
+    <name>jdk.scripting.nashorn.shell</name>
+    <depend>java.base</depend>
+    <depend>java.prefs</depend>
+    <depend>jdk.scripting.nashorn</depend>
+    <depend>jdk.internal.le</depend>
   </module>
   <module>
     <name>jdk.sctp</name>
diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index bd520db026d..c929021d887 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -310,3 +310,4 @@ d017877b3b8cd39337f1bdc00d958f821433c4c3 jdk9-b72
 2e8bb16872d7b15dc0a4f8e45c6ad65f762c1b04 jdk9-b74
 f884dff432a7ac349153f3d1ea1eb222f3764c6c jdk9-b75
 ab231613d7206431ba31917a02e7cedd70e88e70 jdk9-b76
+33cecbc59f2ad78ac0934cbc3e014d346077e848 jdk9-b77
diff --git a/nashorn/make/BuildNashorn.gmk b/nashorn/make/BuildNashorn.gmk
index 044ee4eddf5..45b8f27284d 100644
--- a/nashorn/make/BuildNashorn.gmk
+++ b/nashorn/make/BuildNashorn.gmk
@@ -53,7 +53,10 @@ $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
 
 # Build nashorn into intermediate directory
-$(eval $(call SetupJavaCompilation,BUILD_NASHORN, \
+# Name the compilation setup the same as the module, as is done in the global
+# CompileJavaModules.gmk, to make dependency checking with other modules work
+# seamlessly.
+$(eval $(call SetupJavaCompilation,jdk.scripting.nashorn, \
     SETUP := GENERATE_NEWBYTECODE_DEBUG, \
     SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes, \
     EXCLUDE_FILES := META-INF/MANIFEST.MF, \
@@ -71,7 +74,7 @@ $(eval $(call SetupJavaCompilation,BUILD_NASGEN, \
     ADD_JAVAC_FLAGS := -Xbootclasspath/p:"$(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/classes"))
 
 # Nasgen needs nashorn classes
-$(BUILD_NASGEN): $(BUILD_NASHORN)
+$(BUILD_NASGEN): $(jdk.scripting.nashorn)
 
 NASHORN_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn
 NASGEN_RUN_FILE := $(NASHORN_CLASSES_DIR)/_the.nasgen.run
diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index b3190b092bf..f8f8e7fbb8c 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -147,16 +147,16 @@
        <fileset dir="${meta.inf.dir}/services/"/>
     </copy>
      <copy todir="${build.classes.dir}/jdk/nashorn/api/scripting/resources">
-       <fileset dir="${src.dir}/jdk/nashorn/api/scripting/resources/"/>
+       <fileset dir="${nashorn.module.src.dir}/jdk/nashorn/api/scripting/resources/"/>
     </copy>
     <copy todir="${build.classes.dir}/jdk/nashorn/internal/runtime/resources">
-       <fileset dir="${src.dir}/jdk/nashorn/internal/runtime/resources/"/>
+       <fileset dir="${nashorn.module.src.dir}/jdk/nashorn/internal/runtime/resources/"/>
     </copy>
     <copy todir="${build.classes.dir}/jdk/nashorn/tools/resources">
-       <fileset dir="${src.dir}/jdk/nashorn/tools/resources/"/>
+       <fileset dir="${nashorn.module.src.dir}/jdk/nashorn/tools/resources/"/>
     </copy>
-    <copy file="${src.dir}/jdk/internal/dynalink/support/messages.properties" todir="${build.classes.dir}/jdk/internal/dynalink/support"/>
-    <copy file="${src.dir}/jdk/nashorn/internal/codegen/anchor.properties" todir="${build.classes.dir}/jdk/nashorn/internal/codegen"/>
+    <copy file="${nashorn.module.src.dir}/jdk/internal/dynalink/support/messages.properties" todir="${build.classes.dir}/jdk/internal/dynalink/support"/>
+    <copy file="${nashorn.module.src.dir}/jdk/nashorn/internal/codegen/anchor.properties" todir="${build.classes.dir}/jdk/nashorn/internal/codegen"/>
 
     <echo message="full=${nashorn.fullversion}" file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties"/>
     <echo file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties" append="true">${line.separator}</echo>
@@ -165,7 +165,14 @@
 
   <target name="jar" depends="compile, run-nasgen, generate-cc-template" description="Creates nashorn.jar" unless="compile.suppress.jar">
     <jar jarfile="${dist.jar}" manifest="${meta.inf.dir}/MANIFEST.MF" index="true" filesetmanifest="merge">
-      <fileset dir="${build.classes.dir}"/>
+      <!-- 
+        Exclude jjs classes from nashorn.jar to avoid desktop dependency.
+        We have a test to make sure basic nashorn code has only "compact1"
+        dependency - except for jjs shell code which has desktop dependency.
+      -->
+      <fileset dir="${build.classes.dir}">
+          <exclude name="**/jdk/nashorn/tools/jjs/*"/>
+      </fileset>
       <manifest>
         <attribute name="Archiver-Version" value="n/a"/>
         <attribute name="Build-Jdk" value="${java.runtime.version}"/>
@@ -230,13 +237,14 @@
 
   <!-- generate javadoc for Nashorn classes -->
   <target name="javadocnh" depends="jar">
-    <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${src.dir}/overview.html"
+    <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${nashorn.module.src.dir}/overview.html"
         extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name} ${nashorn.version}"
         additionalparam="-quiet" failonerror="true" useexternalfile="true">
       <classpath>
         <pathelement location="${build.classes.dir}"/>
       </classpath>
-      <fileset dir="${src.dir}" includes="**/*.java"/>
+      <fileset dir="${nashorn.module.src.dir}" includes="**/*.java"/>
+      <fileset dir="${nashorn.shell.module.src.dir}" includes="**/*.java"/>
       <link href="http://docs.oracle.com/javase/8/docs/api/"/>
     </javadoc>
   </target>
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index aab32c62a83..d3730d8cdd6 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -26,6 +26,9 @@ application.title=nashorn
 # location of JDK embedded ASM sources
 jdk.asm.src.dir=../jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm
 
+# location of JDK embedded jline sources
+jdk.jline.src.dir=../jdk/src/jdk.internal.le/share/classes
+
 # source and target levels
 build.compiler=modern
 javac.source=1.8
@@ -112,7 +115,7 @@ javac.test.classpath=\
     ${build.test.classes.dir}${path.separator}\
     ${file.reference.testng.jar}
 
-meta.inf.dir=${src.dir}/META-INF
+meta.inf.dir=${nashorn.module.src.dir}/META-INF
 
 run.classpath=\
     ${build.classes.dir}
@@ -266,7 +269,13 @@ run.test.classpath=\
     ${nashorn.internal.tests.jar}${path.separator}\
     ${nashorn.api.tests.jar}
 
-src.dir=src/jdk.scripting.nashorn/share/classes
+nashorn.module.src.dir=src/jdk.scripting.nashorn/share/classes
+nashorn.shell.module.src.dir=src/jdk.scripting.nashorn.shell/share/classes
+
+src.dir=${nashorn.module.src.dir}${path.separator}\
+        ${nashorn.shell.module.src.dir}${path.separator}\
+        ${jdk.jline.src.dir}
+
 test.src.dir=test/src
 
 # -Xmx is used for all tests, -Xms only for octane benchmark
diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java b/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java
new file mode 100644
index 00000000000..932eb7ab055
--- /dev/null
+++ b/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.tools.jjs;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.prefs.BackingStoreException;
+import java.util.prefs.Preferences;
+import jdk.internal.jline.console.ConsoleReader;
+import jdk.internal.jline.console.history.History.Entry;
+import jdk.internal.jline.console.history.MemoryHistory;
+
+class Console implements AutoCloseable {
+    private final ConsoleReader in;
+    private final PersistentHistory history;
+
+    Console(InputStream cmdin, PrintStream cmdout, Preferences prefs) throws IOException {
+        in = new ConsoleReader(cmdin, cmdout);
+        in.setExpandEvents(false);
+        in.setHandleUserInterrupt(true);
+        in.setHistory(history = new PersistentHistory(prefs));
+        Runtime.getRuntime().addShutdownHook(new Thread(()->close()));
+    }
+
+    String readLine(String prompt) throws IOException {
+        return in.readLine(prompt);
+    }
+
+
+    @Override
+    public void close() {
+        history.save();
+    }
+
+    public static class PersistentHistory extends MemoryHistory {
+
+        private final Preferences prefs;
+
+        protected PersistentHistory(Preferences prefs) {
+            this.prefs = prefs;
+            load();
+        }
+
+        private static final String HISTORY_LINE_PREFIX = "HISTORY_LINE_";
+
+        public final void load() {
+            try {
+                List<String> keys = new ArrayList<>(Arrays.asList(prefs.keys()));
+                Collections.sort(keys);
+                for (String key : keys) {
+                    if (!key.startsWith(HISTORY_LINE_PREFIX))
+                        continue;
+                    CharSequence line = prefs.get(key, "");
+                    add(line);
+                }
+            } catch (BackingStoreException ex) {
+                throw new IllegalStateException(ex);
+            }
+        }
+
+        public void save() {
+            Iterator<Entry> entries = iterator();
+            if (entries.hasNext()) {
+                int len = (int) Math.ceil(Math.log10(size()+1));
+                String format = HISTORY_LINE_PREFIX + "%0" + len + "d";
+                while (entries.hasNext()) {
+                    Entry entry = entries.next();
+                    prefs.put(String.format(format, entry.index()), entry.value().toString());
+                }
+            }
+        }
+
+    }
+}
diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java b/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java
new file mode 100644
index 00000000000..9bc4b56638e
--- /dev/null
+++ b/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.tools.jjs;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.prefs.Preferences;
+import jdk.nashorn.internal.objects.Global;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ErrorManager;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptEnvironment;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.tools.Shell;
+import jdk.internal.jline.console.UserInterruptException;
+
+/**
+ * Interactive command line Shell for Nashorn.
+ */
+public final class Main extends Shell {
+    private Main() {}
+
+    static final Preferences PREFS = Preferences.userRoot().node("tool/jjs");
+
+    /**
+     * Main entry point with the default input, output and error streams.
+     *
+     * @param args The command line arguments
+     */
+    public static void main(final String[] args) {
+        try {
+            final int exitCode = main(System.in, System.out, System.err, args);
+            if (exitCode != SUCCESS) {
+                System.exit(exitCode);
+            }
+        } catch (final IOException e) {
+            System.err.println(e); //bootstrapping, Context.err may not exist
+            System.exit(IO_ERROR);
+        }
+    }
+
+    /**
+     * Starting point for executing a {@code Shell}. Starts a shell with the
+     * given arguments and streams and lets it run until exit.
+     *
+     * @param in input stream for Shell
+     * @param out output stream for Shell
+     * @param err error stream for Shell
+     * @param args arguments to Shell
+     *
+     * @return exit code
+     *
+     * @throws IOException if there's a problem setting up the streams
+     */
+    public static int main(final InputStream in, final OutputStream out, final OutputStream err, final String[] args) throws IOException {
+        return new Main().run(in, out, err, args);
+    }
+
+    /**
+     * read-eval-print loop for Nashorn shell.
+     *
+     * @param context the nashorn context
+     * @param global  global scope object to use
+     * @return return code
+     */
+    protected int readEvalPrint(final Context context, final Global global) {
+        final ScriptEnvironment env = context.getEnv();
+        final String prompt = bundle.getString("shell.prompt");
+        final PrintWriter err = context.getErr();
+        final Global oldGlobal = Context.getGlobal();
+        final boolean globalChanged = (oldGlobal != global);
+
+        try (final Console in = new Console(System.in, System.out, PREFS)) {
+            if (globalChanged) {
+                Context.setGlobal(global);
+            }
+
+            global.addShellBuiltins();
+
+            while (true) {
+                String source = "";
+                try {
+                    source = in.readLine(prompt);
+                } catch (final IOException ioe) {
+                    err.println(ioe.toString());
+                    if (env._dump_on_error) {
+                        ioe.printStackTrace(err);
+                    }
+                    return IO_ERROR;
+                } catch (final UserInterruptException ex) {
+                    break;
+                }
+
+                if (source.isEmpty()) {
+                    continue;
+                }
+
+                try {
+                    final Object res = context.eval(global, source, global, "<shell>");
+                    if (res != ScriptRuntime.UNDEFINED) {
+                        err.println(JSType.toString(res));
+                    }
+                } catch (final Exception e) {
+                    err.println(e);
+                    if (env._dump_on_error) {
+                        e.printStackTrace(err);
+                    }
+                }
+            }
+        } catch (final Exception e) {
+            err.println(e);
+            if (env._dump_on_error) {
+                e.printStackTrace(err);
+            }
+        } finally {
+            if (globalChanged) {
+                Context.setGlobal(oldGlobal);
+            }
+        }
+
+        return SUCCESS;
+    }
+}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
index 3d2a67172eb..ec0397a7b37 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
@@ -68,7 +68,7 @@ public class Shell {
     /**
      * Shell message bundle.
      */
-    private static final ResourceBundle bundle = ResourceBundle.getBundle(MESSAGE_RESOURCE, Locale.getDefault());
+    protected static final ResourceBundle bundle = ResourceBundle.getBundle(MESSAGE_RESOURCE, Locale.getDefault());
 
     /**
      * Exit code for command line tool - successful
@@ -403,7 +403,7 @@ public class Shell {
      * @param global  global scope object to use
      * @return return code
      */
-    private static int readEvalPrint(final Context context, final Global global) {
+    protected int readEvalPrint(final Context context, final Global global) {
         final String prompt = bundle.getString("shell.prompt");
         final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
         final PrintWriter err = context.getErr();