You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/05/08 14:03:18 UTC
svn commit: r654499 - in /incubator/sling/trunk/scripting/core/src:
main/java/org/apache/sling/scripting/core/
main/java/org/apache/sling/scripting/core/impl/
main/java/org/apache/sling/scripting/core/impl/helper/
main/java/org/apache/sling/scripting/r...
Author: fmeschbe
Date: Thu May 8 05:03:17 2008
New Revision: 654499
URL: http://svn.apache.org/viewvc?rev=654499&view=rev
Log:
SLING-438 Rename scripting/resolver to scripting/core (take 2) - rename packages
Added:
incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/
incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/ScriptHelper.java
- copied, changed from r654498, incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/ScriptHelper.java
incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/
incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java
- copied, changed from r654498, incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/impl/DefaultSlingScript.java
incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/LogWriter.java
- copied, changed from r654498, incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/impl/LogWriter.java
incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/SlingScriptAdapterFactory.java
- copied, changed from r654498, incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/impl/SlingScriptAdapterFactory.java
incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/
- copied from r654498, incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/impl/helper/
incubator/sling/trunk/scripting/core/src/test/java/org/apache/sling/scripting/core/
incubator/sling/trunk/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/
- copied from r654498, incubator/sling/trunk/scripting/core/src/test/java/org/apache/sling/scripting/resolver/impl/
Removed:
incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/
incubator/sling/trunk/scripting/core/src/test/java/org/apache/sling/scripting/resolver/
Modified:
incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandReader.java
incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandReaderRequest.java
incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandWriter.java
incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandWriterResponse.java
incubator/sling/trunk/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/LogWriterTest.java
Copied: incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/ScriptHelper.java (from r654498, incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/ScriptHelper.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/ScriptHelper.java?p2=incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/ScriptHelper.java&p1=incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/ScriptHelper.java&r1=654498&r2=654499&rev=654499&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/ScriptHelper.java (original)
+++ incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/ScriptHelper.java Thu May 8 05:03:17 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.resolver;
+package org.apache.sling.scripting.core;
import java.io.IOException;
import java.util.ArrayList;
@@ -36,8 +36,8 @@
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.scripting.resolver.impl.helper.OnDemandReaderRequest;
-import org.apache.sling.scripting.resolver.impl.helper.OnDemandWriterResponse;
+import org.apache.sling.scripting.core.impl.helper.OnDemandReaderRequest;
+import org.apache.sling.scripting.core.impl.helper.OnDemandWriterResponse;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
Copied: incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java (from r654498, incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/impl/DefaultSlingScript.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java?p2=incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java&p1=incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/impl/DefaultSlingScript.java&r1=654498&r2=654499&rev=654499&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/impl/DefaultSlingScript.java (original)
+++ incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java Thu May 8 05:03:17 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.resolver.impl;
+package org.apache.sling.scripting.core.impl;
import static org.apache.sling.api.scripting.SlingBindings.LOG;
import static org.apache.sling.api.scripting.SlingBindings.OUT;
@@ -63,7 +63,7 @@
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.api.scripting.SlingScript;
import org.apache.sling.api.scripting.SlingScriptHelper;
-import org.apache.sling.scripting.resolver.ScriptHelper;
+import org.apache.sling.scripting.core.ScriptHelper;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/LogWriter.java (from r654498, incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/impl/LogWriter.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/LogWriter.java?p2=incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/LogWriter.java&p1=incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/impl/LogWriter.java&r1=654498&r2=654499&rev=654499&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/impl/LogWriter.java (original)
+++ incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/LogWriter.java Thu May 8 05:03:17 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.resolver.impl;
+package org.apache.sling.scripting.core.impl;
import java.io.Writer;
Copied: incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/SlingScriptAdapterFactory.java (from r654498, incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/impl/SlingScriptAdapterFactory.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/SlingScriptAdapterFactory.java?p2=incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/SlingScriptAdapterFactory.java&p1=incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/impl/SlingScriptAdapterFactory.java&r1=654498&r2=654499&rev=654499&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/resolver/impl/SlingScriptAdapterFactory.java (original)
+++ incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/SlingScriptAdapterFactory.java Thu May 8 05:03:17 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.scripting.resolver.impl;
+package org.apache.sling.scripting.core.impl;
import java.io.BufferedReader;
import java.io.IOException;
Modified: incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandReader.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandReader.java?rev=654499&r1=654498&r2=654499&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandReader.java (original)
+++ incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandReader.java Thu May 8 05:03:17 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.resolver.impl.helper;
+package org.apache.sling.scripting.core.impl.helper;
import java.io.IOException;
import java.io.Reader;
Modified: incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandReaderRequest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandReaderRequest.java?rev=654499&r1=654498&r2=654499&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandReaderRequest.java (original)
+++ incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandReaderRequest.java Thu May 8 05:03:17 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.resolver.impl.helper;
+package org.apache.sling.scripting.core.impl.helper;
import java.io.BufferedReader;
Modified: incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandWriter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandWriter.java?rev=654499&r1=654498&r2=654499&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandWriter.java (original)
+++ incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandWriter.java Thu May 8 05:03:17 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.resolver.impl.helper;
+package org.apache.sling.scripting.core.impl.helper;
import java.io.IOException;
import java.io.Writer;
Modified: incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandWriterResponse.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandWriterResponse.java?rev=654499&r1=654498&r2=654499&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandWriterResponse.java (original)
+++ incubator/sling/trunk/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/OnDemandWriterResponse.java Thu May 8 05:03:17 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.resolver.impl.helper;
+package org.apache.sling.scripting.core.impl.helper;
import java.io.PrintWriter;
Modified: incubator/sling/trunk/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/LogWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/LogWriterTest.java?rev=654499&r1=654498&r2=654499&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/LogWriterTest.java (original)
+++ incubator/sling/trunk/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/LogWriterTest.java Thu May 8 05:03:17 2008
@@ -16,12 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.resolver.impl;
+package org.apache.sling.scripting.core.impl;
import java.io.IOException;
import junit.framework.TestCase;
+import org.apache.sling.scripting.core.impl.LogWriter;
import org.slf4j.Logger;
import org.slf4j.Marker;