Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7FD4B85EE for ; Thu, 8 Sep 2011 01:00:47 +0000 (UTC) Received: (qmail 64177 invoked by uid 500); 8 Sep 2011 01:00:47 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 64067 invoked by uid 500); 8 Sep 2011 01:00:46 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 64057 invoked by uid 99); 8 Sep 2011 01:00:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Sep 2011 01:00:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Sep 2011 01:00:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B35432388B71; Thu, 8 Sep 2011 01:00:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1166488 - in /sling/trunk/bundles/scripting/core: pom.xml src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java src/main/java/org/apache/sling/scripting/core/impl/SlingScriptAdapterFactory.java Date: Thu, 08 Sep 2011 01:00:23 -0000 To: commits@sling.apache.org From: justin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110908010023.B35432388B71@eris.apache.org> Author: justin Date: Thu Sep 8 01:00:23 2011 New Revision: 1166488 URL: http://svn.apache.org/viewvc?rev=1166488&view=rev Log: SLING-2209 - updating annotations Modified: sling/trunk/bundles/scripting/core/pom.xml sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/SlingScriptAdapterFactory.java Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1166488&r1=1166487&r2=1166488&view=diff ============================================================================== --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Thu Sep 8 01:00:23 2011 @@ -122,6 +122,10 @@ org.osgi org.osgi.compendium + + org.apache.felix + org.apache.felix.scr.annotations + org.slf4j Modified: sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java?rev=1166488&r1=1166487&r2=1166488&view=diff ============================================================================== --- sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java (original) +++ sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java Thu Sep 8 01:00:23 2011 @@ -34,6 +34,10 @@ import javax.script.ScriptEngine; import javax.script.ScriptEngineFactory; import javax.script.ScriptEngineManager; +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Reference; +import org.apache.felix.scr.annotations.ReferenceCardinality; +import org.apache.felix.scr.annotations.ReferencePolicy; import org.apache.sling.api.scripting.SlingScriptConstants; import org.apache.sling.scripting.core.impl.helper.SlingScriptEngineManager; import org.osgi.framework.Bundle; @@ -51,11 +55,10 @@ import org.slf4j.LoggerFactory; /** * Component which exposes a ScriptEngineManager service. * - * @scr.component metatype="no" immediate="true" - * @scr.reference name="ScriptEngineFactory" - * interface="javax.script.ScriptEngineFactory" - * cardinality="0..n" policy="dynamic" */ +@Component(metatype=false, immediate=true) +@Reference(name="ScriptEngineFactory", referenceInterface=ScriptEngineFactory.class, + policy=ReferencePolicy.DYNAMIC, cardinality=ReferenceCardinality.OPTIONAL_MULTIPLE) public class ScriptEngineManagerFactory implements BundleListener { private final Logger log = LoggerFactory.getLogger(ScriptEngineManagerFactory.class); 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=1166488&r1=1166487&r2=1166488&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 Sep 8 01:00:23 2011 @@ -28,6 +28,11 @@ import javax.script.ScriptEngine; import javax.script.ScriptEngineFactory; import javax.script.ScriptEngineManager; +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Properties; +import org.apache.felix.scr.annotations.Property; +import org.apache.felix.scr.annotations.Reference; +import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.adapter.AdapterFactory; import org.apache.sling.api.resource.Resource; import org.apache.sling.commons.mime.MimeTypeProvider; @@ -47,18 +52,16 @@ import org.slf4j.LoggerFactory; /** * AdapterFactory that adapts Resources to the DefaultSlingScript servlet, which * executes the Resources as scripts. - * - * @scr.component metatype="no" immediate="true" - * @scr.property name="service.vendor" value="The Apache Software Foundation" - * @scr.property name="service.description" value="Default SlingScriptResolver" - * @scr.property name="adaptables" - * value="org.apache.sling.api.resource.Resource"; - * @scr.property name="adapters" - * 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.commons.mime.MimeTypeProvider" */ +@Component(metatype=false, immediate=true) +@Service({AdapterFactory.class, MimeTypeProvider.class}) +@Properties({ + @Property(name="service.vendor", value="The Apache Software Foundation"), + @Property(name="service.description", value="Default SlingScriptResolver"), + @Property(name="adaptables", value="org.apache.sling.api.resource.Resource"), + @Property(name="adapters", value={"org.apache.sling.api.scripting.SlingScript", + "javax.servlet.Servlet"}) +}) public class SlingScriptAdapterFactory implements AdapterFactory, MimeTypeProvider { private final Logger log = LoggerFactory.getLogger(SlingScriptAdapterFactory.class); @@ -95,9 +98,8 @@ public class SlingScriptAdapterFactory i /** * The script engine manager. - * - * @scr.reference */ + @Reference private ScriptEngineManager scriptEngineManager; // ---------- AdapterFactory -----------------------------------------------