Author: justin
Date: Thu Jan 28 18:24:46 2010
New Revision: 904201
URL: http://svn.apache.org/viewvc?rev=904201&view=rev
Log:
SLING-1339 - populating new groovy module
Added:
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/JSONGroovyBuilder.java
- copied, changed from r904166,
sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/groovy/JSONGroovyBuilder.java
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/internal/
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/internal/JSONGroovyBuilderBindingsValuesProvider.java
- copied, changed from r904166,
sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/groovy/internal/JSONGroovyBuilderBindingsValuesProvider.java
sling/trunk/bundles/extensions/groovy/src/test/groovy/org/apache/sling/extensions/
sling/trunk/bundles/extensions/groovy/src/test/groovy/org/apache/sling/extensions/groovy/
sling/trunk/bundles/extensions/groovy/src/test/groovy/org/apache/sling/extensions/groovy/json/
sling/trunk/bundles/extensions/groovy/src/test/groovy/org/apache/sling/extensions/groovy/json/JSONGroovyBuilderTest.groovy
- copied, changed from r904166,
sling/trunk/bundles/extensions/groovy/src/test/groovy/org/apache/sling/commons/json/groovy/JSONGroovyBuilderTest.groovy
Removed:
sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/groovy/JSONGroovyBuilder.java
sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/groovy/internal/JSONGroovyBuilderBindingsValuesProvider.java
sling/trunk/bundles/commons/json/src/test/groovy/org/apache/sling/commons/json/groovy/JSONGroovyBuilderTest.groovy
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/commons/json/groovy/JSONGroovyBuilder.java
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/commons/json/groovy/dummy.txt
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/commons/json/groovy/internal/JSONGroovyBuilderBindingsValuesProvider.java
sling/trunk/bundles/extensions/groovy/src/test/groovy/org/apache/sling/commons/json/groovy/JSONGroovyBuilderTest.groovy
Modified:
sling/trunk/bundles/commons/json/pom.xml
sling/trunk/bundles/extensions/groovy/pom.xml
sling/trunk/launchpad/builder/src/main/bundles/list.xml
sling/trunk/pom.xml
Modified: sling/trunk/bundles/commons/json/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/pom.xml?rev=904201&r1=904200&r2=904201&view=diff
==============================================================================
--- sling/trunk/bundles/commons/json/pom.xml (original)
+++ sling/trunk/bundles/commons/json/pom.xml Thu Jan 28 18:24:46 2010
@@ -44,33 +44,16 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
-
<Import-Package>groovy.*;resolution:=optional,org.apache.sling.scripting.api.*;resolution:=optional,*</Import-Package>
<Export-Package>
org.apache.sling.commons.json.*;version=${pom.version}
</Export-Package>
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -80,18 +63,6 @@
<artifactId>jcr</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>1.6.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.scripting.api</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
Modified: sling/trunk/bundles/extensions/groovy/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy/pom.xml?rev=904201&r1=904200&r2=904201&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/groovy/pom.xml (original)
+++ sling/trunk/bundles/extensions/groovy/pom.xml Thu Jan 28 18:24:46 2010
@@ -35,7 +35,7 @@
<description>
Various extensions for Apache Sling to faciliate Groovy scripts.
</description>
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/groovy</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/groovy</developerConnection>
@@ -46,22 +46,58 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>1.6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.json</artifactId>
<version>2.0.5-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.api</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Copied:
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/JSONGroovyBuilder.java
(from r904166,
sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/groovy/JSONGroovyBuilder.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/JSONGroovyBuilder.java?p2=sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/JSONGroovyBuilder.java&p1=sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/groovy/JSONGroovyBuilder.java&r1=904166&r2=904201&rev=904201&view=diff
==============================================================================
---
sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/groovy/JSONGroovyBuilder.java
(original)
+++
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/JSONGroovyBuilder.java
Thu Jan 28 18:24:46 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.commons.json.groovy;
+package org.apache.sling.extensions.groovy.json;
import groovy.lang.Closure;
import groovy.util.BuilderSupport;
Copied:
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/internal/JSONGroovyBuilderBindingsValuesProvider.java
(from r904166,
sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/groovy/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?p2=sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/internal/JSONGroovyBuilderBindingsValuesProvider.java&p1=sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/groovy/internal/JSONGroovyBuilderBindingsValuesProvider.java&r1=904166&r2=904201&rev=904201&view=diff
==============================================================================
---
sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/groovy/internal/JSONGroovyBuilderBindingsValuesProvider.java
(original)
+++
sling/trunk/bundles/extensions/groovy/src/main/java/org/apache/sling/extensions/groovy/json/internal/JSONGroovyBuilderBindingsValuesProvider.java
Thu Jan 28 18:24:46 2010
@@ -14,11 +14,11 @@
* License for the specific language governing permissions and limitations
under
* the License.
*/
-package org.apache.sling.commons.json.groovy.internal;
+package org.apache.sling.extensions.groovy.json.internal;
import javax.script.Bindings;
-import org.apache.sling.commons.json.groovy.JSONGroovyBuilder;
+import org.apache.sling.extensions.groovy.json.JSONGroovyBuilder;
import org.apache.sling.scripting.api.BindingsValuesProvider;
/**
Copied:
sling/trunk/bundles/extensions/groovy/src/test/groovy/org/apache/sling/extensions/groovy/json/JSONGroovyBuilderTest.groovy
(from r904166,
sling/trunk/bundles/extensions/groovy/src/test/groovy/org/apache/sling/commons/json/groovy/JSONGroovyBuilderTest.groovy)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy/src/test/groovy/org/apache/sling/extensions/groovy/json/JSONGroovyBuilderTest.groovy?p2=sling/trunk/bundles/extensions/groovy/src/test/groovy/org/apache/sling/extensions/groovy/json/JSONGroovyBuilderTest.groovy&p1=sling/trunk/bundles/extensions/groovy/src/test/groovy/org/apache/sling/commons/json/groovy/JSONGroovyBuilderTest.groovy&r1=904166&r2=904201&rev=904201&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/groovy/src/test/groovy/org/apache/sling/commons/json/groovy/JSONGroovyBuilderTest.groovy
(original)
+++
sling/trunk/bundles/extensions/groovy/src/test/groovy/org/apache/sling/extensions/groovy/json/JSONGroovyBuilderTest.groovy
Thu Jan 28 18:24:46 2010
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.commons.json.groovy;
+package org.apache.sling.extensions.groovy.json;
import org.apache.sling.commons.json.*;
-import org.apache.sling.commons.json.test.*;
+import json.JSONAssert;
/**
* Test of JSONGroovyBuilder.
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=904201&r1=904200&r2=904201&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Thu Jan 28 18:24:46
2010
@@ -198,6 +198,11 @@
<artifactId>org.apache.sling.jcr.webconsole</artifactId>
<version>1.0.0-SNAPSHOT</version>
</bundle>
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.extensions.groovy</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </bundle>
</startLevel>
<startLevel level="10">
Modified: sling/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=904201&r1=904200&r2=904201&view=diff
==============================================================================
--- sling/trunk/pom.xml (original)
+++ sling/trunk/pom.xml Thu Jan 28 18:24:46 2010
@@ -123,6 +123,7 @@
<module>bundles/extensions/threaddump</module>
<module>bundles/extensions/systemstatus</module>
<module>bundles/extensions/webconsolebranding</module>
+ <module>bundles/extensions/groovy</module>
<!-- Launchpad -->
<module>launchpad/base</module>
