You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2017/07/05 19:49:24 UTC

svn commit: r1800930 - in /commons/proper/jelly/trunk/jelly-tags: ./ bsf/ bsf/src/java/org/apache/commons/jelly/tags/bsf/ bsf/src/main/ bsf/src/main/java/ bsf/src/main/java/org/ bsf/src/main/java/org/apache/ bsf/src/main/java/org/apache/commons/ bsf/sr...

Author: oheger
Date: Wed Jul  5 19:49:23 2017
New Revision: 1800930

URL: http://svn.apache.org/viewvc?rev=1800930&view=rev
Log:
Added bsf tag lib to multi-module build.

Added:
    commons/proper/jelly/trunk/jelly-tags/bsf/pom.xml
      - copied, changed from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/project.xml
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java
      - copied, changed from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
      - copied, changed from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java
      - copied, changed from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JPythonTagLibrary.java
      - copied, changed from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JPythonTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JavaScriptTagLibrary.java
      - copied, changed from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JavaScriptTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java
      - copied, changed from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JythonTagLibrary.java
      - copied, changed from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JythonTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/PNutsTagLibrary.java
      - copied, changed from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/PNutsTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java
      - copied, changed from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/package.html
      - copied, changed from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/package.html
    commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/commons/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/bsf/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/bsf/example.jelly
      - copied, changed from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/test/org/apache/commons/jelly/tags/bsf/example.jelly
    commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/javascript/
    commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/javascript/example.jelly
      - copied, changed from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/test/org/apache/commons/jelly/tags/javascript/example.jelly
Removed:
    commons/proper/jelly/trunk/jelly-tags/bsf/build.xml
    commons/proper/jelly/trunk/jelly-tags/bsf/maven.xml
    commons/proper/jelly/trunk/jelly-tags/bsf/project.properties
    commons/proper/jelly/trunk/jelly-tags/bsf/project.xml
    commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JPythonTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JavaScriptTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JythonTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/PNutsTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java
    commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/package.html
    commons/proper/jelly/trunk/jelly-tags/bsf/src/test/org/apache/commons/jelly/tags/bsf/example.jelly
    commons/proper/jelly/trunk/jelly-tags/bsf/src/test/org/apache/commons/jelly/tags/javascript/example.jelly
Modified:
    commons/proper/jelly/trunk/jelly-tags/pom.xml

Copied: commons/proper/jelly/trunk/jelly-tags/bsf/pom.xml (from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/bsf/pom.xml?p2=commons/proper/jelly/trunk/jelly-tags/bsf/pom.xml&p1=commons/proper/jelly/trunk/jelly-tags/bsf/project.xml&r1=1800929&r2=1800930&rev=1800930&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/bsf/project.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/bsf/pom.xml Wed Jul  5 19:49:23 2017
@@ -15,44 +15,28 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project>
-  <extend>${basedir}/../tag-project.xml</extend>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>commons-jelly</groupId>
+    <artifactId>commons-jelly-tags</artifactId>
+    <version>1.1-SNAPSHOT</version>
+  </parent>
+
   <artifactId>commons-jelly-tags-bsf</artifactId>
+  <packaging>jar</packaging>
   <name>commons-jelly-tags-bsf</name>
-  <currentVersion>1.0.1-SNAPSHOT</currentVersion>
-  <package>org.apache.commons.jelly.tags.bsf</package>
+  <description>This is a Jelly interface for the Bean Scripting Framework.</description>
 
-  <description>
-      This is a Jelly interface for the Bean Scripting Framework
-  </description>
-  <shortDescription>Commons Jelly BSF Tag Library</shortDescription>
-  
-  <versions>
-    <version>
-      <id>1.0</id>
-      <name>1.0</name>
-      <tag>COMMONS_JELLY_BSF-1_0</tag>
-    </version>
-  </versions>
-    
   <dependencies>
-  
-    
-  
     <!-- START for compilation -->
     <dependency>
       <groupId>bsf</groupId>
       <artifactId>bsf</artifactId>
       <version>2.3.0</version>
-      <url>http://jakarta.apache.org/bsf</url>
-      <properties>
-        <gump.project>jakarta-bsf</gump.project>
-      </properties>
     </dependency>
-    <!-- END for compilation -->
-    
 
-    
+    <!-- END for compilation -->
   </dependencies>
-  
 </project>

Copied: commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java (from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java?p2=commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java&p1=commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java&r1=1800929&r2=1800930&rev=1800930&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java (from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java?p2=commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java&p1=commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java&r1=1800929&r2=1800930&rev=1800930&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java (from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java&r1=1800929&r2=1800930&rev=1800930&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JPythonTagLibrary.java (from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JPythonTagLibrary.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JPythonTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JPythonTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JPythonTagLibrary.java&r1=1800929&r2=1800930&rev=1800930&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JavaScriptTagLibrary.java (from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JavaScriptTagLibrary.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JavaScriptTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JavaScriptTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JavaScriptTagLibrary.java&r1=1800929&r2=1800930&rev=1800930&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java (from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java?p2=commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java&p1=commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java&r1=1800929&r2=1800930&rev=1800930&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JythonTagLibrary.java (from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JythonTagLibrary.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JythonTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JythonTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/JythonTagLibrary.java&r1=1800929&r2=1800930&rev=1800930&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/PNutsTagLibrary.java (from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/PNutsTagLibrary.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/PNutsTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/PNutsTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/PNutsTagLibrary.java&r1=1800929&r2=1800930&rev=1800930&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java (from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java?p2=commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java&p1=commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java&r1=1800929&r2=1800930&rev=1800930&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/package.html (from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/package.html)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/package.html?p2=commons/proper/jelly/trunk/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/package.html&p1=commons/proper/jelly/trunk/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/package.html&r1=1800929&r2=1800930&rev=1800930&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/bsf/example.jelly (from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/test/org/apache/commons/jelly/tags/bsf/example.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/bsf/example.jelly?p2=commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/bsf/example.jelly&p1=commons/proper/jelly/trunk/jelly-tags/bsf/src/test/org/apache/commons/jelly/tags/bsf/example.jelly&r1=1800929&r2=1800930&rev=1800930&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/javascript/example.jelly (from r1800929, commons/proper/jelly/trunk/jelly-tags/bsf/src/test/org/apache/commons/jelly/tags/javascript/example.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/javascript/example.jelly?p2=commons/proper/jelly/trunk/jelly-tags/bsf/src/test/resources/org/apache/commons/jelly/tags/javascript/example.jelly&p1=commons/proper/jelly/trunk/jelly-tags/bsf/src/test/org/apache/commons/jelly/tags/javascript/example.jelly&r1=1800929&r2=1800930&rev=1800930&view=diff
==============================================================================
    (empty)

Modified: commons/proper/jelly/trunk/jelly-tags/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/pom.xml?rev=1800930&r1=1800929&r2=1800930&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/pom.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/pom.xml Wed Jul  5 19:49:23 2017
@@ -20,6 +20,7 @@
     <module>bean</module>
     <module>beanshell</module>
     <module>betwixt</module>
+    <module>bsf</module>
     <module>junit</module>
     <module>log</module>
     <module>util</module>