sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject [sling-whiteboard] branch master updated: Make space for a different prototype
Date Thu, 03 Sep 2020 10:15:57 GMT
This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 50a4e24  Make space for a different prototype
50a4e24 is described below

commit 50a4e246b48f91abfdabeb6fe8812cad48ec53d6
Author: Bertrand Delacretaz <bdelacretaz@apache.org>
AuthorDate: Thu Sep 3 12:15:45 2020 +0200

    Make space for a different prototype
---
 .../{impl => hardcodedfirstshot}/ChildrenProcessor.java       |  2 +-
 .../{impl => hardcodedfirstshot}/ContentProcessor.java        |  2 +-
 .../HardcodedFirstShotServlet.java}                           | 11 +++++++----
 .../{impl => hardcodedfirstshot}/JsonProcessor.java           |  2 +-
 .../{impl => hardcodedfirstshot}/MetadataProcessor.java       |  2 +-
 .../remotecontentapi/{impl => hardcodedfirstshot}/P.java      |  2 +-
 .../{impl => hardcodedfirstshot}/PipelineContext.java         |  2 +-
 .../src/main/resources/SLING-INF/initial-content/ROOT.json    |  2 +-
 8 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/ChildrenProcessor.java
b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/ChildrenProcessor.java
similarity index 96%
rename from remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/ChildrenProcessor.java
rename to remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/ChildrenProcessor.java
index a954ba4..847e74e 100644
--- a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/ChildrenProcessor.java
+++ b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/ChildrenProcessor.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.sling.remotecontentapi.impl;
+package org.apache.sling.remotecontentapi.hardcodedfirstshot;
 
 import javax.json.Json;
 import javax.json.JsonObjectBuilder;
diff --git a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/ContentProcessor.java
b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/ContentProcessor.java
similarity index 95%
rename from remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/ContentProcessor.java
rename to remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/ContentProcessor.java
index 1b84fec..92fc063 100644
--- a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/ContentProcessor.java
+++ b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/ContentProcessor.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.sling.remotecontentapi.impl;
+package org.apache.sling.remotecontentapi.hardcodedfirstshot;
 
 import org.apache.sling.api.resource.ValueMap;
 
diff --git a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/RemoteContentApiServlet.java
b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/HardcodedFirstShotServlet.java
similarity index 87%
rename from remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/RemoteContentApiServlet.java
rename to remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/HardcodedFirstShotServlet.java
index dc98d9f..ce48ef7 100644
--- a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/RemoteContentApiServlet.java
+++ b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/HardcodedFirstShotServlet.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.sling.remotecontentapi.impl;
+package org.apache.sling.remotecontentapi.hardcodedfirstshot;
 
 import java.io.IOException;
 
@@ -31,7 +31,10 @@ import org.apache.sling.api.SlingHttpServletResponse;
 import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
 import org.osgi.service.component.annotations.Component;
 
-/** Main Remote Content API servlet */
+/** This is a first shot at this remote content API, that
+ *  works well with the (simplistic) test content
+ *  found under /content/articles
+ */
 @Component(service = Servlet.class,
     name="org.apache.sling.servlets.get.DefaultGetServlet",
     property = {
@@ -43,10 +46,10 @@ import org.osgi.service.component.annotations.Component;
 
             "sling.servlet.methods=GET",
             "sling.servlet.methods=HEAD",
-            "sling.servlet.selectors=dkp",
+            "sling.servlet.selectors=hfs",
             "sling.servlet.extension=json",
     })
-public class RemoteContentApiServlet extends SlingSafeMethodsServlet {
+public class HardcodedFirstShotServlet extends SlingSafeMethodsServlet {
     private static final long serialVersionUID = 1L;
 
     @Override
diff --git a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/JsonProcessor.java
b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/JsonProcessor.java
similarity index 93%
rename from remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/JsonProcessor.java
rename to remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/JsonProcessor.java
index a9fa68a..4e8d80a 100644
--- a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/JsonProcessor.java
+++ b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/JsonProcessor.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.sling.remotecontentapi.impl;
+package org.apache.sling.remotecontentapi.hardcodedfirstshot;
 
 public interface JsonProcessor {
     void process(PipelineContext pc);
diff --git a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/MetadataProcessor.java
b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/MetadataProcessor.java
similarity index 95%
rename from remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/MetadataProcessor.java
rename to remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/MetadataProcessor.java
index 8a57554..3a58999 100644
--- a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/MetadataProcessor.java
+++ b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/MetadataProcessor.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.sling.remotecontentapi.impl;
+package org.apache.sling.remotecontentapi.hardcodedfirstshot;
 
 import org.apache.sling.api.resource.ValueMap;
 
diff --git a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/P.java
b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/P.java
similarity index 97%
rename from remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/P.java
rename to remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/P.java
index 17cec59..168833f 100644
--- a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/P.java
+++ b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/P.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.sling.remotecontentapi.impl;
+package org.apache.sling.remotecontentapi.hardcodedfirstshot;
 
 import javax.json.Json;
 import javax.json.JsonArrayBuilder;
diff --git a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/PipelineContext.java
b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/PipelineContext.java
similarity index 97%
rename from remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/PipelineContext.java
rename to remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/PipelineContext.java
index e2c3267..8d2893b 100644
--- a/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/impl/PipelineContext.java
+++ b/remote-content-api/src/main/java/org/apache/sling/remotecontentapi/hardcodedfirstshot/PipelineContext.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.sling.remotecontentapi.impl;
+package org.apache.sling.remotecontentapi.hardcodedfirstshot;
 
 import javax.json.Json;
 import javax.json.JsonObject;
diff --git a/remote-content-api/src/main/resources/SLING-INF/initial-content/ROOT.json b/remote-content-api/src/main/resources/SLING-INF/initial-content/ROOT.json
index d9fc31c..c1d2309 100644
--- a/remote-content-api/src/main/resources/SLING-INF/initial-content/ROOT.json
+++ b/remote-content-api/src/main/resources/SLING-INF/initial-content/ROOT.json
@@ -1,4 +1,4 @@
 {
     "sling:resourceType" : "sling:redirect",
-    "sling:target" : "/content.dkp.json"
+    "sling:target" : "/content.hfs.json"
 }
\ No newline at end of file


Mime
View raw message