incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1357144 - in /sling/trunk/contrib/scripting/scala/config: pom.xml src/main/java/org/apache/sling/scripting/scala/config/SlingScriptInfo.java src/main/java/org/apache/sling/scripting/scala/config/SlingSettingsProvider.java
Date Wed, 04 Jul 2012 08:01:26 GMT
Author: cziegeler
Date: Wed Jul  4 08:01:25 2012
New Revision: 1357144

URL: http://svn.apache.org/viewvc?rev=1357144&view=rev
Log:
SLING-2363 : Replace JavaDoc SCR annotations with Java SCR annotations

Modified:
    sling/trunk/contrib/scripting/scala/config/pom.xml
    sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingScriptInfo.java
    sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingSettingsProvider.java

Modified: sling/trunk/contrib/scripting/scala/config/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/config/pom.xml?rev=1357144&r1=1357143&r2=1357144&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/config/pom.xml (original)
+++ sling/trunk/contrib/scripting/scala/config/pom.xml Wed Jul  4 08:01:25 2012
@@ -113,6 +113,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
         
     </dependencies>
   

Modified: sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingScriptInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingScriptInfo.java?rev=1357144&r1=1357143&r2=1357144&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingScriptInfo.java
(original)
+++ sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingScriptInfo.java
Wed Jul  4 08:01:25 2012
@@ -21,6 +21,8 @@ import static org.apache.sling.scripting
 import javax.script.ScriptContext;
 import javax.script.ScriptException;
 
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.scripting.SlingBindings;
 import org.apache.sling.api.scripting.SlingScriptHelper;
@@ -31,9 +33,9 @@ import org.apache.sling.scripting.scala.
  * This {@link ScriptInfo} implementation provides the script class name
  * by retrieving it from the <code>ScriptContext</code>.
  *
- * @scr.component
- * @scr.service
  */
+@Component
+@Service
 public class SlingScriptInfo extends AbstractScriptInfo {
 
     @Override

Modified: sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingSettingsProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingSettingsProvider.java?rev=1357144&r1=1357143&r2=1357144&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingSettingsProvider.java
(original)
+++ sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingSettingsProvider.java
Wed Jul  4 08:01:25 2012
@@ -31,6 +31,10 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.script.ScriptException;
 
+import org.apache.felix.scr.annotations.Component;
+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.jcr.api.SlingRepository;
 import org.apache.sling.scripting.scala.AbstractSettingsProvider;
 import org.apache.sling.scripting.scala.BundleFS;
@@ -52,35 +56,25 @@ import scala.tools.nsc.io.PlainFile;
  * directory to the Felix admin console. Furthermore it adds all classes of all bundles
  * to the Scala compiler classpath.
  *
- * @scr.component
- * @scr.service
  */
+@Component
+@Service
 public class SlingSettingsProvider extends AbstractSettingsProvider {
     private static final Logger log = LoggerFactory.getLogger(SlingSettingsProvider.class);
 
     private static final String PATH_SEPARATOR = System.getProperty("path.separator");
 
-    /**
-     * @scr.property
-     *   value=""
-     *   label="Scala compiler options"
-     *   description="Scala compiler settings as documented by scalac -help"
-     */
+    @Property(value="", label="Scala compiler options", description="Scala compiler settings
as documented by scalac -help")
     public static final String SETTINGS = "scala.compiler.settings";
     private String settings;
 
-    /**
-     * @scr.property
-     *   value="/var/classes"
-     *   label="Compiler output directory"
-     *   description="Output directory for files generated by the Scala compiler. Defaults
to /var/classes."
-     */
+    @Property(value="/var/classes", label="Compiler output directory", description="Output
directory for files generated by the Scala compiler. Defaults to /var/classes.")
     public static final String OUT_DIR = "scala.compiler.outdir";
     private String outDir;
 
     private ComponentContext context;
 
-    /** @scr.reference */
+    @Reference
     private SlingRepository repository;
     private Session session;
 



Mime
View raw message