Revert "[nobug] fix failing dbws builder tests" - affected tests started failing on 8
This reverts commit 1f29202b94c04b1c5bb8365743e440b262c4eac9.
diff --git a/utils/eclipselink.dbws.builder.test/src/dbws/testing/secondarysql/SecondarySQLTestSuite.java b/utils/eclipselink.dbws.builder.test/src/dbws/testing/secondarysql/SecondarySQLTestSuite.java
index 0f958e2..d067ea2 100644
--- a/utils/eclipselink.dbws.builder.test/src/dbws/testing/secondarysql/SecondarySQLTestSuite.java
+++ b/utils/eclipselink.dbws.builder.test/src/dbws/testing/secondarysql/SecondarySQLTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -510,9 +510,9 @@ public void countSecondary() throws SOAPException, SAXException, IOException, Tr
static final String COUNT_RESPONSE_MSG =
"<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" +
"<SOAP-ENV:Header/>" +
- "<SOAP-ENV:Body xmlns=\"" + SECONDARY_NAMESPACE +
- "\" xmlns:srvc=\"" + SECONDARY_SERVICE_NAMESPACE + "\">" +
- "<srvc:countSecondaryResponse>" +
+ "<SOAP-ENV:Body>" +
+ "<srvc:countSecondaryResponse xmlns=\"" + SECONDARY_NAMESPACE +
+ "\" xmlns:srvc=\"" + SECONDARY_SERVICE_NAMESPACE + "\">" +
"<srvc:result>" +
"<secondaryAggregate>" +
"<count>14</count>" +
@@ -563,9 +563,9 @@ public void allSecondary() throws SOAPException, SAXException, IOException, Tran
static final String ALL_RESPONSE_MSG =
"<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" +
"<SOAP-ENV:Header/>" +
- "<SOAP-ENV:Body xmlns=\"" + SECONDARY_NAMESPACE +
- "\" xmlns:srvc=\"" + SECONDARY_SERVICE_NAMESPACE + "\">" +
- "<srvc:allSecondaryResponse>" +
+ "<SOAP-ENV:Body>" +
+ "<srvc:allSecondaryResponse xmlns=\"" + SECONDARY_NAMESPACE +
+ "\" xmlns:srvc=\"" + SECONDARY_SERVICE_NAMESPACE + "\">" +
"<srvc:result>" +
"<secondaryType>" +
"<empno>7369</empno>" +
diff --git a/utils/eclipselink.dbws.builder.test/src/dbws/testing/sqlascollection/SQLAsCollectionTestSuite.java b/utils/eclipselink.dbws.builder.test/src/dbws/testing/sqlascollection/SQLAsCollectionTestSuite.java
index 780582c..2a554d1 100644
--- a/utils/eclipselink.dbws.builder.test/src/dbws/testing/sqlascollection/SQLAsCollectionTestSuite.java
+++ b/utils/eclipselink.dbws.builder.test/src/dbws/testing/sqlascollection/SQLAsCollectionTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -434,8 +434,8 @@ public void getData() throws SOAPException, ParserConfigurationException, SAXExc
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
"<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n" +
"<SOAP-ENV:Header/>\n" +
- "<SOAP-ENV:Body xmlns=\"" + SQLCOLLECTION_NAMESPACE + "\" xmlns:srvc=\"" + SQLCOLLECTION_SERVICE_NAMESPACE + "\">\n" +
- "<srvc:"+SQLCOLLECTION_SERVICE+"Response>\n" +
+ "<SOAP-ENV:Body>\n" +
+ "<srvc:"+SQLCOLLECTION_SERVICE+"Response xmlns=\"" + SQLCOLLECTION_NAMESPACE + "\" xmlns:srvc=\"" + SQLCOLLECTION_SERVICE_NAMESPACE + "\">\n" +
"<srvc:result>\n" +
"<sRecord>\n" +
"<id>1</id>\n" +
