You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/01/19 17:11:05 UTC
[isis] 03/04: ISIS-2158: move encoding -> legacy
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 73e9ea3baf650bc5c535db2742d972cf77a82aa2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 19 18:08:31 2020 +0100
ISIS-2158: move encoding -> legacy
---
.../isis/legacy}/commons/internal/encoding/DataInputExtended.java | 2 +-
.../commons/internal/encoding/DataInputExtendedDecorator.java | 2 +-
.../commons/internal/encoding/DataInputStreamExtended.java | 2 +-
.../legacy}/commons/internal/encoding/DataOutputExtended.java | 2 +-
.../commons/internal/encoding/DataOutputExtendedDecorator.java | 2 +-
.../commons/internal/encoding/DataOutputStreamExtended.java | 2 +-
.../legacy}/commons/internal/encoding/DebugDataInputExtended.java | 2 +-
.../commons/internal/encoding/DebugDataOutputExtended.java | 2 +-
.../apache/isis/legacy}/commons/internal/encoding/Encodable.java | 2 +-
.../isis/legacy}/commons/internal/encoding/EncodingConstants.java | 2 +-
.../commons/internal/encoding/FailedToDecodeException.java | 2 +-
.../commons/internal/encoding/FailedToDeserializeException.java | 2 +-
.../apache/isis/legacy}/commons/internal/encoding/FieldType.java | 2 +-
.../internal/encoding/ByteEncoderDecoderRoundtripTest.java | 8 +++++++-
14 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtended.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataInputExtended.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtended.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataInputExtended.java
index f160d20..9e5a287 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtended.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataInputExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
import java.io.DataInput;
import java.io.DataInputStream;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtendedDecorator.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataInputExtendedDecorator.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtendedDecorator.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataInputExtendedDecorator.java
index 94d97d9..739e96c 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtendedDecorator.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataInputExtendedDecorator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
import java.io.DataInputStream;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputStreamExtended.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataInputStreamExtended.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputStreamExtended.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataInputStreamExtended.java
index 1ab6fa1..ec75b45 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputStreamExtended.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataInputStreamExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
import java.io.DataInputStream;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtended.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataOutputExtended.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtended.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataOutputExtended.java
index b525809..28a180b 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtended.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataOutputExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
import java.io.DataOutput;
import java.io.DataOutputStream;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtendedDecorator.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataOutputExtendedDecorator.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtendedDecorator.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataOutputExtendedDecorator.java
index d2c3665..bb418d0 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtendedDecorator.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataOutputExtendedDecorator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputStreamExtended.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataOutputStreamExtended.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputStreamExtended.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataOutputStreamExtended.java
index af80371..366fb7d 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputStreamExtended.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DataOutputStreamExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataInputExtended.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DebugDataInputExtended.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataInputExtended.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DebugDataInputExtended.java
index b8fc9b5..75e86fe 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataInputExtended.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DebugDataInputExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
import java.io.IOException;
import java.util.Arrays;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataOutputExtended.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DebugDataOutputExtended.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataOutputExtended.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DebugDataOutputExtended.java
index 179f3c4..c11b1e9 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataOutputExtended.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/DebugDataOutputExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/Encodable.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/Encodable.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/Encodable.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/Encodable.java
index 821b03d..af5fb6d 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/Encodable.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/Encodable.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/EncodingConstants.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/EncodingConstants.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/EncodingConstants.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/EncodingConstants.java
index 6950c4d..8562986 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/EncodingConstants.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/EncodingConstants.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
public class EncodingConstants {
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDecodeException.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/FailedToDecodeException.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDecodeException.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/FailedToDecodeException.java
index 373b953..1870d3b 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDecodeException.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/FailedToDecodeException.java
@@ -20,7 +20,7 @@
/**
*
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDeserializeException.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/FailedToDeserializeException.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDeserializeException.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/FailedToDeserializeException.java
index b10b15f..707cbfd 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDeserializeException.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/FailedToDeserializeException.java
@@ -20,7 +20,7 @@
/**
*
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FieldType.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/FieldType.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FieldType.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/FieldType.java
index 4690fde..e0c1d7e 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FieldType.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/encoding/FieldType.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
import java.io.DataInputStream;
import java.io.DataOutputStream;
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java b/legacy/extensions/core/commons/src/test/java/org/apache/isis/legacy/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
similarity index 93%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
rename to legacy/extensions/core/commons/src/test/java/org/apache/isis/legacy/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
index ac1a947..5565deb 100644
--- a/core/commons/src/test/java/org/apache/isis/core/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
+++ b/legacy/extensions/core/commons/src/test/java/org/apache/isis/legacy/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.encoding;
+package org.apache.isis.legacy.commons.internal.encoding;
import java.io.IOException;
import java.io.PipedInputStream;
@@ -33,6 +33,12 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.legacy.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.legacy.commons.internal.encoding.DataInputStreamExtended;
+import org.apache.isis.legacy.commons.internal.encoding.DataOutputExtended;
+import org.apache.isis.legacy.commons.internal.encoding.DataOutputStreamExtended;
+import org.apache.isis.legacy.commons.internal.encoding.Encodable;
+
public class ByteEncoderDecoderRoundtripTest {
private DataOutputStreamExtended outputImpl;