Author: oheger
Date: Sat Sep 16 14:56:53 2017
New Revision: 1808556
URL: http://svn.apache.org/viewvc?rev=1808556&view=rev
Log:
Added regexp tag lib to multi-module build.
Added:
commons/proper/jelly/trunk/jelly-tags/regexp/pom.xml
- copied, changed from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/project.xml
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java
- copied, changed from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/MatchTag.java
- copied, changed from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/MatchTag.java
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java
- copied, changed from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTagLibrary.java
- copied, changed from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/RegexpTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/apache/
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
- copied, changed from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
- copied, changed from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
Removed:
commons/proper/jelly/trunk/jelly-tags/regexp/project.properties
commons/proper/jelly/trunk/jelly-tags/regexp/project.xml
commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java
commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/MatchTag.java
commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java
commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/RegexpTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
Modified:
commons/proper/jelly/trunk/jelly-tags/pom.xml
Modified: commons/proper/jelly/trunk/jelly-tags/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/pom.xml?rev=1808556&r1=1808555&r2=1808556&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/pom.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/pom.xml Sat Sep 16 14:56:53 2017
@@ -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>
Copied: commons/proper/jelly/trunk/jelly-tags/regexp/pom.xml (from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/project.xml)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/regexp/pom.xml?p2=commons/proper/jelly/trunk/jelly-tags/regexp/pom.xml&p1=commons/proper/jelly/trunk/jelly-tags/regexp/project.xml&r1=1808555&r2=1808556&rev=1808556&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/regexp/project.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/regexp/pom.xml Sat Sep 16 14:56:53
2017
@@ -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>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+
<artifactId>commons-jelly-tags-regexp</artifactId>
+ <packaging>jar</packaging>
<name>commons-jelly-tags-regexp</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.regexp</package>
-
- <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>
+ <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>
Copied:
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java
(from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java?p2=commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java&p1=commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java&r1=1808555&r2=1808556&rev=1808556&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/MatchTag.java
(from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/MatchTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/MatchTag.java?p2=commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/MatchTag.java&p1=commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/MatchTag.java&r1=1808555&r2=1808556&rev=1808556&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java
(from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java?p2=commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java&p1=commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java&r1=1808555&r2=1808556&rev=1808556&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTagLibrary.java
(from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/RegexpTagLibrary.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/regexp/src/java/org/apache/commons/jelly/tags/regexp/RegexpTagLibrary.java&r1=1808555&r2=1808556&rev=1808556&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
(from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java?p2=commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java&p1=commons/proper/jelly/trunk/jelly-tags/regexp/src/test/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java&r1=1808555&r2=1808556&rev=1808556&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
(from r1808555,
commons/proper/jelly/trunk/jelly-tags/regexp/src/test/org/apache/commons/jelly/tags/regexp/MatchTagTest.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java?p2=commons/proper/jelly/trunk/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java&p1=commons/proper/jelly/trunk/jelly-tags/regexp/src/test/org/apache/commons/jelly/tags/regexp/MatchTagTest.java&r1=1808555&r2=1808556&rev=1808556&view=diff
==============================================================================
(empty)