You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dl...@apache.org on 2017/08/25 11:23:10 UTC
svn commit: r1806160 - in /felix/trunk/converter: persister/
persister/src/main/java/org/apache/felix/persister/impl/
persister/src/test/java/org/apache/felix/persister/impl/ schematizer/
schematizer/src/main/java/org/apache/felix/schematizer/impl/ ser...
Author: dleangen
Date: Fri Aug 25 11:23:09 2017
New Revision: 1806160
URL: http://svn.apache.org/viewvc?rev=1806160&view=rev
Log:
Refactored serializer package
Added:
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Deserializing.java (contents, props changed)
- copied, changed from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Deserializing.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Parser.java (contents, props changed)
- copied, changed from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Parser.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Serializer.java (contents, props changed)
- copied, changed from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Serializer.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Serializing.java (contents, props changed)
- copied, changed from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Serializing.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Writer.java (contents, props changed)
- copied, changed from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Writer.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/WriterFactory.java (contents, props changed)
- copied, changed from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/WriterFactory.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/package-info.java (contents, props changed)
- copied, changed from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/package-info.java
Removed:
felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Deserializing.java
felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Parser.java
felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Serializer.java
felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Serializing.java
felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Writer.java
felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/WriterFactory.java
felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/package-info.java
Modified:
felix/trunk/converter/persister/pom.xml
felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/Activator.java
felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/PersisterFactoryService.java
felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/StandardPersister.java
felix/trunk/converter/persister/src/test/java/org/apache/felix/persister/impl/InMemoryPersisterTest.java
felix/trunk/converter/schematizer/pom.xml
felix/trunk/converter/schematizer/src/main/java/org/apache/felix/schematizer/impl/Activator.java
felix/trunk/converter/serializer/pom.xml
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/Activator.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DebugJsonWriter.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DefaultJsonParser.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DefaultJsonWriter.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonDeserializingImpl.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializerImpl.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializingImpl.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonWriterFactory.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/DefaultYamlParser.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/DefaultYamlWriter.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlDeserializingImpl.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializerImpl.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializingImpl.java
felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlWriterFactory.java
felix/trunk/converter/serializer/src/test/java/org/apache/felix/serializer/impl/json/JsonParserTest.java
Modified: felix/trunk/converter/persister/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/converter/persister/pom.xml?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/persister/pom.xml (original)
+++ felix/trunk/converter/persister/pom.xml Fri Aug 25 11:23:09 2017
@@ -78,13 +78,13 @@
</Export-Package>
<Import-Package>
org.osgi.util.converter,
- org.osgi.service.serializer,
+ org.apache.felix.serializer,
org.osgi.service.schematizer,
*
</Import-Package>
<Provide-Capability>
- osgi.service;objectClass:List<String>="org.apache.felix.persister.Persister,org.osgi.service.serializer.Serializer";
- uses:="org.apache.felix.persister,org.osgi.service.serializer,org.osgi.util.converter,org.osgi.util.function"
+ osgi.service;objectClass:List<String>="org.apache.felix.persister.Persister,org.apache.felix.serializer.Serializer";
+ uses:="org.apache.felix.persister,org.apache.felix.serializer,org.osgi.util.converter,org.osgi.util.function"
</Provide-Capability>
<_sources>true</_sources>
</instructions>
Modified: felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/Activator.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/Activator.java (original)
+++ felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/Activator.java Fri Aug 25 11:23:09 2017
@@ -17,13 +17,13 @@
package org.apache.felix.persister.impl;
import org.apache.felix.persister.PersisterFactory;
+import org.apache.felix.serializer.Serializer;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.serializer.Serializer;
public class Activator implements ServiceListener, BundleActivator {
Modified: felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/PersisterFactoryService.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/PersisterFactoryService.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/PersisterFactoryService.java (original)
+++ felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/PersisterFactoryService.java Fri Aug 25 11:23:09 2017
@@ -18,7 +18,7 @@ package org.apache.felix.persister.impl;
import org.apache.felix.persister.Persister;
import org.apache.felix.persister.PersisterFactory;
-import org.osgi.service.serializer.Serializer;
+import org.apache.felix.serializer.Serializer;
public class PersisterFactoryService implements PersisterFactory {
Modified: felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/StandardPersister.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/StandardPersister.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/StandardPersister.java (original)
+++ felix/trunk/converter/persister/src/main/java/org/apache/felix/persister/impl/StandardPersister.java Fri Aug 25 11:23:09 2017
@@ -23,7 +23,7 @@ import java.io.OutputStream;
import org.apache.felix.persister.Persister;
import org.apache.felix.schematizer.Schematizer;
import org.apache.felix.schematizer.StandardSchematizer;
-import org.osgi.service.serializer.Serializer;
+import org.apache.felix.serializer.Serializer;
import org.osgi.util.converter.Converter;
public class StandardPersister<D> implements Persister<D> {
Modified: felix/trunk/converter/persister/src/test/java/org/apache/felix/persister/impl/InMemoryPersisterTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/persister/src/test/java/org/apache/felix/persister/impl/InMemoryPersisterTest.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/persister/src/test/java/org/apache/felix/persister/impl/InMemoryPersisterTest.java (original)
+++ felix/trunk/converter/persister/src/test/java/org/apache/felix/persister/impl/InMemoryPersisterTest.java Fri Aug 25 11:23:09 2017
@@ -17,6 +17,7 @@
package org.apache.felix.persister.impl;
+import org.apache.felix.serializer.Serializer;
import org.apache.felix.serializer.impl.json.JsonSerializerImpl;
import org.apache.felix.persister.Persister;
import org.apache.felix.persister.PersisterFactory;
@@ -28,7 +29,6 @@ import org.apache.felix.persister.test.o
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.osgi.service.serializer.Serializer;
import static org.junit.Assert.*;
Modified: felix/trunk/converter/schematizer/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/converter/schematizer/pom.xml?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/schematizer/pom.xml (original)
+++ felix/trunk/converter/schematizer/pom.xml Fri Aug 25 11:23:09 2017
@@ -78,15 +78,15 @@
</Export-Package>
<Import-Package>
org.osgi.util.converter,
- org.osgi.service.serializer,
+ org.apache.felix.serializer,
*
</Import-Package>
<Provide-Capability>
- osgi.service;objectClass:List<String>="org.apache.felix.schematizer.Schematizer,org.osgi.service.serializer.Serializer";
- uses:="org.apache.felix.schematizer,org.osgi.service.serializer,org.osgi.util.converter,org.osgi.util.function"
+ osgi.service;objectClass:List<String>="org.apache.felix.schematizer.Schematizer,org.apache.felix.serializer.Serializer";
+ uses:="org.apache.felix.schematizer,org.apache.serializer,org.osgi.util.converter,org.osgi.util.function"
</Provide-Capability>
<Require-Capability>
- osgi.service;objectClass:List<String>="org.osgi.service.serializer.Converter";
+ osgi.service;objectClass:List<String>="org.osgi.util.converter.Converter";
effective:="active"
</Require-Capability>
<_sources>true</_sources>
Modified: felix/trunk/converter/schematizer/src/main/java/org/apache/felix/schematizer/impl/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/schematizer/src/main/java/org/apache/felix/schematizer/impl/Activator.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/schematizer/src/main/java/org/apache/felix/schematizer/impl/Activator.java (original)
+++ felix/trunk/converter/schematizer/src/main/java/org/apache/felix/schematizer/impl/Activator.java Fri Aug 25 11:23:09 2017
@@ -20,11 +20,11 @@ import java.util.Dictionary;
import java.util.Hashtable;
import org.apache.felix.schematizer.Schematizer;
+import org.apache.felix.serializer.Serializer;
import org.apache.felix.serializer.impl.json.JsonSerializerImpl;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceFactory;
-import org.osgi.service.serializer.Serializer;
public class Activator implements BundleActivator {
@Override
Modified: felix/trunk/converter/serializer/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/pom.xml?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/pom.xml (original)
+++ felix/trunk/converter/serializer/pom.xml Fri Aug 25 11:23:09 2017
@@ -72,15 +72,15 @@
org.apache.felix.utils.*
</Private-Package>
<Export-Package>
- org.osgi.service.serializer;-split-package:=merge-first
+ org.apache.felix.serializer;-split-package:=merge-first
</Export-Package>
<Import-Package>*</Import-Package>
<Provide-Capability>
- osgi.service;objectClass:List<String>="org.osgi.service.serializer.Serializer";
- uses:="org.osgi.service.serializer,org.osgi.util.converter,org.osgi.util.function"
+ osgi.service;objectClass:List<String>="org.apache.felix.serializer.Serializer";
+ uses:="org.apache.felix.serializer,org.osgi.util.converter,org.osgi.util.function"
</Provide-Capability>
<Require-Capability>
- osgi.service;objectClass:List<String>="org.osgi.service.serializer.Converter";
+ osgi.service;objectClass:List<String>="org.osgi.util.converter.Converter";
effective:="active"
</Require-Capability>
<_sources>true</_sources>
Copied: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Deserializing.java (from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Deserializing.java)
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Deserializing.java?p2=felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Deserializing.java&p1=felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Deserializing.java&r1=1806159&r2=1806160&rev=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Deserializing.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Deserializing.java Fri Aug 25 11:23:09 2017
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.osgi.service.serializer;
+package org.apache.felix.serializer;
import java.io.InputStream;
import java.nio.charset.Charset;
Propchange: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Deserializing.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Parser.java (from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Parser.java)
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Parser.java?p2=felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Parser.java&p1=felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Parser.java&r1=1806159&r2=1806160&rev=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Parser.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Parser.java Fri Aug 25 11:23:09 2017
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.osgi.service.serializer;
+package org.apache.felix.serializer;
import java.io.InputStream;
import java.util.Map;
Propchange: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Parser.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Serializer.java (from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Serializer.java)
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Serializer.java?p2=felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Serializer.java&p1=felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Serializer.java&r1=1806159&r2=1806160&rev=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Serializer.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Serializer.java Fri Aug 25 11:23:09 2017
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.osgi.service.serializer;
+package org.apache.felix.serializer;
import java.lang.reflect.Type;
Propchange: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Serializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Serializing.java (from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Serializing.java)
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Serializing.java?p2=felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Serializing.java&p1=felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Serializing.java&r1=1806159&r2=1806160&rev=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Serializing.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Serializing.java Fri Aug 25 11:23:09 2017
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.osgi.service.serializer;
+package org.apache.felix.serializer;
import java.io.IOException;
import java.io.OutputStream;
Propchange: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Serializing.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Writer.java (from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Writer.java)
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Writer.java?p2=felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Writer.java&p1=felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Writer.java&r1=1806159&r2=1806160&rev=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/Writer.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Writer.java Fri Aug 25 11:23:09 2017
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.osgi.service.serializer;
+package org.apache.felix.serializer;
/**
* Common interface for a writer, which can be provided by the client.
Propchange: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/Writer.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/WriterFactory.java (from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/WriterFactory.java)
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/WriterFactory.java?p2=felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/WriterFactory.java&p1=felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/WriterFactory.java&r1=1806159&r2=1806160&rev=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/WriterFactory.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/WriterFactory.java Fri Aug 25 11:23:09 2017
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.osgi.service.serializer;
+package org.apache.felix.serializer;
import java.util.List;
Propchange: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/WriterFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/Activator.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/Activator.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/Activator.java Fri Aug 25 11:23:09 2017
@@ -19,14 +19,14 @@ package org.apache.felix.serializer.impl
import java.util.Dictionary;
import java.util.Hashtable;
+import org.apache.felix.serializer.Serializer;
+import org.apache.felix.serializer.WriterFactory;
import org.apache.felix.serializer.impl.json.JsonSerializerImpl;
import org.apache.felix.serializer.impl.json.JsonWriterFactory;
import org.apache.felix.serializer.impl.yaml.YamlSerializerImpl;
import org.apache.felix.serializer.impl.yaml.YamlWriterFactory;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.osgi.service.serializer.Serializer;
-import org.osgi.service.serializer.WriterFactory;
public class Activator implements BundleActivator {
@Override
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DebugJsonWriter.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DebugJsonWriter.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DebugJsonWriter.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DebugJsonWriter.java Fri Aug 25 11:23:09 2017
@@ -27,8 +27,8 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.Map.Entry;
+import org.apache.felix.serializer.Writer;
import org.osgi.dto.DTO;
-import org.osgi.service.serializer.Writer;
import org.osgi.util.converter.Converter;
public class DebugJsonWriter implements Writer {
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DefaultJsonParser.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DefaultJsonParser.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DefaultJsonParser.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DefaultJsonParser.java Fri Aug 25 11:23:09 2017
@@ -21,8 +21,8 @@ import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
+import org.apache.felix.serializer.Parser;
import org.apache.felix.utils.json.JSONParser;
-import org.osgi.service.serializer.Parser;
public class DefaultJsonParser implements Parser {
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DefaultJsonWriter.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DefaultJsonWriter.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DefaultJsonWriter.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/DefaultJsonWriter.java Fri Aug 25 11:23:09 2017
@@ -24,8 +24,8 @@ import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
+import org.apache.felix.serializer.Writer;
import org.osgi.dto.DTO;
-import org.osgi.service.serializer.Writer;
import org.osgi.util.converter.Converter;
public class DefaultJsonWriter implements Writer {
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonDeserializingImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonDeserializingImpl.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonDeserializingImpl.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonDeserializingImpl.java Fri Aug 25 11:23:09 2017
@@ -24,9 +24,9 @@ import java.nio.charset.StandardCharsets
import java.util.Map;
import java.util.Scanner;
+import org.apache.felix.serializer.Deserializing;
+import org.apache.felix.serializer.Parser;
import org.apache.felix.serializer.impl.Util;
-import org.osgi.service.serializer.Deserializing;
-import org.osgi.service.serializer.Parser;
import org.osgi.util.converter.ConversionException;
import org.osgi.util.converter.Converter;
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializerImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializerImpl.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializerImpl.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializerImpl.java Fri Aug 25 11:23:09 2017
@@ -18,11 +18,11 @@ package org.apache.felix.serializer.impl
import java.lang.reflect.Type;
-import org.osgi.service.serializer.Deserializing;
-import org.osgi.service.serializer.Parser;
-import org.osgi.service.serializer.Serializer;
-import org.osgi.service.serializer.Serializing;
-import org.osgi.service.serializer.Writer;
+import org.apache.felix.serializer.Deserializing;
+import org.apache.felix.serializer.Parser;
+import org.apache.felix.serializer.Serializer;
+import org.apache.felix.serializer.Serializing;
+import org.apache.felix.serializer.Writer;
import org.osgi.util.converter.Converter;
import org.osgi.util.converter.Converters;
import org.osgi.util.converter.TypeReference;
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializingImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializingImpl.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializingImpl.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializingImpl.java Fri Aug 25 11:23:09 2017
@@ -21,9 +21,9 @@ import java.io.OutputStream;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
+import org.apache.felix.serializer.Serializing;
+import org.apache.felix.serializer.Writer;
import org.apache.felix.serializer.impl.AbstractSpecifying;
-import org.osgi.service.serializer.Serializing;
-import org.osgi.service.serializer.Writer;
import org.osgi.util.converter.ConversionException;
import org.osgi.util.converter.Converter;
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonWriterFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonWriterFactory.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonWriterFactory.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonWriterFactory.java Fri Aug 25 11:23:09 2017
@@ -20,8 +20,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.osgi.service.serializer.Writer;
-import org.osgi.service.serializer.WriterFactory;
+import org.apache.felix.serializer.Writer;
+import org.apache.felix.serializer.WriterFactory;
import org.osgi.util.converter.Converter;
public class JsonWriterFactory implements WriterFactory, WriterFactory.JsonWriterFactory {
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/DefaultYamlParser.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/DefaultYamlParser.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/DefaultYamlParser.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/DefaultYamlParser.java Fri Aug 25 11:23:09 2017
@@ -20,7 +20,7 @@ import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
-import org.osgi.service.serializer.Parser;
+import org.apache.felix.serializer.Parser;
import org.yaml.snakeyaml.Yaml;
public class DefaultYamlParser implements Parser {
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/DefaultYamlWriter.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/DefaultYamlWriter.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/DefaultYamlWriter.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/DefaultYamlWriter.java Fri Aug 25 11:23:09 2017
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
-import org.osgi.service.serializer.Writer;
+import org.apache.felix.serializer.Writer;
import org.osgi.util.converter.Converter;
public class DefaultYamlWriter implements Writer {
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlDeserializingImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlDeserializingImpl.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlDeserializingImpl.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlDeserializingImpl.java Fri Aug 25 11:23:09 2017
@@ -24,9 +24,9 @@ import java.nio.charset.StandardCharsets
import java.util.Map;
import java.util.Scanner;
+import org.apache.felix.serializer.Deserializing;
+import org.apache.felix.serializer.Parser;
import org.apache.felix.serializer.impl.Util;
-import org.osgi.service.serializer.Deserializing;
-import org.osgi.service.serializer.Parser;
import org.osgi.util.converter.ConversionException;
import org.osgi.util.converter.Converter;
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializerImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializerImpl.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializerImpl.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializerImpl.java Fri Aug 25 11:23:09 2017
@@ -18,11 +18,11 @@ package org.apache.felix.serializer.impl
import java.lang.reflect.Type;
-import org.osgi.service.serializer.Deserializing;
-import org.osgi.service.serializer.Parser;
-import org.osgi.service.serializer.Serializer;
-import org.osgi.service.serializer.Serializing;
-import org.osgi.service.serializer.Writer;
+import org.apache.felix.serializer.Deserializing;
+import org.apache.felix.serializer.Parser;
+import org.apache.felix.serializer.Serializer;
+import org.apache.felix.serializer.Serializing;
+import org.apache.felix.serializer.Writer;
import org.osgi.util.converter.Converter;
import org.osgi.util.converter.Converters;
import org.osgi.util.converter.TypeReference;
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializingImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializingImpl.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializingImpl.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializingImpl.java Fri Aug 25 11:23:09 2017
@@ -21,9 +21,9 @@ import java.io.OutputStream;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
+import org.apache.felix.serializer.Serializing;
+import org.apache.felix.serializer.Writer;
import org.apache.felix.serializer.impl.AbstractSpecifying;
-import org.osgi.service.serializer.Serializing;
-import org.osgi.service.serializer.Writer;
import org.osgi.util.converter.ConversionException;
import org.osgi.util.converter.Converter;
Modified: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlWriterFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlWriterFactory.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlWriterFactory.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlWriterFactory.java Fri Aug 25 11:23:09 2017
@@ -20,8 +20,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.osgi.service.serializer.Writer;
-import org.osgi.service.serializer.WriterFactory;
+import org.apache.felix.serializer.Writer;
+import org.apache.felix.serializer.WriterFactory;
import org.osgi.util.converter.Converter;
public class YamlWriterFactory implements WriterFactory, WriterFactory.YamlWriterFactory {
Copied: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/package-info.java (from r1806159, felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/package-info.java)
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/package-info.java?p2=felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/package-info.java&p1=felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/package-info.java&r1=1806159&r2=1806160&rev=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/main/java/org/osgi/service/serializer/package-info.java (original)
+++ felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/package-info.java Fri Aug 25 11:23:09 2017
@@ -33,6 +33,6 @@
* @author $Id: 1b82a2a1db1431c5e4398f368662b5b6fb5f8547 $
*/
@Version("1.0")
-package org.osgi.service.serializer;
+package org.apache.felix.serializer;
import org.osgi.annotation.versioning.Version;
Propchange: felix/trunk/converter/serializer/src/main/java/org/apache/felix/serializer/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: felix/trunk/converter/serializer/src/test/java/org/apache/felix/serializer/impl/json/JsonParserTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/serializer/src/test/java/org/apache/felix/serializer/impl/json/JsonParserTest.java?rev=1806160&r1=1806159&r2=1806160&view=diff
==============================================================================
--- felix/trunk/converter/serializer/src/test/java/org/apache/felix/serializer/impl/json/JsonParserTest.java (original)
+++ felix/trunk/converter/serializer/src/test/java/org/apache/felix/serializer/impl/json/JsonParserTest.java Fri Aug 25 11:23:09 2017
@@ -22,9 +22,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.felix.serializer.Parser;
import org.junit.Before;
import org.junit.Test;
-import org.osgi.service.serializer.Parser;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;