Added http tag lib to multi-module build.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jelly/trunk@1808544 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jelly-tags/http/build.xml b/jelly-tags/http/build.xml
deleted file mode 100644
index c7ae476..0000000
--- a/jelly-tags/http/build.xml
+++ /dev/null
@@ -1,369 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.1-SNAPSHOT
- on date November 27 2005, time 2339-->
-<project default="jar" name="commons-jelly-tags-http" basedir=".">
- <!--Load local and user build preferences-->
- <property file="build.properties">
- </property>
- <property file="${user.home}/build.properties">
- </property>
- <!--Build properties-->
- <property name="defaulttargetdir" value="${basedir}/target">
- </property>
- <property name="libdir" value="${user.home}/.maven/repository">
- </property>
- <property name="classesdir" value="${basedir}/target/classes">
- </property>
- <property name="testclassesdir" value="${basedir}/target/test-classes">
- </property>
- <property name="testreportdir" value="${basedir}/target/test-reports">
- </property>
- <property name="distdir" value="${basedir}/dist">
- </property>
- <property name="javadocdir" value="${basedir}/dist/docs/api">
- </property>
- <property name="final.name" value="commons-jelly-tags-http-1.1-SNAPSHOT">
- </property>
- <property name="proxy.host" value="">
- </property>
- <property name="proxy.port" value="">
- </property>
- <property name="proxy.username" value="">
- </property>
- <property name="proxy.password" value="">
- </property>
- <path id="build.classpath">
- <pathelement location="${libdir}/commons-httpclient/jars/commons-httpclient-3.0-rc4.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-jelly/jars/commons-jelly-tags-define-1.0.jar">
- </pathelement>
- <pathelement location="${libdir}/xml-apis/jars/xml-apis-1.0.b2.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-beanutils/jars/commons-beanutils-1.6.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-collections/jars/commons-collections-2.1.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-jexl/jars/commons-jexl-1.0.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-jelly/jars/commons-jelly-1.0.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar">
- </pathelement>
- <pathelement location="${libdir}/dom4j/jars/dom4j-1.5.jar">
- </pathelement>
- <pathelement location="${libdir}/jaxen/jars/jaxen-1.1-beta-2.jar">
- </pathelement>
- <pathelement location="${libdir}/xerces/jars/xerces-2.2.1.jar">
- </pathelement>
- </path>
- <target name="init" description="o Initializes some properties">
- <mkdir dir="${libdir}">
- </mkdir>
- <condition property="noget">
- <equals arg2="only" arg1="${build.sysclasspath}">
- </equals>
- </condition>
- <!--Test if JUNIT is present in ANT classpath-->
- <available property="Junit.present" classname="junit.framework.Test">
- </available>
- <!--Test if user defined a proxy-->
- <condition property="useProxy">
- <and>
- <isset property="proxy.host">
- </isset>
- <not>
- <equals trim="true" arg2="" arg1="${proxy.host}">
- </equals>
- </not>
- </and>
- </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="${basedir}/src/java">
- </pathelement>
- </src>
- <classpath refid="build.classpath">
- </classpath>
- </javac>
- <copy todir="${classesdir}">
- <fileset dir="${basedir}/src/java">
- <include name="**/*.properties">
- </include>
- </fileset>
- </copy>
- <mkdir dir="${classesdir}/META-INF">
- </mkdir>
- <copy todir="${classesdir}/META-INF">
- <fileset dir="${basedir}/../../">
- <include name="NOTICE.txt">
- </include>
- </fileset>
- </copy>
- <copy todir="${classesdir}/META-INF" file="${basedir}/../../LICENSE.txt">
- </copy>
- </target>
- <target name="jar" description="o Create the jar" depends="compile,test">
- <jar jarfile="${defaulttargetdir}/${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" if="Junit.present" depends="junit-present,compile-tests">
- <mkdir dir="${testreportdir}">
- </mkdir>
- <junit dir="${basedir}" 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>
- <path refid="build.classpath">
- </path>
- <pathelement path="${testclassesdir}">
- </pathelement>
- <pathelement path="${classesdir}">
- </pathelement>
- </classpath>
- <batchtest todir="${testreportdir}">
- <fileset dir="${basedir}/src/test">
- <include name="**/Test*.java">
- </include>
- </fileset>
- </batchtest>
- </junit>
- </target>
- <target name="junit-present" unless="Junit.present" depends="init">
- <echo>================================= WARNING ================================</echo>
- <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
- <echo>==========================================================================</echo>
- </target>
- <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
- <mkdir dir="${testclassesdir}">
- </mkdir>
- <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
- <src>
- <pathelement location="${basedir}/src/test">
- </pathelement>
- </src>
- <classpath>
- <path refid="build.classpath">
- </path>
- <pathelement path="${classesdir}">
- </pathelement>
- </classpath>
- </javac>
- <copy todir="${testclassesdir}">
- <fileset dir="${basedir}/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="javadoc" description="o Generate javadoc" depends="get-deps">
- <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-http 1.1-SNAPSHOT API">
- </property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.jelly.tags.http.*">
- <classpath>
- <path refid="build.classpath">
- </path>
- </classpath>
- </javadoc>
- </target>
- <target name="get-dep-commons-httpclient.jar" description="o Download the dependency : commons-httpclient.jar" unless="commons-httpclient.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-httpclient.jar">
- <mkdir dir="${libdir}/commons-httpclient/jars/">
- </mkdir>
- <get dest="${libdir}/commons-httpclient/jars/commons-httpclient-3.0-rc4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-3.0-rc4.jar">
- </get>
- </target>
- <target name="get-custom-dep-commons-httpclient.jar" if="commons-httpclient.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-httpclient/jars/">
- </mkdir>
- <get dest="${libdir}/commons-httpclient/jars/commons-httpclient-3.0-rc4.jar" usetimestamp="true" ignoreerrors="true" src="${commons-httpclient.jar}">
- </get>
- </target>
- <target name="get-dep-commons-jelly-tags-define.jar" description="o Download the dependency : commons-jelly-tags-define.jar" unless="commons-jelly-tags-define.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-jelly-tags-define.jar">
- <mkdir dir="${libdir}/commons-jelly/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jelly/jars/commons-jelly-tags-define-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-define-1.0.jar">
- </get>
- </target>
- <target name="get-custom-dep-commons-jelly-tags-define.jar" if="commons-jelly-tags-define.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-jelly/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jelly/jars/commons-jelly-tags-define-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${commons-jelly-tags-define.jar}">
- </get>
- </target>
- <target name="get-dep-xml-apis.jar" description="o Download the dependency : xml-apis.jar" unless="xml-apis.jar" depends="init,setProxy,noProxy,get-custom-dep-xml-apis.jar">
- <mkdir dir="${libdir}/xml-apis/jars/">
- </mkdir>
- <get dest="${libdir}/xml-apis/jars/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>
- </target>
- <target name="get-custom-dep-xml-apis.jar" if="xml-apis.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/xml-apis/jars/">
- </mkdir>
- <get dest="${libdir}/xml-apis/jars/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true" src="${xml-apis.jar}">
- </get>
- </target>
- <target name="get-dep-commons-beanutils.jar" description="o Download the dependency : commons-beanutils.jar" unless="commons-beanutils.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-beanutils.jar">
- <mkdir dir="${libdir}/commons-beanutils/jars/">
- </mkdir>
- <get dest="${libdir}/commons-beanutils/jars/commons-beanutils-1.6.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.6.jar">
- </get>
- </target>
- <target name="get-custom-dep-commons-beanutils.jar" if="commons-beanutils.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-beanutils/jars/">
- </mkdir>
- <get dest="${libdir}/commons-beanutils/jars/commons-beanutils-1.6.jar" usetimestamp="true" ignoreerrors="true" src="${commons-beanutils.jar}">
- </get>
- </target>
- <target name="get-dep-commons-collections.jar" description="o Download the dependency : commons-collections.jar" unless="commons-collections.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-collections.jar">
- <mkdir dir="${libdir}/commons-collections/jars/">
- </mkdir>
- <get dest="${libdir}/commons-collections/jars/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar">
- </get>
- </target>
- <target name="get-custom-dep-commons-collections.jar" if="commons-collections.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-collections/jars/">
- </mkdir>
- <get dest="${libdir}/commons-collections/jars/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="${commons-collections.jar}">
- </get>
- </target>
- <target name="get-dep-commons-jexl.jar" description="o Download the dependency : commons-jexl.jar" unless="commons-jexl.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-jexl.jar">
- <mkdir dir="${libdir}/commons-jexl/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jexl/jars/commons-jexl-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jexl/jars/commons-jexl-1.0.jar">
- </get>
- </target>
- <target name="get-custom-dep-commons-jexl.jar" if="commons-jexl.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-jexl/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jexl/jars/commons-jexl-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${commons-jexl.jar}">
- </get>
- </target>
- <target name="get-dep-commons-jelly.jar" description="o Download the dependency : commons-jelly.jar" unless="commons-jelly.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-jelly.jar">
- <mkdir dir="${libdir}/commons-jelly/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jelly/jars/commons-jelly-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-1.0.jar">
- </get>
- </target>
- <target name="get-custom-dep-commons-jelly.jar" if="commons-jelly.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-jelly/jars/">
- </mkdir>
- <get dest="${libdir}/commons-jelly/jars/commons-jelly-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${commons-jelly.jar}">
- </get>
- </target>
- <target name="get-dep-commons-logging.jar" description="o Download the dependency : commons-logging.jar" unless="commons-logging.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-logging.jar">
- <mkdir dir="${libdir}/commons-logging/jars/">
- </mkdir>
- <get dest="${libdir}/commons-logging/jars/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>
- </target>
- <target name="get-custom-dep-commons-logging.jar" if="commons-logging.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/commons-logging/jars/">
- </mkdir>
- <get dest="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="${commons-logging.jar}">
- </get>
- </target>
- <target name="get-dep-dom4j.jar" description="o Download the dependency : dom4j.jar" unless="dom4j.jar" depends="init,setProxy,noProxy,get-custom-dep-dom4j.jar">
- <mkdir dir="${libdir}/dom4j/jars/">
- </mkdir>
- <get dest="${libdir}/dom4j/jars/dom4j-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dom4j/jars/dom4j-1.5.jar">
- </get>
- </target>
- <target name="get-custom-dep-dom4j.jar" if="dom4j.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/dom4j/jars/">
- </mkdir>
- <get dest="${libdir}/dom4j/jars/dom4j-1.5.jar" usetimestamp="true" ignoreerrors="true" src="${dom4j.jar}">
- </get>
- </target>
- <target name="get-dep-jaxen.jar" description="o Download the dependency : jaxen.jar" unless="jaxen.jar" depends="init,setProxy,noProxy,get-custom-dep-jaxen.jar">
- <mkdir dir="${libdir}/jaxen/jars/">
- </mkdir>
- <get dest="${libdir}/jaxen/jars/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>
- </target>
- <target name="get-custom-dep-jaxen.jar" if="jaxen.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/jaxen/jars/">
- </mkdir>
- <get dest="${libdir}/jaxen/jars/jaxen-1.1-beta-2.jar" usetimestamp="true" ignoreerrors="true" src="${jaxen.jar}">
- </get>
- </target>
- <target name="get-dep-xerces.jar" description="o Download the dependency : xerces.jar" unless="xerces.jar" depends="init,setProxy,noProxy,get-custom-dep-xerces.jar">
- <mkdir dir="${libdir}/xerces/jars/">
- </mkdir>
- <get dest="${libdir}/xerces/jars/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.2.1.jar">
- </get>
- </target>
- <target name="get-custom-dep-xerces.jar" if="xerces.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/xerces/jars/">
- </mkdir>
- <get dest="${libdir}/xerces/jars/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="${xerces.jar}">
- </get>
- </target>
- <target name="get-deps" unless="noget" depends="get-dep-commons-httpclient.jar,get-dep-commons-jelly-tags-define.jar,get-dep-xml-apis.jar,get-dep-commons-beanutils.jar,get-dep-commons-collections.jar,get-dep-commons-jexl.jar,get-dep-commons-jelly.jar,get-dep-commons-logging.jar,get-dep-dom4j.jar,get-dep-jaxen.jar,get-dep-xerces.jar">
- </target>
- <target name="setProxy" if="useProxy" depends="init">
- <!--Proxy settings works only with a JDK 1.2 and higher.-->
- <echo>Proxy used :</echo>
- <echo>Proxy host [${proxy.host}]</echo>
- <echo>Proxy port [${proxy.port}]</echo>
- <echo>Proxy user [${proxy.username}]</echo>
- <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}">
- </setproxy>
- </target>
- <target name="noProxy" unless="useProxy" depends="init">
- <echo>Proxy not used.</echo>
- </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/http/maven.xml b/jelly-tags/http/maven.xml
deleted file mode 100644
index 8a2b8cc..0000000
--- a/jelly-tags/http/maven.xml
+++ /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.
--->
-<project default="java:jar">
-
-</project>
diff --git a/jelly-tags/http/project.xml b/jelly-tags/http/pom.xml
similarity index 68%
rename from jelly-tags/http/project.xml
rename to jelly-tags/http/pom.xml
index 219445b..20117f0 100644
--- a/jelly-tags/http/project.xml
+++ b/jelly-tags/http/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
@@ -16,38 +15,39 @@
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-http</artifactId>
- <currentVersion>1.1-SNAPSHOT</currentVersion>
+ <packaging>jar</packaging>
<name>commons-jelly-tags-http</name>
- <package>org.apache.commons.jelly.tags.http</package>
<description>These are simple Jelly tags that can perform HTTP requests.</description>
- <shortDescription>Commons Jelly HTTP Tag Library</shortDescription>
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS-JELLY-HTTP-1_0</tag>
- </version>
- </versions>
+
<dependencies>
+ <!-- START for compilation -->
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0-rc4</version>
</dependency>
-
- <!-- testing -->
+
+ <!-- END for compilation -->
+
+ <!-- START for testing -->
+
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-define</artifactId>
- <version>1.0</version>
- <url>http://commons.apache.org/jelly/tags/define/</url>
- <properties>
- <scope>test</scope>
- </properties>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
+
+ <!-- END for testing -->
</dependencies>
</project>
diff --git a/jelly-tags/http/project.properties b/jelly-tags/http/project.properties
deleted file mode 100644
index 2850c0e..0000000
--- a/jelly-tags/http/project.properties
+++ /dev/null
@@ -1,20 +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/http/src/java/org/apache/commons/jelly/tags/http/BodyTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/BodyTag.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/BodyTag.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/BodyTag.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/DeleteTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/DeleteTag.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/DeleteTag.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/DeleteTag.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/GetTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/GetTag.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/GetTag.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/GetTag.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HeadTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HeadTag.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HeadTag.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HeadTag.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HeaderTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HeaderTag.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HeaderTag.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HeaderTag.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HttpTagSupport.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagSupport.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HttpTagSupport.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagSupport.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/MultipartPostTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/MultipartPostTag.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/MultipartPostTag.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/MultipartPostTag.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/OptionsTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/OptionsTag.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/OptionsTag.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/OptionsTag.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/ParameterTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/ParameterTag.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/ParameterTag.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/ParameterTag.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/PartTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PartTag.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/PartTag.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PartTag.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/PostTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PostTag.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/PostTag.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PostTag.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/Proxy.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/Proxy.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/Proxy.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/Proxy.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/PutTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PutTag.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/PutTag.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PutTag.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/SessionTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/SessionTag.java
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/SessionTag.java
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/SessionTag.java
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/package.html b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/package.html
similarity index 100%
rename from jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/package.html
rename to jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/package.html
diff --git a/jelly-tags/http/src/test/org/apache/commons/jelly/google/defineTags.jelly b/jelly-tags/http/src/test/resources/org/apache/commons/jelly/google/defineTags.jelly
similarity index 100%
rename from jelly-tags/http/src/test/org/apache/commons/jelly/google/defineTags.jelly
rename to jelly-tags/http/src/test/resources/org/apache/commons/jelly/google/defineTags.jelly
diff --git a/jelly-tags/http/src/test/org/apache/commons/jelly/google/search.jelly b/jelly-tags/http/src/test/resources/org/apache/commons/jelly/google/search.jelly
similarity index 100%
rename from jelly-tags/http/src/test/org/apache/commons/jelly/google/search.jelly
rename to jelly-tags/http/src/test/resources/org/apache/commons/jelly/google/search.jelly
diff --git a/jelly-tags/http/src/test/org/apache/commons/jelly/http/http.jelly b/jelly-tags/http/src/test/resources/org/apache/commons/jelly/http/http.jelly
similarity index 100%
rename from jelly-tags/http/src/test/org/apache/commons/jelly/http/http.jelly
rename to jelly-tags/http/src/test/resources/org/apache/commons/jelly/http/http.jelly
diff --git a/jelly-tags/pom.xml b/jelly-tags/pom.xml
index eac8ce8..f3bdf0e 100644
--- a/jelly-tags/pom.xml
+++ b/jelly-tags/pom.xml
@@ -26,6 +26,7 @@
<module>email</module>
<module>fmt</module>
<module>html</module>
+ <module>http</module>
<module>jsl</module>
<module>junit</module>
<module>log</module>
