You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:58:58 UTC
[sling-org-apache-sling-resource-inventory] annotated tag
org.apache.sling.resource.inventory-1.0.8 created (now fa7b224)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.resource.inventory-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-inventory.git.
at fa7b224 (tag)
tagging 414ad69d0b2dbf576d6ae5fd397101973ed819db (commit)
by Karl Pauls
on Fri Jun 2 20:22:27 2017 +0000
- Log -----------------------------------------------------------------
org.apache.sling.resource.inventory-1.0.8
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 12839ad SLING-3018 : Add an inventory printer which dumps a resource tree into json
new b692003 Set svn:ignore
new 6d2ad49 Add metatype info
new 0f3f228 [maven-release-plugin] prepare release org.apache.sling.resource.inventory-0.5.0
new 09ea917 [maven-release-plugin] rollback the release of org.apache.sling.resource.inventory-0.5.0
new fa37b1f Correct scm info
new 773e549 [maven-release-plugin] prepare release org.apache.sling.resource.inventory-0.5.0
new 8db6343 [maven-release-plugin] prepare for next development iteration
new 81b2fa4 SLING-3197 : ClassCastException when serializing arrays of scalar types
new a6fd992 SLING-3198 : JSON Tree Rendering should do tree depth first tree traversal
new ab62e38 [maven-release-plugin] prepare release org.apache.sling.resource.inventory-1.0.0
new 564a3ec [maven-release-plugin] prepare for next development iteration
new 01bf0a8 SLING-3507 : Potential NPE in JSON dump from JMX
new 6428026 [maven-release-plugin] prepare release org.apache.sling.resource.inventory-1.0.2
new b556e64 [maven-release-plugin] prepare for next development iteration
new 3529b23 SLING-4625 : No resource inventory if mbean attribute value is a double
new 365b839 [maven-release-plugin] prepare release org.apache.sling.resource.inventory-1.0.4
new 4aef166 [maven-release-plugin] prepare for next development iteration
new 82c7ac1 Use latest parent pom
new e37e1d2 Update contrib modules to Parent 23
new 67d49cd set parent version to 24 and add empty relativePath where missing
new f839f3e Update the contrib reactor to parent 25
new 471306d Switch to parent pom 26
new a5151b7 Switch to parent pom 29 and OSGi annotations
new 3833d03 SLING-6468 - Improve code coverage for Sling Inventory Printer
new adf43b2 [maven-release-plugin] prepare release org.apache.sling.resource.inventory-1.0.6
new 16ba552 [maven-release-plugin] prepare for next development iteration
new 3c51354 use Sling Parent 30
new 59f949c add missing Felix SCR annotations
new 0159c94 SLING-6898: Remove commons.json from Resource Inventory.
new 88a1b76 Fix some javadoc
new 597b5f5 [maven-release-plugin] prepare release org.apache.sling.resource.inventory-1.0.8
new 414ad69 [maven-release-plugin] copy for tag org.apache.sling.resource.inventory-1.0.8
The 33 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-resource-inventory] 02/07: use Sling Parent
30
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resource.inventory-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-inventory.git
commit 3c51354f8c8079acd8311202412787ed1bfd73b3
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 6 10:22:30 2017 +0000
use Sling Parent 30
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resource-inventory@1785621 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c789244..e959a19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>29</version>
+ <version>30</version>
<relativePath />
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resource-inventory] 04/07: SLING-6898:
Remove commons.json from Resource Inventory.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resource.inventory-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-inventory.git
commit 0159c943787290710b5ae2df7a4278e7caa70dda
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Wed May 31 12:51:16 2017 +0000
SLING-6898: Remove commons.json from Resource Inventory.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resource-inventory@1797029 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 +-
.../resource/inventory/impl/JsonObjectCreator.java | 79 +++++++++++-----------
.../impl/ResourceInventoryPrinterFactory.java | 13 ++--
.../resource/inventory/impl/ResourceTraversor.java | 33 ++++-----
.../inventory/impl/JsonObjectCreatorTest.java | 71 +++++++++----------
.../inventory/impl/ResourceTraversorTest.java | 15 ++--
6 files changed, 113 insertions(+), 102 deletions(-)
diff --git a/pom.xml b/pom.xml
index e7f09df..76f494e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,8 +75,8 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.json</artifactId>
- <version>2.0.6</version>
+ <artifactId>org.apache.sling.commons.johnzon</artifactId>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java b/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java
index 34d5d23..b08e418 100644
--- a/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java
+++ b/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java
@@ -20,18 +20,21 @@ import java.io.IOException;
import java.io.InputStream;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import java.util.Arrays;
import java.util.Calendar;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
+import javax.json.Json;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonException;
+import javax.json.JsonObject;
+import javax.json.JsonObjectBuilder;
+import javax.json.JsonValue;
+
import org.apache.commons.lang3.ArrayUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.commons.json.JSONArray;
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.JSONObject;
import org.slf4j.LoggerFactory;
/**
@@ -41,8 +44,7 @@ import org.slf4j.LoggerFactory;
public abstract class JsonObjectCreator {
/** Dump given resource in JSON, optionally recursing into its objects */
- public static JSONObject create(final Resource resource)
- throws JSONException {
+ public static JsonObjectBuilder create(final Resource resource) {
final ValueMap valueMap = resource.adaptTo(ValueMap.class);
@SuppressWarnings("unchecked")
@@ -50,7 +52,7 @@ public abstract class JsonObjectCreator {
? valueMap
: resource.adaptTo(Map.class);
- final JSONObject obj = new JSONObject();
+ final JsonObjectBuilder obj = Json.createObjectBuilder();
if (propertyMap == null) {
@@ -59,22 +61,26 @@ public abstract class JsonObjectCreator {
if (value != null) {
// single value property or just plain String resource or...
- obj.put(resource.getName(), value);
+ obj.add(resource.getName(), value);
} else {
// Try multi-value "property"
final String[] values = resource.adaptTo(String[].class);
if (values != null) {
- obj.put(resource.getName(), new JSONArray(Arrays.asList(values)));
+ JsonArrayBuilder array = Json.createArrayBuilder();
+ for (String v : values) {
+ array.add(v);
+ }
+ obj.add(resource.getName(), array);
}
}
if ( resource.getResourceType() != null ) {
- obj.put("sling:resourceType", resource.getResourceType());
+ obj.add("sling:resourceType", resource.getResourceType());
}
if ( resource.getResourceSuperType() != null ) {
- obj.put("sling:resourceSuperType", resource.getResourceSuperType());
+ obj.add("sling:resourceSuperType", resource.getResourceSuperType());
}
} else {
@@ -117,35 +123,36 @@ public abstract class JsonObjectCreator {
}
/** Dump only a value in the correct format */
- private static Object getValue(final Object value) {
+ private static JsonValue getValue(final Object value) {
+ JsonObjectBuilder builder = Json.createObjectBuilder();
if ( value instanceof InputStream ) {
// input stream is already handled
- return 0;
+ builder.add("key", 0);
} else if ( value instanceof Calendar ) {
- return format((Calendar)value);
+ builder.add("key",format((Calendar)value));
} else if ( value instanceof Boolean ) {
- return value;
+ builder.add("key", (Boolean) value);
} else if ( value instanceof Long ) {
- return value;
+ builder.add("key", (Long) value);
} else if ( value instanceof Integer ) {
- return value;
+ builder.add("key", (Integer) value);
} else if ( value != null ) {
- return value.toString();
+ builder.add("key", value.toString());
} else {
- return ""; // assume empty string
+ builder.add("key", ""); // assume empty string
}
+ return builder.build().get("key");
}
/** Dump a single node */
- private static void createSingleResource(final Resource n, final JSONObject parent)
- throws JSONException {
- parent.put(n.getName(), create(n));
+ private static void createSingleResource(final Resource n, final JsonObjectBuilder parent) {
+ parent.add(n.getName(), create(n));
}
/**
* Write a single property
*/
- private static void createProperty(final JSONObject obj,
+ private static void createProperty(final JsonObjectBuilder obj,
final ValueMap valueMap,
final String key,
final Object value) {
@@ -174,11 +181,7 @@ public abstract class JsonObjectCreator {
}
// write out empty array
if ( values.length == 0 ) {
- try {
- obj.put(key, new JSONArray());
- } catch ( final JSONException ignore ) {
- // we ignore this
- }
+ obj.add(key, Json.createArrayBuilder());
return;
}
}
@@ -192,15 +195,15 @@ public abstract class JsonObjectCreator {
// in the name, and the value should be the size of the binary data
try {
if (values == null) {
- obj.put(":" + key, getLength(valueMap, -1, key, (InputStream)value));
+ obj.add(":" + key, getLength(valueMap, -1, key, (InputStream)value));
} else {
- final JSONArray result = new JSONArray();
+ final JsonArrayBuilder result = Json.createArrayBuilder();
for (int i = 0; i < values.length; i++) {
- result.put(getLength(valueMap, i, key, (InputStream)values[i]));
+ result.add(getLength(valueMap, i, key, (InputStream)values[i]));
}
- obj.put(":" + key, result);
+ obj.add(":" + key, result);
}
- } catch ( final JSONException ignore ) {
+ } catch ( final JsonException ignore ) {
// we ignore this
LoggerFactory.getLogger(JsonObjectCreator.class).warn("Unable to create JSON value", ignore);
}
@@ -209,15 +212,15 @@ public abstract class JsonObjectCreator {
try {
if (!value.getClass().isArray()) {
- obj.put(key, getValue(value));
+ obj.add(key, getValue(value));
} else {
- final JSONArray result = new JSONArray();
+ final JsonArrayBuilder result = Json.createArrayBuilder();
for (Object v : values) {
- result.put(getValue(v));
+ result.add(getValue(v));
}
- obj.put(key, result);
+ obj.add(key, result);
}
- } catch ( final JSONException ignore ) {
+ } catch ( final JsonException ignore ) {
// we ignore this
LoggerFactory.getLogger(JsonObjectCreator.class).warn("Unable to create JSON value", ignore);
}
diff --git a/src/main/java/org/apache/sling/resource/inventory/impl/ResourceInventoryPrinterFactory.java b/src/main/java/org/apache/sling/resource/inventory/impl/ResourceInventoryPrinterFactory.java
index a3618e4..347619e 100644
--- a/src/main/java/org/apache/sling/resource/inventory/impl/ResourceInventoryPrinterFactory.java
+++ b/src/main/java/org/apache/sling/resource/inventory/impl/ResourceInventoryPrinterFactory.java
@@ -19,6 +19,11 @@
package org.apache.sling.resource.inventory.impl;
import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.json.Json;
+import javax.json.JsonException;
+import javax.json.stream.JsonGenerator;
import org.apache.felix.inventory.Format;
import org.apache.felix.inventory.InventoryPrinter;
@@ -26,7 +31,6 @@ import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.commons.json.JSONException;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy;
@@ -84,12 +88,13 @@ public class ResourceInventoryPrinterFactory implements InventoryPrinter {
if ( rootResource != null ) {
final ResourceTraversor rt = new ResourceTraversor(rootResource);
rt.collectResources();
- printWriter.write(rt.getJSONObject().toString(2));
-
+ StringWriter writer = new StringWriter();
+ Json.createGenerator(writer).write(rt.getJsonObject()).close();
+ printWriter.write(writer.toString());
}
} catch (final LoginException e) {
// ignore
- } catch (final JSONException ignore) {
+ } catch (final JsonException ignore) {
LoggerFactory.getLogger(this.getClass()).warn("Unable to create resource json", ignore);
} finally {
if ( resolver != null ) {
diff --git a/src/main/java/org/apache/sling/resource/inventory/impl/ResourceTraversor.java b/src/main/java/org/apache/sling/resource/inventory/impl/ResourceTraversor.java
index ed2f161..0a8d960 100644
--- a/src/main/java/org/apache/sling/resource/inventory/impl/ResourceTraversor.java
+++ b/src/main/java/org/apache/sling/resource/inventory/impl/ResourceTraversor.java
@@ -19,18 +19,19 @@ package org.apache.sling.resource.inventory.impl;
import java.util.Iterator;
+import javax.json.JsonException;
+import javax.json.JsonObject;
+import javax.json.JsonObjectBuilder;
+
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.JSONObject;
public class ResourceTraversor {
- private final JSONObject startObject;
+ private final JsonObjectBuilder startObject;
private final Resource startResource;
- public ResourceTraversor(final Resource resource)
- throws JSONException {
+ public ResourceTraversor(final Resource resource) {
this.startResource = resource;
this.startObject = this.adapt(resource);
}
@@ -40,7 +41,7 @@ public class ResourceTraversor {
* startObject.
* @throws JSONException
*/
- public void collectResources() throws JSONException {
+ public void collectResources() throws JsonException {
collectChildren(startResource, this.startObject);
}
@@ -50,13 +51,13 @@ public class ResourceTraversor {
* @throws JSONException
*/
private void collectChildren(final Resource resource,
- final JSONObject jsonObj)
- throws JSONException {
+ final JsonObjectBuilder jsonObj)
+ throws JsonException {
final Iterator<Resource> children = resource.listChildren();
while (children.hasNext()) {
final Resource res = children.next();
- final JSONObject json = collectResource(res, jsonObj);
+ final JsonObjectBuilder json = collectResource(res, jsonObj);
collectChildren(res, json);
}
}
@@ -68,10 +69,10 @@ public class ResourceTraversor {
* @param level The level where this resource is located.
* @throws JSONException
*/
- private JSONObject collectResource(final Resource resource, final JSONObject parent)
- throws JSONException {
- final JSONObject o = adapt(resource);
- parent.put(resource.getName(), o);
+ private JsonObjectBuilder collectResource(final Resource resource, final JsonObjectBuilder parent)
+ throws JsonException {
+ final JsonObjectBuilder o = adapt(resource);
+ parent.add(resource.getName(), o);
return o;
}
@@ -82,11 +83,11 @@ public class ResourceTraversor {
* @return The JSON representation of the Resource
* @throws JSONException
*/
- private JSONObject adapt(final Resource resource) throws JSONException {
+ private JsonObjectBuilder adapt(final Resource resource) throws JsonException {
return JsonObjectCreator.create(resource);
}
- public JSONObject getJSONObject() {
- return startObject;
+ public JsonObject getJsonObject() {
+ return startObject.build();
}
}
diff --git a/src/test/java/org/apache/sling/resource/inventory/impl/JsonObjectCreatorTest.java b/src/test/java/org/apache/sling/resource/inventory/impl/JsonObjectCreatorTest.java
index 4b072b0..5468951 100644
--- a/src/test/java/org/apache/sling/resource/inventory/impl/JsonObjectCreatorTest.java
+++ b/src/test/java/org/apache/sling/resource/inventory/impl/JsonObjectCreatorTest.java
@@ -19,11 +19,12 @@ package org.apache.sling.resource.inventory.impl;
import java.util.HashMap;
import java.util.Map;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.commons.json.JSONArray;
-import org.apache.sling.commons.json.JSONObject;
import org.apache.sling.testing.resourceresolver.MockHelper;
import org.apache.sling.testing.resourceresolver.MockResource;
import org.apache.sling.testing.resourceresolver.MockResourceResolverFactory;
@@ -60,15 +61,15 @@ public class JsonObjectCreatorTest {
});
Resource resource = new MockResource("/some/path", properties, resolver);
- JSONObject json = JsonObjectCreator.create(resource);
+ JsonObject json = JsonObjectCreator.create(resource).build();
- assertEquals(10, json.get("byte"));
- assertEquals(10, json.get("int"));
- assertEquals("10.0", json.get("float"));
- assertEquals("10.0", json.get("double"));
- assertEquals("10", json.get("string"));
- assertEquals(false, json.get("boolean"));
- assertEquals("object", json.get("object"));
+ assertEquals(10, json.getInt("byte"));
+ assertEquals(10, json.getInt("int"));
+ assertEquals("10.0", json.getString("float"));
+ assertEquals("10.0", json.getString("double"));
+ assertEquals("10", json.getString("string"));
+ assertEquals(false, json.getBoolean("boolean"));
+ assertEquals("object", json.getString("object"));
}
@Test
@@ -87,27 +88,27 @@ public class JsonObjectCreatorTest {
properties.put("charArray", new char[]{'a', 'b'});
Resource resource = new MockResource("/some/path", properties, resolver);
- JSONObject json = JsonObjectCreator.create(resource);
- assertEquals(0, json.getJSONArray("emptyArray").length());
- JSONArray array;
- array = json.getJSONArray("stringArray");
- assertEquals("10", array.get(0));
- array = json.getJSONArray("intArray");
- assertEquals(10, array.get(0));
- array = json.getJSONArray("doubleArray");
- assertEquals("10.0", array.get(0));
- array = json.getJSONArray("byteArray");
- assertEquals("10", array.get(0));
- array = json.getJSONArray("floatArray");
- assertEquals("10.0", array.get(0));
- array = json.getJSONArray("shortArray");
- assertEquals("10", array.get(0));
- array = json.getJSONArray("longArray");
- assertEquals(10L, array.get(0));
- array = json.getJSONArray("booleanArray");
- assertEquals(true, array.get(0));
- array = json.getJSONArray("charArray");
- assertEquals("a", array.get(0));
+ JsonObject json = JsonObjectCreator.create(resource).build();
+ assertEquals(0, json.getJsonArray("emptyArray").size());
+ JsonArray array;
+ array = json.getJsonArray("stringArray");
+ assertEquals("10", array.getString(0));
+ array = json.getJsonArray("intArray");
+ assertEquals(10, array.getInt(0));
+ array = json.getJsonArray("doubleArray");
+ assertEquals("10.0", array.getString(0));
+ array = json.getJsonArray("byteArray");
+ assertEquals("10", array.getString(0));
+ array = json.getJsonArray("floatArray");
+ assertEquals("10.0", array.getString(0));
+ array = json.getJsonArray("shortArray");
+ assertEquals("10", array.getString(0));
+ array = json.getJsonArray("longArray");
+ assertEquals(10L, array.getJsonNumber(0).longValue());
+ array = json.getJsonArray("booleanArray");
+ assertEquals(true, array.getBoolean(0));
+ array = json.getJsonArray("charArray");
+ assertEquals("a", array.getString(0));
}
@@ -122,10 +123,10 @@ public class JsonObjectCreatorTest {
.commit();
Resource resource = resolver.getResource("/some");
- JSONObject json = JsonObjectCreator.create(resource);
- assertEquals("v1", json.get("p1"));
- JSONObject path = json.getJSONObject("path");
- assertEquals("v2", path.get("p2"));
+ JsonObject json = JsonObjectCreator.create(resource).build();
+ assertEquals("v1", json.getString("p1"));
+ JsonObject path = json.getJsonObject("path");
+ assertEquals("v2", path.getString("p2"));
}
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/resource/inventory/impl/ResourceTraversorTest.java b/src/test/java/org/apache/sling/resource/inventory/impl/ResourceTraversorTest.java
index 4a6a767..098d112 100644
--- a/src/test/java/org/apache/sling/resource/inventory/impl/ResourceTraversorTest.java
+++ b/src/test/java/org/apache/sling/resource/inventory/impl/ResourceTraversorTest.java
@@ -18,10 +18,11 @@ package org.apache.sling.resource.inventory.impl;
import java.util.Collections;
+import javax.json.JsonObject;
+
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.commons.json.JSONObject;
import org.apache.sling.testing.resourceresolver.MockHelper;
import org.apache.sling.testing.resourceresolver.MockResource;
import org.apache.sling.testing.resourceresolver.MockResourceResolverFactory;
@@ -52,19 +53,19 @@ public class ResourceTraversorTest {
Resource resource = resolver.getResource("/some");
ResourceTraversor traversor = new ResourceTraversor(resource);
traversor.collectResources();
- JSONObject json = traversor.getJSONObject();
- assertEquals("v1", json.get("p1"));
- JSONObject path = json.getJSONObject("path");
+ JsonObject json = traversor.getJsonObject();
+ assertEquals("v1", json.getString("p1"));
+ JsonObject path = json.getJsonObject("path");
assertNotNull(path);
- assertEquals("v2", path.get("p2"));
+ assertEquals("v2", path.getString("p2"));
}
@Test
public void testGetJSONObject() throws Exception {
Resource resource = new MockResource("/some/path", Collections.<String, Object>singletonMap("p1", "v1"), resolver);
- JSONObject json = new ResourceTraversor(resource).getJSONObject();
- assertEquals("v1", json.get("p1"));
+ JsonObject json = new ResourceTraversor(resource).getJsonObject();
+ assertEquals("v1", json.getString("p1"));
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resource-inventory] 03/07: add missing
Felix SCR annotations
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resource.inventory-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-inventory.git
commit 59f949c0073198a729ce4079d7580693a6fd9825
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 6 19:00:14 2017 +0000
add missing Felix SCR annotations
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resource-inventory@1785730 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pom.xml b/pom.xml
index e959a19..e7f09df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
<version>2.4.0</version>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resource-inventory] 05/07: Fix some javadoc
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resource.inventory-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-inventory.git
commit 88a1b76e19a6212c92232d31485193e6f420d225
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Fri Jun 2 20:21:29 2017 +0000
Fix some javadoc
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resource-inventory@1797424 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/resource/inventory/impl/ResourceTraversor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/resource/inventory/impl/ResourceTraversor.java b/src/main/java/org/apache/sling/resource/inventory/impl/ResourceTraversor.java
index 0a8d960..c68060d 100644
--- a/src/main/java/org/apache/sling/resource/inventory/impl/ResourceTraversor.java
+++ b/src/main/java/org/apache/sling/resource/inventory/impl/ResourceTraversor.java
@@ -39,7 +39,7 @@ public class ResourceTraversor {
/**
* Recursive descent from startResource, collecting JSONObjects into
* startObject.
- * @throws JSONException
+ * @throws JsonException
*/
public void collectResources() throws JsonException {
collectChildren(startResource, this.startObject);
@@ -48,7 +48,7 @@ public class ResourceTraversor {
/**
* @param resource
* @param currentLevel
- * @throws JSONException
+ * @throws JsonException
*/
private void collectChildren(final Resource resource,
final JsonObjectBuilder jsonObj)
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resource-inventory] 06/07:
[maven-release-plugin] prepare release
org.apache.sling.resource.inventory-1.0.8
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resource.inventory-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-inventory.git
commit 597b5f5de334467b7151e57ccb7ddcc782da3de0
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Fri Jun 2 20:22:12 2017 +0000
[maven-release-plugin] prepare release org.apache.sling.resource.inventory-1.0.8
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resource-inventory@1797425 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 76f494e..40f7759 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.resource.inventory</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.8</version>
<packaging>bundle</packaging>
<name>Apache Sling Inventory Printer Based on Resources</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resource-inventory</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resource-inventory</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resource-inventory</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resource.inventory-1.0.8</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resource.inventory-1.0.8</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.resource.inventory-1.0.8</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resource-inventory] 01/07:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resource.inventory-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-inventory.git
commit 16ba552e82cd81b09d0ac3739e241d8bb231f901
Author: Timothée Maret <tm...@apache.org>
AuthorDate: Thu Jan 26 10:27:58 2017 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resource-inventory@1780354 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a68a64e..c789244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.resource.inventory</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Inventory Printer Based on Resources</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resource.inventory-1.0.6</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resource.inventory-1.0.6</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.resource.inventory-1.0.6</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resource-inventory</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resource-inventory</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resource-inventory</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resource-inventory] 07/07:
[maven-release-plugin] copy for tag
org.apache.sling.resource.inventory-1.0.8
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resource.inventory-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-inventory.git
commit 414ad69d0b2dbf576d6ae5fd397101973ed819db
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Fri Jun 2 20:22:27 2017 +0000
[maven-release-plugin] copy for tag org.apache.sling.resource.inventory-1.0.8
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resource.inventory-1.0.8@1797426 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.