Used default directory layout for Java source files.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jelly/trunk@1798721 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 25e0b6a..3d5e251 100644
--- a/pom.xml
+++ b/pom.xml
@@ -307,7 +307,6 @@
     </notifiers>
   </ciManagement>
   <build>
-    <sourceDirectory>${basedir}/src/java</sourceDirectory>
     <testSourceDirectory>${basedir}/src/test</testSourceDirectory>
     <resources>
       <resource>
diff --git a/src/java/org/apache/commons/jelly/CompilableTag.java b/src/main/java/org/apache/commons/jelly/CompilableTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/CompilableTag.java
rename to src/main/java/org/apache/commons/jelly/CompilableTag.java
diff --git a/src/java/org/apache/commons/jelly/DynaBeanTagSupport.java b/src/main/java/org/apache/commons/jelly/DynaBeanTagSupport.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/DynaBeanTagSupport.java
rename to src/main/java/org/apache/commons/jelly/DynaBeanTagSupport.java
diff --git a/src/java/org/apache/commons/jelly/DynaTag.java b/src/main/java/org/apache/commons/jelly/DynaTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/DynaTag.java
rename to src/main/java/org/apache/commons/jelly/DynaTag.java
diff --git a/src/java/org/apache/commons/jelly/DynaTagSupport.java b/src/main/java/org/apache/commons/jelly/DynaTagSupport.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/DynaTagSupport.java
rename to src/main/java/org/apache/commons/jelly/DynaTagSupport.java
diff --git a/src/java/org/apache/commons/jelly/Jelly.java b/src/main/java/org/apache/commons/jelly/Jelly.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/Jelly.java
rename to src/main/java/org/apache/commons/jelly/Jelly.java
diff --git a/src/java/org/apache/commons/jelly/JellyContext.java b/src/main/java/org/apache/commons/jelly/JellyContext.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/JellyContext.java
rename to src/main/java/org/apache/commons/jelly/JellyContext.java
diff --git a/src/java/org/apache/commons/jelly/JellyException.java b/src/main/java/org/apache/commons/jelly/JellyException.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/JellyException.java
rename to src/main/java/org/apache/commons/jelly/JellyException.java
diff --git a/src/java/org/apache/commons/jelly/JellyTagException.java b/src/main/java/org/apache/commons/jelly/JellyTagException.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/JellyTagException.java
rename to src/main/java/org/apache/commons/jelly/JellyTagException.java
diff --git a/src/java/org/apache/commons/jelly/LocationAware.java b/src/main/java/org/apache/commons/jelly/LocationAware.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/LocationAware.java
rename to src/main/java/org/apache/commons/jelly/LocationAware.java
diff --git a/src/java/org/apache/commons/jelly/MapTagSupport.java b/src/main/java/org/apache/commons/jelly/MapTagSupport.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/MapTagSupport.java
rename to src/main/java/org/apache/commons/jelly/MapTagSupport.java
diff --git a/src/java/org/apache/commons/jelly/MissingAttributeException.java b/src/main/java/org/apache/commons/jelly/MissingAttributeException.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/MissingAttributeException.java
rename to src/main/java/org/apache/commons/jelly/MissingAttributeException.java
diff --git a/src/java/org/apache/commons/jelly/NamespaceAwareTag.java b/src/main/java/org/apache/commons/jelly/NamespaceAwareTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/NamespaceAwareTag.java
rename to src/main/java/org/apache/commons/jelly/NamespaceAwareTag.java
diff --git a/src/java/org/apache/commons/jelly/Script.java b/src/main/java/org/apache/commons/jelly/Script.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/Script.java
rename to src/main/java/org/apache/commons/jelly/Script.java
diff --git a/src/java/org/apache/commons/jelly/Tag.java b/src/main/java/org/apache/commons/jelly/Tag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/Tag.java
rename to src/main/java/org/apache/commons/jelly/Tag.java
diff --git a/src/java/org/apache/commons/jelly/TagLibrary.java b/src/main/java/org/apache/commons/jelly/TagLibrary.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/TagLibrary.java
rename to src/main/java/org/apache/commons/jelly/TagLibrary.java
diff --git a/src/java/org/apache/commons/jelly/TagSupport.java b/src/main/java/org/apache/commons/jelly/TagSupport.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/TagSupport.java
rename to src/main/java/org/apache/commons/jelly/TagSupport.java
diff --git a/src/java/org/apache/commons/jelly/XMLOutput.java b/src/main/java/org/apache/commons/jelly/XMLOutput.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/XMLOutput.java
rename to src/main/java/org/apache/commons/jelly/XMLOutput.java
diff --git a/src/java/org/apache/commons/jelly/expression/CompositeExpression.java b/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/expression/CompositeExpression.java
rename to src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
diff --git a/src/java/org/apache/commons/jelly/expression/ConstantExpression.java b/src/main/java/org/apache/commons/jelly/expression/ConstantExpression.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/expression/ConstantExpression.java
rename to src/main/java/org/apache/commons/jelly/expression/ConstantExpression.java
diff --git a/src/java/org/apache/commons/jelly/expression/Expression.java b/src/main/java/org/apache/commons/jelly/expression/Expression.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/expression/Expression.java
rename to src/main/java/org/apache/commons/jelly/expression/Expression.java
diff --git a/src/java/org/apache/commons/jelly/expression/ExpressionFactory.java b/src/main/java/org/apache/commons/jelly/expression/ExpressionFactory.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/expression/ExpressionFactory.java
rename to src/main/java/org/apache/commons/jelly/expression/ExpressionFactory.java
diff --git a/src/java/org/apache/commons/jelly/expression/ExpressionSupport.java b/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/expression/ExpressionSupport.java
rename to src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
diff --git a/src/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java b/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java
rename to src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java
diff --git a/src/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java b/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
rename to src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
diff --git a/src/java/org/apache/commons/jelly/expression/jexl/package.html b/src/main/java/org/apache/commons/jelly/expression/jexl/package.html
similarity index 100%
rename from src/java/org/apache/commons/jelly/expression/jexl/package.html
rename to src/main/java/org/apache/commons/jelly/expression/jexl/package.html
diff --git a/src/java/org/apache/commons/jelly/expression/package.html b/src/main/java/org/apache/commons/jelly/expression/package.html
similarity index 100%
rename from src/java/org/apache/commons/jelly/expression/package.html
rename to src/main/java/org/apache/commons/jelly/expression/package.html
diff --git a/src/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java b/src/main/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java
rename to src/main/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java
diff --git a/src/java/org/apache/commons/jelly/impl/Attribute.java b/src/main/java/org/apache/commons/jelly/impl/Attribute.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/Attribute.java
rename to src/main/java/org/apache/commons/jelly/impl/Attribute.java
diff --git a/src/java/org/apache/commons/jelly/impl/BeanSource.java b/src/main/java/org/apache/commons/jelly/impl/BeanSource.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/BeanSource.java
rename to src/main/java/org/apache/commons/jelly/impl/BeanSource.java
diff --git a/src/java/org/apache/commons/jelly/impl/BreakException.java b/src/main/java/org/apache/commons/jelly/impl/BreakException.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/BreakException.java
rename to src/main/java/org/apache/commons/jelly/impl/BreakException.java
diff --git a/src/java/org/apache/commons/jelly/impl/CollectionTag.java b/src/main/java/org/apache/commons/jelly/impl/CollectionTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/CollectionTag.java
rename to src/main/java/org/apache/commons/jelly/impl/CollectionTag.java
diff --git a/src/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java b/src/main/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java
rename to src/main/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java
diff --git a/src/java/org/apache/commons/jelly/impl/DefaultTagFactory.java b/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
rename to src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
diff --git a/src/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java b/src/main/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
rename to src/main/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
diff --git a/src/java/org/apache/commons/jelly/impl/DynamicBeanTag.java b/src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
rename to src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
diff --git a/src/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java b/src/main/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java
rename to src/main/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java
diff --git a/src/java/org/apache/commons/jelly/impl/DynamicTag.java b/src/main/java/org/apache/commons/jelly/impl/DynamicTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/DynamicTag.java
rename to src/main/java/org/apache/commons/jelly/impl/DynamicTag.java
diff --git a/src/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java b/src/main/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java
rename to src/main/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java
diff --git a/src/java/org/apache/commons/jelly/impl/Embedded.java b/src/main/java/org/apache/commons/jelly/impl/Embedded.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/Embedded.java
rename to src/main/java/org/apache/commons/jelly/impl/Embedded.java
diff --git a/src/java/org/apache/commons/jelly/impl/ExpressionScript.java b/src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/ExpressionScript.java
rename to src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java
diff --git a/src/java/org/apache/commons/jelly/impl/ScriptBlock.java b/src/main/java/org/apache/commons/jelly/impl/ScriptBlock.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/ScriptBlock.java
rename to src/main/java/org/apache/commons/jelly/impl/ScriptBlock.java
diff --git a/src/java/org/apache/commons/jelly/impl/StaticTag.java b/src/main/java/org/apache/commons/jelly/impl/StaticTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/StaticTag.java
rename to src/main/java/org/apache/commons/jelly/impl/StaticTag.java
diff --git a/src/java/org/apache/commons/jelly/impl/StaticTagScript.java b/src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/StaticTagScript.java
rename to src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java
diff --git a/src/java/org/apache/commons/jelly/impl/TagFactory.java b/src/main/java/org/apache/commons/jelly/impl/TagFactory.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/TagFactory.java
rename to src/main/java/org/apache/commons/jelly/impl/TagFactory.java
diff --git a/src/java/org/apache/commons/jelly/impl/TagLibraryResolver.java b/src/main/java/org/apache/commons/jelly/impl/TagLibraryResolver.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/TagLibraryResolver.java
rename to src/main/java/org/apache/commons/jelly/impl/TagLibraryResolver.java
diff --git a/src/java/org/apache/commons/jelly/impl/TagScript.java b/src/main/java/org/apache/commons/jelly/impl/TagScript.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/TagScript.java
rename to src/main/java/org/apache/commons/jelly/impl/TagScript.java
diff --git a/src/java/org/apache/commons/jelly/impl/TextScript.java b/src/main/java/org/apache/commons/jelly/impl/TextScript.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/TextScript.java
rename to src/main/java/org/apache/commons/jelly/impl/TextScript.java
diff --git a/src/java/org/apache/commons/jelly/impl/package.html b/src/main/java/org/apache/commons/jelly/impl/package.html
similarity index 100%
rename from src/java/org/apache/commons/jelly/impl/package.html
rename to src/main/java/org/apache/commons/jelly/impl/package.html
diff --git a/src/java/org/apache/commons/jelly/jelly.properties b/src/main/java/org/apache/commons/jelly/jelly.properties
similarity index 100%
rename from src/java/org/apache/commons/jelly/jelly.properties
rename to src/main/java/org/apache/commons/jelly/jelly.properties
diff --git a/src/java/org/apache/commons/jelly/package.html b/src/main/java/org/apache/commons/jelly/package.html
similarity index 100%
rename from src/java/org/apache/commons/jelly/package.html
rename to src/main/java/org/apache/commons/jelly/package.html
diff --git a/src/java/org/apache/commons/jelly/parser/DefaultNamespaceFilter.java b/src/main/java/org/apache/commons/jelly/parser/DefaultNamespaceFilter.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/parser/DefaultNamespaceFilter.java
rename to src/main/java/org/apache/commons/jelly/parser/DefaultNamespaceFilter.java
diff --git a/src/java/org/apache/commons/jelly/parser/XMLParser.java b/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/parser/XMLParser.java
rename to src/main/java/org/apache/commons/jelly/parser/XMLParser.java
diff --git a/src/java/org/apache/commons/jelly/parser/package.html b/src/main/java/org/apache/commons/jelly/parser/package.html
similarity index 100%
rename from src/java/org/apache/commons/jelly/parser/package.html
rename to src/main/java/org/apache/commons/jelly/parser/package.html
diff --git a/src/java/org/apache/commons/jelly/servlet/JellyServlet.java b/src/main/java/org/apache/commons/jelly/servlet/JellyServlet.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/servlet/JellyServlet.java
rename to src/main/java/org/apache/commons/jelly/servlet/JellyServlet.java
diff --git a/src/java/org/apache/commons/jelly/servlet/JellyServletContext.java b/src/main/java/org/apache/commons/jelly/servlet/JellyServletContext.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/servlet/JellyServletContext.java
rename to src/main/java/org/apache/commons/jelly/servlet/JellyServletContext.java
diff --git a/src/java/org/apache/commons/jelly/servlet/package.html b/src/main/java/org/apache/commons/jelly/servlet/package.html
similarity index 100%
rename from src/java/org/apache/commons/jelly/servlet/package.html
rename to src/main/java/org/apache/commons/jelly/servlet/package.html
diff --git a/src/java/org/apache/commons/jelly/tags/Resources.java b/src/main/java/org/apache/commons/jelly/tags/Resources.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/Resources.java
rename to src/main/java/org/apache/commons/jelly/tags/Resources.java
diff --git a/src/java/org/apache/commons/jelly/tags/Resources.properties b/src/main/java/org/apache/commons/jelly/tags/Resources.properties
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/Resources.properties
rename to src/main/java/org/apache/commons/jelly/tags/Resources.properties
diff --git a/src/java/org/apache/commons/jelly/tags/core/ArgTag.java b/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/ArgTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/ArgTagParent.java b/src/main/java/org/apache/commons/jelly/tags/core/ArgTagParent.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/ArgTagParent.java
rename to src/main/java/org/apache/commons/jelly/tags/core/ArgTagParent.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/BaseClassLoaderTag.java b/src/main/java/org/apache/commons/jelly/tags/core/BaseClassLoaderTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/BaseClassLoaderTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/BaseClassLoaderTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/BreakTag.java b/src/main/java/org/apache/commons/jelly/tags/core/BreakTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/BreakTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/BreakTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/CaseTag.java b/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/CaseTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/CatchTag.java b/src/main/java/org/apache/commons/jelly/tags/core/CatchTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/CatchTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/CatchTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/ChooseTag.java b/src/main/java/org/apache/commons/jelly/tags/core/ChooseTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/ChooseTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/ChooseTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/CoreTagLibrary.java b/src/main/java/org/apache/commons/jelly/tags/core/CoreTagLibrary.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/CoreTagLibrary.java
rename to src/main/java/org/apache/commons/jelly/tags/core/CoreTagLibrary.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/DefaultTag.java b/src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/DefaultTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/ExprTag.java b/src/main/java/org/apache/commons/jelly/tags/core/ExprTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/ExprTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/ExprTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/FileTag.java b/src/main/java/org/apache/commons/jelly/tags/core/FileTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/FileTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/FileTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/ForEachTag.java b/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/ForEachTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/GetStaticTag.java b/src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/IfTag.java b/src/main/java/org/apache/commons/jelly/tags/core/IfTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/IfTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/IfTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/ImportTag.java b/src/main/java/org/apache/commons/jelly/tags/core/ImportTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/ImportTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/ImportTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/IncludeTag.java b/src/main/java/org/apache/commons/jelly/tags/core/IncludeTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/IncludeTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/IncludeTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java b/src/main/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/InvokeTag.java b/src/main/java/org/apache/commons/jelly/tags/core/InvokeTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/InvokeTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/InvokeTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/JellyTag.java b/src/main/java/org/apache/commons/jelly/tags/core/JellyTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/JellyTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/JellyTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/MuteTag.java b/src/main/java/org/apache/commons/jelly/tags/core/MuteTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/MuteTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/MuteTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/NewTag.java b/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/NewTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/NewTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/OtherwiseTag.java b/src/main/java/org/apache/commons/jelly/tags/core/OtherwiseTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/OtherwiseTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/OtherwiseTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/ParseTag.java b/src/main/java/org/apache/commons/jelly/tags/core/ParseTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/ParseTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/ParseTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/RemoveTag.java b/src/main/java/org/apache/commons/jelly/tags/core/RemoveTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/RemoveTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/RemoveTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/ScopeTag.java b/src/main/java/org/apache/commons/jelly/tags/core/ScopeTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/ScopeTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/ScopeTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java b/src/main/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/SetTag.java b/src/main/java/org/apache/commons/jelly/tags/core/SetTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/SetTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/SetTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/SwitchTag.java b/src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/SwitchTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/ThreadTag.java b/src/main/java/org/apache/commons/jelly/tags/core/ThreadTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/ThreadTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/ThreadTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/UseBeanTag.java b/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/UseListTag.java b/src/main/java/org/apache/commons/jelly/tags/core/UseListTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/UseListTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/UseListTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/WhenTag.java b/src/main/java/org/apache/commons/jelly/tags/core/WhenTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/WhenTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/WhenTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/WhileTag.java b/src/main/java/org/apache/commons/jelly/tags/core/WhileTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/WhileTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/WhileTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java b/src/main/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java
rename to src/main/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java
diff --git a/src/java/org/apache/commons/jelly/tags/core/package.html b/src/main/java/org/apache/commons/jelly/tags/core/package.html
similarity index 100%
rename from src/java/org/apache/commons/jelly/tags/core/package.html
rename to src/main/java/org/apache/commons/jelly/tags/core/package.html
diff --git a/src/java/org/apache/commons/jelly/test/BaseJellyTest.java b/src/main/java/org/apache/commons/jelly/test/BaseJellyTest.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/test/BaseJellyTest.java
rename to src/main/java/org/apache/commons/jelly/test/BaseJellyTest.java
diff --git a/src/java/org/apache/commons/jelly/util/ClassLoaderUtils.java b/src/main/java/org/apache/commons/jelly/util/ClassLoaderUtils.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/util/ClassLoaderUtils.java
rename to src/main/java/org/apache/commons/jelly/util/ClassLoaderUtils.java
diff --git a/src/java/org/apache/commons/jelly/util/CommandLineParser.java b/src/main/java/org/apache/commons/jelly/util/CommandLineParser.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/util/CommandLineParser.java
rename to src/main/java/org/apache/commons/jelly/util/CommandLineParser.java
diff --git a/src/java/org/apache/commons/jelly/util/NestedRuntimeException.java b/src/main/java/org/apache/commons/jelly/util/NestedRuntimeException.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/util/NestedRuntimeException.java
rename to src/main/java/org/apache/commons/jelly/util/NestedRuntimeException.java
diff --git a/src/java/org/apache/commons/jelly/util/SafeContentHandler.java b/src/main/java/org/apache/commons/jelly/util/SafeContentHandler.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/util/SafeContentHandler.java
rename to src/main/java/org/apache/commons/jelly/util/SafeContentHandler.java
diff --git a/src/java/org/apache/commons/jelly/util/TagUtils.java b/src/main/java/org/apache/commons/jelly/util/TagUtils.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/util/TagUtils.java
rename to src/main/java/org/apache/commons/jelly/util/TagUtils.java
diff --git a/src/java/org/apache/commons/jelly/xpath/XPathComparator.java b/src/main/java/org/apache/commons/jelly/xpath/XPathComparator.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/xpath/XPathComparator.java
rename to src/main/java/org/apache/commons/jelly/xpath/XPathComparator.java
diff --git a/src/java/org/apache/commons/jelly/xpath/XPathSource.java b/src/main/java/org/apache/commons/jelly/xpath/XPathSource.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/xpath/XPathSource.java
rename to src/main/java/org/apache/commons/jelly/xpath/XPathSource.java
diff --git a/src/java/org/apache/commons/jelly/xpath/XPathTagSupport.java b/src/main/java/org/apache/commons/jelly/xpath/XPathTagSupport.java
similarity index 100%
rename from src/java/org/apache/commons/jelly/xpath/XPathTagSupport.java
rename to src/main/java/org/apache/commons/jelly/xpath/XPathTagSupport.java