This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 2afdf46e75 FELIX-6578 : Migrate to jakarta json - rename package
2afdf46e75 is described below
commit 2afdf46e75e5351762e6b17d4d0c2d83c69a025b
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Fri Nov 4 07:13:06 2022 +0100
FELIX-6578 : Migrate to jakarta json - rename package
---
.../cm/{configuration => json/io}/ConfigurationReader.java | 2 +-
.../cm/{configuration => json/io}/ConfigurationResource.java | 2 +-
.../cm/{configuration => json/io}/ConfigurationWriter.java | 2 +-
.../felix/cm/{configuration => json/io}/Configurations.java | 10 +++++-----
.../io}/impl/ConfigurationReaderImpl.java | 8 ++++----
.../io}/impl/ConfigurationWriterImpl.java | 6 +++---
.../felix/cm/{configuration => json/io}/impl/JsonSupport.java | 4 ++--
.../cm/{configuration => json/io}/impl/OrderedDictionary.java | 2 +-
.../cm/{configuration => json/io}/impl/TypeConverter.java | 2 +-
.../felix/cm/{configuration => json/io}/package-info.java | 2 +-
.../io}/impl/ConfigurationReaderImplTest.java | 2 +-
.../cm/{configuration => json/io}/impl/JsonSupportTest.java | 4 ++--
.../{configuration => json/io}/impl/OrderedDictionaryTest.java | 2 +-
.../cm/{configuration => json/io}/impl/TypeConverterTest.java | 2 +-
14 files changed, 25 insertions(+), 25 deletions(-)
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationReader.java
b/cm.json/src/main/java/org/apache/felix/cm/json/io/ConfigurationReader.java
similarity index 99%
rename from
cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationReader.java
rename to
cm.json/src/main/java/org/apache/felix/cm/json/io/ConfigurationReader.java
index e5132fa4e7..a1f020a215 100644
---
a/cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationReader.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/json/io/ConfigurationReader.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.configuration;
+package org.apache.felix.cm.json.io;
import java.io.IOException;
import java.io.Reader;
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationResource.java
b/cm.json/src/main/java/org/apache/felix/cm/json/io/ConfigurationResource.java
similarity index 97%
rename from
cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationResource.java
rename to
cm.json/src/main/java/org/apache/felix/cm/json/io/ConfigurationResource.java
index 00b3f16428..f40739674e 100644
---
a/cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationResource.java
+++
b/cm.json/src/main/java/org/apache/felix/cm/json/io/ConfigurationResource.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.configuration;
+package org.apache.felix.cm.json.io;
import java.util.Hashtable;
import java.util.LinkedHashMap;
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationWriter.java
b/cm.json/src/main/java/org/apache/felix/cm/json/io/ConfigurationWriter.java
similarity index 98%
rename from
cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationWriter.java
rename to
cm.json/src/main/java/org/apache/felix/cm/json/io/ConfigurationWriter.java
index 4498c117bd..6c6546f9e5 100644
---
a/cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationWriter.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/json/io/ConfigurationWriter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.configuration;
+package org.apache.felix.cm.json.io;
import java.io.IOException;
import java.io.Writer;
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/configuration/Configurations.java
b/cm.json/src/main/java/org/apache/felix/cm/json/io/Configurations.java
similarity index 93%
rename from
cm.json/src/main/java/org/apache/felix/cm/configuration/Configurations.java
rename to cm.json/src/main/java/org/apache/felix/cm/json/io/Configurations.java
index fe23dcf877..607a76d1a0 100644
---
a/cm.json/src/main/java/org/apache/felix/cm/configuration/Configurations.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/json/io/Configurations.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.configuration;
+package org.apache.felix.cm.json.io;
import java.io.IOException;
import java.io.Reader;
import java.util.Hashtable;
-import org.apache.felix.cm.configuration.impl.ConfigurationReaderImpl;
-import org.apache.felix.cm.configuration.impl.ConfigurationWriterImpl;
-import org.apache.felix.cm.configuration.impl.JsonSupport;
-import org.apache.felix.cm.configuration.impl.OrderedDictionary;
+import org.apache.felix.cm.json.io.impl.ConfigurationReaderImpl;
+import org.apache.felix.cm.json.io.impl.ConfigurationWriterImpl;
+import org.apache.felix.cm.json.io.impl.JsonSupport;
+import org.apache.felix.cm.json.io.impl.OrderedDictionary;
import jakarta.json.JsonValue;
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/ConfigurationReaderImpl.java
b/cm.json/src/main/java/org/apache/felix/cm/json/io/impl/ConfigurationReaderImpl.java
similarity index 98%
rename from
cm.json/src/main/java/org/apache/felix/cm/configuration/impl/ConfigurationReaderImpl.java
rename to
cm.json/src/main/java/org/apache/felix/cm/json/io/impl/ConfigurationReaderImpl.java
index d877c8b6e2..42dcf67a68 100644
---
a/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/ConfigurationReaderImpl.java
+++
b/cm.json/src/main/java/org/apache/felix/cm/json/io/impl/ConfigurationReaderImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.configuration.impl;
+package org.apache.felix.cm.json.io.impl;
import java.io.IOException;
import java.io.Reader;
@@ -30,9 +30,9 @@ import jakarta.json.JsonObject;
import jakarta.json.JsonValue;
import jakarta.json.JsonValue.ValueType;
-import org.apache.felix.cm.configuration.ConfigurationReader;
-import org.apache.felix.cm.configuration.ConfigurationResource;
-import org.apache.felix.cm.configuration.Configurations;
+import org.apache.felix.cm.json.io.ConfigurationReader;
+import org.apache.felix.cm.json.io.ConfigurationResource;
+import org.apache.felix.cm.json.io.Configurations;
import org.osgi.service.configurator.ConfiguratorConstants;
import org.osgi.util.converter.ConversionException;
import org.osgi.util.converter.Converters;
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/ConfigurationWriterImpl.java
b/cm.json/src/main/java/org/apache/felix/cm/json/io/impl/ConfigurationWriterImpl.java
similarity index 96%
rename from
cm.json/src/main/java/org/apache/felix/cm/configuration/impl/ConfigurationWriterImpl.java
rename to
cm.json/src/main/java/org/apache/felix/cm/json/io/impl/ConfigurationWriterImpl.java
index 5b55208786..3ad7058aa4 100644
---
a/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/ConfigurationWriterImpl.java
+++
b/cm.json/src/main/java/org/apache/felix/cm/json/io/impl/ConfigurationWriterImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.configuration.impl;
+package org.apache.felix.cm.json.io.impl;
import java.io.FilterWriter;
import java.io.IOException;
@@ -27,8 +27,8 @@ import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Map;
-import org.apache.felix.cm.configuration.ConfigurationResource;
-import org.apache.felix.cm.configuration.ConfigurationWriter;
+import org.apache.felix.cm.json.io.ConfigurationResource;
+import org.apache.felix.cm.json.io.ConfigurationWriter;
import jakarta.json.Json;
import jakarta.json.JsonException;
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/JsonSupport.java
b/cm.json/src/main/java/org/apache/felix/cm/json/io/impl/JsonSupport.java
similarity index 99%
rename from
cm.json/src/main/java/org/apache/felix/cm/configuration/impl/JsonSupport.java
rename to
cm.json/src/main/java/org/apache/felix/cm/json/io/impl/JsonSupport.java
index 35b9ba5abc..427e675735 100644
---
a/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/JsonSupport.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/json/io/impl/JsonSupport.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.configuration.impl;
+package org.apache.felix.cm.json.io.impl;
import java.io.FilterReader;
import java.io.IOException;
@@ -39,7 +39,7 @@ import jakarta.json.JsonStructure;
import jakarta.json.JsonValue;
import jakarta.json.JsonValue.ValueType;
-import org.apache.felix.cm.configuration.Configurations;
+import org.apache.felix.cm.json.io.Configurations;
import org.osgi.util.converter.Converters;
public class JsonSupport {
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/OrderedDictionary.java
b/cm.json/src/main/java/org/apache/felix/cm/json/io/impl/OrderedDictionary.java
similarity index 99%
rename from
cm.json/src/main/java/org/apache/felix/cm/configuration/impl/OrderedDictionary.java
rename to
cm.json/src/main/java/org/apache/felix/cm/json/io/impl/OrderedDictionary.java
index a476d8bd57..5d393cfe8b 100644
---
a/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/OrderedDictionary.java
+++
b/cm.json/src/main/java/org/apache/felix/cm/json/io/impl/OrderedDictionary.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.configuration.impl;
+package org.apache.felix.cm.json.io.impl;
import java.io.Serializable;
import java.util.AbstractSet;
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/TypeConverter.java
b/cm.json/src/main/java/org/apache/felix/cm/json/io/impl/TypeConverter.java
similarity index 99%
rename from
cm.json/src/main/java/org/apache/felix/cm/configuration/impl/TypeConverter.java
rename to
cm.json/src/main/java/org/apache/felix/cm/json/io/impl/TypeConverter.java
index 30e15030b2..e56bdf689b 100644
---
a/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/TypeConverter.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/json/io/impl/TypeConverter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.configuration.impl;
+package org.apache.felix.cm.json.io.impl;
import java.lang.reflect.Array;
import java.util.ArrayList;
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/configuration/package-info.java
b/cm.json/src/main/java/org/apache/felix/cm/json/io/package-info.java
similarity index 90%
rename from
cm.json/src/main/java/org/apache/felix/cm/configuration/package-info.java
rename to cm.json/src/main/java/org/apache/felix/cm/json/io/package-info.java
index 5fe976540c..a474d88626 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/configuration/package-info.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/json/io/package-info.java
@@ -17,6 +17,6 @@
* under the License.
*/
@Version("1.0.0")
-package org.apache.felix.cm.configuration;
+package org.apache.felix.cm.json.io;
import org.osgi.annotation.versioning.Version;
\ No newline at end of file
diff --git
a/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/ConfigurationReaderImplTest.java
b/cm.json/src/test/java/org/apache/felix/cm/json/io/impl/ConfigurationReaderImplTest.java
similarity index 99%
rename from
cm.json/src/test/java/org/apache/felix/cm/configuration/impl/ConfigurationReaderImplTest.java
rename to
cm.json/src/test/java/org/apache/felix/cm/json/io/impl/ConfigurationReaderImplTest.java
index 9d44b59736..bd76537c34 100644
---
a/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/ConfigurationReaderImplTest.java
+++
b/cm.json/src/test/java/org/apache/felix/cm/json/io/impl/ConfigurationReaderImplTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.configuration.impl;
+package org.apache.felix.cm.json.io.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git
a/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/JsonSupportTest.java
b/cm.json/src/test/java/org/apache/felix/cm/json/io/impl/JsonSupportTest.java
similarity index 98%
rename from
cm.json/src/test/java/org/apache/felix/cm/configuration/impl/JsonSupportTest.java
rename to
cm.json/src/test/java/org/apache/felix/cm/json/io/impl/JsonSupportTest.java
index e7c700a832..bf9d631408 100644
---
a/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/JsonSupportTest.java
+++
b/cm.json/src/test/java/org/apache/felix/cm/json/io/impl/JsonSupportTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.configuration.impl;
+package org.apache.felix.cm.json.io.impl;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -32,7 +32,7 @@ import jakarta.json.JsonArrayBuilder;
import jakarta.json.JsonObjectBuilder;
import jakarta.json.JsonValue;
-import org.apache.felix.cm.configuration.Configurations;
+import org.apache.felix.cm.json.io.Configurations;
import org.junit.Test;
/**
diff --git
a/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/OrderedDictionaryTest.java
b/cm.json/src/test/java/org/apache/felix/cm/json/io/impl/OrderedDictionaryTest.java
similarity index 98%
rename from
cm.json/src/test/java/org/apache/felix/cm/configuration/impl/OrderedDictionaryTest.java
rename to
cm.json/src/test/java/org/apache/felix/cm/json/io/impl/OrderedDictionaryTest.java
index 94d59add69..67d4dc1e6d 100644
---
a/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/OrderedDictionaryTest.java
+++
b/cm.json/src/test/java/org/apache/felix/cm/json/io/impl/OrderedDictionaryTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.cm.configuration.impl;
+package org.apache.felix.cm.json.io.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git
a/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/TypeConverterTest.java
b/cm.json/src/test/java/org/apache/felix/cm/json/io/impl/TypeConverterTest.java
similarity index 99%
rename from
cm.json/src/test/java/org/apache/felix/cm/configuration/impl/TypeConverterTest.java
rename to
cm.json/src/test/java/org/apache/felix/cm/json/io/impl/TypeConverterTest.java
index 03584ba5a5..ca6e0c1305 100644
---
a/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/TypeConverterTest.java
+++
b/cm.json/src/test/java/org/apache/felix/cm/json/io/impl/TypeConverterTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.configuration.impl;
+package org.apache.felix.cm.json.io.impl;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
