You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2010/04/29 04:01:16 UTC
svn commit: r939173 - in /sling/trunk: bundles/scripting/api/
bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/
bundles/scripting/core/
bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/
launchpad/builder/src/m...
Author: justin
Date: Thu Apr 29 02:01:15 2010
New Revision: 939173
URL: http://svn.apache.org/viewvc?rev=939173&view=rev
Log:
SLING-1510 - adding ScriptEngineManagerFactory service interface
Added:
sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/ScriptEngineManagerFactory.java
Modified:
sling/trunk/bundles/scripting/api/pom.xml
sling/trunk/bundles/scripting/core/pom.xml
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/SlingScriptAdapterFactory.java
sling/trunk/launchpad/builder/src/main/bundles/list.xml
Modified: sling/trunk/bundles/scripting/api/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/pom.xml?rev=939173&r1=939172&r2=939173&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/api/pom.xml (original)
+++ sling/trunk/bundles/scripting/api/pom.xml Thu Apr 29 02:01:15 2010
@@ -55,7 +55,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.scripting.api;version=2.1.0,
+ org.apache.sling.scripting.api;version=2.2.0,
javax.script
</Export-Package>
<Private-Package>
Added: sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/ScriptEngineManagerFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/ScriptEngineManagerFactory.java?rev=939173&view=auto
==============================================================================
--- sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/ScriptEngineManagerFactory.java (added)
+++ sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/ScriptEngineManagerFactory.java Thu Apr 29 02:01:15 2010
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.sling.scripting.api;
+
+import javax.script.ScriptEngineManager;
+
+/**
+ * Service interface to access ScriptEngineManager instances.
+ *
+ */
+public interface ScriptEngineManagerFactory {
+
+ /**
+ * Get a ScriptEngineManager instance.
+ */
+ public ScriptEngineManager getScriptEngineManager();
+
+}
Modified: sling/trunk/bundles/scripting/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=939173&r1=939172&r2=939173&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/core/pom.xml (original)
+++ sling/trunk/bundles/scripting/core/pom.xml Thu Apr 29 02:01:15 2010
@@ -103,7 +103,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.api</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -112,7 +112,7 @@
<version>2.0.6</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
Modified: sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/SlingScriptAdapterFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/SlingScriptAdapterFactory.java?rev=939173&r1=939172&r2=939173&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/SlingScriptAdapterFactory.java (original)
+++ sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/SlingScriptAdapterFactory.java Thu Apr 29 02:01:15 2010
@@ -43,6 +43,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.scripting.SlingScriptConstants;
import org.apache.sling.commons.mime.MimeTypeProvider;
import org.apache.sling.scripting.api.BindingsValuesProvider;
+import org.apache.sling.scripting.api.ScriptEngineManagerFactory;
import org.apache.sling.scripting.core.impl.helper.SlingScriptEngineManager;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -73,12 +74,13 @@ import org.slf4j.LoggerFactory;
* values.0="org.apache.sling.api.scripting.SlingScript"
* values.1="javax.servlet.Servlet"
* @scr.service interface="org.apache.sling.api.adapter.AdapterFactory"
+ * @scr.service interface="org.apache.sling.scripting.api.ScriptEngineManagerFactory"
* @scr.service interface="org.apache.sling.commons.mime.MimeTypeProvider"
* @scr.reference name="ScriptEngineFactory"
* interface="javax.script.ScriptEngineFactory"
* cardinality="0..n" policy="dynamic"
*/
-public class SlingScriptAdapterFactory implements AdapterFactory, MimeTypeProvider, BundleListener {
+public class SlingScriptAdapterFactory implements AdapterFactory, MimeTypeProvider, BundleListener, ScriptEngineManagerFactory {
private final Logger log = LoggerFactory.getLogger(SlingScriptAdapterFactory.class);
@@ -145,7 +147,7 @@ public class SlingScriptAdapterFactory i
return null;
}
- /* package */ScriptEngineManager getScriptEngineManager() {
+ public ScriptEngineManager getScriptEngineManager() {
if (scriptEngineManager == null) {
// create (empty) script engine manager
Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=939173&r1=939172&r2=939173&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Thu Apr 29 02:01:15 2010
@@ -125,7 +125,7 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.api</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>