Author: olli
Date: Sun Oct 2 12:13:09 2016
New Revision: 1763056
URL: http://svn.apache.org/viewvc?rev=1763056&view=rev
Log:
move non-extensible pipes to package internal
Added:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/AuthorizablePipe.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/AuthorizablePipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/FilterPipe.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/FilterPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/JsonPipe.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/JsonPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/MovePipe.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/MovePipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/MultiPropertyPipe.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/MultiPropertyPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/NotPipe.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/NotPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/ParentPipe.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/ParentPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PathPipe.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PathPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/RemovePipe.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/RemovePipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/SlingQueryPipe.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/SlingQueryPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/WritePipe.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/WritePipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/XPathPipe.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/XPathPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/FilterPipeTest.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/FilterPipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/JsonPipeTest.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/JsonPipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MovePipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/MultiPropertyPipeTest.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/NotPipeTest.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/NotPipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/RemovePipeTest.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/RemovePipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/SlingQueryPipeTest.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java
- copied, changed from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java
Removed:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/AuthorizablePipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/FilterPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/JsonPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/MovePipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/MultiPropertyPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/NotPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/ParentPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PathPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/RemovePipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/SlingQueryPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/WritePipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/XPathPipe.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/FilterPipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/JsonPipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MovePipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/NotPipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/RemovePipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java
Modified:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/PlumberServletTest.java
Modified:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java?rev=1763056&r1=1763055&r2=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java
Sun Oct 2 12:13:09 2016
@@ -32,7 +32,9 @@ import org.slf4j.LoggerFactory;
* provides generic utilities for a pipe
*/
public class BasePipe implements Pipe {
- Logger logger = LoggerFactory.getLogger(BasePipe.class);
+
+ private final Logger logger = LoggerFactory.getLogger(BasePipe.class);
+
public static final String RESOURCE_TYPE = "slingPipes/base";
public static final String DRYRUN_KEY = "dryRun";
protected static final String DRYRUN_EXPR = "${" + DRYRUN_KEY + "}";
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/AuthorizablePipe.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/AuthorizablePipe.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/AuthorizablePipe.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/AuthorizablePipe.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/AuthorizablePipe.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/AuthorizablePipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/AuthorizablePipe.java
Sun Oct 2 12:13:09 2016
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.commons.lang.StringUtils;
import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -24,6 +24,8 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.commons.json.JSONArray;
+import org.apache.sling.pipes.BasePipe;
+import org.apache.sling.pipes.Plumber;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/FilterPipe.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/FilterPipe.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/FilterPipe.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/FilterPipe.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/FilterPipe.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/FilterPipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/FilterPipe.java
Sun Oct 2 12:13:09 2016
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.pipes.BasePipe;
+import org.apache.sling.pipes.Plumber;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/JsonPipe.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/JsonPipe.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/JsonPipe.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/JsonPipe.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/JsonPipe.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/JsonPipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/JsonPipe.java
Sun Oct 2 12:13:09 2016
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpConnectionManager;
@@ -30,6 +30,8 @@ import org.apache.sling.commons.json.JSO
import org.apache.sling.commons.json.JSONException;
import org.apache.sling.commons.json.JSONObject;
import org.apache.sling.commons.json.JSONTokener;
+import org.apache.sling.pipes.BasePipe;
+import org.apache.sling.pipes.Plumber;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/MovePipe.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/MovePipe.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/MovePipe.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/MovePipe.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/MovePipe.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/MovePipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/MovePipe.java
Sun Oct 2 12:13:09 2016
@@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.Resource;
+import org.apache.sling.pipes.BasePipe;
+import org.apache.sling.pipes.Plumber;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/MultiPropertyPipe.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/MultiPropertyPipe.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/MultiPropertyPipe.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/MultiPropertyPipe.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/MultiPropertyPipe.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/MultiPropertyPipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/MultiPropertyPipe.java
Sun Oct 2 12:13:09 2016
@@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.Resource;
+import org.apache.sling.pipes.BasePipe;
+import org.apache.sling.pipes.Plumber;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/NotPipe.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/NotPipe.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/NotPipe.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/NotPipe.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/NotPipe.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/NotPipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/NotPipe.java
Sun Oct 2 12:13:09 2016
@@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.Resource;
+import org.apache.sling.pipes.Plumber;
+import org.apache.sling.pipes.ReferencePipe;
import java.util.Collections;
import java.util.Iterator;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/ParentPipe.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/ParentPipe.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/ParentPipe.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/ParentPipe.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/ParentPipe.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/ParentPipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/ParentPipe.java
Sun Oct 2 12:13:09 2016
@@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.Resource;
+import org.apache.sling.pipes.BasePipe;
+import org.apache.sling.pipes.Plumber;
import java.util.Collections;
import java.util.Iterator;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PathPipe.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PathPipe.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PathPipe.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PathPipe.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PathPipe.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PathPipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PathPipe.java
Sun Oct 2 12:13:09 2016
@@ -14,16 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
-import org.apache.sling.api.resource.Resource;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.StringTokenizer;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.StringTokenizer;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.pipes.BasePipe;
+import org.apache.sling.pipes.Plumber;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* creates or get given expression's path and returns corresponding resource
@@ -38,6 +43,8 @@ public class PathPipe extends BasePipe {
boolean autosave;
+ private final Logger logger = LoggerFactory.getLogger(PathPipe.class);
+
public PathPipe(Plumber plumber, Resource resource) throws Exception {
super(plumber, resource);
nodeType = properties.get(PN_NODETYPE, "sling:Folder");
Modified:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java?rev=1763056&r1=1763055&r2=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
Sun Oct 2 12:13:09 2016
@@ -37,23 +37,11 @@ import org.apache.sling.distribution.Dis
import org.apache.sling.distribution.DistributionResponse;
import org.apache.sling.distribution.Distributor;
import org.apache.sling.distribution.SimpleDistributionRequest;
-import org.apache.sling.pipes.AuthorizablePipe;
import org.apache.sling.pipes.BasePipe;
import org.apache.sling.pipes.ContainerPipe;
-import org.apache.sling.pipes.FilterPipe;
-import org.apache.sling.pipes.JsonPipe;
-import org.apache.sling.pipes.MovePipe;
-import org.apache.sling.pipes.MultiPropertyPipe;
-import org.apache.sling.pipes.NotPipe;
-import org.apache.sling.pipes.ParentPipe;
-import org.apache.sling.pipes.PathPipe;
import org.apache.sling.pipes.Pipe;
import org.apache.sling.pipes.Plumber;
import org.apache.sling.pipes.ReferencePipe;
-import org.apache.sling.pipes.RemovePipe;
-import org.apache.sling.pipes.SlingQueryPipe;
-import org.apache.sling.pipes.WritePipe;
-import org.apache.sling.pipes.XPathPipe;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java?rev=1763056&r1=1763055&r2=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java
Sun Oct 2 12:13:09 2016
@@ -33,15 +33,12 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.apache.sling.commons.json.JSONException;
import org.apache.sling.commons.json.JSONObject;
-import org.apache.sling.pipes.AuthorizablePipe;
import org.apache.sling.pipes.BasePipe;
import org.apache.sling.pipes.ContainerPipe;
import org.apache.sling.pipes.OutputWriter;
import org.apache.sling.pipes.Pipe;
import org.apache.sling.pipes.PipeBindings;
import org.apache.sling.pipes.Plumber;
-import org.apache.sling.pipes.SlingQueryPipe;
-import org.apache.sling.pipes.WritePipe;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/RemovePipe.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/RemovePipe.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/RemovePipe.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/RemovePipe.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/RemovePipe.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/RemovePipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/RemovePipe.java
Sun Oct 2 12:13:09 2016
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.pipes.BasePipe;
+import org.apache.sling.pipes.Plumber;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/SlingQueryPipe.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/SlingQueryPipe.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/SlingQueryPipe.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/SlingQueryPipe.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/SlingQueryPipe.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/SlingQueryPipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/SlingQueryPipe.java
Sun Oct 2 12:13:09 2016
@@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.Resource;
+import org.apache.sling.pipes.BasePipe;
+import org.apache.sling.pipes.Plumber;
import org.apache.sling.query.SlingQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/WritePipe.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/WritePipe.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/WritePipe.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/WritePipe.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/WritePipe.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/WritePipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/WritePipe.java
Sun Oct 2 12:13:09 2016
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.ModifiableValueMap;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.pipes.BasePipe;
+import org.apache.sling.pipes.Plumber;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/XPathPipe.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/XPathPipe.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/XPathPipe.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/XPathPipe.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/XPathPipe.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/XPathPipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/XPathPipe.java
Sun Oct 2 12:13:09 2016
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.commons.lang.StringUtils;
import org.apache.sling.api.resource.Resource;
+import org.apache.sling.pipes.BasePipe;
+import org.apache.sling.pipes.Plumber;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/FilterPipeTest.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/FilterPipeTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/FilterPipeTest.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/FilterPipeTest.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/FilterPipeTest.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/FilterPipeTest.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/FilterPipeTest.java
Sun Oct 2 12:13:09 2016
@@ -14,18 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
+
+import java.util.Iterator;
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.resource.ModifiableValueMap;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.pipes.AbstractPipeTest;
+import org.apache.sling.pipes.Pipe;
import org.junit.Test;
-import java.util.Iterator;
-
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
* testing different kind of filters
@@ -98,4 +102,4 @@ public class FilterPipeTest extends Abst
assertFalse("output has no resource...", resourceIterator.hasNext());
}
-}
\ No newline at end of file
+}
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/JsonPipeTest.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/JsonPipeTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/JsonPipeTest.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/JsonPipeTest.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/JsonPipeTest.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/JsonPipeTest.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/JsonPipeTest.java
Sun Oct 2 12:13:09 2016
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.pipes.AbstractPipeTest;
import org.junit.Before;
import org.junit.Test;
@@ -60,4 +61,4 @@ public class JsonPipeTest extends Abstra
assertEquals("second resource should be two",
"/content/json/array/two", second.getPath());
assertEquals("third resource should be three",
"/content/json/array/three", third.getPath());
}
-}
\ No newline at end of file
+}
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MovePipeTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MovePipeTest.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MovePipeTest.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java
Sun Oct 2 12:13:09 2016
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.Resource;
+import org.apache.sling.pipes.AbstractPipeTest;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
@@ -63,4 +64,4 @@ public class MovePipeTest extends Abstra
Assert.assertTrue("new property path should exists",
session.propertyExists(PATH_FRUITS + MOVED_NODE_PATH));
Assert.assertFalse("old property path should not",
session.propertyExists(PATH_FRUITS + PN_INDEX));
}
-}
\ No newline at end of file
+}
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/MultiPropertyPipeTest.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/MultiPropertyPipeTest.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/MultiPropertyPipeTest.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/MultiPropertyPipeTest.java
Sun Oct 2 12:13:09 2016
@@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.Resource;
+import org.apache.sling.pipes.AbstractPipeTest;
+import org.apache.sling.pipes.Pipe;
import org.junit.Before;
import org.junit.Test;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/NotPipeTest.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/NotPipeTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/NotPipeTest.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/NotPipeTest.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/NotPipeTest.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/NotPipeTest.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/NotPipeTest.java
Sun Oct 2 12:13:09 2016
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
+import org.apache.sling.pipes.AbstractPipeTest;
import org.junit.Before;
import org.junit.Test;
@@ -39,4 +40,4 @@ public class NotPipeTest extends Abstrac
//not working referred pipe should stream input of the not pipe
testOneResource(PATH_PIPE + "/notfailure", PATH_APPLE);
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/PlumberServletTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/PlumberServletTest.java?rev=1763056&r1=1763055&r2=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/PlumberServletTest.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/PlumberServletTest.java
Sun Oct 2 12:13:09 2016
@@ -35,7 +35,6 @@ import org.apache.sling.pipes.AbstractPi
import org.apache.sling.pipes.BasePipe;
import org.apache.sling.pipes.ContainerPipeTest;
import org.apache.sling.pipes.OutputWriter;
-import org.apache.sling.pipes.WritePipeTest;
import org.junit.Before;
import org.junit.Test;
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/RemovePipeTest.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/RemovePipeTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/RemovePipeTest.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/RemovePipeTest.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/RemovePipeTest.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/RemovePipeTest.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/RemovePipeTest.java
Sun Oct 2 12:13:09 2016
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.pipes.AbstractPipeTest;
+import org.apache.sling.pipes.Pipe;
import org.junit.Before;
import org.junit.Test;
@@ -30,7 +32,7 @@ import static org.junit.Assert.*;
/**
* testing removal
*/
-public class RemovePipeTest extends AbstractPipeTest{
+public class RemovePipeTest extends AbstractPipeTest {
@Before
public void setUp() throws Exception {
@@ -82,4 +84,4 @@ public class RemovePipeTest extends Abst
assertNotNull("isnota pea should not be removed", isNotAPea);
assertFalse("isnota pea color property should not be here",
isNotAPea.adaptTo(ValueMap.class).containsKey("color"));
}
-}
\ No newline at end of file
+}
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/SlingQueryPipeTest.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/SlingQueryPipeTest.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/SlingQueryPipeTest.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/SlingQueryPipeTest.java
Sun Oct 2 12:13:09 2016
@@ -14,8 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
+import org.apache.sling.pipes.AbstractPipeTest;
import org.junit.Before;
import org.junit.Test;
@@ -37,4 +38,4 @@ public class SlingQueryPipeTest extends
public void testChildren() throws Exception {
assertTrue("this pipe should have an output", getOutput(PATH_PIPE +
"/" + NN_SIMPLE).hasNext());
}
-}
\ No newline at end of file
+}
Copied:
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java
(from r1763055,
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java?p2=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java&p1=sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java&r1=1763055&r2=1763056&rev=1763056&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java
Sun Oct 2 12:13:09 2016
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.pipes;
+package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.pipes.AbstractPipeTest;
+import org.apache.sling.pipes.Pipe;
import org.junit.Before;
import org.junit.Test;
@@ -115,4 +117,4 @@ public class WritePipeTest extends Abstr
NodeIterator children = appleNode.getNodes();
assertTrue("Apple node should have children", children.hasNext());
}
-}
\ No newline at end of file
+}
