Added xml tag lib to multi-module build.
Some unit tests were failing (due to a different order of
attribute generation) and had to be reworked.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jelly/trunk@1800932 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jelly-tags/pom.xml b/jelly-tags/pom.xml
index ffd3a4b..36ec095 100644
--- a/jelly-tags/pom.xml
+++ b/jelly-tags/pom.xml
@@ -25,6 +25,7 @@
<module>junit</module>
<module>log</module>
<module>util</module>
+ <module>xml</module>
</modules>
<build>
diff --git a/jelly-tags/xml/build.xml b/jelly-tags/xml/build.xml
deleted file mode 100644
index 0778ebc..0000000
--- a/jelly-tags/xml/build.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.0-SNAPSHOT
- on date May 24 2004, time 2301-->
-<project default="jar" name="commons-jelly-tags-xml" basedir=".">
- <property name="defaulttargetdir" value="target">
- </property>
- <property name="libdir" value="target/lib">
- </property>
- <property name="classesdir" value="target/classes">
- </property>
- <property name="testclassesdir" value="target/test-classes">
- </property>
- <property name="testreportdir" value="target/test-reports">
- </property>
- <property name="distdir" value="dist">
- </property>
- <property name="javadocdir" value="dist/docs/api">
- </property>
- <property name="final.name" value="commons-jelly-tags-xml-1.0-SNAPSHOT">
- </property>
- <target name="init" description="o Initializes some properties">
- <mkdir dir="${libdir}">
- </mkdir>
- <condition property="noget">
- <equals arg2="only" arg1="${build.sysclasspath}">
- </equals>
- </condition>
- </target>
- <target name="compile" description="o Compile the code" depends="get-deps">
- <mkdir dir="${classesdir}">
- </mkdir>
- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
- <src>
- <pathelement location="src/java">
- </pathelement>
- </src>
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- </classpath>
- </javac>
- <copy todir="${classesdir}">
- <fileset dir="src/java">
- <include name="**/*.properties">
- </include>
- </fileset>
- </copy>
- <copy todir="${testclassesdir}">
- <fileset dir="src/test">
- <include name="**/*.jelly">
- </include>
- <include name="**/*.xml">
- </include>
- <include name="**/*.xsl">
- </include>
- <include name="**/*.rng">
- </include>
- <include name="**/*.dtd">
- </include>
- <include name="**/*.properties">
- </include>
- <include name="**/*.html">
- </include>
- </fileset>
- </copy>
- </target>
- <target name="jar" description="o Create the jar" depends="compile,test">
- <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
- </jar>
- </target>
- <target name="clean" description="o Clean up the generated directories">
- <delete dir="${defaulttargetdir}">
- </delete>
- <delete dir="${distdir}">
- </delete>
- </target>
- <target name="dist" description="o Create a distribution" depends="jar, javadoc">
- <mkdir dir="dist">
- </mkdir>
- <copy todir="dist">
- <fileset dir="${defaulttargetdir}" includes="*.jar">
- </fileset>
- <fileset dir="${basedir}" includes="LICENSE*, README*">
- </fileset>
- </copy>
- </target>
- <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
- <fail message="There were test failures.">
- </fail>
- </target>
- <target name="internal-test" depends="compile-tests">
- <mkdir dir="${testreportdir}">
- </mkdir>
- <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
- <sysproperty key="basedir" value=".">
- </sysproperty>
- <formatter type="xml">
- </formatter>
- <formatter usefile="false" type="plain">
- </formatter>
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement path="${testclassesdir}">
- </pathelement>
- <pathelement path="${classesdir}">
- </pathelement>
- </classpath>
- <batchtest todir="${testreportdir}">
- <fileset dir="src/test">
- <include name="**/Test*.java">
- </include>
- </fileset>
- </batchtest>
- </junit>
- </target>
- <target name="compile-tests" depends="compile">
- <mkdir dir="${testclassesdir}">
- </mkdir>
- <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
- <src>
- <pathelement location="src/test">
- </pathelement>
- </src>
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement path="${classesdir}">
- </pathelement>
- </classpath>
- </javac>
- </target>
- <target name="javadoc" description="o Generate javadoc" depends="jar">
- <mkdir dir="${javadocdir}">
- </mkdir>
- <tstamp>
- <format pattern="2002-yyyy" property="year">
- </format>
- </tstamp>
- <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved.">
- </property>
- <property name="title" value="commons-jelly-tags-xml 1.0-SNAPSHOT API">
- </property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.jelly.tags.xml.*">
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement location="target/${final.name}.jar">
- </pathelement>
- </classpath>
- </javadoc>
- </target>
- <target name="get-deps" unless="noget" depends="init">
- <get dest="${libdir}/commons-jelly-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-SNAPSHOT.jar">
- </get>
- <get dest="${libdir}/xalan-2.3.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xalan/jars/xalan-2.3.1.jar">
- </get>
- <get dest="${libdir}/commons-jelly-tags-junit-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-junit-SNAPSHOT.jar">
- </get>
- <get dest="${libdir}/commons-jexl-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jexl/jars/commons-jexl-SNAPSHOT.jar">
- </get>
- <get dest="${libdir}/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar">
- </get>
- <get dest="${libdir}/commons-beanutils-1.6.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.6.jar">
- </get>
- <get dest="${libdir}/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar">
- </get>
- <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar">
- </get>
- <get dest="${libdir}/dom4j-1.5-beta-2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dom4j/jars/dom4j-1.5-beta-2.jar">
- </get>
- <get dest="${libdir}/jaxen-1.1-beta-2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jaxen/jars/jaxen-1.1-beta-2.jar">
- </get>
- <get dest="${libdir}/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.2.1.jar">
- </get>
- <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
- </get>
- <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
- </get>
- <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
- </get>
- </target>
- <target name="install-maven">
- <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
- </get>
- <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
- </unjar>
- </target>
-</project>
\ No newline at end of file
diff --git a/jelly-tags/xml/maven.xml b/jelly-tags/xml/maven.xml
deleted file mode 100644
index 7e21f6d..0000000
--- a/jelly-tags/xml/maven.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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 default="java:jar">
-
-</project>
diff --git a/jelly-tags/xml/project.xml b/jelly-tags/xml/pom.xml
similarity index 61%
rename from jelly-tags/xml/project.xml
rename to jelly-tags/xml/pom.xml
index b498bc6..52378e1 100644
--- a/jelly-tags/xml/project.xml
+++ b/jelly-tags/xml/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -7,58 +6,52 @@
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
-
+
+ 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>
-<project>
- <extend>${basedir}/../tag-project.xml</extend>
<artifactId>commons-jelly-tags-xml</artifactId>
+ <packaging>jar</packaging>
+ <version>1.2-SNAPSHOT</version>
<name>commons-jelly-tags-xml</name>
- <currentVersion>1.2-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.xml</package>
- <description>The Jelly XML Tag Library</description>
- <shortDescription>Commons Jelly XML Tag Library</shortDescription>
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS_JELLY_XML-1_0</tag>
- </version>
- <version>
- <id>1.1</id>
- <name>1.1</name>
- <tag>commons-jelly-tags-xml-1.1</tag>
- </version>
- </versions>
+ <description>The Jelly XML Tag Library.</description>
+
<dependencies>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
-
- <!-- run time / in testing-->
+ <!-- START for runtime / testing -->
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.3.1</version>
+ <scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-junit</artifactId>
- <version>1.0</version>
- <url>http://commons.apache.org/jelly/libs/junit/</url>
- <properties>
- <scope>test</scope>
- </properties>
+ <version>1.1-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
+
+ <!-- END for runtime / testing -->
</dependencies>
</project>
diff --git a/jelly-tags/xml/project.properties b/jelly-tags/xml/project.properties
deleted file mode 100644
index 5bbed47..0000000
--- a/jelly-tags/xml/project.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# 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.
-
-# -------------------------------------------------------------------
-# P R O J E C T P R O P E R T I E S
-# -------------------------------------------------------------------
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/AttributeTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/AttributeTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/AttributeTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/AttributeTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/CommentTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CommentTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/CommentTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CommentTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/CopyOfTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CopyOfTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/CopyOfTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CopyOfTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/CopyTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CopyTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/CopyTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CopyTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/DoctypeTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/DoctypeTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/DoctypeTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/DoctypeTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ElementTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ElementTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ElementTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ElementTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ExprTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ExprTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ExprTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ExprTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ForEachTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ForEachTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ForEachTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ForEachTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/IfTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/IfTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/IfTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/IfTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParamTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParamTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParamTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParamTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParseTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParseTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParseTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParseTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParseTagSupport.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParseTagSupport.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParseTagSupport.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParseTagSupport.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ReplaceNamespaceTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ReplaceNamespaceTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ReplaceNamespaceTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ReplaceNamespaceTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SortTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SortTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SortTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SortTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/TransformTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/TransformTag.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/TransformTag.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/TransformTag.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/XMLTagLibrary.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/XMLTagLibrary.java
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/XMLTagLibrary.java
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/XMLTagLibrary.java
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/package.html b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/package.html
similarity index 100%
rename from jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/package.html
rename to jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/package.html
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestImport.java b/jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestImport.java
similarity index 92%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestImport.java
rename to jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestImport.java
index 8d6de8d..c89536d 100644
--- a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestImport.java
+++ b/jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestImport.java
@@ -34,7 +34,7 @@
* Test that compiled scripts can access resources
*/
public class TestImport extends TestCase {
-
+
private String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ "<html xmlns=\"http://www.w3.org/TR/xhtml1/strict\" "
+ "xmlns=\"http://www.w3.org/TR/xhtml1/strict\">"
@@ -43,10 +43,10 @@
public TestImport(String name) {
super(name);
}
-
+
public void testImportResources() throws JellyException, UnsupportedEncodingException, IOException {
JellyContext context = new JellyContext();
- URL url = TestImport.class.getResource("/resources/import.jelly");
+ URL url = TestImport.class.getResource("/import.jelly");
StringWriter writer = new StringWriter();
XMLOutput out = XMLOutput.createXMLOutput(writer);
// this works because of the created child context that has knowledge
@@ -58,7 +58,7 @@
public void testImportResourcesCompiled() throws JellyException, UnsupportedEncodingException, IOException {
JellyContext context = new JellyContext();
- URL url = TestImport.class.getResource("/resources/import.jelly");
+ URL url = TestImport.class.getResource("/import.jelly");
StringWriter writer = new StringWriter();
XMLOutput out = XMLOutput.createXMLOutput(writer);
Script script = context.compileScript(url);
@@ -69,7 +69,7 @@
public void testImportResourcesFromUncompiledScript() throws JellyException, UnsupportedEncodingException, IOException, SAXException {
JellyContext context = new JellyContext();
- URL url = TestImport.class.getResource("/resources/import.jelly");
+ URL url = TestImport.class.getResource("/import.jelly");
StringWriter writer = new StringWriter();
XMLOutput out = XMLOutput.createXMLOutput(writer);
Script script = new XMLParser().parse(url);
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestJelly.java b/jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestJelly.java
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestJelly.java
rename to jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestJelly.java
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestParser.java b/jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestParser.java
similarity index 96%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestParser.java
rename to jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestParser.java
index baefd7f..ba1e97e 100644
--- a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestParser.java
+++ b/jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestParser.java
@@ -61,7 +61,7 @@
* relationships
*/
public void testParser() throws Exception {
- InputStream in = new FileInputStream("src/test/org/apache/commons/jelly/tags/xml/example2.jelly");
+ InputStream in = new FileInputStream("target/test-classes/org/apache/commons/jelly/tags/xml/example2.jelly");
XMLParser parser = new XMLParser();
Script script = parser.parse(in);
script = script.compile();
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestXMLTags.java b/jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestXMLTags.java
similarity index 75%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestXMLTags.java
rename to jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestXMLTags.java
index fe7d381..7abd733 100644
--- a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestXMLTags.java
+++ b/jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestXMLTags.java
@@ -25,6 +25,8 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import junit.framework.Assert;
import junit.framework.Test;
@@ -56,7 +58,10 @@
private static final Log log = LogFactory.getLog(TestXMLTags.class);
/** basedir for test source */
- private static final String testBaseDir ="src/test/org/apache/commons/jelly/tags/xml";
+ private static final String testBaseDir ="target/test-classes/org/apache/commons/jelly/tags/xml";
+
+ /** Regular expression for multiple namespace attributes. */
+ private static final String REG_NS = "( xmlns(:(\\w)+)?=\".+\")+";
public static void main(String[] args) {
TestRunner.run(suite());
@@ -66,6 +71,54 @@
return new TestSuite(TestXMLTags.class);
}
+ /**
+ * Returns a matcher for a namespace XML fragment.
+ * @param s the fragment to be checked
+ * @param pre the part before the namespace expression
+ * @param post the part after the namespace expression
+ * @return the matcher
+ */
+ private static Matcher matcherForNamespaceFragment(String s, String pre, String post) {
+ Pattern pattern = Pattern.compile(Pattern.quote(pre) + REG_NS + Pattern.quote(post));
+ return pattern.matcher(s);
+ }
+
+ /**
+ * Checks an XML fragment with a namespace expression. Namespaces are
+ * generated in arbitrary order. Therefore, they cannot be checked
+ * directly.
+ * @param s the fragment to be checked
+ * @param pre the part before the namespace expression
+ * @param post the part after the namespace expression
+ * @return the extracted namespace expression
+ */
+ private static String checkNamespaceFragment(String s, String pre, String post) {
+ Matcher matcher = matcherForNamespaceFragment(s, pre, post);
+ assertTrue("Pattern '" + pre + REG_NS + post + "' does not match " + s,
+ matcher.matches());
+ return matcher.group(1);
+ }
+
+ /**
+ * Tries to find a fragment with the specified namespaces in the given
+ * string.
+ * @param s the string
+ * @param pre the part before the namespace expression
+ * @param post the part after the namespace expression
+ * @param ns the namespaces to be matched in the fragment
+ */
+ private static void findNamespaceFragment(String s, String pre, String post,
+ String... ns) {
+ Matcher matcher = matcherForNamespaceFragment(s, pre, post);
+ assertTrue("Pattern '" + pre + REG_NS + post + "' does not match " + s,
+ matcher.find());
+ String match = matcher.group(1);
+ for (String namespace : ns) {
+ assertTrue("Namespace '" + namespace + "' not found in '" + match + "':",
+ match.contains(namespace));
+ }
+ }
+
public TestXMLTags(String testName) {
super(testName);
}
@@ -128,27 +181,16 @@
text = evaluateScriptAsText(testBaseDir + "/namespaceReplace.jelly", ctxVars);
- String firstTrunk =
- "<test-subnode xmlns=\"\" attr=\"test\">" +
- "<test-anotherSubNode>" +
- "</test-anotherSubNode>" +
- "<test-anotherSubNodeAgain xmlns:other=\"http://java/ns\" xmlns=\"http://java/ns\" other:abc=\"testValue\">" +
- "</test-anotherSubNodeAgain>" +
- "</test-subnode>";
-
- String secondTrunk =
- "<test-subnode attr=\"test\">" +
- "<test-anotherSubNode>" +
- "</test-anotherSubNode>" +
- "<test-anotherSubNodeAgain xmlns:other=\"http://java/ns\" other:abc=\"testValue\">" +
- "</test-anotherSubNodeAgain>" +
- "</test-subnode>";
-
- System.out.println("TestXMLTags.testNamespaceReplace() text="+text);
- assertEquals("Should produce the correct output",
- "<test-node xmlns:test=\"http://apache/testNS\" xmlns=\"http://java/ns\" test:abc=\"testValue\">"+
- firstTrunk + secondTrunk +
- "</test-node>", text);
+ findNamespaceFragment(text,
+ "<test-subnode xmlns=\"\" attr=\"test\">"
+ + "<test-anotherSubNode>" + "</test-anotherSubNode>"
+ + "<test-anotherSubNodeAgain",
+ " other:abc=\"testValue\">" + "</test-anotherSubNodeAgain>"
+ + "</test-subnode>" + "<test-subnode attr=\"test\">"
+ + "<test-anotherSubNode>" + "</test-anotherSubNode>"
+ + "<test-anotherSubNodeAgain xmlns:other=\"http://java/ns\" other:abc=\"testValue\">"
+ + "</test-anotherSubNodeAgain>" + "</test-subnode>",
+ "xmlns:other=\"http://java/ns\"", "xmlns=\"http://java/ns\"");
}
public void testAttributeNameSpaceDuplicatedNS() throws Exception {
@@ -163,27 +205,29 @@
public void testAttributeNameSpace() throws Exception {
String text = evaluateScriptAsText(testBaseDir + "/attributeNameSpace.jelly");
System.out.println(text);
- assertEquals("Should produce the correct output",
- "<top-node xmlns=\"abc\">"+
- "<test-node xmlns:test=\"http://apache/testNS\" xmlns=\"http://apache/trueNS\" test:abc=\"testValue\" abc2=\"testValue\" abc3=\"testValue\">"+
- "<test:test-subnode><node-at-same-ns-as-top xmlns=\"abc\">"+
- "</node-at-same-ns-as-top>"+
- "</test:test-subnode>"+
- "</test-node>"+
- "</top-node>", text);
+ String ns = checkNamespaceFragment(text, "<top-node xmlns=\"abc\"><test-node",
+ " test:abc=\"testValue\" abc2=\"testValue\" abc3=\"testValue\">"+
+ "<test:test-subnode><node-at-same-ns-as-top xmlns=\"abc\">"+
+ "</node-at-same-ns-as-top>"+
+ "</test:test-subnode>"+
+ "</test-node>"+
+ "</top-node>");
+ assertTrue(ns.contains("xmlns:test=\"http://apache/testNS\""));
+ assertTrue(ns.contains("xmlns=\"http://apache/trueNS\""));
}
public void testAttributeNameSpaceDefaultNS() throws Exception {
String text = evaluateScriptAsText(testBaseDir + "/attributeNameSpaceDefaultNS.jelly");
System.out.println(text);
- assertEquals("Should produce the correct output",
- "<top-node>"+
- "<test-node xmlns:test=\"http://apache/testNS\" xmlns=\"http://apache/trueNS\" test:abc=\"testValue\" abc2=\"testValue\" abc3=\"testValue\">"+
- "<test:test-subnode><node-at-same-ns-as-top xmlns=\"\">"+
- "</node-at-same-ns-as-top>"+
- "</test:test-subnode>"+
- "</test-node>"+
- "</top-node>", text);
+ String ns = checkNamespaceFragment(text, "<top-node><test-node",
+ " test:abc=\"testValue\" abc2=\"testValue\" abc3=\"testValue\">" +
+ "<test:test-subnode><node-at-same-ns-as-top xmlns=\"\">"+
+ "</node-at-same-ns-as-top>"+
+ "</test:test-subnode>"+
+ "</test-node>"+
+ "</top-node>");
+ assertTrue(ns.contains("xmlns:test=\"http://apache/testNS\""));
+ assertTrue(ns.contains("xmlns=\"http://apache/trueNS\""));
}
public void testAttributeNameSpaceWithInnerElements() throws Exception {
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/attributeNameSpace.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/attributeNameSpace.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/attributeNameSpace.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/attributeNameSpace.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/attributeNameSpaceDefaultNS.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/attributeNameSpaceDefaultNS.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/attributeNameSpaceDefaultNS.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/attributeNameSpaceDefaultNS.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/attributeNameSpaceDuplicatedNS.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/attributeNameSpaceDuplicatedNS.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/attributeNameSpaceDuplicatedNS.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/attributeNameSpaceDuplicatedNS.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/attributeNameSpaceWithInnerElements.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/attributeNameSpaceWithInnerElements.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/attributeNameSpaceWithInnerElements.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/attributeNameSpaceWithInnerElements.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/betwixt/input.xml b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/betwixt/input.xml
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/betwixt/input.xml
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/betwixt/input.xml
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/betwixt/makeBetwixt.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/betwixt/makeBetwixt.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/betwixt/makeBetwixt.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/betwixt/makeBetwixt.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/dummy.xml b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/dummy.xml
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/dummy.xml
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/dummy.xml
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/elementWithNameSpace.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/elementWithNameSpace.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/elementWithNameSpace.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/elementWithNameSpace.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/elementWithNameSpaceError.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/elementWithNameSpaceError.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/elementWithNameSpaceError.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/elementWithNameSpaceError.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/entity.xml b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/entity.xml
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/entity.xml
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/entity.xml
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/example.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/example.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/example.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/example.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/example2.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/example2.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/example2.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/example2.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/filesetExample.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/filesetExample.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/filesetExample.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/filesetExample.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/namespaceReplace.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/namespaceReplace.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/namespaceReplace.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/namespaceReplace.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/schematron-wrapper.xsl b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/schematron/schematron-wrapper.xsl
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/schematron-wrapper.xsl
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/schematron/schematron-wrapper.xsl
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/skeleton1-5.xsl b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/schematron/skeleton1-5.xsl
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/skeleton1-5.xsl
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/schematron/skeleton1-5.xsl
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/source.xml b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/schematron/source.xml
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/source.xml
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/schematron/source.xml
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/test-schematron.xml b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/schematron/test-schematron.xml
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/test-schematron.xml
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/schematron/test-schematron.xml
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/transformSchematronExample.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/schematron/transformSchematronExample.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/transformSchematronExample.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/schematron/transformSchematronExample.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/suite.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/suite.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/suite.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/suite.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/testDoctype.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/testDoctype.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/testDoctype.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/testDoctype.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/testExpressions.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/testExpressions.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/testExpressions.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/testExpressions.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/testForEach.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/testForEach.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/testForEach.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/testForEach.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/testThread.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/testThread.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/testThread.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/testThread.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample.xsl b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample.xsl
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample.xsl
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample.xsl
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample1.xsl b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample1.xsl
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample1.xsl
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample1.xsl
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample2.xsl b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample2.xsl
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample2.xsl
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample2.xsl
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample3.xsl b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample3.xsl
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample3.xsl
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample3.xsl
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample4.xsl b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample4.xsl
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample4.xsl
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample4.xsl
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample5.xsl b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample5.xsl
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExample5.xsl
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExample5.xsl
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExampleAllInLine.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExampleAllInLine.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExampleAllInLine.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExampleAllInLine.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExampleSAXOutput.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExampleSAXOutput.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExampleSAXOutput.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExampleSAXOutput.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExampleSAXOutputNestedTransforms.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExampleSAXOutputNestedTransforms.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExampleSAXOutputNestedTransforms.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExampleSAXOutputNestedTransforms.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExampleXmlVar.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExampleXmlVar.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExampleXmlVar.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExampleXmlVar.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExampleXmlVar.xml b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExampleXmlVar.xml
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExampleXmlVar.xml
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformExampleXmlVar.xml
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformParamExample.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformParamExample.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformParamExample.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformParamExample.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformParamExample.xml b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformParamExample.xml
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformParamExample.xml
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformParamExample.xml
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformParamExample.xsl b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformParamExample.xsl
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformParamExample.xsl
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformParamExample.xsl
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformParamExample2.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformParamExample2.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformParamExample2.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/transformParamExample2.jelly
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/xpathSortExample.jelly b/jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/xpathSortExample.jelly
similarity index 100%
rename from jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/xpathSortExample.jelly
rename to jelly-tags/xml/src/test/resources/org/apache/commons/jelly/tags/xml/xpathSortExample.jelly
