Author: rombert
Date: Fri Aug 16 15:52:29 2013
New Revision: 1514759
URL: http://svn.apache.org/r1514759
Log:
SLING-2989 - [Tooling] integrate with vlt once available
Make the TracingCommand part of the api bundle to allow other transport
implementations to reuse it.
Added:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/TracingCommand.java
(contents, props changed)
- copied, changed from r1514633,
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/TracingCommand.java
Removed:
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/TracingCommand.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/META-INF/MANIFEST.MF
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Command.java
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Repository.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractCommand.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
Modified: sling/branches/tooling-ide-vlt/tooling/ide/api/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/api/META-INF/MANIFEST.MF?rev=1514759&r1=1514758&r2=1514759&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/api/META-INF/MANIFEST.MF
(original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/api/META-INF/MANIFEST.MF Fri Aug
16 15:52:29 2013
@@ -11,3 +11,4 @@ Export-Package: org.apache.sling.ide.fil
org.apache.sling.ide.serialization,
org.apache.sling.ide.transport,
org.apache.sling.ide.util
+Import-Package: org.osgi.service.event
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Command.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Command.java?rev=1514759&r1=1514758&r2=1514759&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Command.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Command.java
Fri Aug 16 15:52:29 2013
@@ -19,4 +19,6 @@ package org.apache.sling.ide.transport;
public interface Command<T> {
Result<T> execute();
+
+ String getPath();
}
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Repository.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Repository.java?rev=1514759&r1=1514758&r2=1514759&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Repository.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Repository.java
Fri Aug 16 15:52:29 2013
@@ -87,8 +87,20 @@ public interface Repository {
Command<Void> newDeleteNodeCommand(FileInfo fileInfo);
+ /**
+ * Retrieves information about the resource located at <tt>path</tt> and
its direct descendants
+ *
+ * @param path
+ * @return a <tt>ResourceProxy</tt> rooted at <tt>path</tt> and its direct
descendants
+ */
Command<ResourceProxy> newListChildrenNodeCommand(String path);
+ /**
+ * Retrieves all properties of a resource located at <tt>path</tt>
+ *
+ * @param path
+ * @return all properties for the resource located at <tt>path</tt>
+ */
Command<Map<String, Object>> newGetNodeContentCommand(String path);
Command<byte[]> newGetNodeCommand(String path);
Copied:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/TracingCommand.java
(from r1514633,
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/TracingCommand.java)
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/TracingCommand.java?p2=sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/TracingCommand.java&p1=sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/TracingCommand.java&r1=1514633&r2=1514759&rev=1514759&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/TracingCommand.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/TracingCommand.java
Fri Aug 16 15:52:29 2013
@@ -14,24 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.impl.resource.transport;
+package org.apache.sling.ide.transport;
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.ide.transport.Command;
-import org.apache.sling.ide.transport.CommandExecutionProperties;
-import org.apache.sling.ide.transport.RepositoryException;
-import org.apache.sling.ide.transport.Result;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
-class TracingCommand<T> implements Command<T> {
+public class TracingCommand<T> implements Command<T> {
- private final AbstractCommand<T> command;
+ public static <T> TracingCommand<T> wrap(Command<T> command, EventAdmin
eventAdmin) {
+ return new TracingCommand<T>(command, eventAdmin);
+ }
+
+ private final Command<T> command;
private final EventAdmin eventAdmin;
- public TracingCommand(AbstractCommand<T> command, EventAdmin eventAdmin) {
+ public TracingCommand(Command<T> command, EventAdmin eventAdmin) {
this.command = command;
this.eventAdmin = eventAdmin;
}
@@ -62,4 +62,8 @@ class TracingCommand<T> implements Comma
return result;
}
+ public String getPath() {
+ return command.getPath();
+ }
+
}
\ No newline at end of file
Propchange:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/TracingCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/TracingCommand.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractCommand.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractCommand.java?rev=1514759&r1=1514758&r2=1514759&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractCommand.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractCommand.java
Fri Aug 16 15:52:29 2013
@@ -35,6 +35,7 @@ public abstract class AbstractCommand<T>
this.path = createFullPath(relativePath);
}
+ @Override
public String getPath() {
return path;
}
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java?rev=1514759&r1=1514758&r2=1514759&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
Fri Aug 16 15:52:29 2013
@@ -22,6 +22,7 @@ import org.apache.commons.httpclient.Htt
import org.apache.sling.ide.transport.Command;
import org.apache.sling.ide.transport.FileInfo;
import org.apache.sling.ide.transport.ResourceProxy;
+import org.apache.sling.ide.transport.TracingCommand;
import org.osgi.service.event.EventAdmin;
public class RepositoryImpl extends AbstractRepository{
