rename TCK package from package jakarta.jsonp.tck to jsonp.tck

Signed-off-by: Scott Marlow <[email protected]>
jakartaee · Jan 12, 2022 · 83c6727 · 83c6727
1 parent 630c014
commit 83c6727
Show file tree

Hide file tree

Showing 109 changed files with 1,421 additions and 1,435 deletions.
diff --git a/impl-tck/tck-tests/pom.xml b/impl-tck/tck-tests/pom.xml
@@ -138,7 +138,7 @@
                                 <include>**/JsonProviderTest.java</include>
                             </includes>
                             <systemPropertyVariables>
-                                <jakarta.json.provider>jakarta.jsonp.tck.api.provider.JsonProviderTest.DummyJsonProvider</jakarta.json.provider>
+                                <jakarta.json.provider>jsonp.tck.api.provider.JsonProviderTest.DummyJsonProvider</jakarta.json.provider>
                             </systemPropertyVariables>
                         </configuration>
                     </execution>

diff --git a/.../jakarta/jsonp/tck/common/JSONP_Data.java → ...ain/java/jsonp/tck/common/JSONP_Data.java b/.../jakarta/jsonp/tck/common/JSONP_Data.java → ...ain/java/jsonp/tck/common/JSONP_Data.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.common;
+package jsonp.tck.common;
 
 
 import java.util.*;

diff --git a/.../jakarta/jsonp/tck/common/JSONP_Util.java → ...ain/java/jsonp/tck/common/JSONP_Util.java b/.../jakarta/jsonp/tck/common/JSONP_Util.java → ...ain/java/jsonp/tck/common/JSONP_Util.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.common;
+package jsonp.tck.common;
 
 
 import java.util.*;
@@ -52,7 +52,7 @@ public final class JSONP_Util {
   public static final Charset UTF_32LE = Charset.forName("UTF-32LE");
 
   // Test Config properties
-  public static final String FOO_CONFIG = "jakarta.jsonp.tck.common.FOO_CONFIG";
+  public static final String FOO_CONFIG = "jsonp.tck.common.FOO_CONFIG";
 
   // Number of parser errors encountered
   private static int parseErrs = 0;

diff --git a/...onp/tck/common/MyBufferedInputStream.java → ...onp/tck/common/MyBufferedInputStream.java b/...onp/tck/common/MyBufferedInputStream.java → ...onp/tck/common/MyBufferedInputStream.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.common;
+package jsonp.tck.common;
 
 
 import java.io.*;

diff --git a/...ta/jsonp/tck/common/MyBufferedReader.java → ...va/jsonp/tck/common/MyBufferedReader.java b/...ta/jsonp/tck/common/MyBufferedReader.java → ...va/jsonp/tck/common/MyBufferedReader.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.common;
+package jsonp.tck.common;
 
 
 import java.io.*;

diff --git a/...ta/jsonp/tck/common/MyBufferedWriter.java → ...va/jsonp/tck/common/MyBufferedWriter.java b/...ta/jsonp/tck/common/MyBufferedWriter.java → ...va/jsonp/tck/common/MyBufferedWriter.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.common;
+package jsonp.tck.common;
 
 
 import java.io.*;

diff --git a/...arta/jsonp/tck/common/MyJsonLocation.java → ...java/jsonp/tck/common/MyJsonLocation.java b/...arta/jsonp/tck/common/MyJsonLocation.java → ...java/jsonp/tck/common/MyJsonLocation.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.common;
+package jsonp.tck.common;
 
 
 import jakarta.json.stream.JsonLocation;

diff --git a/...arta/jsonp/tck/util/FileUTFConverter.java → ...java/jsonp/tck/util/FileUTFConverter.java b/...arta/jsonp/tck/util/FileUTFConverter.java → ...java/jsonp/tck/util/FileUTFConverter.java
@@ -46,7 +46,7 @@
  * UTF-32LE
  */
 
-package jakarta.jsonp.tck.util;
+package jsonp.tck.util;
 
 import java.io.*;
 import java.util.logging.Logger;

diff --git a/...ava/jakarta/jsonp/tck/util/MyEncoder.java → ...c/main/java/jsonp/tck/util/MyEncoder.java b/...ava/jakarta/jsonp/tck/util/MyEncoder.java → ...c/main/java/jsonp/tck/util/MyEncoder.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.util;
+package jsonp.tck.util;
 
 import java.io.*;
 import java.util.logging.Logger;

diff --git a/...ta/jsonp/tck/util/StringUTFConverter.java → ...va/jsonp/tck/util/StringUTFConverter.java b/...ta/jsonp/tck/util/StringUTFConverter.java → ...va/jsonp/tck/util/StringUTFConverter.java
@@ -31,7 +31,7 @@
  * output file (fooUTF16LE).
  */
 
-package jakarta.jsonp.tck.util;
+package jsonp.tck.util;
 
 import java.io.*;
 import java.util.logging.Logger;

diff --git a/tck/tck-dist/pom.xml b/tck/tck-dist/pom.xml
@@ -108,7 +108,7 @@
        <id>EFTL</id>
          <properties>
             <license>EFTL</license>
-            <bundle-name>jakarta-jsonp-tck</bundle-name>
+            <bundle-name>jsonp-tck</bundle-name>
          </properties>
       </profile>
       <profile>

diff --git a/tck/tck-docs/userguide/src/main/jbake/content/attributes.conf b/tck/tck-docs/userguide/src/main/jbake/content/attributes.conf
@@ -26,10 +26,10 @@
 :JakartaEEVersion: 10.0
 :jteFileName: <TS_HOME>/bin/ts.jte
 :excludeListFileName: tck-docs/TCK-Exclude-List.txt
-:TCKPackageName: jakarta-jsonp-tck-2.1.0.zip
+:TCKPackageName: jsonp-tck-2.1.0.zip
 // Directory names used in examples in using.adoc.
-:sigTestDirectoryExample: jakarta/jsonp/tck/signaturetest/jsonp
-:singleTestDirectoryExample: jakarta/jsonp/tck/api/jsoncoding
-:subsetTestDirectoryExample: jakarta/jsonp/tck/api/
+:sigTestDirectoryExample: jsonp/tck/signaturetest/jsonp
+:singleTestDirectoryExample: jsonp/tck/api/jsoncoding
+:subsetTestDirectoryExample: jsonp/tck/api/
 // Define this attribute (uncomment it) if the TCK needs the rebuild appendix.
 // :rebuild:
diff --git a/tck/tck-docs/userguide/src/main/jbake/content/using-examples.inc b/tck/tck-docs/userguide/src/main/jbake/content/using-examples.inc
@@ -22,7 +22,7 @@ following commands:
 
 [source,subs="attributes"]
 ----
-mvn verify -Dit.test=jakarta.jsonp.tck.signaturetest.** 
+mvn verify -Dit.test=jsonp.tck.signaturetest.** 
 ----
 
 [[GCMBV]]

diff --git a/...bility/jsonprovidertests/ClientTests.java → ...bility/jsonprovidertests/ClientTests.java b/...bility/jsonprovidertests/ClientTests.java → ...bility/jsonprovidertests/ClientTests.java
@@ -17,7 +17,7 @@
 /*
  * $Id$
  */
-package jakarta.jsonp.tck.pluggability.jsonprovidertests;
+package jsonp.tck.pluggability.jsonprovidertests;
 
 import jakarta.json.*;
 import jakarta.json.spi.JsonProvider;
@@ -33,9 +33,10 @@
 import java.util.HashMap;
 import java.util.logging.Logger;
 
-import jakarta.jsonp.tck.common.*;
-import jakarta.jsonp.tck.provider.MyJsonProvider;
-import jakarta.jsonp.tck.provider.MyJsonGenerator;
+import jsonp.tck.common.*;
+import jsonp.tck.provider.MyJsonProvider;
+import jsonp.tck.provider.MyJsonGenerator;
+import jsonp.tck.common.JSONP_Util;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit5.ArquillianExtension;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -50,7 +51,7 @@
 @ExtendWith(ArquillianExtension.class)
 public class ClientTests {
 
-  private static final String MY_JSONPROVIDER_CLASS = "jakarta.jsonp.tck.provider.MyJsonProvider";
+  private static final String MY_JSONPROVIDER_CLASS = "jsonp.tck.provider.MyJsonProvider";
   private static final Logger LOGGER = Logger.getLogger(ClientTests.class.getName());
 
   private String providerPath = null;
@@ -88,7 +89,7 @@ public void jsonProviderTest1() {
       if (providerClass.equals(MY_JSONPROVIDER_CLASS))
         LOGGER.info("Current provider is my provider - expected.");
       else {
-        LOGGER.warning("Current provider is not my provider - unexpected.");
+        LOGGER.warning("Current provider is not my provider - unexpected.  providerClass=" + providerClass + " , MY_JSONPROVIDER_CLASS=" +MY_JSONPROVIDER_CLASS);
         pass = false;
         ServiceLoader<JsonProvider> loader = ServiceLoader.load(JsonProvider.class);
         Iterator<JsonProvider> it = loader.iterator();

diff --git a/...a/jsonp/tck/provider/MyJsonGenerator.java → ...a/jsonp/tck/provider/MyJsonGenerator.java b/...a/jsonp/tck/provider/MyJsonGenerator.java → ...a/jsonp/tck/provider/MyJsonGenerator.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package jsonp.tck.provider;
 
 import java.io.*;
 import java.math.BigDecimal;

diff --git a/.../tck/provider/MyJsonGeneratorFactory.java → .../tck/provider/MyJsonGeneratorFactory.java b/.../tck/provider/MyJsonGeneratorFactory.java → .../tck/provider/MyJsonGeneratorFactory.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package jsonp.tck.provider;
 
 import jakarta.json.stream.*;
 import java.io.*;

diff --git a/...arta/jsonp/tck/provider/MyJsonParser.java → ...java/jsonp/tck/provider/MyJsonParser.java b/...arta/jsonp/tck/provider/MyJsonParser.java → ...java/jsonp/tck/provider/MyJsonParser.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package jsonp.tck.provider;
 
 
 import jakarta.json.stream.*;

diff --git a/...onp/tck/provider/MyJsonParserFactory.java → ...onp/tck/provider/MyJsonParserFactory.java b/...onp/tck/provider/MyJsonParserFactory.java → ...onp/tck/provider/MyJsonParserFactory.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package jsonp.tck.provider;
 
 import jakarta.json.*;
 import jakarta.json.stream.*;

diff --git a/...ta/jsonp/tck/provider/MyJsonProvider.java → ...va/jsonp/tck/provider/MyJsonProvider.java b/...ta/jsonp/tck/provider/MyJsonProvider.java → ...va/jsonp/tck/provider/MyJsonProvider.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.jsonp.tck.provider;
+package jsonp.tck.provider;
 
 import java.io.*;
 import java.util.*;

diff --git a/...arta/jsonp/tck/provider/MyJsonReader.java → ...java/jsonp/tck/provider/MyJsonReader.java b/...arta/jsonp/tck/provider/MyJsonReader.java → ...java/jsonp/tck/provider/MyJsonReader.java
@@ -18,14 +18,11 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package jsonp.tck.provider;
 
 import jakarta.json.*;
-import jakarta.json.stream.*;
-import jakarta.json.spi.JsonProvider;
+
 import java.io.*;
-import java.nio.charset.Charset;
-import java.util.*;
 import java.util.logging.Logger;
 
 /*

diff --git a/...onp/tck/provider/MyJsonReaderFactory.java → ...onp/tck/provider/MyJsonReaderFactory.java b/...onp/tck/provider/MyJsonReaderFactory.java → ...onp/tck/provider/MyJsonReaderFactory.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package jsonp.tck.provider;
 
 import jakarta.json.*;
 import java.io.*;

diff --git a/...arta/jsonp/tck/provider/MyJsonWriter.java → ...java/jsonp/tck/provider/MyJsonWriter.java b/...arta/jsonp/tck/provider/MyJsonWriter.java → ...java/jsonp/tck/provider/MyJsonWriter.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package jsonp.tck.provider;
 
 import jakarta.json.*;
 import java.io.*;

diff --git a/...onp/tck/provider/MyJsonWriterFactory.java → ...onp/tck/provider/MyJsonWriterFactory.java b/...onp/tck/provider/MyJsonWriterFactory.java → ...onp/tck/provider/MyJsonWriterFactory.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package jsonp.tck.provider;
 
 
 import jakarta.json.*;

diff --git a/...tck-tests-pluggability/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider b/...tck-tests-pluggability/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider
@@ -1 +1 @@
-jakarta.jsonp.tck.provider.MyJsonProvider
+jsonp.tck.provider.MyJsonProvider
diff --git a/...ck/api/collectortests/CollectorTests.java → ...ck/api/collectortests/CollectorTests.java b/...ck/api/collectortests/CollectorTests.java → ...ck/api/collectortests/CollectorTests.java
@@ -14,9 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.jsonp.tck.api.collectortests;
+package jsonp.tck.api.collectortests;
 
-import jakarta.jsonp.tck.api.common.TestResult;
+import jsonp.tck.api.common.TestResult;
 import org.junit.jupiter.api.Test;
 import org.opentest4j.AssertionFailedError;
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ @@
      * $Id$
      */
-    package jakarta.jsonp.tck.common;
+    package jsonp.tck.common;
     import java.util.*;
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		jakarta.jsonp.tck.provider.MyJsonProvider
		jsonp.tck.provider.MyJsonProvider