You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/02/27 19:25:21 UTC
svn commit: r631670 - in /incubator/sling/trunk: api/src/main/java/org/apache/sling/api/scripting/ api/src/main/java/org/apache/sling/api/services/ scripting/resolver/src/main/java/org/apache/sling/scripting/resolver/

Author: cziegeler
Date: Wed Feb 27 10:25:20 2008
New Revision: 631670

URL: http://svn.apache.org/viewvc?rev=631670&view=rev
Log:
IN PROGRESS - issue SLING-279: ServiceLocator clean up 
https://issues.apache.org/jira/browse/SLING-279
Remove ServiceLocator interface and from request.

Added:
    incubator/sling/trunk/api/src/main/java/org/apache/sling/api/scripting/InvalidServiceFilterSyntaxException.java
      - copied, changed from r631529, incubator/sling/trunk/api/src/main/java/org/apache/sling/api/services/InvalidServiceFilterSyntaxException.java
Removed:
    incubator/sling/trunk/api/src/main/java/org/apache/sling/api/services/InvalidServiceFilterSyntaxException.java
Modified:
    incubator/sling/trunk/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java
    incubator/sling/trunk/scripting/resolver/src/main/java/org/apache/sling/scripting/resolver/ScriptHelper.java

Copied: incubator/sling/trunk/api/src/main/java/org/apache/sling/api/scripting/InvalidServiceFilterSyntaxException.java (from r631529, incubator/sling/trunk/api/src/main/java/org/apache/sling/api/services/InvalidServiceFilterSyntaxException.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/api/src/main/java/org/apache/sling/api/scripting/InvalidServiceFilterSyntaxException.java?p2=incubator/sling/trunk/api/src/main/java/org/apache/sling/api/scripting/InvalidServiceFilterSyntaxException.java&p1=incubator/sling/trunk/api/src/main/java/org/apache/sling/api/services/InvalidServiceFilterSyntaxException.java&r1=631529&r2=631670&rev=631670&view=diff
==============================================================================
--- incubator/sling/trunk/api/src/main/java/org/apache/sling/api/services/InvalidServiceFilterSyntaxException.java (original)
+++ incubator/sling/trunk/api/src/main/java/org/apache/sling/api/scripting/InvalidServiceFilterSyntaxException.java Wed Feb 27 10:25:20 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.api.services;
+package org.apache.sling.api.scripting;
 
 import org.apache.sling.api.SlingException;
 

Modified: incubator/sling/trunk/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java?rev=631670&r1=631669&r2=631670&view=diff
==============================================================================
--- incubator/sling/trunk/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java (original)
+++ incubator/sling/trunk/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java Wed Feb 27 10:25:20 2008
@@ -23,7 +23,6 @@
 import org.apache.sling.api.SlingIOException;
 import org.apache.sling.api.SlingServletException;
 import org.apache.sling.api.request.RequestDispatcherOptions;
-import org.apache.sling.api.services.InvalidServiceFilterSyntaxException;
 
 /**
  * The <code>SlingScriptHelper</code> interface defines the API of a helper

Modified: incubator/sling/trunk/scripting/resolver/src/main/java/org/apache/sling/scripting/resolver/ScriptHelper.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/resolver/src/main/java/org/apache/sling/scripting/resolver/ScriptHelper.java?rev=631670&r1=631669&r2=631670&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/resolver/src/main/java/org/apache/sling/scripting/resolver/ScriptHelper.java (original)
+++ incubator/sling/trunk/scripting/resolver/src/main/java/org/apache/sling/scripting/resolver/ScriptHelper.java Wed Feb 27 10:25:20 2008
@@ -33,9 +33,9 @@
 import org.apache.sling.api.SlingIOException;
 import org.apache.sling.api.SlingServletException;
 import org.apache.sling.api.request.RequestDispatcherOptions;
+import org.apache.sling.api.scripting.InvalidServiceFilterSyntaxException;
 import org.apache.sling.api.scripting.SlingScript;
 import org.apache.sling.api.scripting.SlingScriptHelper;
-import org.apache.sling.api.services.InvalidServiceFilterSyntaxException;
 import org.apache.sling.scripting.resolver.impl.helper.OnDemandReaderRequest;
 import org.apache.sling.scripting.resolver.impl.helper.OnDemandWriterResponse;
 import org.osgi.framework.BundleContext;