Added regexp tag lib to multi-module build.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jelly/trunk@1808556 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jelly-tags/pom.xml b/jelly-tags/pom.xml
index 272d480..b4e54f0 100644
--- a/jelly-tags/pom.xml
+++ b/jelly-tags/pom.xml
@@ -39,6 +39,7 @@
<module>memory</module>
<module>ojb</module>
<module>quartz</module>
+ <module>regexp</module>
<module>swt</module>
<module>util</module>
<module>xml</module>
diff --git a/jelly-tags/regexp/project.xml b/jelly-tags/regexp/pom.xml
similarity index 61%
rename from jelly-tags/regexp/project.xml
rename to jelly-tags/regexp/pom.xml
index 0999aef..7f24b53 100644
--- a/jelly-tags/regexp/project.xml
+++ b/jelly-tags/regexp/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.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
@@ -6,45 +6,37 @@
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>
- <extend>${basedir}/../tag-project.xml</extend>
- <artifactId>commons-jelly-tags-regexp</artifactId>
- <name>commons-jelly-tags-regexp</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.regexp</package>
+<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>
- <description>
- This is a Jelly interface for ORO.
- </description>
- <shortDescription>Commons Jelly Regular Expression Tag Library</shortDescription>
-
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS-JELLY-REGEXP-1_0</tag>
- </version>
- </versions>
+ <artifactId>commons-jelly-tags-regexp</artifactId>
+ <packaging>jar</packaging>
+ <name>commons-jelly-tags-regexp</name>
+ <description>This is a Jelly interface for ORO.</description>
<dependencies>
+ <!-- START for compilation -->
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
- <properties>
- <gump.project>jakarta-oro</gump.project>
- </properties>
</dependency>
+ <!-- END for compilation -->
</dependencies>
-
</project>
diff --git a/jelly-tags/regexp/project.properties b/jelly-tags/regexp/project.properties
deleted file mode 100644
index c8fb896..0000000
--- a/jelly-tags/regexp/project.properties
+++ /dev/null
@@ -1,18 +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/regexp/src/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java b/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java
similarity index 100%
rename from jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java
rename to jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java
diff --git a/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/MatchTag.java b/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/MatchTag.java
similarity index 100%
rename from jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/MatchTag.java
rename to jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/MatchTag.java
diff --git a/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java b/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java
similarity index 100%
rename from jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java
rename to jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java
diff --git a/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/RegexpTagLibrary.java b/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTagLibrary.java
similarity index 100%
rename from jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/RegexpTagLibrary.java
rename to jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTagLibrary.java
diff --git a/jelly-tags/regexp/src/test/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java b/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
similarity index 100%
rename from jelly-tags/regexp/src/test/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
rename to jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
diff --git a/jelly-tags/regexp/src/test/org/apache/commons/jelly/tags/regexp/MatchTagTest.java b/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
similarity index 100%
rename from jelly-tags/regexp/src/test/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
rename to jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
