Author: justin
Date: Tue Aug 17 17:55:03 2010
New Revision: 986419
URL: http://svn.apache.org/viewvc?rev=986419&view=rev
Log:
switching groovy extension bundle to use scr annotations
Modified:
sling/trunk/bundles/extensions/groovy/pom.xml
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/internal/JSONGroovyBuilderBindingsValuesProvider.java
Modified: sling/trunk/bundles/extensions/groovy/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy/pom.xml?rev=986419&r1=986418&r2=986419&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/groovy/pom.xml (original)
+++ sling/trunk/bundles/extensions/groovy/pom.xml Tue Aug 17 17:55:03 2010
@@ -93,5 +93,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified:
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/internal/JSONGroovyBuilderBindingsValuesProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/internal/JSONGroovyBuilderBindingsValuesProvider.java?rev=986419&r1=986418&r2=986419&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/internal/JSONGroovyBuilderBindingsValuesProvider.java
(original)
+++
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/internal/JSONGroovyBuilderBindingsValuesProvider.java
Tue Aug 17 17:55:03 2010
@@ -18,19 +18,22 @@ package org.apache.sling.extensions.groo
import java.util.HashMap;
+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.Service;
import org.apache.sling.extensions.groovy.json.JSONGroovyBuilder;
/**
* BindingsValuesProvider which binds an instance of JSONGroovyBuilder.
- *
- * @scr.component immediate="true" metatype="no"
- * @scr.service
- *
- * @scr.property name="service.description" value="JSONGroovyBuilder
BindingsValuesProvider"
- * @scr.property name="service.vendor" value="The Apache Software Foundation"
- *
- * @scr.property name="javax.script.name" value="groovy"
*/
+...@component(immediate=true, metatype=false)
+...@service
+...@properties({
+ @Property(name="service.description", value="JSONGroovyBuilder
BindingsValuesProvider"),
+ @Property(name="service.vendor", value="The Apache Software Foundation"),
+ @Property(name="javax.script.name", value="groovy")
+})
public class JSONGroovyBuilderBindingsValuesProvider extends HashMap<String,
Object> {
public JSONGroovyBuilderBindingsValuesProvider() {
