svn commit: r1059598 - in /websites/staging/felix/trunk/content: ./ downloads.html news.html
Author: buildbot
Date: Mon Apr 20 14:44:37 2020
New Revision: 1059598
Log:
Staging update by buildbot for felix
Modified:
websites/staging/felix/trunk/content/ (props changed)
websites/staging/felix/trunk/content/downloads.html
websites/staging/felix/trunk/content/news.html
Propchange: websites/staging/felix/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 20 14:44:37 2020
@@ -1 +1 @@
-1876740
+1876759
Modified: websites/staging/felix/trunk/content/downloads.html
==
--- websites/staging/felix/trunk/content/downloads.html (original)
+++ websites/staging/felix/trunk/content/downloads.html Mon Apr 20 14:44:37 2020
@@ -579,9 +579,9 @@ h2:hover > .headerlink, h3:hover > .head
SCR (Declarative Services)
-2.1.18 (http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.scr-2.1.18/changelog.txt;>changes)
-jar (http://www.apache.org/dist/felix/org.apache.felix.scr-2.1.18.jar.asc;>asc,
http://www.apache.org/dist/felix/org.apache.felix.scr-2.1.18.jar.sha1;>sha1)
-tar.gz
(http://www.apache.org/dist/felix/org.apache.felix.scr-2.1.18-source-release.tar.gz.asc;>asc,
http://www.apache.org/dist/felix/org.apache.felix.scr-2.1.18-source-release.tar.gz.sha1;>sha1)
zip
(http://www.apache.org/dist/felix/org.apache.felix.scr-2.1.18-source-release.zip.asc;>asc,
http://www.apache.org/dist/felix/org.apache.felix.scr-2.1.18-source-release.zip.sha1;>sha1)
+2.1.20 (http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.scr-2.1.20/changelog.txt;>changes)
+jar (http://www.apache.org/dist/felix/org.apache.felix.scr-2.1.20.jar.asc;>asc,
http://www.apache.org/dist/felix/org.apache.felix.scr-2.1.20.jar.sha1;>sha1)
+tar.gz
(http://www.apache.org/dist/felix/org.apache.felix.scr-2.1.20-source-release.tar.gz.asc;>asc,
http://www.apache.org/dist/felix/org.apache.felix.scr-2.1.20-source-release.tar.gz.sha1;>sha1)
zip
(http://www.apache.org/dist/felix/org.apache.felix.scr-2.1.20-source-release.zip.asc;>asc,
http://www.apache.org/dist/felix/org.apache.felix.scr-2.1.20-source-release.zip.sha1;>sha1)
SCR Annotations
@@ -859,7 +859,7 @@ the https://archive.apache.org/
-Rev. 1876740 by cziegeler on Mon, 20 Apr 2020 06:56:31 +
+Rev. 1876759 by cziegeler on Mon, 20 Apr 2020 14:44:16 +
Apache Felix, Felix, Apache, the Apache feather logo, and the Apache
Felix project
Modified: websites/staging/felix/trunk/content/news.html
==
--- websites/staging/felix/trunk/content/news.html (original)
+++ websites/staging/felix/trunk/content/news.html Mon Apr 20 14:44:37 2020
@@ -89,6 +89,7 @@ h2:hover > .headerlink, h3:hover > .head
}
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink,
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink,
dt:hover > .elementid-permalink { visibility: visible }
+Apache Felix SCR 2.1.20 (April 20th, 2020)
Apache Felix CM Json 1.0.0 (April 20th, 2020)
Apache Felix SCR 2.1.18, Http Jetty 4.0.18, Http Bridge 4.0.12, Http Base
4.0.10 (April 16th, 2020)
Apache Felix Configuration Admin Values Interpolation Plugin 1.1.0 (March
2nd, 2020)
@@ -517,7 +518,7 @@ h2:hover > .headerlink, h3:hover > .head
Felix has its own website! (July 17, 2006)
-Rev. 1876740 by cziegeler on Mon, 20 Apr 2020 06:56:31 +
+Rev. 1876759 by cziegeler on Mon, 20 Apr 2020 14:44:16 +
Apache Felix, Felix, Apache, the Apache feather logo, and the Apache
Felix project
svn commit: r1876759 - in /felix/site/trunk/content: downloads.list news.mdtext
Author: cziegeler Date: Mon Apr 20 14:44:16 2020 New Revision: 1876759 URL: http://svn.apache.org/viewvc?rev=1876759=rev Log: SCR 2.1.20 Modified: felix/site/trunk/content/downloads.list felix/site/trunk/content/news.mdtext Modified: felix/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/felix/site/trunk/content/downloads.list?rev=1876759=1876758=1876759=diff == --- felix/site/trunk/content/downloads.list (original) +++ felix/site/trunk/content/downloads.list Mon Apr 20 14:44:16 2020 @@ -95,7 +95,7 @@ OSGi OBR service API|org.osgi.service.ob Preferences|org.apache.felix.prefs|1.1.0 Remote Shell|org.apache.felix.shell.remote|1.1.2|project||doc/changelog.txt Resolver|org.apache.felix.resolver|2.0.0|||doc/changelog.txt -SCR (Declarative Services)|org.apache.felix.scr|2.1.18 +SCR (Declarative Services)|org.apache.felix.scr|2.1.20 SCR Compat (Declarative Services)|org.apache.felix.scr.compat|1.0.4 SCR Annotations|org.apache.felix.scr.annotations|1.12.0 SCR DS Annotations|org.apache.felix.scr.ds-annotations|1.2.10 Modified: felix/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/felix/site/trunk/content/news.mdtext?rev=1876759=1876758=1876759=diff == --- felix/site/trunk/content/news.mdtext (original) +++ felix/site/trunk/content/news.mdtext Mon Apr 20 14:44:16 2020 @@ -1,5 +1,6 @@ Title: News +* Apache Felix SCR 2.1.20 (April 20th, 2020) * Apache Felix CM Json 1.0.0 (April 20th, 2020) * Apache Felix SCR 2.1.18, Http Jetty 4.0.18, Http Bridge 4.0.12, Http Base 4.0.10 (April 16th, 2020) * Apache Felix Configuration Admin Values Interpolation Plugin 1.1.0 (March 2nd, 2020)
svn commit: r39040 - /release/felix/
Author: cziegeler Date: Mon Apr 20 14:43:30 2020 New Revision: 39040 Log: SCR 2.1.20 Added: release/felix/org.apache.felix.scr-2.1.20-javadoc.jar (with props) release/felix/org.apache.felix.scr-2.1.20-javadoc.jar.asc (with props) release/felix/org.apache.felix.scr-2.1.20-javadoc.jar.sha1 (with props) release/felix/org.apache.felix.scr-2.1.20-javadoc.jar.sha512 (with props) release/felix/org.apache.felix.scr-2.1.20-source-release.tar.gz (with props) release/felix/org.apache.felix.scr-2.1.20-source-release.tar.gz.asc (with props) release/felix/org.apache.felix.scr-2.1.20-source-release.tar.gz.sha1 (with props) release/felix/org.apache.felix.scr-2.1.20-source-release.tar.gz.sha512 (with props) release/felix/org.apache.felix.scr-2.1.20-source-release.zip (with props) release/felix/org.apache.felix.scr-2.1.20-source-release.zip.asc (with props) release/felix/org.apache.felix.scr-2.1.20-source-release.zip.sha1 (with props) release/felix/org.apache.felix.scr-2.1.20-source-release.zip.sha512 (with props) release/felix/org.apache.felix.scr-2.1.20-sources.jar (with props) release/felix/org.apache.felix.scr-2.1.20-sources.jar.asc (with props) release/felix/org.apache.felix.scr-2.1.20-sources.jar.sha1 (with props) release/felix/org.apache.felix.scr-2.1.20-sources.jar.sha512 (with props) release/felix/org.apache.felix.scr-2.1.20.jar (with props) release/felix/org.apache.felix.scr-2.1.20.jar.asc (with props) release/felix/org.apache.felix.scr-2.1.20.jar.sha1 (with props) release/felix/org.apache.felix.scr-2.1.20.jar.sha512 (with props) release/felix/org.apache.felix.scr-2.1.20.pom (with props) release/felix/org.apache.felix.scr-2.1.20.pom.asc (with props) release/felix/org.apache.felix.scr-2.1.20.pom.sha1 (with props) release/felix/org.apache.felix.scr-2.1.20.pom.sha512 (with props) Removed: release/felix/org.apache.felix.scr-2.1.18-javadoc.jar release/felix/org.apache.felix.scr-2.1.18-javadoc.jar.asc release/felix/org.apache.felix.scr-2.1.18-javadoc.jar.sha1 release/felix/org.apache.felix.scr-2.1.18-javadoc.jar.sha512 release/felix/org.apache.felix.scr-2.1.18-source-release.tar.gz release/felix/org.apache.felix.scr-2.1.18-source-release.tar.gz.asc release/felix/org.apache.felix.scr-2.1.18-source-release.tar.gz.sha1 release/felix/org.apache.felix.scr-2.1.18-source-release.tar.gz.sha512 release/felix/org.apache.felix.scr-2.1.18-source-release.zip release/felix/org.apache.felix.scr-2.1.18-source-release.zip.asc release/felix/org.apache.felix.scr-2.1.18-source-release.zip.sha1 release/felix/org.apache.felix.scr-2.1.18-source-release.zip.sha512 release/felix/org.apache.felix.scr-2.1.18-sources.jar release/felix/org.apache.felix.scr-2.1.18-sources.jar.asc release/felix/org.apache.felix.scr-2.1.18-sources.jar.sha1 release/felix/org.apache.felix.scr-2.1.18-sources.jar.sha512 release/felix/org.apache.felix.scr-2.1.18.jar release/felix/org.apache.felix.scr-2.1.18.jar.asc release/felix/org.apache.felix.scr-2.1.18.jar.sha1 release/felix/org.apache.felix.scr-2.1.18.jar.sha512 release/felix/org.apache.felix.scr-2.1.18.pom release/felix/org.apache.felix.scr-2.1.18.pom.asc release/felix/org.apache.felix.scr-2.1.18.pom.sha1 release/felix/org.apache.felix.scr-2.1.18.pom.sha512 Added: release/felix/org.apache.felix.scr-2.1.20-javadoc.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.1.20-javadoc.jar -- svn:executable = * Propchange: release/felix/org.apache.felix.scr-2.1.20-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.scr-2.1.20-javadoc.jar.asc == --- release/felix/org.apache.felix.scr-2.1.20-javadoc.jar.asc (added) +++ release/felix/org.apache.felix.scr-2.1.20-javadoc.jar.asc Mon Apr 20 14:43:30 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAl6ZwPQACgkQP89Sn/Ly +egYr9xAAqawF/8Qzpc3983FS/TM5r+PAw+UOsmzQv26zd+Qk0IAAfmAaggd/WFVG +55anSyTDtlkAUPU2uaNGfYf0ZCMwIoAwT796UHf2LECFllS2dFIEjDYLCa3ncoHD +TwWssAAdqphu1aHceDBRxnGiAjkxBfuURxKuxr5g+GTnjtUZn9vvdz/DhLNdVYRH +w8vrH1vPqIfsZiaJ9S1UEnGmO76VdRTgyx+ihpQxqkfLsu9je1Ty4vjA/p2vKfti +00cJryA0YKcrR1lYKfV8ms75bVXu3LX3K63f0LGDorBIJBcPpZbENp1DcKpWiJyu +39bU33JHhnUhRpEyV+96z74kRRN1ZQgtPCgLIhIOUu9PNsnxu7Dp4MgxnsxgyKqs +WKxgJ6grKL/MUuydkC5k0OAw0l1zGDpo0SB7A6z/pkF7SEEZgpaxMXLO+QRkXdbL +1gjjKqfZmJ+4+5Y7hN/hG9GmPiScFKDgRRrYCehN0zYhy+I3lBoJUhA7dDXTuDMm
[felix-dev] branch master updated: FELIX-6261 : Finish test and add assertions for property tags without a value
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 1e28a6a FELIX-6261 : Finish test and add assertions for property tags
without a value
1e28a6a is described below
commit 1e28a6ab057e3f84c502a1bb26045fcb01b1ed0b
Author: Carsten Ziegeler
AuthorDate: Mon Apr 20 15:51:32 2020 +0200
FELIX-6261 : Finish test and add assertions for property tags without a
value
---
.../org/apache/felix/scr/impl/xml/XmlHandlerTest.java | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git
a/scr/src/test/java/org/apache/felix/scr/impl/xml/XmlHandlerTest.java
b/scr/src/test/java/org/apache/felix/scr/impl/xml/XmlHandlerTest.java
index 94d8c62..5484acd 100755
--- a/scr/src/test/java/org/apache/felix/scr/impl/xml/XmlHandlerTest.java
+++ b/scr/src/test/java/org/apache/felix/scr/impl/xml/XmlHandlerTest.java
@@ -18,14 +18,19 @@
*/
package org.apache.felix.scr.impl.xml;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.List;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.felix.scr.impl.logger.MockBundleLogger;
+import org.apache.felix.scr.impl.metadata.ComponentMetadata;
import org.junit.Test;
import org.mockito.Mockito;
import org.osgi.framework.Bundle;
@@ -35,10 +40,19 @@ public class XmlHandlerTest {
@Test
public void testPropertiesWithoutValue() throws Exception {
final URL url =
this.getClass().getClassLoader().getResource("parsertest-nopropvalue.xml");
-parse(url);
+final List components = parse(url);
+assertEquals(1, components.size());
+
+final ComponentMetadata cm = components.get(0);
+cm.validate();
+// the xml has four properties, two of them with no value, so they
should not be part of the
+// component metadata
+assertEquals(2, cm.getProperties().size());
+assertNotNull(cm.getProperties().get("service.vendor"));
+assertNotNull(cm.getProperties().get("jmx.objectname"));
}
-private void parse(final URL descriptorURL) throws Exception {
+private List parse(final URL descriptorURL) throws
Exception {
final Bundle bundle = Mockito.mock(Bundle.class);
Mockito.when(bundle.getLocation()).thenReturn("bundle");
@@ -53,6 +67,7 @@ public class XmlHandlerTest {
parser.parse(stream, handler);
+return handler.getComponentMetadataList();
} finally {
if (stream != null) {
try {
[felix-dev] annotated tag org.apache.felix.cm.json-1.0.2 updated (06ac4fe -> 8cd4804)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.cm.json-1.0.2 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. *** WARNING: tag org.apache.felix.cm.json-1.0.2 was modified! *** from 06ac4fe (commit) to 8cd4804 (tag) tagging 06ac4fe6b84f3f50e92fe06136757516cf655110 (commit) replaces org.apache.felix.scr-2.1.20 by Carsten Ziegeler on Mon Apr 20 12:32:43 2020 +0200 - Log - [maven-release-plugin] copy for tag org.apache.felix.cm.json-1.0.2 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated: [maven-release-plugin] prepare for next development iteration
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 5f022ee [maven-release-plugin] prepare for next development iteration 5f022ee is described below commit 5f022ee0a824ab6bbe70b8496754e89ed443c65e Author: Carsten Ziegeler AuthorDate: Mon Apr 20 12:32:50 2020 +0200 [maven-release-plugin] prepare for next development iteration --- cm.json/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cm.json/pom.xml b/cm.json/pom.xml index 028bec0..f706c55 100644 --- a/cm.json/pom.xml +++ b/cm.json/pom.xml @@ -33,13 +33,13 @@ Support for OSGi configurations specified in JSON documents. -1.0.2 +1.0.3-SNAPSHOT scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git;f=cm.json -org.apache.felix.cm.json-1.0.2 +HEAD
[felix-dev] branch master updated (ae8b362 -> 06ac4fe)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from ae8b362 Use released converter 1.0.14 add 06ac4fe [maven-release-plugin] prepare release org.apache.felix.cm.json-1.0.2 No new revisions were added by this update. Summary of changes: cm.json/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[felix-dev] branch master updated: Use released converter 1.0.14
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 ae8b362 Use released converter 1.0.14 ae8b362 is described below commit ae8b362ef145c25084f43345b75211be17ef9e88 Author: Carsten Ziegeler AuthorDate: Mon Apr 20 12:31:29 2020 +0200 Use released converter 1.0.14 --- cm.json/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cm.json/pom.xml b/cm.json/pom.xml index ad518cf..6c6c38f 100644 --- a/cm.json/pom.xml +++ b/cm.json/pom.xml @@ -95,7 +95,7 @@ org.apache.felix org.apache.felix.converter -1.0.15-SNAPSHOT +1.0.14 provided
svn commit: r39036 - /release/felix/
Author: davidb Date: Mon Apr 20 09:26:49 2020 New Revision: 39036 Log: org.apache.felix.converter-1.0.14 Added: release/felix/org.apache.felix.converter-1.0.14-all.jar (with props) release/felix/org.apache.felix.converter-1.0.14-all.jar.asc release/felix/org.apache.felix.converter-1.0.14-all.jar.md5 release/felix/org.apache.felix.converter-1.0.14-all.jar.sha1 release/felix/org.apache.felix.converter-1.0.14-javadoc.jar (with props) release/felix/org.apache.felix.converter-1.0.14-javadoc.jar.asc release/felix/org.apache.felix.converter-1.0.14-javadoc.jar.md5 release/felix/org.apache.felix.converter-1.0.14-javadoc.jar.sha1 release/felix/org.apache.felix.converter-1.0.14-source-release.tar.gz (with props) release/felix/org.apache.felix.converter-1.0.14-source-release.tar.gz.asc release/felix/org.apache.felix.converter-1.0.14-source-release.tar.gz.md5 release/felix/org.apache.felix.converter-1.0.14-source-release.tar.gz.sha1 release/felix/org.apache.felix.converter-1.0.14-source-release.zip (with props) release/felix/org.apache.felix.converter-1.0.14-source-release.zip.asc release/felix/org.apache.felix.converter-1.0.14-source-release.zip.md5 release/felix/org.apache.felix.converter-1.0.14-source-release.zip.sha1 release/felix/org.apache.felix.converter-1.0.14-sources.jar (with props) release/felix/org.apache.felix.converter-1.0.14-sources.jar.asc release/felix/org.apache.felix.converter-1.0.14-sources.jar.md5 release/felix/org.apache.felix.converter-1.0.14-sources.jar.sha1 release/felix/org.apache.felix.converter-1.0.14.jar (with props) release/felix/org.apache.felix.converter-1.0.14.jar.asc release/felix/org.apache.felix.converter-1.0.14.jar.md5 release/felix/org.apache.felix.converter-1.0.14.jar.sha1 release/felix/org.apache.felix.converter-1.0.14.pom release/felix/org.apache.felix.converter-1.0.14.pom.asc release/felix/org.apache.felix.converter-1.0.14.pom.md5 release/felix/org.apache.felix.converter-1.0.14.pom.sha1 Removed: release/felix/org.apache.felix.converter-1.0.12-all.jar release/felix/org.apache.felix.converter-1.0.12-all.jar.asc release/felix/org.apache.felix.converter-1.0.12-all.jar.md5 release/felix/org.apache.felix.converter-1.0.12-all.jar.sha1 release/felix/org.apache.felix.converter-1.0.12-javadoc.jar release/felix/org.apache.felix.converter-1.0.12-javadoc.jar.asc release/felix/org.apache.felix.converter-1.0.12-javadoc.jar.md5 release/felix/org.apache.felix.converter-1.0.12-javadoc.jar.sha1 release/felix/org.apache.felix.converter-1.0.12-source-release.tar.gz release/felix/org.apache.felix.converter-1.0.12-source-release.tar.gz.asc release/felix/org.apache.felix.converter-1.0.12-source-release.tar.gz.md5 release/felix/org.apache.felix.converter-1.0.12-source-release.tar.gz.sha1 release/felix/org.apache.felix.converter-1.0.12-source-release.zip release/felix/org.apache.felix.converter-1.0.12-source-release.zip.asc release/felix/org.apache.felix.converter-1.0.12-source-release.zip.md5 release/felix/org.apache.felix.converter-1.0.12-source-release.zip.sha1 release/felix/org.apache.felix.converter-1.0.12-sources.jar release/felix/org.apache.felix.converter-1.0.12-sources.jar.asc release/felix/org.apache.felix.converter-1.0.12-sources.jar.md5 release/felix/org.apache.felix.converter-1.0.12-sources.jar.sha1 release/felix/org.apache.felix.converter-1.0.12.jar release/felix/org.apache.felix.converter-1.0.12.jar.asc release/felix/org.apache.felix.converter-1.0.12.jar.md5 release/felix/org.apache.felix.converter-1.0.12.jar.sha1 release/felix/org.apache.felix.converter-1.0.12.pom release/felix/org.apache.felix.converter-1.0.12.pom.asc release/felix/org.apache.felix.converter-1.0.12.pom.md5 release/felix/org.apache.felix.converter-1.0.12.pom.sha1 Added: release/felix/org.apache.felix.converter-1.0.14-all.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.converter-1.0.14-all.jar -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.converter-1.0.14-all.jar.asc == --- release/felix/org.apache.felix.converter-1.0.14-all.jar.asc (added) +++ release/felix/org.apache.felix.converter-1.0.14-all.jar.asc Mon Apr 20 09:26:49 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE6xvDHSN2Fhyp8Ax73f1PYfJPDZ8FAl6ZZP4ACgkQ3f1PYfJP +DZ+sAw//eL6395utCK9zA0RcPQ+NJCZh3aXXueLpZBz3bcifo+H+PxK0dvyMt+f/ +4QcZ/ATKxC8bLayFRdQ577rk5jNOUpqr6MgmiIOgTdOHlYIvQf5KMoGnrjQfmnWf +297bvU4rZUXZvEkb9JA6zVICo+/fSfr5Nu4cbmuoKhqLICNUYSDDwEG3M2TmNHZq
[felix-dev] branch master updated: Fix javadoc issue
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 90e9a54 Fix javadoc issue
90e9a54 is described below
commit 90e9a54dd8d10904a3b85ce66bac7c188f7df698
Author: Carsten Ziegeler
AuthorDate: Mon Apr 20 11:19:11 2020 +0200
Fix javadoc issue
---
cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationReader.java | 2 +-
cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationWriter.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationReader.java
b/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationReader.java
index c75a683..e80851e 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationReader.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationReader.java
@@ -29,7 +29,7 @@ import org.osgi.annotation.versioning.ProviderType;
/**
* A configuration reader can read configuration resources as defined in
- * {@link
https://osgi.org/specification/osgi.cmpn/7.0.0/service.configurator.html}.
+ * https://osgi.org/specification/osgi.cmpn/7.0.0/service.configurator.html;>OSGi
Configurator specificiation.
* A reader can be obtained through a {@link Builder}.
*/
@ProviderType
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationWriter.java
b/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationWriter.java
index 491caeb..fb783cc 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationWriter.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationWriter.java
@@ -28,7 +28,7 @@ import org.osgi.annotation.versioning.ProviderType;
/**
* A configuration writer can write configuration resources as defined in
- * {@link
https://osgi.org/specification/osgi.cmpn/7.0.0/service.configurator.html}.
+ * https://osgi.org/specification/osgi.cmpn/7.0.0/service.configurator.html;>OSGi
Configurator specificiation.
* A writer can be obtained through a {@link Builder}.
*/
@ProviderType
[felix-dev] branch master updated: Add readme
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 9b9c95c Add readme 9b9c95c is described below commit 9b9c95c4a08a6dbece2c6d22f0eaa851ed7e3e93 Author: Carsten Ziegeler AuthorDate: Mon Apr 20 10:26:20 2020 +0200 Add readme --- cm.json/README.md | 8 1 file changed, 8 insertions(+) diff --git a/cm.json/README.md b/cm.json/README.md new file mode 100644 index 000..dabe4b9 --- /dev/null +++ b/cm.json/README.md @@ -0,0 +1,8 @@ +# CM JSON + +This module provides an easy to use Java API to read and write OSGi configurations in JSON format as defined by the [OSGi Configurator specification](https://osgi.org/specification/osgi.cmpn/7.0.0/service.configurator.html). + +The primary purpose of this module is to be used by tooling dealing with OSGi configuration resources. The tools can directly leverage the read/write functionality without having to deal with the JSON format itself. + +For example, the Apache Felix Configurator implementation uses this module for reading configuration resources. +
svn commit: r1059580 - in /websites/staging/felix/trunk/content: ./ downloads.html news.html
Author: buildbot
Date: Mon Apr 20 07:00:51 2020
New Revision: 1059580
Log:
Staging update by buildbot for felix
Modified:
websites/staging/felix/trunk/content/ (props changed)
websites/staging/felix/trunk/content/downloads.html
websites/staging/felix/trunk/content/news.html
Propchange: websites/staging/felix/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 20 07:00:51 2020
@@ -1 +1 @@
-1876629
+1876740
Modified: websites/staging/felix/trunk/content/downloads.html
==
--- websites/staging/felix/trunk/content/downloads.html (original)
+++ websites/staging/felix/trunk/content/downloads.html Mon Apr 20 07:00:51 2020
@@ -200,6 +200,12 @@ h2:hover > .headerlink, h3:hover > .head
tar.gz
(http://www.apache.org/dist/felix/org.apache.felix.bundlerepository-2.0.10-source-release.tar.gz.asc;>asc,
http://www.apache.org/dist/felix/org.apache.felix.bundlerepository-2.0.10-source-release.tar.gz.sha1;>sha1)
zip
(http://www.apache.org/dist/felix/org.apache.felix.bundlerepository-2.0.10-source-release.zip.asc;>asc,
http://www.apache.org/dist/felix/org.apache.felix.bundlerepository-2.0.10-source-release.zip.sha1;>sha1)
+CM Json
+1.0.0 (http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.cm.json-1.0.0/changelog.txt;>changes)
+jar (http://www.apache.org/dist/felix/org.apache.felix.cm.json-1.0.0.jar.asc;>asc,
http://www.apache.org/dist/felix/org.apache.felix.cm.json-1.0.0.jar.sha1;>sha1)
+tar.gz
(http://www.apache.org/dist/felix/org.apache.felix.cm.json-1.0.0-source-release.tar.gz.asc;>asc,
http://www.apache.org/dist/felix/org.apache.felix.cm.json-1.0.0-source-release.tar.gz.sha1;>sha1)
zip
(http://www.apache.org/dist/felix/org.apache.felix.cm.json-1.0.0-source-release.zip.asc;>asc,
http://www.apache.org/dist/felix/org.apache.felix.cm.json-1.0.0-source-release.zip.sha1;>sha1)
+
+
Configuration Admin Interceptor Plugin
1.1.0 (http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.configadmin.plugin.interpolation-1.1.0/changelog.txt;>changes)
jar
(http://www.apache.org/dist/felix/org.apache.felix.configadmin.plugin.interpolation-1.1.0.jar.asc;>asc,
http://www.apache.org/dist/felix/org.apache.felix.configadmin.plugin.interpolation-1.1.0.jar.sha1;>sha1)
@@ -853,7 +859,7 @@ the https://archive.apache.org/
-Rev. 1876607 by cziegeler on Thu, 16 Apr 2020 14:40:40 +
+Rev. 1876740 by cziegeler on Mon, 20 Apr 2020 06:56:31 +
Apache Felix, Felix, Apache, the Apache feather logo, and the Apache
Felix project
Modified: websites/staging/felix/trunk/content/news.html
==
--- websites/staging/felix/trunk/content/news.html (original)
+++ websites/staging/felix/trunk/content/news.html Mon Apr 20 07:00:51 2020
@@ -89,6 +89,7 @@ h2:hover > .headerlink, h3:hover > .head
}
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink,
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink,
dt:hover > .elementid-permalink { visibility: visible }
+Apache Felix CM Json 1.0.0 (April 20th, 2020)
Apache Felix SCR 2.1.18, Http Jetty 4.0.18, Http Bridge 4.0.12, Http Base
4.0.10 (April 16th, 2020)
Apache Felix Configuration Admin Values Interpolation Plugin 1.1.0 (March
2nd, 2020)
Apache Felix Configuration Admin Values Interpolation Plugin 1.0.0
(January 13th, 2020)
@@ -516,7 +517,7 @@ h2:hover > .headerlink, h3:hover > .head
Felix has its own website! (July 17, 2006)
-Rev. 1876607 by cziegeler on Thu, 16 Apr 2020 14:40:40 +
+Rev. 1876740 by cziegeler on Mon, 20 Apr 2020 06:56:31 +
Apache Felix, Felix, Apache, the Apache feather logo, and the Apache
Felix project
svn commit: r1876740 - in /felix/site/trunk/content: downloads.list news.mdtext
Author: cziegeler Date: Mon Apr 20 06:56:31 2020 New Revision: 1876740 URL: http://svn.apache.org/viewvc?rev=1876740=rev Log: CM Json 1.0 Modified: felix/site/trunk/content/downloads.list felix/site/trunk/content/news.mdtext Modified: felix/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/felix/site/trunk/content/downloads.list?rev=1876740=1876739=1876740=diff == --- felix/site/trunk/content/downloads.list (original) +++ felix/site/trunk/content/downloads.list Mon Apr 20 06:56:31 2020 @@ -32,6 +32,7 @@ framework|6.0.3 # AutoConf Resource Processor|org.apache.felix.deployment.rp.autoconf|0.1.8 Bundle Repository|org.apache.felix.bundlerepository|2.0.10|||doc/changelog.txt +CM Json|org.apache.felix.cm.json|1.0.0 Configuration Admin|org.apache.felix.configadmin|1.9.16 Configurator|org.apache.felix.configurator|1.0.10 Configuration Admin Interceptor Plugin|org.apache.felix.configadmin.plugin.interpolation|1.1.0 Modified: felix/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/felix/site/trunk/content/news.mdtext?rev=1876740=1876739=1876740=diff == --- felix/site/trunk/content/news.mdtext (original) +++ felix/site/trunk/content/news.mdtext Mon Apr 20 06:56:31 2020 @@ -1,5 +1,6 @@ Title: News +* Apache Felix CM Json 1.0.0 (April 20th, 2020) * Apache Felix SCR 2.1.18, Http Jetty 4.0.18, Http Bridge 4.0.12, Http Base 4.0.10 (April 16th, 2020) * Apache Felix Configuration Admin Values Interpolation Plugin 1.1.0 (March 2nd, 2020) * Apache Felix Configuration Admin Values Interpolation Plugin 1.0.0 (January 13th, 2020)
svn commit: r39032 - /release/felix/
Author: cziegeler Date: Mon Apr 20 06:55:16 2020 New Revision: 39032 Log: CM Json 1.0 Added: release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar (with props) release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.asc (with props) release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.sha1 (with props) release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.sha512 (with props) release/felix/org.apache.felix.cm.json-1.0.0-source-release.tar.gz (with props) release/felix/org.apache.felix.cm.json-1.0.0-source-release.tar.gz.asc (with props) release/felix/org.apache.felix.cm.json-1.0.0-source-release.tar.gz.sha1 (with props) release/felix/org.apache.felix.cm.json-1.0.0-source-release.tar.gz.sha512 (with props) release/felix/org.apache.felix.cm.json-1.0.0-source-release.zip (with props) release/felix/org.apache.felix.cm.json-1.0.0-source-release.zip.asc (with props) release/felix/org.apache.felix.cm.json-1.0.0-source-release.zip.sha1 (with props) release/felix/org.apache.felix.cm.json-1.0.0-source-release.zip.sha512 (with props) release/felix/org.apache.felix.cm.json-1.0.0-sources.jar (with props) release/felix/org.apache.felix.cm.json-1.0.0-sources.jar.asc (with props) release/felix/org.apache.felix.cm.json-1.0.0-sources.jar.sha1 (with props) release/felix/org.apache.felix.cm.json-1.0.0-sources.jar.sha512 (with props) release/felix/org.apache.felix.cm.json-1.0.0.jar (with props) release/felix/org.apache.felix.cm.json-1.0.0.jar.asc (with props) release/felix/org.apache.felix.cm.json-1.0.0.jar.sha1 (with props) release/felix/org.apache.felix.cm.json-1.0.0.jar.sha512 (with props) release/felix/org.apache.felix.cm.json-1.0.0.pom (with props) release/felix/org.apache.felix.cm.json-1.0.0.pom.asc (with props) release/felix/org.apache.felix.cm.json-1.0.0.pom.sha1 (with props) release/felix/org.apache.felix.cm.json-1.0.0.pom.sha512 (with props) Added: release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar -- svn:executable = * Propchange: release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.asc == --- release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.asc (added) +++ release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.asc Mon Apr 20 06:55:16 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAl6ZQgoACgkQP89Sn/Ly +egat9A//fjnDYiw0z2KHh/Nuq77aD80fGdM8qGW9ZeCxnuEOAGjST4UlQZ4U8Nxy +RdAt80AEu3p187U7HCOUhd3s526JZJalwCPqeC3xvq09XWChunvgEb4LjfV75LDx +sP3VBKAmyhC2b93Ix0ZBW9VShnV9ik82ZlATqI1p7aZbeV89+tC3f7m4EtInqZ98 +nZ3jm+CY8BnCT9czcG1997MKS3Ry4L9GlCDjWDMJOPpTZN1TpTwLKaDw8X7zbuJq +jL6jTXvOqIMg/Q92zK9hyxz++tXVcQXh0DTJbumr1Fn3yyYXn5OZiG5EZxWJf/Zz +JgI+1kOoNuDhYKfwPe8Es88XLBwyVtlRNSiFvbLCZRxSopE+EeS09FiluR7XhiBp +koSA/oVfNdlm1+CFbrYHPlwNwhP1/6F2U55ke+LBkVFSmZzRE8ViIPKtq2II+wvc +Y+QeOrG7mK2lyj87PefxvPoGvgKi/41AVZj0jJcDBvQCFvSACPfi9cFrP2vCn+Xc +uLuFnbb82DcDiRYZWNq9yJQ1rI4Wk18PPnjJDS/XDRFxU1Xz3c6pTahoLKxlI0Fv +Uw3R82D8upHA6OKlDc9JcAIOKA82I13QeEWk1GZo7rwwO65hmj2Oqm8ndb+egnM3 +JLNwkktx0ZPuhY6kON0O8QItc/LFsJ1nef4mieJk4rUirBUkSTA= +=s4FV +-END PGP SIGNATURE- Propchange: release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.asc -- svn:executable = * Added: release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.sha1 == --- release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.sha1 (added) +++ release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.sha1 Mon Apr 20 06:55:16 2020 @@ -0,0 +1 @@ +66eda04cc9263616c07f041ef374aa415224ed96 \ No newline at end of file Propchange: release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.sha1 -- svn:executable = * Added: release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.sha512 == --- release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.sha512 (added) +++ release/felix/org.apache.felix.cm.json-1.0.0-javadoc.jar.sha512 Mon Apr 20 06:55:16 2020 @@ -0,0 +1 @@ +97a13c8ed29d4ef79498907833714f8821d8d3bb9ce0b05a8ef581f1a5e308a04d093296aef1cf82fc95a21dd88ae48469e1b706b719c8ad8d033acafc886580
[felix-dev] branch master updated: FELIX-6264 : Catch JSON exceptions and rethrow as IOExceptions
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 263ca9d FELIX-6264 : Catch JSON exceptions and rethrow as IOExceptions
263ca9d is described below
commit 263ca9dee476eb778242c72ee2b8601e811612e5
Author: Carsten Ziegeler
AuthorDate: Mon Apr 20 08:47:42 2020 +0200
FELIX-6264 : Catch JSON exceptions and rethrow as IOExceptions
---
cm.json/pom.xml| 4 +-
.../cm/json/impl/ConfigurationReaderImpl.java | 13 -
.../cm/json/impl/ConfigurationWriterImpl.java | 31 ++
.../cm/json/impl/ConfigurationReaderImplTest.java | 17 ++
.../felix/cm/json/impl/TypeConverterTest.java | 66 +++---
5 files changed, 83 insertions(+), 48 deletions(-)
diff --git a/cm.json/pom.xml b/cm.json/pom.xml
index c5a654c..ad518cf 100644
--- a/cm.json/pom.xml
+++ b/cm.json/pom.xml
@@ -50,7 +50,7 @@
org.apache.felix
maven-bundle-plugin
-3.5.0
+4.2.1
true
@@ -95,7 +95,7 @@
org.apache.felix
org.apache.felix.converter
-1.0.12
+1.0.15-SNAPSHOT
provided
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationReaderImpl.java
b/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationReaderImpl.java
index 467290f..286e93e 100644
---
a/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationReaderImpl.java
+++
b/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationReaderImpl.java
@@ -25,6 +25,7 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Map;
+import javax.json.JsonException;
import javax.json.JsonObject;
import javax.json.JsonValue;
import javax.json.JsonValue.ValueType;
@@ -106,7 +107,11 @@ public class ConfigurationReaderImpl
public Hashtable readConfiguration() throws IOException {
checkClosed();
if (this.reader != null) {
-this.jsonObject = JsonSupport.parseJson(this.identifier,
this.reader);
+try {
+this.jsonObject = JsonSupport.parseJson(this.identifier,
this.reader);
+} catch ( final JsonException jpe) {
+throw new IOException("Invalid JSON " + jpe.getMessage(), jpe);
+}
}
return readSingleConfiguration("", this.jsonObject);
}
@@ -115,7 +120,11 @@ public class ConfigurationReaderImpl
public ConfigurationResource readConfigurationResource() throws
IOException {
checkClosed();
if (this.reader != null) {
-this.jsonObject = JsonSupport.parseJson(this.identifier,
this.reader);
+try {
+this.jsonObject = JsonSupport.parseJson(this.identifier,
this.reader);
+} catch ( final JsonException jpe) {
+throw new IOException("Invalid JSON " + jpe.getMessage(), jpe);
+}
}
verifyJsonResource();
final ConfigurationResource resource = new ConfigurationResource();
diff --git
a/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationWriterImpl.java
b/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationWriterImpl.java
index ef44ab9..01d3666 100644
---
a/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationWriterImpl.java
+++
b/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationWriterImpl.java
@@ -28,6 +28,7 @@ import java.util.Hashtable;
import java.util.Map;
import javax.json.Json;
+import javax.json.JsonException;
import javax.json.JsonValue;
import javax.json.stream.JsonGenerator;
@@ -76,8 +77,12 @@ public class ConfigurationWriterImpl
@Override
public void writeConfiguration(final Dictionary
properties) throws IOException {
checkClosed();
-writeConfigurationInternal(properties);
-if ( this.closeGenerator) this.generator.close();
+try {
+writeConfigurationInternal(properties);
+if ( this.closeGenerator) this.generator.close();
+} catch ( final JsonException je) {
+throw new IOException(je.getMessage(), je);
+}
}
private void writeConfigurationInternal(final Dictionary
properties) throws IOException {
@@ -102,15 +107,19 @@ public class ConfigurationWriterImpl
@Override
public void writeConfigurationResource(final ConfigurationResource
resource) throws IOException {
checkClosed();
-generator.writeStartObject();
-for (final Map.Entry entry :
resource.getProperties().entrySet()) {
-generator.write(entry.getKey(),
JsonSupport.convertToJson(entry.getValue()));
-}
-for
