You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2017/09/16 14:50:51 UTC
svn commit: r1808545 - in /commons/proper/jelly/trunk/jelly-tags: ./
interaction/ interaction/src/java/org/apache/commons/jelly/tags/interaction/
interaction/src/main/ interaction/src/main/java/
interaction/src/main/java/org/ interaction/src/main/java/...
Author: oheger
Date: Sat Sep 16 14:50:51 2017
New Revision: 1808545
URL: http://svn.apache.org/viewvc?rev=1808545&view=rev
Log:
Added interaction tag lib to multi-module build.
Added:
commons/proper/jelly/trunk/jelly-tags/interaction/pom.xml
- copied, changed from r1808544, commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
commons/proper/jelly/trunk/jelly-tags/interaction/src/main/
commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/
commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/
commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/
commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/
commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/AskTag.java
- copied, changed from r1808544, commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/InteractionTagLibrary.java
- copied, changed from r1808544, commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/InteractionTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/package.html
- copied, changed from r1808544, commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/package.html
commons/proper/jelly/trunk/jelly-tags/interaction/src/test/resources/
commons/proper/jelly/trunk/jelly-tags/interaction/src/test/resources/org/
commons/proper/jelly/trunk/jelly-tags/interaction/src/test/resources/org/apache/
commons/proper/jelly/trunk/jelly-tags/interaction/src/test/resources/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/interaction/src/test/resources/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/interaction/src/test/resources/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/interaction/src/test/resources/org/apache/commons/jelly/tags/interaction/
commons/proper/jelly/trunk/jelly-tags/interaction/src/test/resources/org/apache/commons/jelly/tags/interaction/sample.jelly
- copied, changed from r1808544, commons/proper/jelly/trunk/jelly-tags/interaction/src/test/org/apache/commons/jelly/tags/interaction/sample.jelly
Removed:
commons/proper/jelly/trunk/jelly-tags/interaction/build.xml
commons/proper/jelly/trunk/jelly-tags/interaction/maven.xml
commons/proper/jelly/trunk/jelly-tags/interaction/project.properties
commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/InteractionTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/package.html
commons/proper/jelly/trunk/jelly-tags/interaction/src/test/org/apache/commons/jelly/tags/interaction/sample.jelly
Modified:
commons/proper/jelly/trunk/jelly-tags/pom.xml
Copied: commons/proper/jelly/trunk/jelly-tags/interaction/pom.xml (from r1808544, commons/proper/jelly/trunk/jelly-tags/interaction/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/interaction/pom.xml?p2=commons/proper/jelly/trunk/jelly-tags/interaction/pom.xml&p1=commons/proper/jelly/trunk/jelly-tags/interaction/project.xml&r1=1808544&r2=1808545&rev=1808545&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/interaction/project.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/interaction/pom.xml Sat Sep 16 14:50:51 2017
@@ -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,29 +15,28 @@
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-interaction</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>commons-jelly-tags-interaction</name>
- <currentVersion>1.1.1-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.interaction</package>
<description>This is a Jelly interface to the user.</description>
- <shortDescription>Commons Jelly Interaction Tag Library</shortDescription>
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS-JELLY-INTERACTION-1_0</tag>
- </version>
- <version>
- <id>1.1</id>
- <name>1.1</name>
- <tag>COMMONS-JELLY-INTERACTION-1_1</tag>
- </version>
- </versions>
<dependencies>
+ <!-- START for compilation -->
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
@@ -51,23 +49,6 @@
<version>1.0</version>
</dependency>
- <!-- this is brought in by the commons-cli dependency -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.0</version>
- <properties>
- <gump.project>commons-lang-2.x</gump.project>
- <gump.runtime>true</gump.runtime>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>20030211.213356</version>
- </dependency>
-
+ <!-- END for compilation -->
</dependencies>
-
</project>
Copied: commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/AskTag.java (from r1808544, commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/AskTag.java?p2=commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/AskTag.java&p1=commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java&r1=1808544&r2=1808545&rev=1808545&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/InteractionTagLibrary.java (from r1808544, commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/InteractionTagLibrary.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/InteractionTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/InteractionTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/InteractionTagLibrary.java&r1=1808544&r2=1808545&rev=1808545&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/package.html (from r1808544, commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/package.html)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/package.html?p2=commons/proper/jelly/trunk/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/package.html&p1=commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/package.html&r1=1808544&r2=1808545&rev=1808545&view=diff
==============================================================================
(empty)
Copied: commons/proper/jelly/trunk/jelly-tags/interaction/src/test/resources/org/apache/commons/jelly/tags/interaction/sample.jelly (from r1808544, commons/proper/jelly/trunk/jelly-tags/interaction/src/test/org/apache/commons/jelly/tags/interaction/sample.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/interaction/src/test/resources/org/apache/commons/jelly/tags/interaction/sample.jelly?p2=commons/proper/jelly/trunk/jelly-tags/interaction/src/test/resources/org/apache/commons/jelly/tags/interaction/sample.jelly&p1=commons/proper/jelly/trunk/jelly-tags/interaction/src/test/org/apache/commons/jelly/tags/interaction/sample.jelly&r1=1808544&r2=1808545&rev=1808545&view=diff
==============================================================================
(empty)
Modified: commons/proper/jelly/trunk/jelly-tags/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/pom.xml?rev=1808545&r1=1808544&r2=1808545&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/pom.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/pom.xml Sat Sep 16 14:50:51 2017
@@ -27,6 +27,7 @@
<module>fmt</module>
<module>html</module>
<module>http</module>
+ <module>interaction</module>
<module>jsl</module>
<module>junit</module>
<module>log</module>