Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@commons.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1800936 - in /commons/proper/jelly/trunk/jelly-tags: ./ jsl/
 jsl/src/java/org/apache/commons/jelly/tags/jsl/ jsl/src/main/
 jsl/src/main/java/ jsl/src/main/java/org/ jsl/src/main/java/org/apache/
 jsl/src/main/java/org/apache/commons/ jsl/sr...
Date: Wed, 05 Jul 2017 19:53:06 -0000
To: commits@commons.apache.org
From: oheger@apache.org
Message-Id: <20170705195306.1BD143A1970@svn01-us-west.apache.org>
archived-at: Wed, 05 Jul 2017 19:53:09 -0000

Author: oheger
Date: Wed Jul  5 19:53:05 2017
New Revision: 1800936

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

Added:
    commons/proper/jelly/trunk/jelly-tags/jsl/pom.xml
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JellyStylesheet.java
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/JellyStylesheet.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StyleTag.java
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StyleTag.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/package.html
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/package.html
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/apache/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/apache/commons/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/TestJSL.java
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/TestJSLSuite.java
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSLSuite.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/example.jelly
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/example.jelly
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/example2.jelly
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/example2.jelly
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/suite.jelly
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/test1.xml
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/test1.xml
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/test2.xml
      - copied, changed from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/test2.xml
Removed:
    commons/proper/jelly/trunk/jelly-tags/jsl/build.xml
    commons/proper/jelly/trunk/jelly-tags/jsl/maven.xml
    commons/proper/jelly/trunk/jelly-tags/jsl/project.properties
    commons/proper/jelly/trunk/jelly-tags/jsl/project.xml
    commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/JellyStylesheet.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StyleTag.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/package.html
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSLSuite.java
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/example.jelly
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/example2.jelly
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/test1.xml
    commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/test2.xml
Modified:
    commons/proper/jelly/trunk/jelly-tags/pom.xml

Added: commons/proper/jelly/trunk/jelly-tags/jsl/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/pom.xml?rev=1800936&view=auto
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/jsl/pom.xml (added)
+++ commons/proper/jelly/trunk/jelly-tags/jsl/pom.xml Wed Jul  5 19:53:05 2017
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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 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-jsl</artifactId>
+  <packaging>jar</packaging>
+  <name>commons-jelly-tags-jsl</name>
+  <description>The Jelly Stylesheet Library (JSL).</description>
+
+  <dependencies>
+    <!-- START for compilation -->
+    <dependency>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly-tags-xml</artifactId>
+      <version>1.2-SNAPSHOT</version>
+    </dependency>
+
+    <!-- END for compilation -->
+
+    <!-- START for testing -->
+
+    <dependency>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly-tags-ant</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly-tags-junit</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly-tags-log</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- END for testing -->
+
+    <!-- Start for running demos -->
+
+    <dependency>
+      <artifactId>commons-cli</artifactId>
+      <groupId>commons-cli</groupId>
+      <version>1.0</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- END for running demos -->
+  </dependencies>
+</project>

Copied: commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java (from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java?p2=commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java&p1=commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java&r1=1800935&r2=1800936&rev=1800936&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java (from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java&r1=1800935&r2=1800936&rev=1800936&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JellyStylesheet.java (from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/JellyStylesheet.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JellyStylesheet.java?p2=commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JellyStylesheet.java&p1=commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/JellyStylesheet.java&r1=1800935&r2=1800936&rev=1800936&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StyleTag.java (from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StyleTag.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StyleTag.java?p2=commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StyleTag.java&p1=commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StyleTag.java&r1=1800935&r2=1800936&rev=1800936&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java (from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java?p2=commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java&p1=commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java&r1=1800935&r2=1800936&rev=1800936&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java (from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java?p2=commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java&p1=commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java&r1=1800935&r2=1800936&rev=1800936&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java (from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java?p2=commons/proper/jelly/trunk/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java&p1=commons/proper/jelly/trunk/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java&r1=1800935&r2=1800936&rev=1800936&view=diff
==============================================================================
    (empty)

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

Copied: commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/TestJSL.java (from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/TestJSL.java?p2=commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/TestJSL.java&p1=commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java&r1=1800935&r2=1800936&rev=1800936&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java (original)
+++ commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/TestJSL.java Wed Jul  5 19:53:05 2017
@@ -60,7 +60,7 @@ public class TestJSL extends TestCase {
     }
 
     public void testExample1() throws Exception {
-        Document document = runScript( "src/test/org/apache/commons/jelly/jsl/example.jelly" );
+        Document document = runScript( "target/test-classes/org/apache/commons/jelly/jsl/example.jelly" );
         Element small = (Element) document.selectSingleNode("/html/body/small");
 
         //assertTrue( "<small> starts with 'James Elson'", small.getText().trim().startsWith("James Elson") );

Copied: commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/TestJSLSuite.java (from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSLSuite.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/TestJSLSuite.java?p2=commons/proper/jelly/trunk/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/TestJSLSuite.java&p1=commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSLSuite.java&r1=1800935&r2=1800936&rev=1800936&view=diff
==============================================================================
    (empty)

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

Copied: commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/example2.jelly (from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/example2.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/example2.jelly?p2=commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/example2.jelly&p1=commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/example2.jelly&r1=1800935&r2=1800936&rev=1800936&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/suite.jelly (from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/suite.jelly?p2=commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/suite.jelly&p1=commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly&r1=1800935&r2=1800936&rev=1800936&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly (original)
+++ commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/suite.jelly Wed Jul  5 19:53:05 2017
@@ -6,20 +6,20 @@
   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.
 -->
-<test:suite xmlns:j="jelly:core" 
+<test:suite xmlns:j="jelly:core"
             xmlns:jsl="jelly:jsl"
             xmlns:m="jelly:ant"
-            xmlns:test="jelly:junit" 
-            xmlns:u="jelly:util" 
+            xmlns:test="jelly:junit"
+            xmlns:u="jelly:util"
             xmlns:x="jelly:xml"
             xmlns:log="jelly:log">
 
@@ -28,19 +28,19 @@
         <log:info>
             <!-- see if we can break template -->
             <m:fileScanner var="files">
-                <m:fileset dir="src/test/org/apache/commons/jelly/jsl">
+                <m:fileset dir="target/test-classes/org/apache/commons/jelly/jsl">
                     <m:patternset>
                         <m:include name="**/*.xml"/>
                     </m:patternset>
                 </m:fileset>
             </m:fileScanner>
-    
+
             <!-- Remove constantly failing test from suite
             <j:forEach var="file" items="${files.iterator()}">
                 <x:parse var="doc" xml="${file.toURL()}" />
                 <jsl:stylesheet select="$doc">
                     <jsl:template match="document" trim="no">
-    
+
                         <h>
                             <j:set var="full"><x:expr select="$doc/document/properties/title"/></j:set>
                             <j:set var="short"><x:expr select="./properties/title" /></j:set>
@@ -50,15 +50,15 @@
                         </h>
                     </jsl:template>
                 </jsl:stylesheet>
-    
+
             </j:forEach>
             -->
-    
+
             <!-- test stylesheet external to loop -->
             <jsl:stylesheet var="ss1">
                 <jsl:template match="document" trim="no">
                     <h>
-    
+
                         <j:set var="full"><x:expr select="$doc/document/properties/title"/></j:set>
                         <j:set var="short"><x:expr select="./properties/title" /></j:set>
                         <m:echo>full=${full},short=${short}</m:echo>
@@ -66,20 +66,20 @@
                     </h>
                 </jsl:template>
             </jsl:stylesheet>
-    
+
             <j:forEach var="file" items="${files.iterator()}">
                 <x:parse var="doc" xml="${file.toURL()}" />
                 <jsl:style stylesheet="${ss1}" select="$doc" />
             </j:forEach>
-        </log:info>            
-  </test:case>  
+        </log:info>
+  </test:case>
 
 
     <test:case name="testStylesheetReuse" xmlns="dummy">
-        
+
     <!-- see if we can break template -->
     <m:fileScanner var="files">
-      <m:fileset dir="src/test/org/apache/commons/jelly/jsl">
+      <m:fileset dir="target/test-classes/org/apache/commons/jelly/jsl">
         <m:patternset>
           <m:include name="**/*.xml"/>
         </m:patternset>
@@ -102,7 +102,7 @@
       <x:parse var="doc" xml="${file.toURL()}" />
       <jsl:style stylesheet="${myStylesheet}"/>
     </j:forEach>
-  </test:case>  
+  </test:case>
 
 
     <test:case name="testRelativeXPaths">
@@ -116,47 +116,47 @@
                     <properties><title>value ${i}</title></properties>
                 </document>
             </x:parse>
-        
+
             <jsl:stylesheet select="$doc">
                 <jsl:template match="document">
                     <log:info>Found document with ID <x:expr select="./@id"/> title <x:expr select="./properties/title"/></log:info>
 
                     <j:set var="title"><x:expr select="./properties/title"/></j:set>
                     <test:assertEquals expected="value ${i}" actual="${title}"/>
-                    
+
                     <j:set var="title"><x:expr select="$doc/document/properties/title"/></j:set>
                     <test:assertEquals expected="value ${i}" actual="${title}"/>
-                    
-                    
+
+
                     <j:set var="id"><x:expr select="./@id"/></j:set>
                     <test:assert test="${id == i}"/>
-                    
+
                     <test:assert xpath="a[@x = '1']"/>
-                    
+
 										<j:set var="i" value="${i.toString()}"/>
 										<test:assert xpath="@id = $i"/>
-                    
+
                     <jsl:applyTemplates/>
                 </jsl:template>
-    
+
                 <jsl:template match="a">
-                    <test:assert xpath="@x='1'"/>                
+                    <test:assert xpath="@x='1'"/>
                     <jsl:applyTemplates/>
                 </jsl:template>
-    
+
                 <jsl:template match="b">
-                    <test:assert xpath="@y='123'"/>                
+                    <test:assert xpath="@y='123'"/>
                     <jsl:applyTemplates/>
                 </jsl:template>
 
 
                 <jsl:template match="@*"/>
             </jsl:stylesheet>
-        </j:forEach>      
-        
-  </test:case>  
-  
-  <!-- 
+        </j:forEach>
+
+  </test:case>
+
+  <!--
     test case to test that the xml output for a stylesheet template is
     'remembered' when using applyTemplates
    -->
@@ -167,7 +167,7 @@
       </element1>
     </x:parse>
 
-    <!-- stylesheet with embedded set -->    
+    <!-- stylesheet with embedded set -->
     <jsl:stylesheet var="contextStyleSheet">
       <jsl:template match="element1">
         <j:set var="contextText">El1<jsl:applyTemplates /></j:set>
@@ -182,10 +182,10 @@
     </log:info>
 
     <m:echo>text is '${contextText}'</m:echo>
-    
+
     <test:assertEquals expected="El1SomeText" actual="${contextText}" />
   </test:case>
-  
+
   <test:case name="testXMLContextKept2" xmlns="dummy">
     <x:parse var="testDoc">
       <element1>
@@ -193,7 +193,7 @@
       </element1>
     </x:parse>
 
-    <!-- stylesheet with embedded set and text() rule -->    
+    <!-- stylesheet with embedded set and text() rule -->
     <jsl:stylesheet var="contextStyleSheet">
       <jsl:template match="element1">
         <j:set var="contextText">El1<jsl:applyTemplates /></j:set>
@@ -209,10 +209,10 @@
     </log:info>
 
     <m:echo>text is '${contextText}'</m:echo>
-    
+
     <test:assertEquals expected="El1SomeText" actual="${contextText}" />
   </test:case>
-  
+
   <test:case name="testXMLContextKept3" xmlns="dummy">
     <x:parse var="testDoc">
       <element1>
@@ -228,10 +228,10 @@
     <j:set var="contextText"><jsl:style stylesheet="${contextStyleSheet}" select="$testDoc"/></j:set>
 
     <m:echo>text is '${contextText}'</m:echo>
-    
+
     <test:assertEquals expected="El1SomeText" actual="${contextText}" />
-  </test:case>  
-  
+  </test:case>
+
   <test:case name="testXMLContextCDATA" xmlns="dummy">
     <x:parse var="testDoc">
       <element1>
@@ -247,10 +247,10 @@
     <j:set var="contextText"><jsl:style stylesheet="${contextStyleSheet}" select="$testDoc"/></j:set>
 
     <m:echo>text is '${contextText}'</m:echo>
-    
+
     <test:assertEquals expected="El1SomeText" actual="${contextText}" />
-  </test:case>  
-  
+  </test:case>
+
   <test:case name="testXMLContextCDATA2" xmlns="dummy">
     <x:parse var="testDoc">
       <element1>
@@ -268,10 +268,10 @@
     <j:set var="contextText"><jsl:style stylesheet="${contextStyleSheet}" select="$testDoc"/></j:set>
 
     <m:echo>text is '${contextText}'</m:echo>
-    
+
     <test:assertEquals expected="El1CDATA2CDATA3" actual="${contextText}" />
-  </test:case>  
-  
+  </test:case>
+
   <test:case name="testModeBug" xmlns="dummy">
     <x:parse var="testDoc">
       <menu>
@@ -279,17 +279,17 @@
         <item />
       </menu>
     </x:parse>
-    
+
     <jsl:stylesheet var="modeStyleSheet">
       <jsl:template match="menu"><jsl:applyTemplates mode="bbb"/></jsl:template>
 	  <jsl:template match="item">No mode</jsl:template>
 	  <jsl:template match="item" trim="false" mode="bbb">BBB</jsl:template>
     </jsl:stylesheet>
-    
+
     <j:set var="modeText"><jsl:style stylesheet="${modeStyleSheet}" select="$testDoc"/></j:set>
 
     <m:echo>text is '${modeText}'</m:echo>
-    
+
     <test:assertEquals expected="BBBBBB" actual="${modeText}" />
   </test:case>
 </test:suite>

Copied: commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/test1.xml (from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/test1.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/test1.xml?p2=commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/test1.xml&p1=commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/test1.xml&r1=1800935&r2=1800936&rev=1800936&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/test2.xml (from r1800935, commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/test2.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/test2.xml?p2=commons/proper/jelly/trunk/jelly-tags/jsl/src/test/resources/org/apache/commons/jelly/jsl/test2.xml&p1=commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/test2.xml&r1=1800935&r2=1800936&rev=1800936&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=1800936&r1=1800935&r2=1800936&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/pom.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/pom.xml Wed Jul  5 19:53:05 2017
@@ -25,6 +25,7 @@
     <module>dynabean</module>
     <module>email</module>
     <module>fmt</module>
+    <module>jsl</module>
     <module>junit</module>
     <module>log</module>
     <module>util</module>