svn commit: r1800928 - in /commons/proper/jelly/trunk/jelly-tags: ./ beanshell/ beanshell/src/java/org/apache/commons/jelly/tags/beanshell/ beanshell/src/main/ beanshell/src/main/java/ beanshell/src/main/java/org/ beanshell/src/main/java/org/apache/ be...

[oh...@apache.org]

Author: oheger
Date: Wed Jul  5 19:48:25 2017
New Revision: 1800928

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

Added:
    commons/proper/jelly/trunk/jelly-tags/beanshell/pom.xml
      - copied, changed from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/project.xml
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java
      - copied, changed from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java
      - copied, changed from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellTagLibrary.java
      - copied, changed from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/JellyInterpreter.java
      - copied, changed from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/JellyInterpreter.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/ScriptTag.java
      - copied, changed from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/ScriptTag.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/package.html
      - copied, changed from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/package.html
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/apache/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/apache/commons/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java
      - copied, changed from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestJelly.java
      - copied, changed from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/TestJelly.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/resources/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/resources/org/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/resources/org/apache/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/resources/org/apache/commons/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/resources/org/apache/commons/jelly/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/resources/org/apache/commons/jelly/tags/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/resources/org/apache/commons/jelly/tags/beanshell/
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/resources/org/apache/commons/jelly/tags/beanshell/suite.jelly
      - copied, changed from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/suite.jelly
Removed:
    commons/proper/jelly/trunk/jelly-tags/beanshell/build.xml
    commons/proper/jelly/trunk/jelly-tags/beanshell/maven.xml
    commons/proper/jelly/trunk/jelly-tags/beanshell/project.properties
    commons/proper/jelly/trunk/jelly-tags/beanshell/project.xml
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/JellyInterpreter.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/ScriptTag.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/package.html
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/TestJelly.java
    commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/suite.jelly
Modified:
    commons/proper/jelly/trunk/jelly-tags/pom.xml

Copied: commons/proper/jelly/trunk/jelly-tags/beanshell/pom.xml (from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/beanshell/pom.xml?p2=commons/proper/jelly/trunk/jelly-tags/beanshell/pom.xml&p1=commons/proper/jelly/trunk/jelly-tags/beanshell/project.xml&r1=1800927&r2=1800928&rev=1800928&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/beanshell/project.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/beanshell/pom.xml Wed Jul  5 19:48:25 2017
@@ -15,51 +15,39 @@
   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-beanshell</artifactId>
+  <packaging>jar</packaging>
   <name>commons-jelly-tags-beanshell</name>
-  <currentVersion>1.0.1-SNAPSHOT</currentVersion>
-  <package>org.apache.commons.jelly.tags.beanshell</package>
+  <description>This is a Jelly interface for BeanShell.</description>
 
-  <description>
-      This is a Jelly interface for BeanShell.
-  </description>
-  <shortDescription>Commons Jelly BeanShell Tag Library</shortDescription>
-  
-  <versions>
-    <version>
-      <id>1.0</id>
-      <name>1.0</name>
-      <tag>COMMONS_JELLY_BEANSHELL-1_0</tag>
-    </version>
-  </versions>
-    
   <dependencies>
-  
-    
-  
     <!-- START for compilation -->
     <dependency>
       <artifactId>bsh</artifactId>
       <groupId>bsh</groupId>
       <version>2.0b1</version>
     </dependency>
-    
-    <!-- START for testing -->
+
+    <!-- END for compilation -->
+
+    <!-- START for test -->
 
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-junit</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
-      <url>http://commons.apache.org/jelly/libs/junit/</url>
-      <properties>
-        <scope>test</scope>
-      </properties>
+      <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
 
-    <!-- END for testing -->
-
+    <!-- END for test -->
   </dependencies>
-  
 </project>

Copied: commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java (from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java?p2=commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java&p1=commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java&r1=1800927&r2=1800928&rev=1800928&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java (from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java?p2=commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java&p1=commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java&r1=1800927&r2=1800928&rev=1800928&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellTagLibrary.java (from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellTagLibrary.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellTagLibrary.java&r1=1800927&r2=1800928&rev=1800928&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/JellyInterpreter.java (from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/JellyInterpreter.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/JellyInterpreter.java?p2=commons/proper/jelly/trunk/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/JellyInterpreter.java&p1=commons/proper/jelly/trunk/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/JellyInterpreter.java&r1=1800927&r2=1800928&rev=1800928&view=diff
==============================================================================
    (empty)

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

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

Copied: commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java (from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java?p2=commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java&p1=commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java&r1=1800927&r2=1800928&rev=1800928&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestJelly.java (from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/TestJelly.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestJelly.java?p2=commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestJelly.java&p1=commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/TestJelly.java&r1=1800927&r2=1800928&rev=1800928&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/resources/org/apache/commons/jelly/tags/beanshell/suite.jelly (from r1800927, commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/suite.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/resources/org/apache/commons/jelly/tags/beanshell/suite.jelly?p2=commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/resources/org/apache/commons/jelly/tags/beanshell/suite.jelly&p1=commons/proper/jelly/trunk/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/suite.jelly&r1=1800927&r2=1800928&rev=1800928&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=1800928&r1=1800927&r2=1800928&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/pom.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/pom.xml Wed Jul  5 19:48:25 2017
@@ -18,6 +18,7 @@
     <module>antlr</module>
     <module>avalon</module>
     <module>bean</module>
+    <module>beanshell</module>
     <module>junit</module>
     <module>log</module>
     <module>util</module>