You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2010/02/01 20:37:26 UTC

svn commit: r905388 [1/3] - in /sling/trunk/contrib/scripting/scala: config/ config/src/ config/src/main/ config/src/main/java/ config/src/main/java/org/ config/src/main/java/org/apache/ config/src/main/java/org/apache/sling/ config/src/main/java/org/a...

Author: cziegeler
Date: Mon Feb  1 19:37:24 2010
New Revision: 905388

URL: http://svn.apache.org/viewvc?rev=905388&view=rev
Log:
SLING-1274 : Make Scala Scripting JSR 223 compliant. Apply patch from Michael Dürig.

Added:
    sling/trunk/contrib/scripting/scala/config/
    sling/trunk/contrib/scripting/scala/config/LICENSE   (with props)
    sling/trunk/contrib/scripting/scala/config/NOTICE   (with props)
    sling/trunk/contrib/scripting/scala/config/README.txt   (with props)
    sling/trunk/contrib/scripting/scala/config/pom.xml   (with props)
    sling/trunk/contrib/scripting/scala/config/src/
    sling/trunk/contrib/scripting/scala/config/src/main/
    sling/trunk/contrib/scripting/scala/config/src/main/java/
    sling/trunk/contrib/scripting/scala/config/src/main/java/org/
    sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/
    sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/
    sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/
    sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/
    sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/
    sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingScriptInfo.java   (with props)
    sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingSettingsProvider.java   (with props)
    sling/trunk/contrib/scripting/scala/config/src/main/resources/
    sling/trunk/contrib/scripting/scala/config/src/main/resources/META-INF/
    sling/trunk/contrib/scripting/scala/config/src/main/resources/META-INF/LICENSE   (with props)
    sling/trunk/contrib/scripting/scala/config/src/main/resources/META-INF/NOTICE   (with props)
    sling/trunk/contrib/scripting/scala/script/
    sling/trunk/contrib/scripting/scala/script/LICENSE   (with props)
    sling/trunk/contrib/scripting/scala/script/NOTICE   (with props)
    sling/trunk/contrib/scripting/scala/script/README.txt   (with props)
    sling/trunk/contrib/scripting/scala/script/SCALA-LICENSE.txt   (with props)
    sling/trunk/contrib/scripting/scala/script/pom.xml   (with props)
    sling/trunk/contrib/scripting/scala/script/src/
    sling/trunk/contrib/scripting/scala/script/src/main/
    sling/trunk/contrib/scripting/scala/script/src/main/resources/
    sling/trunk/contrib/scripting/scala/script/src/main/resources/META-INF/
    sling/trunk/contrib/scripting/scala/script/src/main/resources/META-INF/LICENSE   (with props)
    sling/trunk/contrib/scripting/scala/script/src/main/resources/META-INF/NOTICE   (with props)
    sling/trunk/contrib/scripting/scala/script/src/main/resources/META-INF/SCALA-LICENSE.txt   (with props)
    sling/trunk/contrib/scripting/scala/script/src/main/resources/META-INF/services/
    sling/trunk/contrib/scripting/scala/script/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
    sling/trunk/contrib/scripting/scala/script/src/main/resources/OSGI-INF/
    sling/trunk/contrib/scripting/scala/script/src/main/resources/OSGI-INF/serviceComponents.xml   (with props)
    sling/trunk/contrib/scripting/scala/script/src/main/scala/
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/AbstractScriptInfo.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/AbstractSettingsProvider.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/BacklogReporter.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/BundleFS.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/JcrFS.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/LogReporter.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/ScalaScriptEngine.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/ScalaScriptEngineFactory.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/ScriptInfo.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/SettingsProvider.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/Utils.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/Bindings.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/InterpreterException.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaClasspath.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaCompiler.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaInterpreter.scala
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaSettings.scala
    sling/trunk/contrib/scripting/scala/script/src/test/
    sling/trunk/contrib/scripting/scala/script/src/test/scala/
    sling/trunk/contrib/scripting/scala/script/src/test/scala/org/
    sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/
    sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/
    sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/
    sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/
    sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/JcrFSTest.scala
    sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/ScalaScriptEngineFactoryTest.scala
    sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/
    sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/InterpreterHelper.scala
    sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/InterpreterTest.scala
    sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/InterpreterWithJcrTest.scala
    sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/Tests.scala
Removed:
    sling/trunk/contrib/scripting/scala/engine/LICENSE
    sling/trunk/contrib/scripting/scala/engine/NOTICE
    sling/trunk/contrib/scripting/scala/engine/README.txt
    sling/trunk/contrib/scripting/scala/engine/pom.xml
    sling/trunk/contrib/scripting/scala/engine/src/main/java/org/apache/sling/scripting/scala/engine/BacklogReporter.java
    sling/trunk/contrib/scripting/scala/engine/src/main/java/org/apache/sling/scripting/scala/engine/ExceptionHelper.java
    sling/trunk/contrib/scripting/scala/engine/src/main/java/org/apache/sling/scripting/scala/engine/LogReporter.java
    sling/trunk/contrib/scripting/scala/engine/src/main/java/org/apache/sling/scripting/scala/engine/ScalaScriptEngine.java
    sling/trunk/contrib/scripting/scala/engine/src/main/java/org/apache/sling/scripting/scala/engine/ScalaScriptEngineFactory.java
    sling/trunk/contrib/scripting/scala/engine/src/main/resources/META-INF/LICENSE
    sling/trunk/contrib/scripting/scala/engine/src/main/resources/META-INF/NOTICE
    sling/trunk/contrib/scripting/scala/engine/src/main/resources/META-INF/SCALA-LICENSE.txt
    sling/trunk/contrib/scripting/scala/engine/src/test/java/org/apache/sling/scripting/scala/ScalaScriptEngineFactoryTest.java
    sling/trunk/contrib/scripting/scala/engine/src/test/java/org/apache/sling/scripting/scala/ScalaScriptEngineTest.java
    sling/trunk/contrib/scripting/scala/engine/src/test/java/org/apache/sling/scripting/scala/ScalaTestBase.java
    sling/trunk/contrib/scripting/scala/engine/src/test/resources/scripts/simple.scs
    sling/trunk/contrib/scripting/scala/engine/src/test/test-config/jackrabbit-test-config.xml
    sling/trunk/contrib/scripting/scala/interpreter/LICENSE
    sling/trunk/contrib/scripting/scala/interpreter/NOTICE
    sling/trunk/contrib/scripting/scala/interpreter/README.txt
    sling/trunk/contrib/scripting/scala/interpreter/pom.xml
    sling/trunk/contrib/scripting/scala/interpreter/src/main/resources/META-INF/LICENSE
    sling/trunk/contrib/scripting/scala/interpreter/src/main/resources/META-INF/NOTICE
    sling/trunk/contrib/scripting/scala/interpreter/src/main/scala/org/apache/sling/scripting/scala/Utils.scala
    sling/trunk/contrib/scripting/scala/interpreter/src/main/scala/org/apache/sling/scripting/scala/interpreter/Bindings.scala
    sling/trunk/contrib/scripting/scala/interpreter/src/main/scala/org/apache/sling/scripting/scala/interpreter/BundleFS.scala
    sling/trunk/contrib/scripting/scala/interpreter/src/main/scala/org/apache/sling/scripting/scala/interpreter/InterpreterException.scala
    sling/trunk/contrib/scripting/scala/interpreter/src/main/scala/org/apache/sling/scripting/scala/interpreter/JcrFS.scala
    sling/trunk/contrib/scripting/scala/interpreter/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaClasspath.scala
    sling/trunk/contrib/scripting/scala/interpreter/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaCompiler.scala
    sling/trunk/contrib/scripting/scala/interpreter/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaInterpreter.scala
    sling/trunk/contrib/scripting/scala/interpreter/src/test/scala/org/apache/sling/scripting/scala/interpreter/InterpreterTest.scala
    sling/trunk/contrib/scripting/scala/interpreter/src/test/scala/org/apache/sling/scripting/scala/interpreter/JcrFSTest.scala

Added: sling/trunk/contrib/scripting/scala/config/LICENSE
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/config/LICENSE?rev=905388&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/scala/config/LICENSE (added)
+++ sling/trunk/contrib/scripting/scala/config/LICENSE Mon Feb  1 19:37:24 2010
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.

Propchange: sling/trunk/contrib/scripting/scala/config/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Added: sling/trunk/contrib/scripting/scala/config/NOTICE
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/config/NOTICE?rev=905388&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/scala/config/NOTICE (added)
+++ sling/trunk/contrib/scripting/scala/config/NOTICE Mon Feb  1 19:37:24 2010
@@ -0,0 +1,8 @@
+Apache Sling Scripting Scala Support
+Copyright 2009 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software developed at
+EPFL, Lausanne, Copyright 2002-2009 (http://www.scala-lang.org/).

Propchange: sling/trunk/contrib/scripting/scala/config/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Added: sling/trunk/contrib/scripting/scala/config/README.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/config/README.txt?rev=905388&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/scala/config/README.txt (added)
+++ sling/trunk/contrib/scripting/scala/config/README.txt Mon Feb  1 19:37:24 2010
@@ -0,0 +1,37 @@
+Apache Sling Scala Scripting Configuration
+
+Apache Sling specific configuration for the Scala Script Engine. To 
+enable Scala scripting for Sling, install this bundle along with the 
+following bundles:
+
+- org.apache.sling:org.apache.sling.scripting.scala.script
+- org.scala-lang-osgi:scala-compiler
+- org.scala-lang-osgi:scala-library
+
+The latter two bundles can be obtained from http://scala-tools.org/repo-releases/
+The former is part of Apache Sling. 
+  
+
+Getting Started
+===============
+
+This component uses a Maven 2 (http://maven.apache.org/) build
+environment. It requires a Java 5 JDK (or higher) and Maven (http://maven.apache.org/)
+2.2.1 or later. We recommend to use the latest Maven version.
+
+If you have Maven 2 installed, you can compile and
+package the jar using the following command:
+
+    mvn package
+
+See the Maven 2 documentation for other build features.
+
+The latest source code for this component is available in the
+Subversion (http://subversion.tigris.org/) source repository of
+the Apache Software Foundation. If you have Subversion installed,
+you can checkout the latest source using the following command:
+
+    svn checkout http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/scala/config/
+
+See the Subversion documentation for other source control features.
+

Propchange: sling/trunk/contrib/scripting/scala/config/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/contrib/scripting/scala/config/README.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: sling/trunk/contrib/scripting/scala/config/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: sling/trunk/contrib/scripting/scala/config/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/config/pom.xml?rev=905388&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/scala/config/pom.xml (added)
+++ sling/trunk/contrib/scripting/scala/config/pom.xml Mon Feb  1 19:37:24 2010
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>sling</artifactId>
+        <version>8</version>
+    </parent>
+
+    <artifactId>org.apache.sling.scripting.scala.config</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>Apache Sling Scala Scripting Configuration</name>
+    <description>
+        Apache Sling specific configuration for the Scala Script Engine.
+    </description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-eclipse-plugin</artifactId>
+                <configuration>
+                    <downloadSources>true</downloadSources>
+                    <classpathContainers>
+                        <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+                    </classpathContainers>
+                </configuration>
+            </plugin>     
+
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>                          
+
+            <plugin>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>maven-sling-plugin</artifactId>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Private-Package>
+                            org.apache.sling.scripting.scala.config.*
+                        </Private-Package>         
+                        <Import-Package>*</Import-Package>
+                    </instructions>                   
+                </configuration>
+            </plugin>  
+            
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.scripting.scala.script</artifactId>
+            <version>0.9.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.api</artifactId>
+            <version>2.0.8</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.scripting.api</artifactId>
+            <version>2.0.2-incubator</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.jcr.api</artifactId>
+            <version>2.0.2-incubator</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId> 
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId> 
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        
+    </dependencies>
+  
+</project>

Propchange: sling/trunk/contrib/scripting/scala/config/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/contrib/scripting/scala/config/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: sling/trunk/contrib/scripting/scala/config/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: 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=905388&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingScriptInfo.java (added)
+++ sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingScriptInfo.java Mon Feb  1 19:37:24 2010
@@ -0,0 +1,88 @@
+/*
+ * 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.scala.config;
+
+import static org.apache.sling.scripting.scala.Utils.makeIdentifier;
+
+import javax.script.ScriptContext;
+import javax.script.ScriptException;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.scripting.SlingBindings;
+import org.apache.sling.api.scripting.SlingScriptHelper;
+import org.apache.sling.scripting.scala.AbstractScriptInfo;
+import org.apache.sling.scripting.scala.ScriptInfo;
+
+/**
+ * This {@link ScriptInfo} implementation provides the script class name
+ * by retreiving it from the <code>ScriptContext</code>.
+ *
+ * @scr.component
+ * @scr.service
+ */
+public class SlingScriptInfo extends AbstractScriptInfo {
+
+    @Override
+    public String getScriptClass(String script, ScriptContext context) throws ScriptException {
+        SlingScriptHelper scriptHelper = getScriptHelper(context);
+
+        String path = getRelativePath(scriptHelper.getScript().getScriptResource());
+        if (path.endsWith(".scala")) {
+            path = path.substring(0, path.length() - 6);
+        }
+
+        String[] parts = path.split("/");
+        StringBuilder scriptName = new StringBuilder();
+        scriptName.append(makeIdentifier(parts[0]));
+        for (int k = 1; k < parts.length; k++) {
+            scriptName.append('.').append(makeIdentifier(parts[k]));
+        }
+
+        return scriptName.toString();
+    }
+
+    // -----------------------------------------------------< private >---
+
+    @SuppressWarnings("unchecked")
+    private static SlingScriptHelper getScriptHelper(ScriptContext context) throws ScriptException {
+        SlingBindings bindings = new SlingBindings();
+        bindings.putAll(context.getBindings(ScriptContext.ENGINE_SCOPE));
+        SlingScriptHelper scriptHelper = bindings.getSling();
+        if (scriptHelper == null) {
+            throw new ScriptException("Error retrieving Sling script helper from script context");
+        }
+        return scriptHelper;
+    }
+
+    private static String getRelativePath(Resource scriptResource) {
+        String path = scriptResource.getPath();
+        String[] searchPath = scriptResource.getResourceResolver().getSearchPath();
+
+        for (int i = 0; i < searchPath.length; i++) {
+            if (path.startsWith(searchPath[i])) {
+                path = path.substring(searchPath[i].length());
+                break;
+            }
+        }
+
+        if (path.startsWith("/")) {
+            path = path.substring(1);
+        }
+        return path;
+    }
+
+}

Propchange: sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingScriptInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingScriptInfo.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingScriptInfo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: 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=905388&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingSettingsProvider.java (added)
+++ sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingSettingsProvider.java Mon Feb  1 19:37:24 2010
@@ -0,0 +1,201 @@
+/*
+ * 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.scala.config;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Dictionary;
+
+import javax.jcr.Item;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.script.ScriptException;
+
+import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.scripting.scala.AbstractSettingsProvider;
+import org.apache.sling.scripting.scala.BundleFS;
+import org.apache.sling.scripting.scala.JcrFS;
+import org.apache.sling.scripting.scala.SettingsProvider;
+import org.apache.sling.scripting.scala.interpreter.ScalaSettings;
+import org.osgi.framework.Bundle;
+import org.osgi.service.component.ComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import scala.tools.nsc.Settings;
+import scala.tools.nsc.io.AbstractFile;
+import scala.tools.nsc.io.PlainFile;
+
+/**
+ * This {@link SettingsProvider} exposes the Scala compiler settings and the output
+ * directory to the Felix admin console. Furthermore it adds all classes of all bundles
+ * to the Scala compiler classpath.
+ *
+ * @scr.component
+ * @scr.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"
+     */
+    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."
+     */
+    public static final String OUT_DIR = "scala.compiler.outdir";
+    private String outDir;
+
+    private ComponentContext context;
+
+    /** @scr.reference */
+    private SlingRepository repository;
+    private Session session;
+
+    @Override
+    public Settings getSettings() {
+        ScalaSettings settings = new ScalaSettings();
+        settings.parse(this.settings);
+        Bundle[] bundles = context.getBundleContext().getBundles();
+        URL[] bootUrls = getBootUrls(bundles[0]);
+        StringBuilder bootPath = new StringBuilder(settings.classpath().v());
+        for (URL url : bootUrls) {
+            // bootUrls are sometimes null, at least when running integration
+            // tests with cargo-maven2-plugin
+            if(url != null) {
+                bootPath.append(PATH_SEPARATOR).append(url.getPath());
+            }
+        }
+        settings.classpath().v_$eq(bootPath.toString());
+        return settings;
+    }
+
+    @Override
+    public AbstractFile[] getClasspathX() {
+        Bundle[] bundles = context.getBundleContext().getBundles();
+        AbstractFile[] bundleFs = new AbstractFile[bundles.length];
+        for (int k = 0; k < bundles.length; k++) {
+            URL url = bundles[k].getResource("/");
+            if (url == null) {
+                url = bundles[k].getResource("");
+            }
+
+            if (url != null) {
+                if ("file".equals(url.getProtocol())) {
+                    try {
+                        bundleFs[k] = new PlainFile(new File(url.toURI()));
+                    }
+                    catch (URISyntaxException e) {
+                        throw (IllegalArgumentException) new IllegalArgumentException(
+                                "Can't determine url of bundle " + k).initCause(e);
+                    }
+                }
+                else {
+                    bundleFs[k] = BundleFS.create(bundles[k]);
+                }
+            }
+            else {
+                log.warn("Cannot retreive resources from Bundle {}. Skipping.", bundles[k].getSymbolicName());
+            }
+        }
+        return bundleFs;
+    }
+
+    // todo use ClassLoaderWriter instead of JcrFs
+    @Override
+    public AbstractFile getOutDir() throws ScriptException {
+        try {
+            if (session == null) {
+                session = repository.loginAdministrative(null);
+            }
+            Node node = deepCreateNode(outDir, session, "sling:Folder");
+            if (node == null) {
+                throw new ScriptException("Unable to create node " + outDir);
+            }
+            return JcrFS.create(node);
+        }
+        catch (RepositoryException e) {
+            throw (ScriptException) new ScriptException("Unable to create node " + outDir).initCause(e);
+        }
+    }
+
+    // -----------------------------------------------------< SCR integration >---
+
+    protected void activate(ComponentContext context) {
+        this.context = context;
+        Dictionary<?, ?> properties = context.getProperties();
+        outDir = (String) properties.get(OUT_DIR);
+        settings = (String) properties.get(SETTINGS);
+    }
+
+    protected void deactivate(ComponentContext context) {
+        if (session != null) {
+            session.logout();
+        }
+        this.context = null;
+    }
+
+    // -----------------------------------------------------< private >---
+
+    private static URL[] getBootUrls(Bundle bundle) {
+        ArrayList<URL> urls = new ArrayList<URL>();
+        ClassLoader classLoader = bundle.getClass().getClassLoader();
+        while (classLoader != null) {
+            if (classLoader instanceof URLClassLoader) {
+                urls.addAll(Arrays.asList(((URLClassLoader) classLoader).getURLs()));
+            }
+            classLoader = classLoader.getParent();
+        }
+
+        return urls.toArray(new URL[urls.size()]);
+    }
+
+    private Node deepCreateNode(String path, Session session, String nodeType) throws RepositoryException {
+        Node result = null;
+        if (session.itemExists(path)) {
+            Item it = session.getItem(path);
+            if(it.isNode()) {
+                result = (Node)it;
+            }
+        }
+        else {
+            int slashPos = path.lastIndexOf("/");
+            String parentPath = path.substring(0, slashPos);
+            String childPath = path.substring(slashPos + 1);
+            result = deepCreateNode(parentPath, session, nodeType).addNode(childPath, nodeType);
+            session.save();
+        }
+        return result;
+    }
+
+}

Propchange: sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingSettingsProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingSettingsProvider.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/contrib/scripting/scala/config/src/main/java/org/apache/sling/scripting/scala/config/SlingSettingsProvider.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: sling/trunk/contrib/scripting/scala/config/src/main/resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/config/src/main/resources/META-INF/LICENSE?rev=905388&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/scala/config/src/main/resources/META-INF/LICENSE (added)
+++ sling/trunk/contrib/scripting/scala/config/src/main/resources/META-INF/LICENSE Mon Feb  1 19:37:24 2010
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.

Propchange: sling/trunk/contrib/scripting/scala/config/src/main/resources/META-INF/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Added: sling/trunk/contrib/scripting/scala/config/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/config/src/main/resources/META-INF/NOTICE?rev=905388&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/scala/config/src/main/resources/META-INF/NOTICE (added)
+++ sling/trunk/contrib/scripting/scala/config/src/main/resources/META-INF/NOTICE Mon Feb  1 19:37:24 2010
@@ -0,0 +1,8 @@
+Apache Sling Scripting Scala Support
+Copyright 2009 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software developed at
+EPFL, Lausanne, Copyright 2002-2009 (http://www.scala-lang.org/).

Propchange: sling/trunk/contrib/scripting/scala/config/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Added: sling/trunk/contrib/scripting/scala/script/LICENSE
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/LICENSE?rev=905388&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/scala/script/LICENSE (added)
+++ sling/trunk/contrib/scripting/scala/script/LICENSE Mon Feb  1 19:37:24 2010
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.

Propchange: sling/trunk/contrib/scripting/scala/script/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Added: sling/trunk/contrib/scripting/scala/script/NOTICE
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/NOTICE?rev=905388&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/scala/script/NOTICE (added)
+++ sling/trunk/contrib/scripting/scala/script/NOTICE Mon Feb  1 19:37:24 2010
@@ -0,0 +1,5 @@
+Apache Sling Scala Interpreter
+Copyright 2009 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

Propchange: sling/trunk/contrib/scripting/scala/script/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Added: sling/trunk/contrib/scripting/scala/script/README.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/README.txt?rev=905388&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/scala/script/README.txt (added)
+++ sling/trunk/contrib/scripting/scala/script/README.txt Mon Feb  1 19:37:24 2010
@@ -0,0 +1,29 @@
+Scala Script Engine
+
+JSR 223 compliant Scala scripting engine. The scripting engine supports
+running in an OSGi container or as part of a stand alone application. 
+It has optional support for compiling from/to a JCR repository. 
+
+Getting Started
+===============
+
+This component uses a Maven 2 (http://maven.apache.org/) build
+environment. It requires a Java 5 JDK (or higher) and Maven (http://maven.apache.org/)
+2.2.1 or later. We recommend to use the latest Maven version.
+
+If you have Maven 2 installed, you can compile and
+package the jar using the following command:
+
+    mvn package
+
+See the Maven 2 documentation for other build features.
+
+The latest source code for this component is available in the
+Subversion (http://subversion.tigris.org/) source repository of
+the Apache Software Foundation. If you have Subversion installed,
+you can checkout the latest source using the following command:
+
+    svn checkout http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/scala/script/
+
+See the Subversion documentation for other source control features.
+

Propchange: sling/trunk/contrib/scripting/scala/script/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/contrib/scripting/scala/script/README.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: sling/trunk/contrib/scripting/scala/script/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: sling/trunk/contrib/scripting/scala/script/SCALA-LICENSE.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/SCALA-LICENSE.txt?rev=905388&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/scala/script/SCALA-LICENSE.txt (added)
+++ sling/trunk/contrib/scripting/scala/script/SCALA-LICENSE.txt Mon Feb  1 19:37:24 2010
@@ -0,0 +1,35 @@
+SCALA LICENSE
+
+Copyright (c) 2002-2008 EPFL, Lausanne, unless otherwise specified.
+All rights reserved.
+
+This software was developed by the Programming Methods Laboratory of the
+Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland.
+
+Permission to use, copy, modify, and distribute this software in source
+or binary form for any purpose with or without fee is hereby granted,
+provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+   3. Neither the name of the EPFL nor the names of its contributors
+      may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

Propchange: sling/trunk/contrib/scripting/scala/script/SCALA-LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/contrib/scripting/scala/script/SCALA-LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: sling/trunk/contrib/scripting/scala/script/SCALA-LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: sling/trunk/contrib/scripting/scala/script/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/pom.xml?rev=905388&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/scala/script/pom.xml (added)
+++ sling/trunk/contrib/scripting/scala/script/pom.xml Mon Feb  1 19:37:24 2010
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>sling</artifactId>
+        <version>8</version>
+    </parent>
+
+    <artifactId>org.apache.sling.scripting.scala.script</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>Scala Script Engine</name>
+    <description>
+        JSR 223 compliant Scala scripting engine. Supports OSGi and JCR.
+    </description>
+
+    <build>
+        <sourceDirectory>src/main/scala</sourceDirectory>
+        <testSourceDirectory>src/test/scala</testSourceDirectory>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.scala-tools</groupId>
+                <artifactId>maven-scala-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile</goal>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <scalaVersion>2.7.7</scalaVersion>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-eclipse-plugin</artifactId>
+                <configuration>
+                    <downloadSources>true</downloadSources>
+                    <downloadJavadocs>true</downloadJavadocs>
+                    <buildcommands>
+                        <buildcommand>ch.epfl.lamp.sdt.core.scalabuilder</buildcommand>
+                    </buildcommands>
+                    <projectnatures>
+                        <java.lang.String>ch.epfl.lamp.sdt.core.scalanature</java.lang.String>
+                        <java.lang.String>org.eclipse.jdt.core.javanature</java.lang.String>
+                    </projectnatures>
+                    <classpathContainers>
+                        <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+                        <classpathContainer>ch.epfl.lamp.sdt.launching.SCALA_CONTAINER</classpathContainer>
+                    </classpathContainers>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>org.apache.jackrabbit.repository.conf</name>
+                            <value>target/repository.xml</value>
+                        </property>
+                        <property>
+                            <name>org.apache.jackrabbit.repository.home</name>
+                            <value>target/repository</value>
+                        </property>
+                        <property>
+                            <name>derby.stream.error.file</name>
+                            <value>target/repository/derby.log</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <ScriptEngine-Name>${pom.name}</ScriptEngine-Name>
+                        <ScriptEngine-Version>${pom.version}</ScriptEngine-Version>
+                        <Export-Package>
+                            org.apache.sling.scripting.scala.*
+                        </Export-Package>
+                        <Import-Package>
+                            !javax.swing.*,
+                            !jline.*,
+                            javax.jcr.*;resolution:=optional,
+                            *
+                        </Import-Package>
+                        <DynamicImport-Package>*</DynamicImport-Package>
+                        <Service-Component>OSGI-INF/serviceComponents.xml</Service-Component>
+                    </instructions>                   
+                </configuration>
+            </plugin>  
+
+        </plugins>
+
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>2.7.7</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-compiler</artifactId>
+            <version>2.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.jcr</groupId>
+            <artifactId>jcr</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.bsf</groupId>
+            <artifactId>bsf-api</artifactId>
+            <version>3.0-beta2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>jackrabbit-core</artifactId>
+            <version>1.5.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <repositories>
+        <repository>
+            <id>scala-tools.org</id>
+            <name>Scala-Tools Maven2 Repository</name>
+            <url>http://scala-tools.org/repo-releases</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>scala-tools.org</id>
+            <name>Scala-Tools Maven2 Repository</name>
+            <url>http://scala-tools.org/repo-releases</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+</project>

Propchange: sling/trunk/contrib/scripting/scala/script/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/contrib/scripting/scala/script/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: sling/trunk/contrib/scripting/scala/script/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain