diff --git a/config/alfresco/slingshot-context.xml b/config/alfresco/slingshot-context.xml
index 12f6b5f340..506460ddea 100644
--- a/config/alfresco/slingshot-context.xml
+++ b/config/alfresco/slingshot-context.xml
@@ -41,25 +41,12 @@
${vti.server.external.contextPath}
-
-
+
+
+
-
-
-
-
- slingshotDocLib
-
-
-
-
-
-
-
-
-
+
diff --git a/source/java/org/alfresco/repo/jscript/SlingshotDocLibCustomResponse.java b/source/java/org/alfresco/repo/jscript/SlingshotDocLibCustomResponse.java
deleted file mode 100644
index 59ba980b34..0000000000
--- a/source/java/org/alfresco/repo/jscript/SlingshotDocLibCustomResponse.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- */
-package org.alfresco.repo.jscript;
-
-import org.alfresco.repo.jscript.app.CustomResponse;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * Populates DocLib webscript response with custom metadata output
- *
- * @author: mikeh
- */
-public final class SlingshotDocLibCustomResponse extends BaseScopableProcessorExtension
-{
- private Map customResponses;
-
- /**
- * Set the custom response beans
- *
- * @param customResponses
- */
- public void setCustomResponses(Map customResponses)
- {
- this.customResponses = customResponses;
- }
-
- /**
- * Returns a JSON string to be added to the DocLib webscript response.
- *
- * @return The JSON string
- */
- public String getJSON()
- {
- return this.getJSONObj().toString();
- }
-
- /**
- * Returns a JSON object to be added to the DocLib webscript response.
- *
- * @return The JSON object
- */
- protected Object getJSONObj()
- {
- JSONObject json = new JSONObject();
-
-
- for (Map.Entry entry : this.customResponses.entrySet())
- {
- try
- {
- Serializable response = ((CustomResponse) entry.getValue()).populate();
- json.put(entry.getKey(), response == null ? JSONObject.NULL: response);
- }
- catch (JSONException error)
- {
- error.printStackTrace();
- }
- }
-
- return json;
- }
-}
diff --git a/source/java/org/alfresco/repo/jscript/SlingshotDocLibCustomResponseRegistrar.java b/source/java/org/alfresco/repo/jscript/SlingshotDocLibCustomResponseRegistrar.java
deleted file mode 100644
index 5b0c2b0a1f..0000000000
--- a/source/java/org/alfresco/repo/jscript/SlingshotDocLibCustomResponseRegistrar.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2005-2014 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- */
-package org.alfresco.repo.jscript;
-
-import java.util.Map;
-
-/**
- * Register an additional custom metadata output for the DocLib webscript response
- *
- * @author: Will Abson
- */
-public final class SlingshotDocLibCustomResponseRegistrar
-{
- private Map responsesMap;
- private String key;
- private Object value;
-
- public String getKey()
- {
- return key;
- }
-
- public void setKey(String key)
- {
- this.key = key;
- }
-
- public Object getValue()
- {
- return value;
- }
-
- public void setValue(Object value)
- {
- this.value = value;
- }
-
- public Map getResponsesMap()
- {
- return responsesMap;
- }
-
- public void setResponsesMap(Map responsesMap)
- {
- this.responsesMap = responsesMap;
- }
-
- public void addCustomResponse()
- {
- responsesMap.put(key, value);
- }
-}
diff --git a/source/java/org/alfresco/repo/jscript/app/CustomResponse.java b/source/java/org/alfresco/repo/jscript/app/CustomResponse.java
index 3317530991..c68b811c7f 100644
--- a/source/java/org/alfresco/repo/jscript/app/CustomResponse.java
+++ b/source/java/org/alfresco/repo/jscript/app/CustomResponse.java
@@ -22,14 +22,14 @@ package org.alfresco.repo.jscript.app;
import java.io.Serializable;
/**
- * Interface for custom properties used by SlingshotDocLibCustomResponse
+ * Interface for returning custom properties
*
* @author: mikeh
*/
public interface CustomResponse
{
/**
- * Populates the DocLib webscript response with custom metadata
+ * Populates the DocLib webscript response with custom metadata
*/
Serializable populate();
}
diff --git a/source/java/org/alfresco/repo/jscript/app/VtiServerCustomResponse.java b/source/java/org/alfresco/repo/jscript/app/VtiServerCustomResponse.java
index 79f07aa823..6b422ff8c4 100644
--- a/source/java/org/alfresco/repo/jscript/app/VtiServerCustomResponse.java
+++ b/source/java/org/alfresco/repo/jscript/app/VtiServerCustomResponse.java
@@ -107,9 +107,9 @@ public class VtiServerCustomResponse implements CustomResponse
}
/**
- * Populates the DocLib webscript response with custom metadata
+ * Populates the CustomResponse with the vti metadata
*
- * @return JSONObject or null
+ * @return JSONObject or null if the vti module is not installed.
*/
public Serializable populate()
{