From e834a481000f16750b9e9eec13ce9c905c218736 Mon Sep 17 00:00:00 2001 From: Tobias Hartmann Date: Wed, 29 Jul 2015 08:05:21 +0200 Subject: [PATCH 01/36] 8130309: Need to bailout cleanly if creation of stubs fails when codecache is out of space Check for failed expansion of stub section in code buffer and bailout. Reviewed-by: kvn, adinn, dlong, roland, twisti --- hotspot/src/cpu/aarch64/vm/aarch64.ad | 45 ++++++++++++++----- .../cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp | 9 +++- .../aarch64/vm/c1_LIRAssembler_aarch64.cpp | 12 ++++- .../src/cpu/aarch64/vm/compiledIC_aarch64.cpp | 10 +++-- .../cpu/aarch64/vm/macroAssembler_aarch64.cpp | 19 ++++---- .../cpu/aarch64/vm/macroAssembler_aarch64.hpp | 6 +-- hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp | 6 +-- hotspot/src/cpu/ppc/vm/ppc.ad | 18 +++++--- .../src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp | 3 ++ hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp | 10 +++-- hotspot/src/cpu/sparc/vm/sparc.ad | 23 +++++++--- hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp | 3 ++ hotspot/src/cpu/x86/vm/compiledIC_x86.cpp | 10 +++-- hotspot/src/cpu/x86/vm/x86.ad | 10 ++++- hotspot/src/cpu/x86/vm/x86_32.ad | 6 ++- hotspot/src/cpu/x86/vm/x86_64.ad | 6 ++- hotspot/src/cpu/zero/vm/compiledIC_zero.cpp | 3 +- hotspot/src/share/vm/c1/c1_LIRAssembler.cpp | 1 + hotspot/src/share/vm/code/compiledIC.hpp | 2 +- hotspot/src/share/vm/opto/compile.cpp | 4 ++ hotspot/src/share/vm/opto/output.cpp | 12 ++++- 21 files changed, 158 insertions(+), 60 deletions(-) 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..d6f7abc7ea1 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) { + 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/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..3c2cf60abc1 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,7 @@ void MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) { } else { bl(pc()); } + return start_offset; } @@ -696,13 +700,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 +731,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/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/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/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/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/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/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)); From c030d4e363908ebf290abc74ddbb1c35df5c43a8 Mon Sep 17 00:00:00 2001 From: Roland Westrelin Date: Wed, 29 Jul 2015 12:33:48 +0200 Subject: [PATCH 02/36] 8132525: java -client -XX:+TieredCompilation -XX:CICompilerCount=1 -version asserts since 8130858 TieredCompilation not validated when CICompilerCount is processed Reviewed-by: kvn, gziemski --- .../commandLineFlagConstraintsCompiler.cpp | 5 +- .../arguments/CheckCICompilerCount.java | 51 +++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp b/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp index c4270d6f400..4a70a000816 100644 --- a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp +++ b/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp @@ -71,7 +71,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/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 }; From fd2f61a53f4ce3dbdf6ea693d4f7c5f1a8c2968f Mon Sep 17 00:00:00 2001 From: Michael Haupt Date: Wed, 18 Mar 2015 16:16:30 +0100 Subject: [PATCH 03/36] 8004073: Implement C2 Ideal node specific dump() method Add Node::dump_rel() to dump a node and its related nodes (the notion of "related" depends on the node at hand); add Node::dump_comp() to dump a node in compact representation; add Node::dump_rel_comp() to dump a node and its related nodes in compact representation; add the required machinery; extend some C2 IR nodes with compact and related dumping Reviewed-by: kvn, roland --- hotspot/src/share/vm/opto/arraycopynode.cpp | 5 + hotspot/src/share/vm/opto/arraycopynode.hpp | 1 + hotspot/src/share/vm/opto/callnode.cpp | 70 +++++ hotspot/src/share/vm/opto/callnode.hpp | 10 + hotspot/src/share/vm/opto/cfgnode.cpp | 43 ++- hotspot/src/share/vm/opto/cfgnode.hpp | 18 +- hotspot/src/share/vm/opto/ifnode.cpp | 34 ++- hotspot/src/share/vm/opto/movenode.cpp | 16 +- hotspot/src/share/vm/opto/movenode.hpp | 6 +- hotspot/src/share/vm/opto/multnode.cpp | 16 +- hotspot/src/share/vm/opto/multnode.hpp | 3 +- hotspot/src/share/vm/opto/node.cpp | 288 ++++++++++++++++++-- hotspot/src/share/vm/opto/node.hpp | 49 +++- hotspot/src/share/vm/opto/rootnode.cpp | 17 +- hotspot/src/share/vm/opto/rootnode.hpp | 6 +- hotspot/src/share/vm/opto/subnode.cpp | 51 +++- hotspot/src/share/vm/opto/subnode.hpp | 11 +- 17 files changed, 593 insertions(+), 51 deletions(-) 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/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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *out_rel, bool compact) const; #endif }; @@ -476,6 +479,7 @@ public: #ifndef PRODUCT virtual void dump_spec(outputStream *st) const; + virtual void related(GrowableArray *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *out_rel, bool compact) const; #endif }; 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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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/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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 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 *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 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 in_rel(C->unique()); + GrowableArray 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 in_rel(C->unique()); + GrowableArray 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 in_rel(C->unique()); + GrowableArray 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 *in_rel, GrowableArray *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 *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 *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 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 sns(Compile::current()->unique()); + for (GrowableArrayIterator it = ns->begin(); it != ns->end(); ++it) { + Node* n = *it; + n->collect_nodes(&sns, 1, primary_is_data, !primary_is_data); + for (GrowableArrayIterator 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 *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 *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 *ns) const { + // Perform a BFS and stop at control nodes. + GrowableArray 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 *in_rel, GrowableArray *out_rel, bool compact) const; + // Collect nodes starting from this node, explicitly including/excluding control and data links. + void collect_nodes(GrowableArray *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 *ns, bool ctrl) const; + // Collect the entire control input graph. Include data inputs if requested. + void collect_nodes_in_all_ctrl(GrowableArray *ns, bool data) const; + // Collect the entire output graph until hitting and including control nodes. + void collect_nodes_out_all_ctrl_boundary(GrowableArray *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/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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 proj(Compile::current()->unique()); + for (GrowableArrayIterator 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 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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *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 *in_rel, GrowableArray *out_rel, bool compact) const; #endif }; From fdbe749d2a3c0f258c2d4d90080e1b4cd2b90077 Mon Sep 17 00:00:00 2001 From: Goetz Lindenmaier Date: Wed, 29 Jul 2015 15:08:42 -0700 Subject: [PATCH 04/36] 8132242: LogTouchedMethods (8025692) asserts if TieredCompilation is off LogTouchedMethods causes the template interpreter to generate profiling code even if no compiler is used. If TieredCompilation is off, code containing an assertion that checks that UseCompiler is set, is reached. This assertion exists on the sparc and ppc platforms. Reviewed-by: simonis, iklam, minqi --- hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp | 2 +- hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp | 2 +- .../CommandLine/PrintTouchedMethods.java | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) 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/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/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(); From 4b348c9fec8d94846c6052add3037b11238fa0e1 Mon Sep 17 00:00:00 2001 From: Jeremy Manson Date: Wed, 29 Jul 2015 22:59:03 -0400 Subject: [PATCH 05/36] 6661889: thread id on Linux is inconsistent in error and log outputs Reviewed-by: dholmes, kvn --- hotspot/src/os/linux/vm/os_linux.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp index 0af27515e89..3b198380646 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(); @@ -1424,7 +1423,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(); } From 98fb52479fdd94f158e455edcbc920ddc2490d3b Mon Sep 17 00:00:00 2001 From: Alexander Kulyakhtin Date: Thu, 30 Jul 2015 12:41:39 +0300 Subject: [PATCH 06/36] 8130527: Serviceability tests fails with Can't attach to process A helper method changed to provide workaround for 8132539 Reviewed-by: jbachorik --- hotspot/test/testlibrary/jdk/test/lib/Utils.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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)); } /** From 3b63ebf830734aab17c085f86fde4b1bed26c0a4 Mon Sep 17 00:00:00 2001 From: Dmitry Samersoff Date: Thu, 30 Jul 2015 16:26:00 +0300 Subject: [PATCH 07/36] 8059036: Implement Diagnostic Commands for heap and finalizerinfo Implement Diagnostic Commands for heap and finalizerinfo Reviewed-by: sla, plevart, mchung --- hotspot/src/share/vm/classfile/vmSymbols.hpp | 5 ++ .../share/vm/services/diagnosticCommand.cpp | 57 ++++++++++++ .../share/vm/services/diagnosticCommand.hpp | 40 +++++++++ .../dcmd/gc/FinalizerInfoTest.java | 87 +++++++++++++++++++ .../serviceability/dcmd/gc/HeapInfoTest.java | 54 ++++++++++++ 5 files changed, 243 insertions(+) create mode 100644 hotspot/test/serviceability/dcmd/gc/FinalizerInfoTest.java create mode 100644 hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/hotspot/src/share/vm/classfile/vmSymbols.hpp index b453e0ec1fa..967750e6c72 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") \ 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(full_export, true, false)); DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export, true, false)); DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export, true, false)); + DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export, true, false)); + DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export, true, false)); #if INCLUDE_SERVICES // Heap dumping/inspection supported DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(DCmd_Source_Internal | DCmd_Source_AttachAPI, true, false)); DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(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/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/hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java b/hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java new file mode 100644 index 00000000000..daedf1252ef --- /dev/null +++ b/hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java @@ -0,0 +1,54 @@ +/* + * 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.io.IOException; + +import jdk.test.lib.dcmd.CommandExecutor; +import jdk.test.lib.dcmd.PidJcmdExecutor; +import jdk.test.lib.OutputAnalyzer; + + +/* + * @test + * @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"); + } + + @Test + public void pid() { + run(new PidJcmdExecutor()); + } +} + From abd5c879c5a8bf862944ff9348a6bbc6640c7004 Mon Sep 17 00:00:00 2001 From: Jaroslav Bachorik Date: Fri, 31 Jul 2015 15:36:19 +0200 Subject: [PATCH 08/36] 8129976: RunFinalizationTest.java times out frequently Reviewed-by: sspitsyn --- .../dcmd/gc/RunFinalizationTest.java | 73 ++++++++++--------- 1 file changed, 40 insertions(+), 33 deletions(-) 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); } } From 26cd440c5591b51f53c060481078570fe5545515 Mon Sep 17 00:00:00 2001 From: Zoltan Majo Date: Mon, 3 Aug 2015 09:39:29 +0200 Subject: [PATCH 09/36] 8132457: Unify command-line flags controlling the usage of compiler intrinsics Cleanup processing of command-line flags controlling intrinsics. Reviewed-by: kvn --- hotspot/src/share/vm/c1/c1_Compiler.cpp | 23 ------ hotspot/src/share/vm/c1/c1_Compiler.hpp | 9 --- hotspot/src/share/vm/c1/c1_GraphBuilder.cpp | 12 ++- hotspot/src/share/vm/classfile/vmSymbols.cpp | 68 ++++++++++++++-- hotspot/src/share/vm/classfile/vmSymbols.hpp | 7 +- .../share/vm/compiler/abstractCompiler.hpp | 14 +--- hotspot/src/share/vm/opto/c2_globals.hpp | 3 - hotspot/src/share/vm/opto/c2compiler.cpp | 80 ------------------- hotspot/src/share/vm/opto/c2compiler.hpp | 15 +--- hotspot/src/share/vm/opto/library_call.cpp | 2 +- hotspot/src/share/vm/runtime/globals.hpp | 3 + 11 files changed, 88 insertions(+), 148 deletions(-) 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/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..8017edd3905 100644 --- a/hotspot/src/share/vm/classfile/vmSymbols.hpp +++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp @@ -1384,10 +1384,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/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 { // // 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 { // 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 { 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/c2_globals.hpp b/hotspot/src/share/vm/opto/c2_globals.hpp index 4c6824cf3f9..779c01e57c5 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/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/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp index daec828a2c0..502aab6eca8 100644 --- a/hotspot/src/share/vm/runtime/globals.hpp +++ b/hotspot/src/share/vm/runtime/globals.hpp @@ -855,6 +855,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") \ \ From bdc4e4d0450dd45fe179b5b31e499f2d0f8eddfc Mon Sep 17 00:00:00 2001 From: Andrew Dinn Date: Mon, 3 Aug 2015 05:05:40 -0400 Subject: [PATCH 10/36] 8132875: AArch64: Fix error introduced into AArch64 CodeCache by commit for 8130309 The fix for issue 8130309 introduced several errors into the AArch64 codecache routines Reviewed-by: aph, thartmann, kvn --- hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp | 2 +- hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp | 3 +++ hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp index d6f7abc7ea1..bdfc017aa82 100644 --- a/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp +++ b/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp @@ -334,7 +334,7 @@ void ArrayCopyStub::emit_code(LIR_Assembler* ce) { relocInfo::static_call_type); address call = __ trampoline_call(resolve); if (call == NULL) { - bailout("trampoline stub overflow"); + ce->bailout("trampoline stub overflow"); return; } ce->add_call_info_here(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/macroAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp index 3c2cf60abc1..2bd4127cd50 100644 --- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp +++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp @@ -685,7 +685,8 @@ address MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) { } else { bl(pc()); } - return start_offset; + // just need to return a non-null address + return pc(); } From 2bf01467e3eb2036967a155ee4d531798fc300a9 Mon Sep 17 00:00:00 2001 From: Staffan Larsen Date: Mon, 3 Aug 2015 11:12:57 +0200 Subject: [PATCH 11/36] 8132876: Increase PerfDataMemorySize to 64K Reviewed-by: sspitsyn --- hotspot/src/share/vm/runtime/globals.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp index d2982e0d422..62bb586d98c 100644 --- a/hotspot/src/share/vm/runtime/globals.hpp +++ b/hotspot/src/share/vm/runtime/globals.hpp @@ -3913,7 +3913,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.") \ \ From 8dfd822c414db2be27843dcb9f6514eb7e3497c2 Mon Sep 17 00:00:00 2001 From: David Holmes Date: Mon, 3 Aug 2015 16:54:08 -0400 Subject: [PATCH 12/36] 8080298: Clean up os::...::supports_variable_stack_size() Reviewed-by: kbarrett, simonis, stuefe, coleenp --- hotspot/src/os/aix/vm/os_aix.cpp | 46 ++++++++-------- hotspot/src/os/aix/vm/os_aix.hpp | 2 - hotspot/src/os/bsd/vm/os_bsd.cpp | 53 +++++++++---------- hotspot/src/os/bsd/vm/os_bsd.hpp | 4 +- hotspot/src/os/linux/vm/os_linux.cpp | 52 +++++++++--------- hotspot/src/os/linux/vm/os_linux.hpp | 2 - hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp | 6 +-- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp | 6 +-- .../src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 6 +-- .../linux_aarch64/vm/os_linux_aarch64.cpp | 5 +- .../src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp | 2 - .../os_cpu/linux_sparc/vm/os_linux_sparc.cpp | 5 +- .../src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 5 -- .../os_cpu/linux_zero/vm/os_linux_zero.cpp | 6 +-- 14 files changed, 77 insertions(+), 123 deletions(-) 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* 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 3b198380646..bd4aa14b32f 100644 --- a/hotspot/src/os/linux/vm/os_linux.cpp +++ b/hotspot/src/os/linux/vm/os_linux.cpp @@ -711,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)); 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* 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); From 4673cb217ea7c7e4120454ce85e967e6f71c6135 Mon Sep 17 00:00:00 2001 From: Bengt Rutisson Date: Tue, 4 Aug 2015 12:58:54 +0200 Subject: [PATCH 13/36] 8132953: imageDecompressor.hpp should not include precompiled.hpp Reviewed-by: dholmes --- hotspot/src/share/vm/classfile/imageDecompressor.cpp | 2 +- hotspot/src/share/vm/classfile/imageDecompressor.hpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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" From 900dc0a49cd6c3a863c21824b17854387a8def72 Mon Sep 17 00:00:00 2001 From: Jan Lahoda Date: Mon, 10 Aug 2015 09:47:35 +0200 Subject: [PATCH 14/36] 8129562: JDK 9 build using boot-jdk classes instead of newly compiled classes Need to specify empty -extdirs and -endorseddirs to javac to avoid loading of boot JDK classes during build. Reviewed-by: tbell, coffeys, jjg, henryjen --- make/CompileJavaModules.gmk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk index ea48c7f40f1..8d97cd0aad2 100644 --- a/make/CompileJavaModules.gmk +++ b/make/CompileJavaModules.gmk @@ -512,8 +512,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 +534,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), \ From 0785d3b590984de0fee8f4590d5a167bee80343b Mon Sep 17 00:00:00 2001 From: Frank Yuan Date: Mon, 10 Aug 2015 09:52:32 -0700 Subject: [PATCH 15/36] 8132660: Change jaxp unit test package name to be different with jaxp api Reviewed-by: joehw --- .../javax/xml/jaxp/unittest/TEST.properties | 6 - .../{javax/xml => }/common/Bug6350682.java | 4 +- .../xml => }/common/Bug6723276Test.java | 4 +- .../{javax/xml => }/common/Bug6941169.xml | 0 .../{javax/xml => }/common/Bug6941169.xsd | 0 .../xml => }/common/Bug6941169Test.java | 4 +- .../xml => }/common/Bug7143711Test.java | 2 +- .../{javax/xml => }/datatype/Bug6320118.java | 4 +- .../xml => }/datatype/Bug6937951Test.java | 8 +- .../xml => }/datatype/Bug6937964Test.java | 8 +- .../xml => }/datatype/Bug7042647Test.java | 8 +- .../datatype/DatatypeFactoryTest.java | 9 +- .../xml => }/datatype/DurationTest.java | 8 +- .../xml => }/datatype/FactoryFindTest.java | 6 +- .../datatype/XMLGregorianCalendarTest.java | 9 +- .../{org/w3c => }/dom/Bug4915524.java | 4 +- .../{org/w3c => }/dom/Bug4915748.java | 4 +- .../{org/w3c => }/dom/Bug4966082.java | 4 +- .../unittest/{org/w3c => }/dom/Bug4966082.xml | 0 .../{org/w3c => }/dom/Bug4966138.java | 4 +- .../{org/w3c => }/dom/Bug4966142.java | 4 +- .../unittest/{org/w3c => }/dom/Bug4966142.xml | 0 .../unittest/{org/w3c => }/dom/Bug4966142.xsd | 0 .../{org/w3c => }/dom/Bug4966143.java | 4 +- .../unittest/{org/w3c => }/dom/Bug4966143.xml | 0 .../unittest/{org/w3c => }/dom/Bug4966143.xsd | 0 .../{org/w3c => }/dom/Bug6339023.java | 4 +- .../{org/w3c => }/dom/Bug6355326.java | 4 +- .../{org/w3c => }/dom/Bug6367542.java | 4 +- .../{org/w3c => }/dom/Bug6520131.java | 4 +- .../{org/w3c => }/dom/Bug6521260.java | 4 +- .../unittest/{org/w3c => }/dom/Bug6582545.xml | 0 .../{org/w3c => }/dom/Bug6582545Test.java | 7 +- .../unittest/{org/w3c => }/dom/Bug6879614.xml | 0 .../{org/w3c => }/dom/Bug6879614Test.java | 5 +- .../{org/w3c => }/dom/CR6333993Test.java | 6 +- .../{org/w3c => }/dom/CR6517707Test.java | 7 +- .../{org/w3c => }/dom/CR6517717Test.java | 7 +- .../{org/w3c => }/dom/CR6909336Test.java | 5 +- .../w3c => }/dom/DOMConfigurationTest.java | 19 +- .../w3c => }/dom/DOMConfigurationTest.xsd | 0 .../{org/w3c => }/dom/DOMXPathTest.java | 4 +- .../{org/w3c => }/dom/JdkXmlDomTest.java | 2 +- .../{org/w3c => }/dom/TCKEncodingTest.java | 5 +- .../{org/w3c => }/dom/ls/Bug4973153.java | 4 +- .../{org/w3c => }/dom/ls/Bug6290947.java | 4 +- .../{org/w3c => }/dom/ls/Bug6354955.java | 4 +- .../{org/w3c => }/dom/ls/Bug6376823.java | 4 +- .../{org/w3c => }/dom/ls/Bug6710741Test.java | 6 +- .../{org/w3c => }/dom/ls/LSParserTCKTest.java | 8 +- .../{org/w3c => }/dom/ls/LSParserTest.java | 8 +- .../w3c => }/dom/ls/LSSerializerTest.java | 6 +- .../{org/w3c => }/dom/ls/note_in_dtd.xml | 0 .../jaxp/unittest/{org/w3c => }/dom/test.xml | 0 .../jaxp/unittest/{org/w3c => }/dom/test.xsd | 0 .../parsers/Bug4674384_MAX_OCCURS_Test.java | 7 +- .../parsers/Bug4674384_MAX_OCCURS_Test.xml | 0 .../parsers/Bug4674384_MAX_OCCURS_Test.xsd | 0 .../{javax/xml => }/parsers/Bug4934208.java | 4 +- .../{javax/xml => }/parsers/Bug4967002.java | 4 +- .../{javax/xml => }/parsers/Bug4985486.java | 4 +- .../{javax/xml => }/parsers/Bug4985486.xml | 0 .../{javax/xml => }/parsers/Bug4991020.java | 4 +- .../{javax/xml => }/parsers/Bug4991020.xml | 0 .../{javax/xml => }/parsers/Bug4991020.xsd | 0 .../{javax/xml => }/parsers/Bug4991946.java | 4 +- .../{javax/xml => }/parsers/Bug4991946.xml | 0 .../{javax/xml => }/parsers/Bug4991946.xsd | 0 .../{javax/xml => }/parsers/Bug5010072.java | 4 +- .../{javax/xml => }/parsers/Bug5010072.xsd | 0 .../{javax/xml => }/parsers/Bug5025825.java | 4 +- .../{javax/xml => }/parsers/Bug6309988.java | 4 +- .../{javax/xml => }/parsers/Bug6341770.java | 4 +- .../{javax/xml => }/parsers/Bug6361283.java | 4 +- .../xml => }/parsers/Bug6506304Test.java | 7 +- .../{javax/xml => }/parsers/Bug6518733.java | 4 +- .../{javax/xml => }/parsers/Bug6518733.xml | 0 .../{javax/xml => }/parsers/Bug6564400.java | 4 +- .../{javax/xml => }/parsers/Bug6564400.xml | 0 .../{javax/xml => }/parsers/Bug6564400.xsd | 0 .../{javax/xml => }/parsers/Bug6573786.java | 4 +- .../parsers/Bug6573786ErrorHandler.java | 4 +- .../{javax/xml => }/parsers/Bug6594813.java | 4 +- .../{javax/xml => }/parsers/Bug6608841.dtd | 0 .../{javax/xml => }/parsers/Bug6608841.java | 4 +- .../{javax/xml => }/parsers/Bug6608841.xml | 0 .../parsers/Bug6608841_xhtml11-flat.dtd | 0 .../{javax/xml => }/parsers/Bug6690015.java | 4 +- .../{javax/xml => }/parsers/Bug6760982.java | 4 +- .../xml => }/parsers/Bug6849942Test.java | 7 +- .../{javax/xml => }/parsers/Bug7157608.dtd | 0 .../{javax/xml => }/parsers/Bug7157608.xml | 0 .../xml => }/parsers/Bug7157608Test.java | 7 +- .../{javax/xml => }/parsers/Bug7157608_1.xml | 0 .../xml => }/parsers/Bug7166896Test.java | 8 +- .../{javax/xml => }/parsers/Bug8073385.java | 2 +- .../{javax/xml => }/parsers/DosTest.xml | 0 .../{javax/xml => }/parsers/DosTest3.xml | 0 .../xml => }/parsers/FactoryFindTest.java | 6 +- .../xml => }/parsers/MyDefaultHandler.java | 4 +- .../xml => }/parsers/MyErrorHandler.java | 4 +- .../xml => }/parsers/ParseEmptyStream.java | 7 +- .../{javax/xml => }/parsers/bug6690015.xml | 0 .../{javax/xml => }/parsers/bug6760982.xml | 0 .../{javax/xml => }/parsers/catalog.xml | 0 .../{javax/xml => }/parsers/catalog.xsd | 0 .../{javax/xml => }/parsers/entity.xml | 0 .../{javax/xml => }/parsers/entity64K.xml | 0 .../unittest/{javax/xml => }/parsers/test.xsd | 0 .../{javax/xml => }/parsers/test1.xml | 0 .../{javax/xml => }/parsers/test2.xml | 0 .../unittest/{javax/xml => }/parsers/toys.xml | 0 .../unittest/{javax/xml => }/parsers/toys.xsd | 0 .../{javax/xml => }/parsers/toys3002.xsd | 0 .../parsers/xinclude/Bug6794483Test.java | 2 +- .../xml => }/parsers/xinclude/test1.xml | 0 .../xml => }/parsers/xinclude/test2.xml | 0 .../xml/jaxp/unittest/policy/PolicyUtil.java | 35 -- .../xml/jaxp/unittest/policy/common.policy | 27 - .../xml => }/sax/Attributes2ImplTest.java | 4 +- .../{org/xml => }/sax/Bug6889654Test.java | 4 +- .../{org/xml => }/sax/Bug6925410Test.java | 4 +- .../{org/xml => }/sax/Bug6949607Test.java | 4 +- .../{org/xml => }/sax/Bug6992561Test.java | 4 +- .../unittest/{org/xml => }/sax/Bug7057778.xml | 0 .../{org/xml => }/sax/Bug7057778Test.java | 4 +- .../xml => }/sax/DefaultHandler2Test.java | 4 +- .../{org/xml => }/sax/IssueTracker56Test.java | 4 +- .../{org/xml => }/sax/MyDefaultHandler2.java | 4 +- .../{org/xml => }/sax/NSSupportTest.java | 4 +- .../{org/xml => }/sax/SAXExceptionExt.java | 4 +- .../{org/xml => }/sax/externalDTD.dtd | 0 .../jaxp/unittest/{org/xml => }/sax/toys.xml | 0 .../unittest/{org/xml => }/sax/toys_error.xml | 0 .../AttributeLocalNameTest.java | 2 +- .../{javax/xml => }/stream/Bug6370703.java | 4 +- .../{javax/xml => }/stream/Bug6378422.java | 4 +- .../{javax/xml => }/stream/Bug6380870.java | 4 +- .../{javax/xml => }/stream/Bug6489502.java | 2 +- .../{javax/xml => }/stream/Bug6509774.java | 4 +- .../xml => }/stream/Bug6688002Test.java | 9 +- .../{javax/xml => }/stream/Bug6976938.xml | 0 .../xml => }/stream/Bug6976938Test.java | 8 +- .../stream/CoalesceTest/CoalesceTest.java | 2 +- .../xml => }/stream/CoalesceTest/coalesce.xml | 0 .../stream/EntitiesTest/EntityTest.java | 2 +- .../stream/EntitiesTest/testCharRef.xml | 0 .../EntitiesTest/testCharRef.xml.output | 0 .../stream/EventReaderDelegateTest.java | 10 +- .../EventsTest}/Issue41Test.java | 4 +- .../EventsTest}/Issue48Test.java | 4 +- .../EventsTest}/Issue53Test.java | 4 +- .../EventsTest}/Issue58Test.java | 4 +- .../xml => }/stream/FactoryFindTest.java | 7 +- .../xml => }/stream/FactoryFindTest.policy | 0 .../stream/IgnoreExternalDTDTest.java | 9 +- .../ProcessingInstructionTest.java | 4 +- .../stream/StreamReaderDelegateTest.java | 9 +- .../xml => }/stream/XMLEventLocationTest.java | 6 +- .../stream/XMLEventReaderTest/Bug6489890.java | 2 +- .../stream/XMLEventReaderTest/Bug6555001.java | 2 +- .../XMLEventReaderTest/Bug6586466Test.java | 2 +- .../XMLEventReaderTest/Bug6613059Test.java | 2 +- .../XMLEventReaderTest/Bug6668115Test.java | 2 +- .../XMLEventReaderTest/Bug6846133Test.java | 2 +- .../XMLEventReaderTest/Issue40Test.java | 2 +- .../stream/XMLEventReaderTest/bug6613059.xml | 0 .../stream/XMLEventReaderTest/play.xml | 0 .../stream/XMLEventReaderTest/play2.xml | 0 .../stream/XMLEventReaderTest/sgml.xml | 0 .../ReaderToWriterTest.java | 2 +- .../ReaderToWriterTest.wsdl | 0 .../XMLEventWriterTest/ReaderToWriterTest.xml | 0 .../W2JDLR4002TestService.wsdl.data | 0 .../XMLEventWriterTest.java | 2 +- .../XMLEventWriterTest/XMLEventWriterTest.xml | 0 .../stream/XMLEventWriterTest/merge-1.xml | 0 .../stream/XMLEventWriterTest/merge-2.xml | 0 .../stream/XMLEventWriterTest/replace1.txt | 0 .../XMLInputFactoryTest/Bug6756677Test.java | 6 +- .../XMLInputFactoryTest/Bug6909759Test.java | 2 +- .../XMLInputFactoryTest/IssueTracker38.java | 2 +- .../XMLInputFactoryTest/MyInputFactory.java | 2 +- .../stream/XMLInputFactoryTest/play.xml | 0 .../XMLOutputFactoryTest/Bug6846132Test.java | 2 +- .../DuplicateNSDeclarationTest.java | 2 +- .../StreamResultTest.java | 2 +- .../XMLResolverTest/XMLResolverTest.java | 2 +- .../XMLResolverTest/XMLResolverTest.xml | 0 .../stream/XMLResolverTest/replace1.txt | 0 .../stream/XMLResolverTest/replace2.txt | 0 .../XMLStreamExceptionTest/ExceptionTest.java | 2 +- .../XMLStreamFilterTest/Bug6481615.java | 2 +- .../XMLStreamFilterTest/Bug6481678.java | 2 +- .../XMLStreamFilterTest/HasNextTest.java | 2 +- .../XMLStreamFilterTest/HasNextTest.xml | 0 .../HasNextTypeFilter.java | 2 +- .../stream/XMLStreamReaderTest/BOMTest.java | 2 +- .../XMLStreamReaderTest/Bug6388460.java | 2 +- .../XMLStreamReaderTest/Bug6472982Test.java | 2 +- .../stream/XMLStreamReaderTest/Bug6767322.xml | 0 .../XMLStreamReaderTest/Bug6767322Test.java | 2 +- .../XMLStreamReaderTest/Bug6847819Test.java | 2 +- .../stream/XMLStreamReaderTest/BugTest.java | 2 +- .../DefaultAttributeTest.java | 2 +- .../XMLStreamReaderTest/DoubleXmlnsTest.java | 2 +- .../XMLStreamReaderTest/ExternalDTD.dtd} | 0 .../XMLStreamReaderTest/ExternalDTD.xml} | 0 .../XMLStreamReaderTest/Hello.wsdl.data | 0 .../XMLStreamReaderTest/IsValidatingTest.java | 2 +- .../XMLStreamReaderTest/IsValidatingTest.xml | 0 .../IsValidatingTestInternalSubset.xml | 0 .../XMLStreamReaderTest/Issue44Test.java | 2 +- .../XMLStreamReaderTest/Issue47Test.java | 2 +- .../XMLStreamReaderTest/IssueTracker24.java | 2 +- .../XMLStreamReaderTest/IssueTracker35.java | 2 +- .../XMLStreamReaderTest/IssueTracker70.java | 2 +- .../XMLStreamReaderTest/IssueTracker70.xml | 0 .../XMLStreamReaderTest/Jsr173MR1Req5.xml | 0 .../Jsr173MR1Req5Test.java | 2 +- .../XMLStreamReaderTest/Jsr173MR1Req8.xml | 0 .../Jsr173MR1Req8Test.java | 2 +- .../XMLStreamReaderTest/NamespaceTest.java | 2 +- .../XMLStreamReaderTest/StreamReaderTest.java | 2 +- .../XMLStreamReaderTest/SupportDTDTest.java | 2 +- .../XMLStreamReaderTest/UTF16-BE.wsdl.data | 0 .../XMLStreamReaderTest/UTF8-BOM.xml.data | 0 .../XMLStreamReaderTest/VoiceXMLDTDTest.java | 2 +- .../stream/XMLStreamReaderTest/XML11Test.java | 2 +- .../stream/XMLStreamReaderTest/XMLSchema.dtd | 0 .../stream/XMLStreamReaderTest/XMLSchema.xsd | 0 .../stream/XMLStreamReaderTest/datatypes.dtd | 0 .../stream/XMLStreamReaderTest/report.dtd | 0 .../stream/XMLStreamReaderTest/sgml.xml | 0 .../stream/XMLStreamReaderTest/voicexml.xml | 0 .../stream/XMLStreamReaderTest/vxml.dtd | 0 .../stream/XMLStreamReaderTest/xml11.xml.data | 0 .../AttributeEscapeTest.java | 2 +- .../XMLStreamWriterTest/Bug6452107.java | 2 +- .../XMLStreamWriterTest/Bug6600882Test.java | 2 +- .../XMLStreamWriterTest/Bug6675332Test.java | 2 +- .../XMLStreamWriterTest/Bug7037352Test.java | 2 +- .../stream/XMLStreamWriterTest/DOMUtil.java | 2 +- .../XMLStreamWriterTest/DomUtilTest.java | 2 +- .../XMLStreamWriterTest/EmptyElementTest.java | 2 +- .../XMLStreamWriterTest/EncodingTest.java | 2 +- .../XMLStreamWriterTest/NamespaceTest.java | 2 +- .../NullUriDetectionTest.java | 2 +- .../XMLStreamWriterTest/SqeLinuxTest.java | 2 +- .../UnprefixedNameTest.java | 2 +- .../XMLStreamWriterTest/WriterTest.java | 2 +- .../XMLStreamWriterTest.java | 2 +- .../stream/XMLStreamWriterTest/message_12.xml | 0 .../XMLStreamWriterTest/testEight.xml.org | 0 .../XMLStreamWriterTest/testFive.xml.org | 0 .../XMLStreamWriterTest/testFour.xml.org | 0 .../XMLStreamWriterTest/testOne.xml.org | 0 .../XMLStreamWriterTest/testSeven.xml.org | 0 .../XMLStreamWriterTest/testSix.xml.org | 0 .../XMLStreamWriterTest/testThree.xml.org | 0 .../{javax/xml => }/stream/basic-form.vxml | 0 .../{javax/xml => }/stream/report.dtd | 0 .../xml => }/stream/sgml-bad-systemId.xml | 0 .../unittest/{javax/xml => }/stream/sgml.xml | 0 .../xml => }/stream/sgml_Bug6509774.xml | 0 .../{javax/xml => }/stream/testfile1.xml | 0 .../{javax/xml => }/stream/testfile2.xml | 0 .../{javax/xml => }/stream/testfile3.xml | 0 .../{javax/xml => }/stream/testfile4.xml | 0 .../unittest/{javax/xml => }/stream/toys.xml | 0 .../unittest/{javax/xml => }/stream/vxml.dtd | 0 .../{javax/xml => }/transform/5368141.xml | 0 .../{javax/xml => }/transform/Bug4693341.dtd | 0 .../{javax/xml => }/transform/Bug4693341.out | 0 .../{javax/xml => }/transform/Bug4693341.xml | 0 .../xml => }/transform/Bug4693341Test.java | 4 +- .../xml => }/transform/Bug4693341_golden.dtd | 0 .../xml => }/transform/Bug4693341_golden.xml | 0 .../{javax/xml => }/transform/Bug4892774.java | 13 +- .../{javax/xml => }/transform/Bug5073477.java | 4 +- .../{javax/xml => }/transform/Bug5073477.xml | 0 .../{javax/xml => }/transform/Bug6175602.java | 4 +- .../{javax/xml => }/transform/Bug6206491.java | 4 +- .../{javax/xml => }/transform/Bug6206491.xml | 0 .../{javax/xml => }/transform/Bug6206491.xsl | 0 .../xml => }/transform/Bug6206491_2.xml | 0 .../xml => }/transform/Bug6216226Test.java | 6 +- .../{javax/xml => }/transform/Bug6311448.java | 4 +- .../{javax/xml => }/transform/Bug6384805.java | 4 +- .../{javax/xml => }/transform/Bug6465722.java | 4 +- .../{javax/xml => }/transform/Bug6467808.java | 4 +- .../{javax/xml => }/transform/Bug6490380.java | 4 +- .../{javax/xml => }/transform/Bug6490921.java | 4 +- .../{javax/xml => }/transform/Bug6505031.java | 4 +- .../{javax/xml => }/transform/Bug6513892.java | 4 +- .../{javax/xml => }/transform/Bug6537167.java | 4 +- .../{javax/xml => }/transform/Bug6540545.java | 4 +- .../{javax/xml => }/transform/Bug6559595.java | 4 +- .../{javax/xml => }/transform/Bug6565260.java | 4 +- .../{javax/xml => }/transform/Bug6940416.java | 4 +- .../xml => }/transform/BugDB12665704.xml | 0 .../xml => }/transform/BugDB12665704.xsl | 0 .../xml => }/transform/BugDB12665704Test.java | 10 +- .../{javax/xml => }/transform/CR6401137.xml | 0 .../{javax/xml => }/transform/CR6401137.xsl | 0 .../xml => }/transform/CR6401137Test.java | 8 +- .../xml => }/transform/CR6551600.policy | 0 .../xml => }/transform/CR6551600Test.java | 6 +- .../{javax/xml => }/transform/CR6577667.xsl | 0 .../xml => }/transform/CR6577667Test.java | 6 +- .../xml => }/transform/CR6652519Test.java | 6 +- .../xml => }/transform/CR6689809Test.java | 5 +- .../{javax/xml => }/transform/CR6905829.xml | 0 .../{javax/xml => }/transform/CR6905829.xsl | 0 .../xml => }/transform/CR6905829Inc.xsl | 0 .../xml => }/transform/CR6905829Test.java | 6 +- .../{javax/xml => }/transform/CR6935697.xml | 0 .../{javax/xml => }/transform/CR6935697.xsl | 0 .../xml => }/transform/CR6935697Test.java | 9 +- .../{javax/xml => }/transform/CR6941869.xml | 0 .../{javax/xml => }/transform/CR6941869.xsl | 0 .../xml => }/transform/CR6941869Test.java | 6 +- .../{javax/xml => }/transform/CR6957215.xml | 0 .../{javax/xml => }/transform/CR6957215.xsl | 0 .../xml => }/transform/CR6957215Test.java | 12 +- .../{javax/xml => }/transform/CR7098746.xml | 0 .../{javax/xml => }/transform/CR7098746.xsl | 0 .../xml => }/transform/CR7098746Test.java | 9 +- .../xml => }/transform/DOMResultTest.java | 9 +- .../xml => }/transform/DocumentExtFunc.java | 2 +- .../xml => }/transform/FactoryFindTest.java | 6 +- .../{javax/xml => }/transform/Issue2204.xml | 0 .../{javax/xml => }/transform/Issue2204.xsl | 0 .../xml => }/transform/Issue2204Test.java | 4 +- .../{javax/xml => }/transform/Issue2290.xsl | 0 .../xml => }/transform/Issue2290Test.java | 4 +- .../transform/MsWordXMLImport.xsl.data | 2 +- .../NCAA_Conference_Schedule_XML.dtd | 0 .../xml => }/transform/OpenJDK100017Test.java | 6 +- .../xml => }/transform/PredicateInKeyTest.xml | 2 +- .../xml => }/transform/PredicateInKeyTest.xsl | 2 +- .../xml => }/transform/SAX2DOMTest.java | 4 +- .../{javax/xml => }/transform/SAX2DOMTest.xml | 0 .../transform/SecureProcessingTest.java | 8 +- .../transform/SecureProcessingTest.xml | 0 .../transform/SecureProcessingTest.xsl | 0 .../{javax/xml => }/transform/SourceTest.java | 7 +- .../{javax/xml => }/transform/SourceTest.xml | 0 .../{javax/xml => }/transform/SourceTest.xsl | 0 .../xml => }/transform/StAXSourceTest.java | 8 +- .../transform/TransformerFactoryTest.java | 11 +- .../xml => }/transform/TransformerTest.java | 7 +- .../transform/TransformerUtilFactory.java | 14 +- .../transform/VersionDefaultHandler.java | 4 +- .../transform/VersionEventWriter.java | 4 +- .../{javax/xml => }/transform/ViewEditor1.xsl | 0 .../xml => }/transform/XSLTFunctionsTest.java | 12 +- .../{javax/xml => }/transform/attribset27.xml | 0 .../{javax/xml => }/transform/attribset27.xsl | 0 .../{javax/xml => }/transform/catalog.xml | 0 .../{javax/xml => }/transform/catalog.xsd | 0 .../{javax/xml => }/transform/catalog_10.xml | 0 .../{javax/xml => }/transform/config.dtd | 0 .../{javax/xml => }/transform/config.xml | 0 .../xml => }/transform/default-layout.xsl | 0 .../xml => }/transform/global-variables.xsl | 0 .../{javax/xml => }/transform/global.xsl | 0 .../{javax/xml => }/transform/home.xsl | 0 .../unittest/{javax/xml => }/transform/in.xml | 0 .../{javax/xml => }/transform/inner.xsl | 0 .../{javax/xml => }/transform/logon.xsl | 0 .../{javax/xml => }/transform/maps.xml | 0 .../{javax/xml => }/transform/msgAttach.xml | 0 .../{javax/xml => }/transform/numbering63.xml | 0 .../{javax/xml => }/transform/numbering63.xsl | 0 .../{javax/xml => }/transform/outer.xsl | 0 .../{javax/xml => }/transform/redirect.xml | 0 .../{javax/xml => }/transform/redirect.xsl | 0 .../xml => }/transform/sax/Bug6451633.java | 4 +- .../{javax/xml => }/transform/src.xml | 0 .../{javax/xml => }/transform/template.xml | 0 .../xml => }/transform/tigertest-in.xml | 0 .../{javax/xml => }/transform/tigertest.xsl | 0 .../{javax/xml => }/transform/tmp.xml | 0 .../{javax/xml => }/transform/toys.xml | 0 .../{javax/xml => }/transform/transform.xsl | 0 .../xml => }/transform/upload-media-form.xsl | 0 .../xml => }/transform/upload-media.xsl | 0 .../{javax/xml => }/transform/util.xsl | 0 .../xml => }/transform/util/DOMUtil.java | 4 +- .../xml => }/transform/util/SAXUtil.java | 7 +- .../xml => }/transform/util/StAXUtil.java | 9 +- .../xml => }/transform/util/StreamUtil.java | 7 +- .../transform/util/TransformerUtil.java | 4 +- .../jaxp/unittest/util/BOMInputStream.java | 80 --- .../xml/jaxp/unittest/util/BaseStAXUT.java | 559 ------------------ .../unittest/util/DraconianErrorHandler.java | 37 -- .../{javax/xml => }/validation/6773084.policy | 0 .../xml => }/validation/AnyElementTest.java | 4 +- .../xml => }/validation/Bug4966232.java | 4 +- .../xml => }/validation/Bug4966254.java | 4 +- .../{javax/xml => }/validation/Bug4966254.xml | 0 .../{javax/xml => }/validation/Bug4966254.xsd | 0 .../xml => }/validation/Bug4969042.java | 4 +- .../xml => }/validation/Bug4969089.java | 4 +- .../xml => }/validation/Bug4969110.java | 4 +- .../xml => }/validation/Bug4969689.java | 4 +- .../xml => }/validation/Bug4969692.java | 4 +- .../xml => }/validation/Bug4969693.java | 4 +- .../xml => }/validation/Bug4969695.java | 4 +- .../xml => }/validation/Bug4969732.java | 4 +- .../xml => }/validation/Bug4970380.java | 4 +- .../xml => }/validation/Bug4970383.java | 4 +- .../xml => }/validation/Bug4970400.java | 4 +- .../xml => }/validation/Bug4970402.java | 4 +- .../xml => }/validation/Bug4970951.java | 4 +- .../xml => }/validation/Bug4971605.java | 4 +- .../xml => }/validation/Bug4971607.java | 4 +- .../xml => }/validation/Bug4972882.java | 4 +- .../xml => }/validation/Bug4986844.java | 4 +- .../{javax/xml => }/validation/Bug4986844.xsd | 0 .../xml => }/validation/Bug4987574.java | 4 +- .../xml => }/validation/Bug4988267.java | 4 +- .../{javax/xml => }/validation/Bug4988267.xsd | 0 .../xml => }/validation/Bug4988268.java | 4 +- .../{javax/xml => }/validation/Bug4988268.xsd | 0 .../xml => }/validation/Bug4988387.java | 4 +- .../{javax/xml => }/validation/Bug4988387.xsd | 0 .../xml => }/validation/Bug4996446.java | 4 +- .../{javax/xml => }/validation/Bug4996446.xsd | 0 .../xml => }/validation/Bug4997818.java | 4 +- .../xml => }/validation/Bug5011500.java | 4 +- .../xml => }/validation/Bug5072946.java | 4 +- .../{javax/xml => }/validation/Bug5072946.xml | 0 .../{javax/xml => }/validation/Bug5072946.xsd | 0 .../xml => }/validation/Bug6378043.java | 4 +- .../xml => }/validation/Bug6449797.java | 4 +- .../{javax/xml => }/validation/Bug6449797.xsd | 0 .../xml => }/validation/Bug6457662.java | 4 +- .../{javax/xml => }/validation/Bug6467424.xml | 0 .../{javax/xml => }/validation/Bug6467424.xsd | 0 .../xml => }/validation/Bug6467424Test.java | 7 +- .../xml => }/validation/Bug6483188.java | 4 +- .../xml => }/validation/Bug6493687.java | 4 +- .../{javax/xml => }/validation/Bug6493687.xml | 0 .../{javax/xml => }/validation/Bug6493687.xsd | 0 .../xml => }/validation/Bug6509668.java | 4 +- .../xml => }/validation/Bug6526547.java | 4 +- .../{javax/xml => }/validation/Bug6526547.xml | 0 .../{javax/xml => }/validation/Bug6526547.xsd | 0 .../xml => }/validation/Bug6531160.java | 4 +- .../{javax/xml => }/validation/Bug6695843.xml | 0 .../{javax/xml => }/validation/Bug6695843.xsd | 0 .../xml => }/validation/Bug6695843Test.java | 7 +- .../{javax/xml => }/validation/Bug6773084.xsd | 0 .../validation/Bug6773084In/Bug6773084_1.xml | 0 .../validation/Bug6773084In/Bug6773084_10.xml | 0 .../validation/Bug6773084In/Bug6773084_11.xml | 0 .../validation/Bug6773084In/Bug6773084_12.xml | 0 .../validation/Bug6773084In/Bug6773084_13.xml | 0 .../validation/Bug6773084In/Bug6773084_14.xml | 0 .../validation/Bug6773084In/Bug6773084_15.xml | 0 .../validation/Bug6773084In/Bug6773084_16.xml | 0 .../validation/Bug6773084In/Bug6773084_17.xml | 0 .../validation/Bug6773084In/Bug6773084_18.xml | 0 .../validation/Bug6773084In/Bug6773084_19.xml | 0 .../validation/Bug6773084In/Bug6773084_2.xml | 0 .../validation/Bug6773084In/Bug6773084_20.xml | 0 .../validation/Bug6773084In/Bug6773084_21.xml | 0 .../validation/Bug6773084In/Bug6773084_22.xml | 0 .../validation/Bug6773084In/Bug6773084_23.xml | 0 .../validation/Bug6773084In/Bug6773084_24.xml | 0 .../validation/Bug6773084In/Bug6773084_25.xml | 0 .../validation/Bug6773084In/Bug6773084_3.xml | 0 .../validation/Bug6773084In/Bug6773084_4.xml | 0 .../validation/Bug6773084In/Bug6773084_5.xml | 0 .../validation/Bug6773084In/Bug6773084_6.xml | 0 .../validation/Bug6773084In/Bug6773084_7.xml | 0 .../validation/Bug6773084In/Bug6773084_8.xml | 0 .../validation/Bug6773084In/Bug6773084_9.xml | 0 .../xml => }/validation/Bug6773084Test.java | 7 +- .../xml => }/validation/Bug6859210.java | 4 +- .../xml => }/validation/Bug6925531Test.java | 7 +- .../{javax/xml => }/validation/Bug6946312.xml | 0 .../xml => }/validation/Bug6946312Test.java | 6 +- .../{javax/xml => }/validation/Bug6954738.xml | 0 .../{javax/xml => }/validation/Bug6954738.xsd | 0 .../xml => }/validation/Bug6954738_Test.java | 7 +- .../xml => }/validation/CR6708840Test.java | 7 +- .../{javax/xml => }/validation/CR6740048.java | 4 +- .../{javax/xml => }/validation/CR6740048.xml | 0 .../{javax/xml => }/validation/CR6740048.xsd | 0 .../{javax/xml => }/validation/CREMAS01.xml | 0 .../{javax/xml => }/validation/CREMAS01.xsd | 0 .../xml => }/validation/ErrorHandlerImpl.java | 4 +- .../{javax/xml => }/validation/Issue682.xml | 0 .../{javax/xml => }/validation/Issue682.xsd | 0 .../xml => }/validation/Issue682Test.java | 4 +- .../xml => }/validation/IssueTracker30.java | 4 +- .../IssueTracker30_occurs-error.xml | 0 .../validation/IssueTracker30_occurs-ok.xml | 0 .../IssueTracker30_occurs-optimize-error.xml | 0 .../IssueTracker30_occurs-optimize-ok.xml | 0 .../IssueTracker30_occurs-optimize.xsd | 0 .../validation/IssueTracker30_occurs.xsd | 0 .../xml => }/validation/JaxpIssue43Test.java | 7 +- .../xml => }/validation/JaxpIssue49.java | 7 +- .../xml => }/validation/JaxpIssue49.xml | 0 .../validation/LargeMaxOccursTest.java | 7 +- .../xml => }/validation/MultiOccursTest.java | 4 +- .../validation/MultiOccursUnboundedTest.java | 4 +- .../xml => }/validation/OccursTest.java | 4 +- .../validation/OccursUnboundedTest.java | 4 +- .../validation/OccursWildcardTest.java | 4 +- .../validation/OccursWildcardUnbounded.java | 4 +- .../validation/ParticlesId005Test.java | 4 +- .../validation/ParticlesIg004Test.java | 7 +- .../validation/ParticlesQ013Test.java | 4 +- .../validation/ProcessContents-lax-error.xml | 0 .../validation/ProcessContents-ok.xml | 0 .../xml => }/validation/ProcessContents.xsd | 0 .../xml => }/validation/TCKGroupA008Test.java | 8 +- .../xml => }/validation/ValidatorTest.java | 7 +- .../xml => }/validation/XMLDocBuilder.java | 4 +- .../validation/XMLSchemaValidator.java | 4 +- .../xml => }/validation/gMonths-invalid.xml | 2 +- .../{javax/xml => }/validation/gMonths.xml | 2 +- .../{javax/xml => }/validation/gMonths.xsd | 2 +- .../{javax/xml => }/validation/groupA008.xsd | 0 .../xml => }/validation/groupA008ea.red | 0 .../xml => }/validation/groupA008eb.red | 0 .../xml => }/validation/hello_literal.wsdl | 0 .../{javax/xml => }/validation/idI009.xsd | 0 .../{javax/xml => }/validation/idIimp.xsd | 0 .../{javax/xml => }/validation/idIxpns.xsd | 0 .../{javax/xml => }/validation/idIxpns1.xsd | 0 .../{javax/xml => }/validation/mgG014.xsd | 0 .../{javax/xml => }/validation/mgJ014.xsd | 0 .../validation/multi-occurs-error-max.xml | 0 .../validation/multi-occurs-error-min-max.xml | 0 .../validation/multi-occurs-error-min.xml | 0 .../xml => }/validation/multi-occurs-ok.xml | 0 .../multi-occurs-unbounded-error-min.xml | 0 .../validation/multi-occurs-unbounded-ok.xml | 0 .../validation/multi-occurs-unbounded.xsd | 0 .../xml => }/validation/multi-occurs.xsd | 0 .../xml => }/validation/occurs-error-max.xml | 0 .../validation/occurs-error-min-max.xml | 0 .../xml => }/validation/occurs-error-min.xml | 0 .../{javax/xml => }/validation/occurs-ok.xml | 0 .../validation/occurs-unbounded-error-min.xml | 0 .../validation/occurs-unbounded-ok.xml | 0 .../xml => }/validation/occurs-unbounded.xsd | 0 .../validation/occurs-wildcard-unbounded.xsd | 0 .../xml => }/validation/occurs-wildcard.xsd | 0 .../{javax/xml => }/validation/occurs.xsd | 0 .../xml => }/validation/particlesId005.xml | 0 .../xml => }/validation/particlesId005.xsd | 0 .../xml => }/validation/particlesIe003.xsd | 0 .../xml => }/validation/particlesIg004.xsd | 0 .../xml => }/validation/particlesOptimize.xsd | 0 .../xml => }/validation/particlesQ013.xml | 0 .../xml => }/validation/particlesQ013.xsd | 0 .../xml => }/validation/particlesR005.xsd | 0 .../xml => }/validation/targetNS00101m2.xsd | 0 .../validation/targetNS00101m2_stub.xml | 0 .../validation/targetNS00101m2_stub.xsd | 0 .../xml => }/validation/targetNS00101m2a.xsd | 0 .../Bug6943252In/byte_fractionDigits004.xsd | 0 .../Bug6943252In/byte_fractionDigits007.xsd | 0 .../Bug6943252In/int_fractionDigits004.xsd | 0 .../Bug6943252In/int_fractionDigits007.xsd | 0 .../integer_fractionDigits004.xsd | 0 .../integer_fractionDigits007.xsd | 0 .../Bug6943252In/long_fractionDigits004.xsd | 0 .../Bug6943252In/long_fractionDigits007.xsd | 0 .../negativeInteger_fractionDigits004.xsd | 0 .../negativeInteger_fractionDigits007.xsd | 0 .../nonNegativeInteger_fractionDigits004.xsd | 0 .../nonNegativeInteger_fractionDigits007.xsd | 0 .../nonPositiveInteger_fractionDigits004.xsd | 0 .../nonPositiveInteger_fractionDigits007.xsd | 0 .../positiveInteger_fractionDigits004.xsd | 0 .../positiveInteger_fractionDigits007.xsd | 0 .../Bug6943252In/short_fractionDigits004.xsd | 0 .../Bug6943252In/short_fractionDigits007.xsd | 0 .../unsignedByte_fractionDigits004.xsd | 0 .../unsignedByte_fractionDigits007.xsd | 0 .../unsignedInt_fractionDigits004.xsd | 0 .../unsignedInt_fractionDigits007.xsd | 0 .../unsignedLong_fractionDigits004.xsd | 0 .../unsignedLong_fractionDigits007.xsd | 0 .../unsignedShort_fractionDigits004.xsd | 0 .../unsignedShort_fractionDigits007.xsd | 0 .../validation/tck/Bug6943252Test.java | 2 +- .../xml => }/validation/tck/Bug6963124.xsd | 0 .../validation/tck/Bug6963124Test.java | 2 +- .../xml => }/validation/tck/Bug6963468.xml | 0 .../xml => }/validation/tck/Bug6963468.xsd | 0 .../validation/tck/Bug6963468Test.java | 2 +- .../xml => }/validation/tck/Bug6964720.xsd | 0 .../validation/tck/Bug6964720Test.java | 2 +- .../tck/Bug6967214/RegexTest_1258.xsd | 0 .../validation/tck/Bug6967214/reD10.xsd | 0 .../validation/tck/Bug6967214/reD11.xsd | 0 .../validation/tck/Bug6967214/reD12.xsd | 0 .../validation/tck/Bug6967214/reE9.xsd | 0 .../validation/tck/Bug6967214Test.java | 2 +- .../xml => }/validation/tck/Bug6970890.xsd | 0 .../validation/tck/Bug6970890Test.java | 2 +- .../xml => }/validation/tck/Bug6970890_1.xsd | 0 .../xml => }/validation/tck/Bug6971190.xml | 0 .../xml => }/validation/tck/Bug6971190.xsd | 0 .../validation/tck/Bug6971190Test.java | 2 +- .../xml => }/validation/tck/Bug6971190_v.xml | 0 .../xml => }/validation/tck/Bug6971190_v.xsd | 0 .../xml => }/validation/tck/Bug6974551.xml | 0 .../xml => }/validation/tck/Bug6974551.xsd | 0 .../validation/tck/Bug6974551Test.java | 2 +- .../validation/tck/Bug6975265/notatF025.xsd | 0 .../validation/tck/Bug6975265/notatF037.xsd | 0 .../validation/tck/Bug6975265/notatF041.xsd | 0 .../validation/tck/Bug6975265/notatF045.xsd | 0 .../validation/tck/Bug6975265/notatF049.xsd | 0 .../validation/tck/Bug6975265Test.java | 2 +- .../validation/tck/Bug6977201/reA2.xml | 0 .../validation/tck/Bug6977201/reA2.xsd | 0 .../validation/tck/Bug6977201/reA3.xml | 0 .../validation/tck/Bug6977201/reA3.xsd | 0 .../validation/tck/Bug6977201/reA4.xml | 0 .../validation/tck/Bug6977201/reA4.xsd | 0 .../validation/tck/Bug6977201/reA5.xml | 0 .../validation/tck/Bug6977201/reA5.xsd | 0 .../validation/tck/Bug6977201/reA6.xml | 0 .../validation/tck/Bug6977201/reA6.xsd | 0 .../validation/tck/Bug6977201Test.java | 2 +- .../xml => }/validation/tck/Bug6989956.xml | 0 .../xml => }/validation/tck/Bug6989956.xsd | 0 .../validation/tck/Bug6989956Test.java | 2 +- .../xml => }/validation/tck/Bug7014246.xsd | 0 .../validation/tck/Bug7014246Test.java | 2 +- .../xml => }/validation/test-element.xsd | 0 .../xml => }/validation/test-sequence.xsd | 0 .../{javax/xml => }/validation/test.xsd | 0 .../{javax/xml => }/validation/toys.xml | 0 .../{javax/xml => }/validation/toys.xsd | 0 .../{javax/xml => }/validation/types.xsd | 0 .../{javax/xml => }/xpath/Bug4991857.java | 4 +- .../{javax/xml => }/xpath/Bug4991939.java | 4 +- .../{javax/xml => }/xpath/Bug4992788.java | 4 +- .../{javax/xml => }/xpath/Bug4992793.java | 4 +- .../{javax/xml => }/xpath/Bug4992805.java | 4 +- .../xml => }/xpath/ClassLoaderTest.java | 4 +- .../{javax/xml => }/xpath/MyClassLoader.java | 4 +- .../xml => }/xpath/SecureProcessingTest.java | 11 +- .../xml => }/xpath/SecureProcessingTest.xml | 0 .../xml => }/xpath/XPathAnyTypeTest.java | 10 +- .../xml => }/xpath/XPathExpAnyTypeTest.java | 11 +- .../{javax/xml => }/xpath/XPathTest.java | 6 +- .../{javax/xml => }/xpath/XPathTestBase.java | 14 +- 660 files changed, 817 insertions(+), 1281 deletions(-) delete mode 100644 jaxp/test/javax/xml/jaxp/unittest/TEST.properties rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/common/Bug6350682.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/common/Bug6723276Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/common/Bug6941169.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/common/Bug6941169.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/common/Bug6941169Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/common/Bug7143711Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/Bug6320118.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/Bug6937951Test.java (88%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/Bug6937964Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/Bug7042647Test.java (89%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/DatatypeFactoryTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/DurationTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/FactoryFindTest.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/XMLGregorianCalendarTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4915524.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4915748.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966082.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966082.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966138.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966142.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966142.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966142.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966143.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966143.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966143.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6339023.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6355326.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6367542.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6520131.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6521260.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6582545.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6582545Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6879614.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6879614Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/CR6333993Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/CR6517707Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/CR6517717Test.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/CR6909336Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/DOMConfigurationTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/DOMConfigurationTest.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/DOMXPathTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/JdkXmlDomTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/TCKEncodingTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/Bug4973153.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/Bug6290947.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/Bug6354955.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/Bug6376823.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/Bug6710741Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/LSParserTCKTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/LSParserTest.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/LSSerializerTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/note_in_dtd.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/test.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/test.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4674384_MAX_OCCURS_Test.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4674384_MAX_OCCURS_Test.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4674384_MAX_OCCURS_Test.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4934208.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4967002.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4985486.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4985486.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4991020.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4991020.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4991020.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4991946.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4991946.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4991946.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug5010072.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug5010072.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug5025825.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6309988.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6341770.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6361283.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6506304Test.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6518733.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6518733.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6564400.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6564400.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6564400.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6573786.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6573786ErrorHandler.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6594813.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6608841.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6608841.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6608841.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6608841_xhtml11-flat.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6690015.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6760982.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6849942Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug7157608.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug7157608.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug7157608Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug7157608_1.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug7166896Test.java (91%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug8073385.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/DosTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/DosTest3.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/FactoryFindTest.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/MyDefaultHandler.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/MyErrorHandler.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/ParseEmptyStream.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/bug6690015.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/bug6760982.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/catalog.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/catalog.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/entity.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/entity64K.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/test.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/test1.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/test2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/toys.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/toys.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/toys3002.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/xinclude/Bug6794483Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/xinclude/test1.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/xinclude/test2.xml (100%) delete mode 100644 jaxp/test/javax/xml/jaxp/unittest/policy/PolicyUtil.java delete mode 100644 jaxp/test/javax/xml/jaxp/unittest/policy/common.policy rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Attributes2ImplTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Bug6889654Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Bug6925410Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Bug6949607Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Bug6992561Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Bug7057778.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Bug7057778Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/DefaultHandler2Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/IssueTracker56Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/MyDefaultHandler2.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/NSSupportTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/SAXExceptionExt.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/externalDTD.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/toys.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/toys_error.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/AttributeLocalNameTest/AttributeLocalNameTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6370703.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6378422.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6380870.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6489502.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6509774.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6688002Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6976938.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6976938Test.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/CoalesceTest/CoalesceTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/CoalesceTest/coalesce.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/EntitiesTest/EntityTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/EntitiesTest/testCharRef.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/EntitiesTest/testCharRef.xml.output (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/EventReaderDelegateTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/Events => stream/EventsTest}/Issue41Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/Events => stream/EventsTest}/Issue48Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/Events => stream/EventsTest}/Issue53Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/Events => stream/EventsTest}/Issue58Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/FactoryFindTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/FactoryFindTest.policy (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/IgnoreExternalDTDTest.java (90%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/ProcessingInstruction => stream/ProcessingInstructionTest}/ProcessingInstructionTest.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/StreamReaderDelegateTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventLocationTest.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Bug6489890.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Bug6555001.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Bug6586466Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Bug6613059Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Bug6668115Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Bug6846133Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Issue40Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/bug6613059.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/play.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/play2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/sgml.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/ReaderToWriterTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/ReaderToWriterTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/XMLEventWriterTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/XMLEventWriterTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/merge-1.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/merge-2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/replace1.txt (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLInputFactoryTest/Bug6756677Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLInputFactoryTest/Bug6909759Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLInputFactoryTest/IssueTracker38.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLInputFactoryTest/MyInputFactory.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLInputFactoryTest/play.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLOutputFactoryTest/Bug6846132Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLOutputFactoryTest/StreamResultTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLResolverTest/XMLResolverTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLResolverTest/XMLResolverTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLResolverTest/replace1.txt (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLResolverTest/replace2.txt (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamExceptionTest/ExceptionTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamFilterTest/Bug6481615.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamFilterTest/Bug6481678.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamFilterTest/HasNextTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamFilterTest/HasNextTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamFilterTest/HasNextTypeFilter.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/BOMTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Bug6388460.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Bug6472982Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Bug6767322.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Bug6767322Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Bug6847819Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/BugTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/DefaultAttributeTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/DoubleXmlnsTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd.bak => stream/XMLStreamReaderTest/ExternalDTD.dtd} (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml.bak => stream/XMLStreamReaderTest/ExternalDTD.xml} (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Hello.wsdl.data (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IsValidatingTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IsValidatingTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Issue44Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Issue47Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IssueTracker24.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IssueTracker35.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IssueTracker70.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IssueTracker70.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/NamespaceTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/StreamReaderTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/SupportDTDTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/UTF8-BOM.xml.data (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/XML11Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/XMLSchema.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/XMLSchema.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/datatypes.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/report.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/sgml.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/voicexml.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/vxml.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/xml11.xml.data (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/AttributeEscapeTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/Bug6452107.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/Bug6600882Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/Bug6675332Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/Bug7037352Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/DOMUtil.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/DomUtilTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/EmptyElementTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/EncodingTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/NamespaceTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/NullUriDetectionTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/SqeLinuxTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/UnprefixedNameTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/WriterTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/XMLStreamWriterTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/message_12.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testEight.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testFive.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testFour.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testOne.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testSeven.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testSix.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testThree.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/basic-form.vxml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/report.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/sgml-bad-systemId.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/sgml.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/sgml_Bug6509774.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/testfile1.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/testfile2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/testfile3.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/testfile4.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/toys.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/vxml.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/5368141.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4693341.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4693341.out (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4693341.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4693341Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4693341_golden.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4693341_golden.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4892774.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug5073477.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug5073477.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6175602.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6206491.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6206491.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6206491.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6206491_2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6216226Test.java (91%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6311448.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6384805.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6465722.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6467808.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6490380.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6490921.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6505031.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6513892.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6537167.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6540545.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6559595.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6565260.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6940416.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/BugDB12665704.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/BugDB12665704.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/BugDB12665704Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6401137.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6401137.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6401137Test.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6551600.policy (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6551600Test.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6577667.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6577667Test.java (90%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6652519Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6689809Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6905829.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6905829.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6905829Inc.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6905829Test.java (91%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6935697.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6935697.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6935697Test.java (89%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6941869.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6941869.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6941869Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6957215.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6957215.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6957215Test.java (88%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR7098746.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR7098746.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR7098746Test.java (90%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/DOMResultTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/DocumentExtFunc.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/FactoryFindTest.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Issue2204.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Issue2204.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Issue2204Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Issue2290.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Issue2290Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/MsWordXMLImport.xsl.data (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/NCAA_Conference_Schedule_XML.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/OpenJDK100017Test.java (91%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/PredicateInKeyTest.xml (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/PredicateInKeyTest.xsl (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SAX2DOMTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SAX2DOMTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SecureProcessingTest.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SecureProcessingTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SecureProcessingTest.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SourceTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SourceTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SourceTest.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/StAXSourceTest.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/TransformerFactoryTest.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/TransformerTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/TransformerUtilFactory.java (84%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/VersionDefaultHandler.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/VersionEventWriter.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/ViewEditor1.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/XSLTFunctionsTest.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/attribset27.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/attribset27.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/catalog.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/catalog.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/catalog_10.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/config.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/config.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/default-layout.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/global-variables.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/global.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/home.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/in.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/inner.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/logon.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/maps.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/msgAttach.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/numbering63.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/numbering63.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/outer.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/redirect.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/redirect.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/sax/Bug6451633.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/src.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/template.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/tigertest-in.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/tigertest.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/tmp.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/toys.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/transform.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/upload-media-form.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/upload-media.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/util.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/util/DOMUtil.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/util/SAXUtil.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/util/StAXUtil.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/util/StreamUtil.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/util/TransformerUtil.java (94%) delete mode 100644 jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java delete mode 100644 jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java delete mode 100644 jaxp/test/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/6773084.policy (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/AnyElementTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4966232.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4966254.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4966254.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4966254.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969042.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969089.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969110.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969689.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969692.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969693.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969695.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969732.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4970380.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4970383.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4970400.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4970402.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4970951.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4971605.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4971607.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4972882.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4986844.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4986844.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4987574.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4988267.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4988267.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4988268.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4988268.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4988387.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4988387.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4996446.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4996446.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4997818.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug5011500.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug5072946.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug5072946.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug5072946.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6378043.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6449797.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6449797.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6457662.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6467424.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6467424.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6467424Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6483188.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6493687.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6493687.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6493687.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6509668.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6526547.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6526547.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6526547.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6531160.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6695843.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6695843.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6695843Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_1.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_10.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_11.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_12.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_13.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_14.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_15.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_16.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_17.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_18.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_19.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_20.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_21.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_22.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_23.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_24.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_25.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_3.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_4.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_5.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_6.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_7.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_8.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_9.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6859210.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6925531Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6946312.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6946312Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6954738.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6954738.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6954738_Test.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/CR6708840Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/CR6740048.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/CR6740048.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/CR6740048.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/CREMAS01.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/CREMAS01.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ErrorHandlerImpl.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Issue682.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Issue682.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Issue682Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30_occurs-error.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30_occurs-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30_occurs-optimize-error.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30_occurs-optimize-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30_occurs-optimize.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30_occurs.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/JaxpIssue43Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/JaxpIssue49.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/JaxpIssue49.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/LargeMaxOccursTest.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/MultiOccursTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/MultiOccursUnboundedTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/OccursTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/OccursUnboundedTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/OccursWildcardTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/OccursWildcardUnbounded.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ParticlesId005Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ParticlesIg004Test.java (88%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ParticlesQ013Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ProcessContents-lax-error.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ProcessContents-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ProcessContents.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/TCKGroupA008Test.java (89%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ValidatorTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/XMLDocBuilder.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/XMLSchemaValidator.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/gMonths-invalid.xml (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/gMonths.xml (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/gMonths.xsd (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/groupA008.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/groupA008ea.red (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/groupA008eb.red (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/hello_literal.wsdl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/idI009.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/idIimp.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/idIxpns.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/idIxpns1.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/mgG014.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/mgJ014.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-error-max.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-error-min-max.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-error-min.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-unbounded-error-min.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-unbounded-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-unbounded.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-error-max.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-error-min-max.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-error-min.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-unbounded-error-min.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-unbounded-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-unbounded.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-wildcard-unbounded.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-wildcard.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesId005.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesId005.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesIe003.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesIg004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesOptimize.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesQ013.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesQ013.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesR005.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/targetNS00101m2.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/targetNS00101m2_stub.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/targetNS00101m2_stub.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/targetNS00101m2a.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/byte_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/byte_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/int_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/int_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/integer_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/integer_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/long_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/long_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/short_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/short_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6963124.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6963124Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6963468.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6963468.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6963468Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6964720.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6964720Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6967214/RegexTest_1258.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6967214/reD10.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6967214/reD11.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6967214/reD12.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6967214/reE9.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6967214Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6970890.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6970890Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6970890_1.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6971190.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6971190.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6971190Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6971190_v.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6971190_v.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6974551.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6974551.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6974551Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6975265/notatF025.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6975265/notatF037.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6975265/notatF041.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6975265/notatF045.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6975265/notatF049.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6975265Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA2.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA3.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA3.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA4.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA4.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA5.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA5.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA6.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA6.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6989956.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6989956.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6989956Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug7014246.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug7014246Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/test-element.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/test-sequence.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/test.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/toys.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/toys.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/types.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/Bug4991857.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/Bug4991939.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/Bug4992788.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/Bug4992793.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/Bug4992805.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/ClassLoaderTest.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/MyClassLoader.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/SecureProcessingTest.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/SecureProcessingTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/XPathAnyTypeTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/XPathExpAnyTypeTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/XPathTest.java (89%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/XPathTestBase.java (92%) diff --git a/jaxp/test/javax/xml/jaxp/unittest/TEST.properties b/jaxp/test/javax/xml/jaxp/unittest/TEST.properties deleted file mode 100644 index 23136c131a5..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/TEST.properties +++ /dev/null @@ -1,6 +0,0 @@ -# jaxp test uses TestNG -TestNG.dirs = . - -# Declare module dependency -modules=java.xml - 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/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/policy/PolicyUtil.java b/jaxp/test/javax/xml/jaxp/unittest/policy/PolicyUtil.java deleted file mode 100644 index 340f5de7d55..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/policy/PolicyUtil.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. - * 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. - */ - -package policy; - -import java.security.Policy; - -public class PolicyUtil { - - public static void changePolicy(String policyFile) { - System.setProperty("java.security.policy", policyFile); - Policy.getPolicy().refresh(); - } - -} diff --git a/jaxp/test/javax/xml/jaxp/unittest/policy/common.policy b/jaxp/test/javax/xml/jaxp/unittest/policy/common.policy deleted file mode 100644 index 0ca5f742c09..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/policy/common.policy +++ /dev/null @@ -1,27 +0,0 @@ -grant { - permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; - permission java.lang.RuntimePermission "accessDeclaredMembers"; - - permission java.io.FilePermission "${test.classes}/../../-", "read, write, delete"; - permission java.io.FilePermission ".", "read, write, delete"; - permission java.util.PropertyPermission "*", "read, write"; - - permission java.lang.RuntimePermission "setSecurityManager"; - permission java.lang.RuntimePermission "createSecurityManager"; - permission java.lang.RuntimePermission "createClassLoader"; - permission java.lang.RuntimePermission "setIO"; - permission java.lang.RuntimePermission "setContextClassLoader"; - permission java.security.SecurityPermission "getPolicy"; - - permission java.io.FilePermission "${test.src}/-", "read, write, delete"; - permission java.io.FilePermission "${user.dir}/-", "read, write, delete"; - permission java.io.FilePermission "${java.io.tmpdir}/-", "read, write, delete"; - - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.bcel.internal.classfile"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.bcel.internal.generic"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.xml.internal.stream.writers"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xerces.internal.impl"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xalan.internal"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xalan.internal.xsltc.trax"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xalan.internal.xslt"; -}; 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.bak 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.bak 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.bak 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.bak 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 @@ " - + "" + + "" + "" - + "" + + "" + ""; static final String documentTesteExpectedResult = "" 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/util/BOMInputStream.java b/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java deleted file mode 100644 index 2088452af58..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. - * 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. - */ -package util; - -import java.io.BufferedInputStream; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; -import java.util.Map; - -public class BOMInputStream { - public static InputStream createStream(String charset, InputStream input) { - - try { - byte[] content = read(input).getBytes(charset); - byte[] head = bom.get(charset); - if (head == null) - return null; - byte[] result = new byte[head.length + content.length]; - System.arraycopy(head, 0, result, 0, head.length); - System.arraycopy(content, 0, result, head.length, content.length); - return new ByteArrayInputStream(result); - } catch (UnsupportedEncodingException e) { - return null; - } - } - - private static String read(InputStream input) - { - try { - StringBuffer sb = new StringBuffer(); - InputStreamReader r = new InputStreamReader(new BufferedInputStream(input)); - int c = 0; - while ((c = r.read()) != -1) - sb.append((char)c); - return sb.toString(); - } catch (IOException e) { - return ""; - } finally { - try { - input.close(); - } catch (IOException e) - {} - } - } - - - private final static Map bom = new HashMap(); - private final static byte[][] bomBytes = {{(byte)0xEF, (byte)0xBB, (byte)0xBF}, - {(byte)0xFE, (byte)0xFF}}; - - static { - bom.put("UTF-8", bomBytes[0]); - bom.put("UTF-16BE", bomBytes[1]); - } - -} diff --git a/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java b/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java deleted file mode 100644 index 86a54335249..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java +++ /dev/null @@ -1,559 +0,0 @@ -/* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. - * 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. - */ - -package util; - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.StringReader; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; - -import javax.xml.stream.XMLEventFactory; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLResolver; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.events.XMLEvent; - -import org.testng.Assert; - -/** - * Base class for all StaxTest unit test classes. Contains shared - * functionality for many common set up tasks, as well as for - * outputting diagnostics. - * - */ -public class BaseStAXUT implements XMLStreamConstants { - /** - * This is the de facto standard property that enables accurate reporting of - * CDATA events. - */ - final static String PROP_REPORT_CDATA = "http://java.sun.com/xml/stream/properties/report-cdata-event"; - - final static HashMap mTokenTypes = new HashMap(); - static { - mTokenTypes.put(new Integer(START_ELEMENT), "START_ELEMENT"); - mTokenTypes.put(new Integer(END_ELEMENT), "END_ELEMENT"); - mTokenTypes.put(new Integer(START_DOCUMENT), "START_DOCUMENT"); - mTokenTypes.put(new Integer(END_DOCUMENT), "END_DOCUMENT"); - mTokenTypes.put(new Integer(CHARACTERS), "CHARACTERS"); - mTokenTypes.put(new Integer(CDATA), "CDATA"); - mTokenTypes.put(new Integer(COMMENT), "COMMENT"); - mTokenTypes.put(new Integer(PROCESSING_INSTRUCTION), "PROCESSING_INSTRUCTION"); - mTokenTypes.put(new Integer(DTD), "DTD"); - mTokenTypes.put(new Integer(SPACE), "SPACE"); - mTokenTypes.put(new Integer(ENTITY_REFERENCE), "ENTITY_REFERENCE"); - mTokenTypes.put(new Integer(NAMESPACE), "NAMESPACE_DECLARATION"); - mTokenTypes.put(new Integer(NOTATION_DECLARATION), "NOTATION_DECLARATION"); - mTokenTypes.put(new Integer(ENTITY_DECLARATION), "ENTITY_DECLARATION"); - } - - /* - * /////////////////////////////////////////////////// // Consts for - * expected values /////////////////////////////////////////////////// - */ - - /** - * Expected return value for streamReader.getNamespaceURI() in - * non-namespace-aware mode. - */ - protected final String DEFAULT_URI_NON_NS = ""; - - protected final String DEFAULT_URI_NS = ""; - - /* - * /////////////////////////////////////////////////// // Other consts - * /////////////////////////////////////////////////// - */ - - /* - * /////////////////////////////////////////////////// // Cached instances - * /////////////////////////////////////////////////// - */ - - XMLInputFactory mInputFactory; - XMLOutputFactory mOutputFactory; - XMLEventFactory mEventFactory; - - protected XMLInputFactory getInputFactory() { - if (mInputFactory == null) { - mInputFactory = getNewInputFactory(); - } - return mInputFactory; - } - - protected static XMLInputFactory getNewInputFactory() { - return XMLInputFactory.newInstance(); - } - - protected XMLOutputFactory getOutputFactory() { - if (mOutputFactory == null) { - mOutputFactory = getNewOutputFactory(); - } - return mOutputFactory; - } - - protected static XMLOutputFactory getNewOutputFactory() { - return XMLOutputFactory.newInstance(); - } - - protected XMLEventFactory getEventFactory() { - if (mEventFactory == null) { - mEventFactory = XMLEventFactory.newInstance(); - } - return mEventFactory; - } - - protected static XMLStreamReader constructStreamReader(XMLInputFactory f, String content) throws XMLStreamException { - // return f.createXMLStreamReader(new StringReader(content)); - try { - byte[] data = content.getBytes("UTF-8"); - return constructStreamReader(f, data); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); - } - } - - protected static XMLStreamReader constructStreamReader(XMLInputFactory f, byte[] b) throws XMLStreamException { - return f.createXMLStreamReader(new ByteArrayInputStream(b)); - } - - protected static XMLStreamReader constructStreamReaderForFile(XMLInputFactory f, String filename) throws IOException, XMLStreamException { - File inf = new File(filename); - XMLStreamReader sr = f.createXMLStreamReader(inf.toURL().toString(), new FileReader(inf)); - Assert.assertEquals(START_DOCUMENT, sr.getEventType()); - return sr; - } - - protected XMLStreamReader constructNsStreamReader(String content) throws XMLStreamException { - XMLInputFactory f = getInputFactory(); - setNamespaceAware(f, true); - return f.createXMLStreamReader(new StringReader(content)); - } - - protected XMLStreamReader constructNsStreamReader(String content, boolean coal) throws XMLStreamException { - XMLInputFactory f = getInputFactory(); - setNamespaceAware(f, true); - setCoalescing(f, coal); - return f.createXMLStreamReader(new StringReader(content)); - } - - /* - * ////////////////////////////////////////////////// // Configuring input - * factory ////////////////////////////////////////////////// - */ - - protected static boolean isCoalescing(XMLInputFactory f) throws XMLStreamException { - return ((Boolean) f.getProperty(XMLInputFactory.IS_COALESCING)).booleanValue(); - } - - protected static void setCoalescing(XMLInputFactory f, boolean state) throws XMLStreamException { - Boolean b = state ? Boolean.TRUE : Boolean.FALSE; - f.setProperty(XMLInputFactory.IS_COALESCING, b); - // Let's just double-check it... - Assert.assertEquals(state, isCoalescing(f)); - } - - protected static boolean isValidating(XMLInputFactory f) throws XMLStreamException { - return ((Boolean) f.getProperty(XMLInputFactory.IS_VALIDATING)).booleanValue(); - } - - protected static void setValidating(XMLInputFactory f, boolean state) throws XMLStreamException { - try { - Boolean b = state ? Boolean.TRUE : Boolean.FALSE; - f.setProperty(XMLInputFactory.IS_VALIDATING, b); - } catch (IllegalArgumentException iae) { - Assert.fail("Could not set DTD validating mode to " + state + ": " + iae); - // throw new XMLStreamException(iae.getMessage(), iae); - } - Assert.assertEquals(state, isValidating(f)); - } - - protected static boolean isNamespaceAware(XMLInputFactory f) throws XMLStreamException { - return ((Boolean) f.getProperty(XMLInputFactory.IS_NAMESPACE_AWARE)).booleanValue(); - } - - /** - * @return True if setting succeeded, and property supposedly was - * succesfully set to the value specified; false if there was a - * problem. - */ - protected static boolean setNamespaceAware(XMLInputFactory f, boolean state) throws XMLStreamException { - try { - f.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, state ? Boolean.TRUE : Boolean.FALSE); - - /* - * 07-Sep-2005, TSa: Let's not assert, but instead let's see if it - * sticks. Some implementations might choose to silently ignore - * setting, at least for 'false'? - */ - return (isNamespaceAware(f) == state); - } catch (IllegalArgumentException e) { - /* - * Let's assume, then, that the property (or specific value for it) - * is NOT supported... - */ - return false; - } - } - - protected static void setReplaceEntities(XMLInputFactory f, boolean state) throws XMLStreamException { - Boolean b = state ? Boolean.TRUE : Boolean.FALSE; - f.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, b); - Assert.assertEquals(b, f.getProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES)); - } - - protected static void setSupportDTD(XMLInputFactory f, boolean state) throws XMLStreamException { - Boolean b = state ? Boolean.TRUE : Boolean.FALSE; - f.setProperty(XMLInputFactory.SUPPORT_DTD, b); - Assert.assertEquals(b, f.getProperty(XMLInputFactory.SUPPORT_DTD)); - } - - protected static boolean setSupportExternalEntities(XMLInputFactory f, boolean state) throws XMLStreamException { - Boolean b = state ? Boolean.TRUE : Boolean.FALSE; - try { - f.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, b); - Object act = f.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES); - return (act instanceof Boolean) && ((Boolean) act).booleanValue() == state; - } catch (IllegalArgumentException e) { - /* - * Let's assume, then, that the property (or specific value for it) - * is NOT supported... - */ - return false; - } - } - - protected static void setResolver(XMLInputFactory f, XMLResolver resolver) throws XMLStreamException { - f.setProperty(XMLInputFactory.RESOLVER, resolver); - } - - protected static boolean setReportCData(XMLInputFactory f, boolean state) throws XMLStreamException { - - Boolean b = state ? Boolean.TRUE : Boolean.FALSE; - if (f.isPropertySupported(PROP_REPORT_CDATA)) { - f.setProperty(PROP_REPORT_CDATA, b); - return true; - } - return false; - } - - /* - * ////////////////////////////////////////////////// // Stream reader - * accessors ////////////////////////////////////////////////// - */ - - /** - * Method that not only gets currently available text from the reader, but - * also checks that its consistenly accessible using different StAX methods. - */ - protected static String getAndVerifyText(XMLStreamReader sr) throws XMLStreamException { - String text = sr.getText(); - - /* - * 05-Apr-2006, TSa: Although getText() is available for DTD and - * ENTITY_REFERENCE, getTextXxx() are not. Thus, can not do more checks - * for those types. - */ - int type = sr.getEventType(); - if (type != ENTITY_REFERENCE && type != DTD) { - Assert.assertNotNull("getText() should never return null.", text); - int expLen = sr.getTextLength(); - /* - * Hmmh. Can only return empty text for CDATA (since empty blocks - * are legal). - */ - /* - * !!! 01-Sep-2004, TSa: note: theoretically, in coalescing mode, it - * could be possible to have empty CDATA section(s) get converted to - * CHARACTERS, which would be empty... may need to enhance this to - * check that mode is not coalescing? Or something - */ - if (sr.getEventType() == CHARACTERS) { - if (expLen == 0) { - Assert.fail("Stream reader should never return empty Strings."); - } - } - Assert.assertEquals(expLen, text.length(), "Expected text length of " + expLen + ", got " + text.length()); - char[] textChars = sr.getTextCharacters(); - int start = sr.getTextStart(); - String text2 = new String(textChars, start, expLen); - Assert.assertEquals("Expected getText() and getTextCharacters() to return same value for event of type (" + tokenTypeDesc(sr.getEventType()) + ")", - text, text2); - } else { // DTD or ENTITY_REFERENCE - // not sure if null is legal for these either, but... - if (text == null) { // let's prevent an NPE at caller - text = ""; - } - } - return text; - } - - protected static String getAllText(XMLStreamReader sr) throws XMLStreamException { - StringBuffer sb = new StringBuffer(); - while (true) { - int tt = sr.getEventType(); - if (tt != CHARACTERS && tt != SPACE) { - break; - } - sb.append(getAndVerifyText(sr)); - sr.next(); - } - return sb.toString(); - } - - protected static String getAllCData(XMLStreamReader sr) throws XMLStreamException { - StringBuffer sb = new StringBuffer(); - while (true) { - /* - * Note: CDATA sections CAN be reported as CHARACTERS, but not as - * SPACE - */ - int tt = sr.getEventType(); - if (tt != CHARACTERS && tt != CDATA) { - break; - } - sb.append(getAndVerifyText(sr)); - sr.next(); - } - return sb.toString(); - } - - /* - * ////////////////////////////////////////////////// // Derived assert/fail - * methods ////////////////////////////////////////////////// - */ - - protected static void assertTokenType(int expType, int actType) { - if (expType == actType) { - return; - } - Assert.fail("Expected token " + tokenTypeDesc(expType) + "; got " + tokenTypeDesc(actType) + "."); - } - - protected static void assertTokenType(int expType, int actType, XMLStreamReader sr) { - if (expType == actType) { - return; - } - Assert.fail("Expected token " + tokenTypeDesc(expType) + "; got " + tokenTypeDesc(actType, sr) + "."); - } - - protected static void assertTextualTokenType(int actType) { - if (actType != CHARACTERS && actType != SPACE && actType != CDATA) { - Assert.fail("Expected textual token (CHARACTERS, SPACE or CDATA)" + "; got " + tokenTypeDesc(actType) + "."); - } - } - - protected static void failStrings(String msg, String exp, String act) { - // !!! TODO: Indicate position where Strings differ - Assert.fail(msg + ": expected " + quotedPrintable(exp) + ", got " + quotedPrintable(act)); - } - - /** - * Specific method makes sense, since earlier it was not clear whether null - * or empty string (or perhaps both) would be the right answer when there is - * no prefix. - *

- * However: as per javadocs of {@link XMLStreamReader#getPrefix}, from JDK - * 1.6 indicate, the current understanding is that null is the - * ultimate right answer here. - */ - protected static void assertNoPrefix(XMLStreamReader sr) throws XMLStreamException { - String prefix = sr.getPrefix(); - if (prefix != null) { - if (prefix.length() != 0) { - Assert.fail("Current element should not have a prefix: got '" + prefix + "'"); - } else { - Assert.fail("Expected null to signify missing prefix (see XMLStreamReader#getPrefix() JavaDocs): got empty String"); - } - } - } - - protected static void assertNoAttrPrefix(String attrPrefix) throws XMLStreamException { - if (attrPrefix != null) { - if (attrPrefix.length() != 0) { - Assert.fail("Attribute should not have a prefix: got '" + attrPrefix + "'"); - } else { - Assert.fail("Expected null to signify missing attribute prefix (see XMLStreamReader#getAttributePrefix() JavaDocs): got empty String"); - } - } - } - - /** - * Similar to {@link #assertNoPrefix}, but here we do know that unbound - * namespace URI should be indicated as empty String. - */ - protected static void assertNoNsURI(XMLStreamReader sr) throws XMLStreamException { - String uri = sr.getNamespaceURI(); - if (uri == null) { - Assert.fail("Expected empty String to indicate \"no namespace\": got null"); - } else if (uri.length() != 0) { - Assert.fail("Expected empty String to indicate \"no namespace\": got '" + uri + "'"); - } - } - - protected static void assertNoAttrNamespace(String attrNsURI) throws XMLStreamException { - if (attrNsURI == null) { - // refer to 6903561; accept null for now. - // fail("Expected empty String to indicate \"no namespace\" (for attribute): got null"); - } else if (attrNsURI.length() != 0) { - Assert.fail("Expected empty String to indicate \"no namespace\" (for attribute): got '" + attrNsURI + "'"); - } - } - - protected static void assertNoPrefixOrNs(XMLStreamReader sr) throws XMLStreamException { - assertNoPrefix(sr); - assertNoNsURI(sr); - } - - /** - * Helper assertion that assert that the String is either null or empty - * (""). - */ - protected static void assertNullOrEmpty(String str) { - if (str != null && str.length() > 0) { - Assert.fail("Expected String to be empty or null; was '" + str + "' (length " + str.length() + ")"); - } - } - - /* - * ////////////////////////////////////////////////// // Debug/output - * helpers ////////////////////////////////////////////////// - */ - - protected static String tokenTypeDesc(int tt) { - String desc = (String) mTokenTypes.get(new Integer(tt)); - if (desc == null) { - return "[" + tt + "]"; - } - return desc; - } - - protected static String tokenTypeDesc(XMLEvent evt) { - return tokenTypeDesc(evt.getEventType()); - } - - final static int MAX_DESC_TEXT_CHARS = 8; - - protected static String tokenTypeDesc(int tt, XMLStreamReader sr) { - String desc = tokenTypeDesc(tt); - // Let's show first 8 chars or so... - if (tt == CHARACTERS || tt == SPACE || tt == CDATA) { - String str = sr.getText(); - if (str.length() > MAX_DESC_TEXT_CHARS) { - desc = "\"" + str.substring(0, MAX_DESC_TEXT_CHARS) + "\"[...]"; - } else { - desc = "\"" + desc + "\""; - } - desc = " (" + desc + ")"; - } - return desc; - } - - protected static String valueDesc(String value) { - if (value == null) { - return "[NULL]"; - } - return "\"" + value + "\""; - } - - protected static String printable(char ch) { - if (ch == '\n') { - return "\\n"; - } - if (ch == '\r') { - return "\\r"; - } - if (ch == '\t') { - return "\\t"; - } - if (ch == ' ') { - return "_"; - } - if (ch > 127 || ch < 32) { - StringBuffer sb = new StringBuffer(6); - sb.append("\\u"); - String hex = Integer.toHexString((int) ch); - for (int i = 0, len = 4 - hex.length(); i < len; i++) { - sb.append('0'); - } - sb.append(hex); - return sb.toString(); - } - return null; - } - - protected static String printable(String str) { - if (str == null || str.length() == 0) { - return str; - } - - int len = str.length(); - StringBuffer sb = new StringBuffer(len + 64); - for (int i = 0; i < len; ++i) { - char c = str.charAt(i); - String res = printable(c); - if (res == null) { - sb.append(c); - } else { - sb.append(res); - } - } - return sb.toString(); - } - - protected static String quotedPrintable(String str) { - if (str == null || str.length() == 0) { - return "[0]''"; - } - return "[len: " + str.length() + "] '" + printable(str) + "'"; - } - - protected void reportNADueToProperty(String method, String prop) { - String clsName = getClass().getName(); - /* - * 27-Sep-2005, TSa: Should probably use some other mechanism for - * reporting this. Does JUnit have something applicable? - */ - System.err.println("Skipping " + clsName + "#" + method + ": property '" + prop + "' (or one of its values) not supported."); - } - - protected void reportNADueToNS(String method) { - reportNADueToProperty(method, "IS_NAMESPACE_AWARE"); - } - - protected void reportNADueToExtEnt(String method) { - reportNADueToProperty(method, "IS_SUPPORTING_EXTERNAL_ENTITIES"); - } - - protected void reportNADueToEntityExpansion(String method, int type) { - String clsName = getClass().getName(); - String msg = (type > 0) ? " (next event: " + tokenTypeDesc(type) + ")" : ""; - System.err.println("Skipping " + clsName + "#" + method + ": entity expansion does not seem to be functioning properly" + msg + "."); - } -} diff --git a/jaxp/test/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java b/jaxp/test/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java deleted file mode 100644 index 5a408d1278a..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. - * 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. - */ -package util; - -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.helpers.DefaultHandler; - -public final class DraconianErrorHandler extends DefaultHandler { - public void error(SAXParseException e) throws SAXException { - throw e; - } - - public void fatalError(SAXParseException e) throws SAXException { - throw e; - } -} 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 @@ - - The Publishers - - Alfred Publishing - 15535 Morrison - South Oaks CA 91403 - &max; - - eXtensible Markup Language - - - - diff --git a/jaxp/test/javax/xml/jaxp/unittest/policy/PolicyUtil.java b/jaxp/test/javax/xml/jaxp/unittest/policy/PolicyUtil.java new file mode 100644 index 00000000000..340f5de7d55 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/policy/PolicyUtil.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package policy; + +import java.security.Policy; + +public class PolicyUtil { + + public static void changePolicy(String policyFile) { + System.setProperty("java.security.policy", policyFile); + Policy.getPolicy().refresh(); + } + +} diff --git a/jaxp/test/javax/xml/jaxp/unittest/policy/common.policy b/jaxp/test/javax/xml/jaxp/unittest/policy/common.policy new file mode 100644 index 00000000000..0ca5f742c09 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/policy/common.policy @@ -0,0 +1,27 @@ +grant { + permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; + permission java.lang.RuntimePermission "accessDeclaredMembers"; + + permission java.io.FilePermission "${test.classes}/../../-", "read, write, delete"; + permission java.io.FilePermission ".", "read, write, delete"; + permission java.util.PropertyPermission "*", "read, write"; + + permission java.lang.RuntimePermission "setSecurityManager"; + permission java.lang.RuntimePermission "createSecurityManager"; + permission java.lang.RuntimePermission "createClassLoader"; + permission java.lang.RuntimePermission "setIO"; + permission java.lang.RuntimePermission "setContextClassLoader"; + permission java.security.SecurityPermission "getPolicy"; + + permission java.io.FilePermission "${test.src}/-", "read, write, delete"; + permission java.io.FilePermission "${user.dir}/-", "read, write, delete"; + permission java.io.FilePermission "${java.io.tmpdir}/-", "read, write, delete"; + + permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.bcel.internal.classfile"; + permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.bcel.internal.generic"; + permission java.lang.RuntimePermission "accessClassInPackage.com.sun.xml.internal.stream.writers"; + permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xerces.internal.impl"; + permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xalan.internal"; + permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xalan.internal.xsltc.trax"; + permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xalan.internal.xslt"; +}; diff --git a/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java b/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java new file mode 100644 index 00000000000..2088452af58 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * 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. + */ +package util; + +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.util.HashMap; +import java.util.Map; + +public class BOMInputStream { + public static InputStream createStream(String charset, InputStream input) { + + try { + byte[] content = read(input).getBytes(charset); + byte[] head = bom.get(charset); + if (head == null) + return null; + byte[] result = new byte[head.length + content.length]; + System.arraycopy(head, 0, result, 0, head.length); + System.arraycopy(content, 0, result, head.length, content.length); + return new ByteArrayInputStream(result); + } catch (UnsupportedEncodingException e) { + return null; + } + } + + private static String read(InputStream input) + { + try { + StringBuffer sb = new StringBuffer(); + InputStreamReader r = new InputStreamReader(new BufferedInputStream(input)); + int c = 0; + while ((c = r.read()) != -1) + sb.append((char)c); + return sb.toString(); + } catch (IOException e) { + return ""; + } finally { + try { + input.close(); + } catch (IOException e) + {} + } + } + + + private final static Map bom = new HashMap(); + private final static byte[][] bomBytes = {{(byte)0xEF, (byte)0xBB, (byte)0xBF}, + {(byte)0xFE, (byte)0xFF}}; + + static { + bom.put("UTF-8", bomBytes[0]); + bom.put("UTF-16BE", bomBytes[1]); + } + +} diff --git a/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java b/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java new file mode 100644 index 00000000000..86a54335249 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java @@ -0,0 +1,559 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package util; + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; +import java.util.HashMap; + +import javax.xml.stream.XMLEventFactory; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLResolver; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.events.XMLEvent; + +import org.testng.Assert; + +/** + * Base class for all StaxTest unit test classes. Contains shared + * functionality for many common set up tasks, as well as for + * outputting diagnostics. + * + */ +public class BaseStAXUT implements XMLStreamConstants { + /** + * This is the de facto standard property that enables accurate reporting of + * CDATA events. + */ + final static String PROP_REPORT_CDATA = "http://java.sun.com/xml/stream/properties/report-cdata-event"; + + final static HashMap mTokenTypes = new HashMap(); + static { + mTokenTypes.put(new Integer(START_ELEMENT), "START_ELEMENT"); + mTokenTypes.put(new Integer(END_ELEMENT), "END_ELEMENT"); + mTokenTypes.put(new Integer(START_DOCUMENT), "START_DOCUMENT"); + mTokenTypes.put(new Integer(END_DOCUMENT), "END_DOCUMENT"); + mTokenTypes.put(new Integer(CHARACTERS), "CHARACTERS"); + mTokenTypes.put(new Integer(CDATA), "CDATA"); + mTokenTypes.put(new Integer(COMMENT), "COMMENT"); + mTokenTypes.put(new Integer(PROCESSING_INSTRUCTION), "PROCESSING_INSTRUCTION"); + mTokenTypes.put(new Integer(DTD), "DTD"); + mTokenTypes.put(new Integer(SPACE), "SPACE"); + mTokenTypes.put(new Integer(ENTITY_REFERENCE), "ENTITY_REFERENCE"); + mTokenTypes.put(new Integer(NAMESPACE), "NAMESPACE_DECLARATION"); + mTokenTypes.put(new Integer(NOTATION_DECLARATION), "NOTATION_DECLARATION"); + mTokenTypes.put(new Integer(ENTITY_DECLARATION), "ENTITY_DECLARATION"); + } + + /* + * /////////////////////////////////////////////////// // Consts for + * expected values /////////////////////////////////////////////////// + */ + + /** + * Expected return value for streamReader.getNamespaceURI() in + * non-namespace-aware mode. + */ + protected final String DEFAULT_URI_NON_NS = ""; + + protected final String DEFAULT_URI_NS = ""; + + /* + * /////////////////////////////////////////////////// // Other consts + * /////////////////////////////////////////////////// + */ + + /* + * /////////////////////////////////////////////////// // Cached instances + * /////////////////////////////////////////////////// + */ + + XMLInputFactory mInputFactory; + XMLOutputFactory mOutputFactory; + XMLEventFactory mEventFactory; + + protected XMLInputFactory getInputFactory() { + if (mInputFactory == null) { + mInputFactory = getNewInputFactory(); + } + return mInputFactory; + } + + protected static XMLInputFactory getNewInputFactory() { + return XMLInputFactory.newInstance(); + } + + protected XMLOutputFactory getOutputFactory() { + if (mOutputFactory == null) { + mOutputFactory = getNewOutputFactory(); + } + return mOutputFactory; + } + + protected static XMLOutputFactory getNewOutputFactory() { + return XMLOutputFactory.newInstance(); + } + + protected XMLEventFactory getEventFactory() { + if (mEventFactory == null) { + mEventFactory = XMLEventFactory.newInstance(); + } + return mEventFactory; + } + + protected static XMLStreamReader constructStreamReader(XMLInputFactory f, String content) throws XMLStreamException { + // return f.createXMLStreamReader(new StringReader(content)); + try { + byte[] data = content.getBytes("UTF-8"); + return constructStreamReader(f, data); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException(e); + } + } + + protected static XMLStreamReader constructStreamReader(XMLInputFactory f, byte[] b) throws XMLStreamException { + return f.createXMLStreamReader(new ByteArrayInputStream(b)); + } + + protected static XMLStreamReader constructStreamReaderForFile(XMLInputFactory f, String filename) throws IOException, XMLStreamException { + File inf = new File(filename); + XMLStreamReader sr = f.createXMLStreamReader(inf.toURL().toString(), new FileReader(inf)); + Assert.assertEquals(START_DOCUMENT, sr.getEventType()); + return sr; + } + + protected XMLStreamReader constructNsStreamReader(String content) throws XMLStreamException { + XMLInputFactory f = getInputFactory(); + setNamespaceAware(f, true); + return f.createXMLStreamReader(new StringReader(content)); + } + + protected XMLStreamReader constructNsStreamReader(String content, boolean coal) throws XMLStreamException { + XMLInputFactory f = getInputFactory(); + setNamespaceAware(f, true); + setCoalescing(f, coal); + return f.createXMLStreamReader(new StringReader(content)); + } + + /* + * ////////////////////////////////////////////////// // Configuring input + * factory ////////////////////////////////////////////////// + */ + + protected static boolean isCoalescing(XMLInputFactory f) throws XMLStreamException { + return ((Boolean) f.getProperty(XMLInputFactory.IS_COALESCING)).booleanValue(); + } + + protected static void setCoalescing(XMLInputFactory f, boolean state) throws XMLStreamException { + Boolean b = state ? Boolean.TRUE : Boolean.FALSE; + f.setProperty(XMLInputFactory.IS_COALESCING, b); + // Let's just double-check it... + Assert.assertEquals(state, isCoalescing(f)); + } + + protected static boolean isValidating(XMLInputFactory f) throws XMLStreamException { + return ((Boolean) f.getProperty(XMLInputFactory.IS_VALIDATING)).booleanValue(); + } + + protected static void setValidating(XMLInputFactory f, boolean state) throws XMLStreamException { + try { + Boolean b = state ? Boolean.TRUE : Boolean.FALSE; + f.setProperty(XMLInputFactory.IS_VALIDATING, b); + } catch (IllegalArgumentException iae) { + Assert.fail("Could not set DTD validating mode to " + state + ": " + iae); + // throw new XMLStreamException(iae.getMessage(), iae); + } + Assert.assertEquals(state, isValidating(f)); + } + + protected static boolean isNamespaceAware(XMLInputFactory f) throws XMLStreamException { + return ((Boolean) f.getProperty(XMLInputFactory.IS_NAMESPACE_AWARE)).booleanValue(); + } + + /** + * @return True if setting succeeded, and property supposedly was + * succesfully set to the value specified; false if there was a + * problem. + */ + protected static boolean setNamespaceAware(XMLInputFactory f, boolean state) throws XMLStreamException { + try { + f.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, state ? Boolean.TRUE : Boolean.FALSE); + + /* + * 07-Sep-2005, TSa: Let's not assert, but instead let's see if it + * sticks. Some implementations might choose to silently ignore + * setting, at least for 'false'? + */ + return (isNamespaceAware(f) == state); + } catch (IllegalArgumentException e) { + /* + * Let's assume, then, that the property (or specific value for it) + * is NOT supported... + */ + return false; + } + } + + protected static void setReplaceEntities(XMLInputFactory f, boolean state) throws XMLStreamException { + Boolean b = state ? Boolean.TRUE : Boolean.FALSE; + f.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, b); + Assert.assertEquals(b, f.getProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES)); + } + + protected static void setSupportDTD(XMLInputFactory f, boolean state) throws XMLStreamException { + Boolean b = state ? Boolean.TRUE : Boolean.FALSE; + f.setProperty(XMLInputFactory.SUPPORT_DTD, b); + Assert.assertEquals(b, f.getProperty(XMLInputFactory.SUPPORT_DTD)); + } + + protected static boolean setSupportExternalEntities(XMLInputFactory f, boolean state) throws XMLStreamException { + Boolean b = state ? Boolean.TRUE : Boolean.FALSE; + try { + f.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, b); + Object act = f.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES); + return (act instanceof Boolean) && ((Boolean) act).booleanValue() == state; + } catch (IllegalArgumentException e) { + /* + * Let's assume, then, that the property (or specific value for it) + * is NOT supported... + */ + return false; + } + } + + protected static void setResolver(XMLInputFactory f, XMLResolver resolver) throws XMLStreamException { + f.setProperty(XMLInputFactory.RESOLVER, resolver); + } + + protected static boolean setReportCData(XMLInputFactory f, boolean state) throws XMLStreamException { + + Boolean b = state ? Boolean.TRUE : Boolean.FALSE; + if (f.isPropertySupported(PROP_REPORT_CDATA)) { + f.setProperty(PROP_REPORT_CDATA, b); + return true; + } + return false; + } + + /* + * ////////////////////////////////////////////////// // Stream reader + * accessors ////////////////////////////////////////////////// + */ + + /** + * Method that not only gets currently available text from the reader, but + * also checks that its consistenly accessible using different StAX methods. + */ + protected static String getAndVerifyText(XMLStreamReader sr) throws XMLStreamException { + String text = sr.getText(); + + /* + * 05-Apr-2006, TSa: Although getText() is available for DTD and + * ENTITY_REFERENCE, getTextXxx() are not. Thus, can not do more checks + * for those types. + */ + int type = sr.getEventType(); + if (type != ENTITY_REFERENCE && type != DTD) { + Assert.assertNotNull("getText() should never return null.", text); + int expLen = sr.getTextLength(); + /* + * Hmmh. Can only return empty text for CDATA (since empty blocks + * are legal). + */ + /* + * !!! 01-Sep-2004, TSa: note: theoretically, in coalescing mode, it + * could be possible to have empty CDATA section(s) get converted to + * CHARACTERS, which would be empty... may need to enhance this to + * check that mode is not coalescing? Or something + */ + if (sr.getEventType() == CHARACTERS) { + if (expLen == 0) { + Assert.fail("Stream reader should never return empty Strings."); + } + } + Assert.assertEquals(expLen, text.length(), "Expected text length of " + expLen + ", got " + text.length()); + char[] textChars = sr.getTextCharacters(); + int start = sr.getTextStart(); + String text2 = new String(textChars, start, expLen); + Assert.assertEquals("Expected getText() and getTextCharacters() to return same value for event of type (" + tokenTypeDesc(sr.getEventType()) + ")", + text, text2); + } else { // DTD or ENTITY_REFERENCE + // not sure if null is legal for these either, but... + if (text == null) { // let's prevent an NPE at caller + text = ""; + } + } + return text; + } + + protected static String getAllText(XMLStreamReader sr) throws XMLStreamException { + StringBuffer sb = new StringBuffer(); + while (true) { + int tt = sr.getEventType(); + if (tt != CHARACTERS && tt != SPACE) { + break; + } + sb.append(getAndVerifyText(sr)); + sr.next(); + } + return sb.toString(); + } + + protected static String getAllCData(XMLStreamReader sr) throws XMLStreamException { + StringBuffer sb = new StringBuffer(); + while (true) { + /* + * Note: CDATA sections CAN be reported as CHARACTERS, but not as + * SPACE + */ + int tt = sr.getEventType(); + if (tt != CHARACTERS && tt != CDATA) { + break; + } + sb.append(getAndVerifyText(sr)); + sr.next(); + } + return sb.toString(); + } + + /* + * ////////////////////////////////////////////////// // Derived assert/fail + * methods ////////////////////////////////////////////////// + */ + + protected static void assertTokenType(int expType, int actType) { + if (expType == actType) { + return; + } + Assert.fail("Expected token " + tokenTypeDesc(expType) + "; got " + tokenTypeDesc(actType) + "."); + } + + protected static void assertTokenType(int expType, int actType, XMLStreamReader sr) { + if (expType == actType) { + return; + } + Assert.fail("Expected token " + tokenTypeDesc(expType) + "; got " + tokenTypeDesc(actType, sr) + "."); + } + + protected static void assertTextualTokenType(int actType) { + if (actType != CHARACTERS && actType != SPACE && actType != CDATA) { + Assert.fail("Expected textual token (CHARACTERS, SPACE or CDATA)" + "; got " + tokenTypeDesc(actType) + "."); + } + } + + protected static void failStrings(String msg, String exp, String act) { + // !!! TODO: Indicate position where Strings differ + Assert.fail(msg + ": expected " + quotedPrintable(exp) + ", got " + quotedPrintable(act)); + } + + /** + * Specific method makes sense, since earlier it was not clear whether null + * or empty string (or perhaps both) would be the right answer when there is + * no prefix. + *

+ * However: as per javadocs of {@link XMLStreamReader#getPrefix}, from JDK + * 1.6 indicate, the current understanding is that null is the + * ultimate right answer here. + */ + protected static void assertNoPrefix(XMLStreamReader sr) throws XMLStreamException { + String prefix = sr.getPrefix(); + if (prefix != null) { + if (prefix.length() != 0) { + Assert.fail("Current element should not have a prefix: got '" + prefix + "'"); + } else { + Assert.fail("Expected null to signify missing prefix (see XMLStreamReader#getPrefix() JavaDocs): got empty String"); + } + } + } + + protected static void assertNoAttrPrefix(String attrPrefix) throws XMLStreamException { + if (attrPrefix != null) { + if (attrPrefix.length() != 0) { + Assert.fail("Attribute should not have a prefix: got '" + attrPrefix + "'"); + } else { + Assert.fail("Expected null to signify missing attribute prefix (see XMLStreamReader#getAttributePrefix() JavaDocs): got empty String"); + } + } + } + + /** + * Similar to {@link #assertNoPrefix}, but here we do know that unbound + * namespace URI should be indicated as empty String. + */ + protected static void assertNoNsURI(XMLStreamReader sr) throws XMLStreamException { + String uri = sr.getNamespaceURI(); + if (uri == null) { + Assert.fail("Expected empty String to indicate \"no namespace\": got null"); + } else if (uri.length() != 0) { + Assert.fail("Expected empty String to indicate \"no namespace\": got '" + uri + "'"); + } + } + + protected static void assertNoAttrNamespace(String attrNsURI) throws XMLStreamException { + if (attrNsURI == null) { + // refer to 6903561; accept null for now. + // fail("Expected empty String to indicate \"no namespace\" (for attribute): got null"); + } else if (attrNsURI.length() != 0) { + Assert.fail("Expected empty String to indicate \"no namespace\" (for attribute): got '" + attrNsURI + "'"); + } + } + + protected static void assertNoPrefixOrNs(XMLStreamReader sr) throws XMLStreamException { + assertNoPrefix(sr); + assertNoNsURI(sr); + } + + /** + * Helper assertion that assert that the String is either null or empty + * (""). + */ + protected static void assertNullOrEmpty(String str) { + if (str != null && str.length() > 0) { + Assert.fail("Expected String to be empty or null; was '" + str + "' (length " + str.length() + ")"); + } + } + + /* + * ////////////////////////////////////////////////// // Debug/output + * helpers ////////////////////////////////////////////////// + */ + + protected static String tokenTypeDesc(int tt) { + String desc = (String) mTokenTypes.get(new Integer(tt)); + if (desc == null) { + return "[" + tt + "]"; + } + return desc; + } + + protected static String tokenTypeDesc(XMLEvent evt) { + return tokenTypeDesc(evt.getEventType()); + } + + final static int MAX_DESC_TEXT_CHARS = 8; + + protected static String tokenTypeDesc(int tt, XMLStreamReader sr) { + String desc = tokenTypeDesc(tt); + // Let's show first 8 chars or so... + if (tt == CHARACTERS || tt == SPACE || tt == CDATA) { + String str = sr.getText(); + if (str.length() > MAX_DESC_TEXT_CHARS) { + desc = "\"" + str.substring(0, MAX_DESC_TEXT_CHARS) + "\"[...]"; + } else { + desc = "\"" + desc + "\""; + } + desc = " (" + desc + ")"; + } + return desc; + } + + protected static String valueDesc(String value) { + if (value == null) { + return "[NULL]"; + } + return "\"" + value + "\""; + } + + protected static String printable(char ch) { + if (ch == '\n') { + return "\\n"; + } + if (ch == '\r') { + return "\\r"; + } + if (ch == '\t') { + return "\\t"; + } + if (ch == ' ') { + return "_"; + } + if (ch > 127 || ch < 32) { + StringBuffer sb = new StringBuffer(6); + sb.append("\\u"); + String hex = Integer.toHexString((int) ch); + for (int i = 0, len = 4 - hex.length(); i < len; i++) { + sb.append('0'); + } + sb.append(hex); + return sb.toString(); + } + return null; + } + + protected static String printable(String str) { + if (str == null || str.length() == 0) { + return str; + } + + int len = str.length(); + StringBuffer sb = new StringBuffer(len + 64); + for (int i = 0; i < len; ++i) { + char c = str.charAt(i); + String res = printable(c); + if (res == null) { + sb.append(c); + } else { + sb.append(res); + } + } + return sb.toString(); + } + + protected static String quotedPrintable(String str) { + if (str == null || str.length() == 0) { + return "[0]''"; + } + return "[len: " + str.length() + "] '" + printable(str) + "'"; + } + + protected void reportNADueToProperty(String method, String prop) { + String clsName = getClass().getName(); + /* + * 27-Sep-2005, TSa: Should probably use some other mechanism for + * reporting this. Does JUnit have something applicable? + */ + System.err.println("Skipping " + clsName + "#" + method + ": property '" + prop + "' (or one of its values) not supported."); + } + + protected void reportNADueToNS(String method) { + reportNADueToProperty(method, "IS_NAMESPACE_AWARE"); + } + + protected void reportNADueToExtEnt(String method) { + reportNADueToProperty(method, "IS_SUPPORTING_EXTERNAL_ENTITIES"); + } + + protected void reportNADueToEntityExpansion(String method, int type) { + String clsName = getClass().getName(); + String msg = (type > 0) ? " (next event: " + tokenTypeDesc(type) + ")" : ""; + System.err.println("Skipping " + clsName + "#" + method + ": entity expansion does not seem to be functioning properly" + msg + "."); + } +} diff --git a/jaxp/test/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java b/jaxp/test/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java new file mode 100644 index 00000000000..5a408d1278a --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * 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. + */ +package util; + +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; +import org.xml.sax.helpers.DefaultHandler; + +public final class DraconianErrorHandler extends DefaultHandler { + public void error(SAXParseException e) throws SAXException { + throw e; + } + + public void fatalError(SAXParseException e) throws SAXException { + throw e; + } +} From d37f9f40c9f569e2cbf251509a0f74132e3e48d8 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Thu, 13 Aug 2015 19:07:27 +0530 Subject: [PATCH 19/36] 8133347: Add makefiles support and basic session, persistence history navigation with jline Reviewed-by: erikj, jlahoda, jlaskey --- nashorn/make/BuildNashorn.gmk | 7 +- nashorn/make/build.xml | 24 ++- nashorn/make/project.properties | 13 +- .../jdk/nashorn/tools/jjs/Console.java | 103 ++++++++++++ .../classes/jdk/nashorn/tools/jjs/Main.java | 150 ++++++++++++++++++ .../classes/jdk/nashorn/tools/Shell.java | 4 +- 6 files changed, 287 insertions(+), 14 deletions(-) create mode 100644 nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java create mode 100644 nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java 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 @@ - + - + - + - - + + ${line.separator} @@ -165,7 +165,14 @@ - + + + + @@ -230,13 +237,14 @@ - - + + 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 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 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, ""); + 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(); From c580b989e0fe086be80db2991af1c41310a02832 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Thu, 13 Aug 2015 19:09:59 +0530 Subject: [PATCH 20/36] 8133347: Add makefiles support and basic session, persistence history navigation with jline Reviewed-by: erikj, jlahoda, jlaskey --- make/CompileJavaModules.gmk | 1 + make/Images.gmk | 6 +++--- modules.xml | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk index 8d97cd0aad2..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 = \ 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 @@ java.base java.logging java.scripting + + jdk.nashorn.internal.runtime + jdk.scripting.nashorn.shell + + + jdk.nashorn.internal.objects + jdk.scripting.nashorn.shell + + + jdk.nashorn.tools + jdk.scripting.nashorn.shell + + + + jdk.scripting.nashorn.shell + java.base + java.prefs + jdk.scripting.nashorn + jdk.internal.le jdk.sctp From c30f555733a452f0b205913862e4f5b53efd39a7 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 13 Aug 2015 12:20:03 -0700 Subject: [PATCH 21/36] Added tag jdk9-b77 for changeset 05020a092c0f --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) 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 From 68d4e9ccf4059d08ea489a2c32759062996870b6 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 13 Aug 2015 12:20:04 -0700 Subject: [PATCH 22/36] Added tag jdk9-b77 for changeset 3cb9ab9c726d --- corba/.hgtags | 1 + 1 file changed, 1 insertion(+) 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 From 053ddb237aac816efa8865797ba82cd7e06d480f Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 13 Aug 2015 12:20:05 -0700 Subject: [PATCH 23/36] Added tag jdk9-b77 for changeset f057c3f8e4d2 --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) 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 From bd2258414ae3f7bdf38a485fd35073ff107dd1e1 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 13 Aug 2015 12:20:06 -0700 Subject: [PATCH 24/36] Added tag jdk9-b77 for changeset 51926b23f437 --- jaxp/.hgtags | 1 + 1 file changed, 1 insertion(+) 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 From 93691df899b98e79c16b290b87467151187404b1 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 13 Aug 2015 12:20:07 -0700 Subject: [PATCH 25/36] Added tag jdk9-b77 for changeset 59d4b73cb39a --- jaxws/.hgtags | 1 + 1 file changed, 1 insertion(+) 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 From 0bce0e49e15e040d8acdcd0a9a6f57bdd7e67d70 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 13 Aug 2015 12:20:10 -0700 Subject: [PATCH 26/36] Added tag jdk9-b77 for changeset 9fdd8b175dc1 --- langtools/.hgtags | 1 + 1 file changed, 1 insertion(+) 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 From 5d7b720b028a13e3a264556deaa6864a1236a1ec Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 13 Aug 2015 12:20:11 -0700 Subject: [PATCH 27/36] Added tag jdk9-b77 for changeset 5bf57225d6fc --- nashorn/.hgtags | 1 + 1 file changed, 1 insertion(+) 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 From 7cc817742fa70dd037d7a4ac6ba673d52bfe4fa9 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Thu, 13 Aug 2015 21:46:05 -0700 Subject: [PATCH 28/36] 8133588: Place TimeoutLockLoops.java on the problem list Reviewed-by: dholmes --- jdk/test/ProblemList.txt | 4 ++++ 1 file changed, 4 insertions(+) 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 From 2c4538edd5ddd7b47b576c801265d86c32cb4d8d Mon Sep 17 00:00:00 2001 From: "J. Duke" Date: Wed, 5 Jul 2017 20:45:01 +0200 Subject: [PATCH 29/36] Added tag jdk9-b77 for changeset c25e882cee96 --- .hgtags | 1 + 1 file changed, 1 insertion(+) 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 From 1b8b82463e4f81119a2815ce2f0e01851b41df30 Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Fri, 14 Aug 2015 10:35:45 +0200 Subject: [PATCH 30/36] 8131168: Refactor ProcessHandleImpl_*.c and add implememtation for AIX Reviewed-by: rriggs, smarks --- .../native/libjava/ProcessHandleImpl_aix.c | 50 ++ .../native/libjava/ProcessHandleImpl_linux.c | 266 ++++++ .../native/libjava/ProcessHandleImpl_macosx.c | 278 ++---- .../classes/java/lang/ProcessHandle.java | 26 + .../classes/java/lang/ProcessHandleImpl.java | 18 +- .../libjava/ProcessHandleImpl_solaris.c | 362 +------- .../native/libjava/ProcessHandleImpl_unix.c | 789 ++++++++---------- .../native/libjava/ProcessHandleImpl_unix.h | 76 ++ .../native/libjava/ProcessHandleImpl_win.c | 5 + .../java/lang/ProcessHandle/InfoTest.java | 86 +- .../java/lang/ProcessHandle/JavaChild.java | 14 +- .../java/lang/ProcessHandle/OnExitTest.java | 5 + 12 files changed, 949 insertions(+), 1026 deletions(-) create mode 100644 jdk/src/java.base/aix/native/libjava/ProcessHandleImpl_aix.c create mode 100644 jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c create mode 100644 jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h 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 + +/* + * 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 +#include +#include +#include +#include +#include + +#include +#include + +/* + * 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//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//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//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//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//cmdline is truncated. + cmdline[cmdlen] = '\0'; + if (cmdlen == pageSize && cmdline[pageSize - 1] != '\0') { + truncated = 1; + } else if (cmdlen == 0) { + // /proc//cmdline was empty. This usually happens for kernel processes + // like '[kthreadd]'. We could try to read /proc//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//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 #include #include @@ -38,144 +40,15 @@ #include /** - * 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//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 { */ public Optional command(); + /** + * Returns the command line of the process. + *

+ * 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. + *

+ * 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} of the command line + * of the process + */ + public Optional 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} of the arguments of the process */ public Optional 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 commandLine() { + if (command != null && arguments != null) { + return Optional.of(command + " " + String.join(" ", arguments)); + } else { + return Optional.ofNullable(commandLine); + } + } + @Override public Optional 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/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 -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include - -/** - * 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//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//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/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 - #include #include #include #include #include #include +#include +#include +#include +#include #include #include #include -#include -#include -#include +#ifdef _AIX +#include +#endif +#ifdef __solaris__ +#include +#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_.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_ functions in + * ProcessHandleImpl_.c + * - if at least two platforms implement an os_ function in the + * same way, this implementation is factored out into unix_, + * placed into this file and called from the corresponding os_ + * function. + * - For convenience, all the os_ and unix_ functions are declared in + * ProcessHandleImpl_unix.h which is included into every + * ProcessHandleImpl_.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//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//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//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//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 + +/* + * 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/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/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//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//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 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 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//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 dur1 = ProcessHandle.current().info().totalCpuDuration(); Duration myCputime2 = ProcessUtil.MXBeanCpuTime(); + if (Platform.isAix()) { + try { + Thread.sleep(1000); + } catch (InterruptedException ex) {} + } Optional 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 getArgs() { + return allArgs; + } + public CompletableFuture 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 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> completions = From ea7449a3adbd9b05b5066bf715dc266a2a543ab3 Mon Sep 17 00:00:00 2001 From: Alexander Stepanov Date: Fri, 14 Aug 2015 14:40:13 +0300 Subject: [PATCH 31/36] 8133480: replace some tags (obsolete in html5) in core-libs docs Reviewed-by: lancea --- .../classes/java/net/InetSocketAddress.java | 4 +- .../classes/java/net/spi/package-info.java | 2 +- .../classes/javax/net/ssl/SSLContext.java | 2 +- .../classes/javax/net/ssl/SSLException.java | 12 +- .../sun/net/ftp/FtpClientProvider.java | 8 +- .../share/classes/sun/util/PreHashedMap.java | 6 +- .../sun/net/www/protocol/file/Handler.java | 4 +- .../classes/sun/io/Win32ErrorMode.java | 4 +- .../sun/net/www/protocol/file/Handler.java | 4 +- .../com/sun/jndi/cosnaming/RemoteToCorba.java | 2 +- .../sun/jndi/toolkit/corba/CorbaUtils.java | 2 +- .../classes/java/rmi/RemoteException.java | 18 +- .../rmi/activation/ActivationException.java | 12 +- .../java/rmi/server/ServerCloneException.java | 12 +- .../share/classes/com/sun/rowset/package.html | 46 ++--- .../com/sun/rowset/providers/package.html | 82 ++++----- .../classes/javax/sql/rowset/package.html | 118 ++++++------ .../javax/sql/rowset/serial/package.html | 138 +++++++------- .../classes/javax/sql/rowset/spi/package.html | 138 +++++++------- .../share/classes/java/sql/Timestamp.java | 172 +++++++++--------- .../com/sun/tools/attach/VirtualMachine.java | 132 +++++++------- .../attach/VirtualMachineDescriptor.java | 26 +-- .../httpserver/spi/HttpServerProvider.java | 2 +- .../com/sun/jdi/VirtualMachineManager.java | 34 ++-- .../connect/TransportTimeoutException.java | 4 +- .../spi/ClosedConnectionException.java | 4 +- .../sun/jdi/connect/spi/TransportService.java | 36 ++-- .../sun/jvmstat/monitor/HostIdentifier.java | 12 +- .../sun/jvmstat/monitor/MonitoredHost.java | 8 +- .../jvmstat/monitor/MonitoredHostService.java | 2 +- .../sun/jvmstat/monitor/MonitoredVm.java | 10 +- .../monitor/AbstractPerfDataBuffer.java | 4 +- .../monitor/PerfByteArrayMonitor.java | 2 +- .../perfdata/monitor/PerfDataBufferImpl.java | 4 +- .../protocol/file/MonitoredHostProvider.java | 2 +- .../monitor/protocol/local/PerfDataFile.java | 2 +- .../monitor/protocol/local/package.html | 2 +- .../management/GarbageCollectorMXBean.java | 8 +- .../management/HotSpotDiagnosticMXBean.java | 30 +-- .../sun/management/OperatingSystemMXBean.java | 10 +- .../classes/com/sun/jndi/dns/DnsContext.java | 2 +- .../classes/com/sun/jndi/dns/DnsName.java | 46 ++--- .../classes/com/sun/jndi/dns/NameNode.java | 6 +- .../classes/com/sun/jndi/dns/Resolver.java | 2 +- .../classes/com/sun/jndi/dns/ZoneNode.java | 2 +- 45 files changed, 589 insertions(+), 589 deletions(-) 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 null. + * 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 null. + * 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 {@link java.net} package. + * Service-provider classes for the {@link java.net} package. * *

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/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; *

Every implementation of the Java platform is required to support the * following standard {@code SSLContext} protocol: *

    - *
  • TLSv1
    • + *
  • {@code TLSv1}
    • *
* This protocol is described in the 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 SSLException 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 null 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 SSLException with the specified cause - * and a detail message of (cause==null ? null : cause.toString()) + * 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 - * cause). + * {@code cause}). * * @param cause the cause (which is saved for later retrieval by the - * {@link #getCause()} method). (A null 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}("ftpClientProvider") + * {@link RuntimePermission}{@code ("ftpClientProvider")} */ protected FtpClientProvider() { SecurityManager sm = System.getSecurityManager(); @@ -108,7 +108,7 @@ public abstract class FtpClientProvider { *
    * *

  1. If the system property - * java.net.FtpClientProvider 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.

    2. @@ -116,8 +116,8 @@ public abstract class FtpClientProvider { *

  2. 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 - * java.net.FtpClientProvider in the resource - * directory META-INF/services, 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.

    3. 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; * * } * - *

    The init method is invoked by the PreHashedMap + *

    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. * *

    In the JDK build, subclasses of this class are typically created via the - * Hasher program in the make/tools/Hasher 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 * Creates a new map. * *

    This constructor invokes the {@link #init init} method, passing it a - * newly-constructed row array that is rows 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/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 true if and only if they - * are equal, false 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/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. *

    * The critial error message box is disabled unless the system property - * sun.io.allowCriticalErrorMessageBox is set to something other than - * false. This includes the empty string. + * {@code sun.io.allowCriticalErrorMessageBox} is set to something other than + * {@code false}. This includes the empty string. *

    * 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 true if and only if they - * are equal, false 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.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 orig 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 remoteObj + * @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 RemoteException 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 java.rmi.Remote, must list - * RemoteException in its throws clause. + * extends {@code java.rmi.Remote}, must list + * {@code RemoteException} in its throws clause. * *

    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." * *

    Invoking the method {@link Throwable#initCause(Throwable)} on an - * instance of RemoteException 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 RemoteException. + * Constructs a {@code RemoteException}. */ public RemoteException() { initCause(null); // Disallow subsequent initCause } /** - * Constructs a RemoteException 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 RemoteException 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 Throwable. + * 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 null. + * @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." * *

    Invoking the method {@link Throwable#initCause(Throwable)} on an - * instance of ActivationException 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 ActivationException. + * Constructs an {@code ActivationException}. */ public ActivationException() { initCause(null); // Disallow subsequent initCause } /** - * Constructs an ActivationException 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 ActivationException with the specified + * Constructs an {@code ActivationException} with the specified * detail message and cause. This constructor sets the {@link #detail} - * field to the specified Throwable. + * 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 null. + * @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 ServerCloneException is thrown if a remote exception occurs - * during the cloning of a UnicastRemoteObject. + * A {@code ServerCloneException} is thrown if a remote exception occurs + * during the cloning of a {@code UnicastRemoteObject}. * *

    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." * *

    Invoking the method {@link Throwable#initCause(Throwable)} on an - * instance of ServerCloneException 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 ServerCloneException 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 ServerCloneException 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 null. + * @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 @@ - + com.sun.rowset Package -Provides five standard implementations of the standard JDBC RowSet implementation -interface definitions. These reference implementations are included with the J2SE version -1.5 platform and represent the benchmark standard RowSet implementations as verified +Provides five standard implementations of the standard JDBC RowSet implementation +interface definitions. These reference implementations are included with the J2SE version +1.5 platform and represent the benchmark standard RowSet implementations as verified by the Test Compatibility Kit (TCK) as mandated by the Java Community Process. -
    - +
    +

    1.0 Available JDBC RowSet Reference Implementations

    - The following implementations are provided:
    - -
    JdbcRowSetImpl - The javax.sql.rowset.JdbcRowSet +The following implementations are provided:
    + +
    JdbcRowSetImpl - The javax.sql.rowset.JdbcRowSet interface reference implementation.

    -CachedRowSetImpl - The javax.sql.rowset.CachedRowSet interface +CachedRowSetImpl - The javax.sql.rowset.CachedRowSet interface reference implementation.

    -WebRowSetImpl - The javax.sql.rowset.WebRowSet interface +WebRowSetImpl - The javax.sql.rowset.WebRowSet interface reference implementation.

    -FilteredRowSetImpl - The javax.sql.rowset.FilteredRowSet +FilteredRowSetImpl - The javax.sql.rowset.FilteredRowSet interface reference implementation.

    -JoinRowSetImpl - The javax.sql.rowset.JoinRowSet interface +JoinRowSetImpl - The javax.sql.rowset.JoinRowSet interface reference implementation.
    -All details on their expected behavior, including their interactions with the SyncProvider -SPI and helper classes are provided in the interface definitions in the javax.sql.rowset +All details on their expected behavior, including their interactions with the SyncProvider +SPI and helper classes are provided in the interface definitions in the javax.sql.rowset package specification.
    - +

    2.0 Usage

    The reference implementations represent robust implementations of the standard -RowSet interfaces defined in the javax.sql.rowset package. -All disconnected RowSet implementations, such as the CachedRowSetImpl -and WebRowSetImpl, are flexible enough to use the SyncFactory SPIs to -leverage non-reference implementation SyncProvider implementations to obtain -differing synchronization semantics. Furthermore, developers and vendors alike are free +RowSet interfaces defined in the javax.sql.rowset package. +All disconnected RowSet implementations, such as the CachedRowSetImpl +and WebRowSetImpl, are flexible enough to use the SyncFactory SPIs to +leverage non-reference implementation SyncProvider 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.
    - +

    3.0 Extending the JDBC RowSet Implementations

    The JDBC RowSet 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.
    -
    +
    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 @@ - + - +