Author: mrdon
Date: Wed Oct 4 08:55:08 2006
New Revision: 452920
URL: http://svn.apache.org/viewvc?view=rev&rev=452920
Log:
Creating new 'toolbox' project for client tools
WW-1462
Added:
struts/struts2/trunk/toolbox/
struts/struts2/trunk/toolbox/pom.xml
struts/struts2/trunk/toolbox/src/
struts/struts2/trunk/toolbox/src/main/
struts/struts2/trunk/toolbox/src/main/java/
struts/struts2/trunk/toolbox/src/main/java/org/
struts/struts2/trunk/toolbox/src/main/java/org/apache/
struts/struts2/trunk/toolbox/src/main/java/org/apache/struts2/
struts/struts2/trunk/toolbox/src/main/java/org/apache/struts2/Main.java
- copied, changed from r452721,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/Main.java
struts/struts2/trunk/toolbox/src/main/java/org/apache/struts2/quickstart/
- copied from r452721,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/quickstart/
struts/struts2/trunk/toolbox/src/main/java/org/apache/struts2/sitegraph/
- copied from r452721,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/
struts/struts2/trunk/toolbox/src/test/
struts/struts2/trunk/toolbox/src/test/java/
struts/struts2/trunk/toolbox/src/test/java/org/
struts/struts2/trunk/toolbox/src/test/java/org/apache/
struts/struts2/trunk/toolbox/src/test/java/org/apache/struts2/
struts/struts2/trunk/toolbox/src/test/java/org/apache/struts2/sitegraph/
- copied from r452721,
struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/
struts/struts2/trunk/toolbox/src/test/resources/
struts/struts2/trunk/toolbox/src/test/resources/org/
struts/struts2/trunk/toolbox/src/test/resources/org/apache/
struts/struts2/trunk/toolbox/src/test/resources/org/apache/struts2/
struts/struts2/trunk/toolbox/src/test/resources/org/apache/struts2/sitegraph/
- copied from r452721,
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/
Removed:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/Main.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/quickstart/
struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/
struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/
Modified:
struts/struts2/trunk/all/pom.xml
struts/struts2/trunk/core/pom.xml
Modified: struts/struts2/trunk/all/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/all/pom.xml?view=diff&rev=452920&r1=452919&r2=452920
==============================================================================
--- struts/struts2/trunk/all/pom.xml (original)
+++ struts/struts2/trunk/all/pom.xml Wed Oct 4 08:55:08 2006
@@ -35,6 +35,11 @@
<artifactId>struts2-api</artifactId>
<version>${version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-toolbox</artifactId>
+ <version>${version}</version>
+ </artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</configuration>
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=452920&r1=452919&r2=452920
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Wed Oct 4 08:55:08 2006
@@ -133,57 +133,6 @@
<version>1.1.1</version>
<optional>true</optional>
</dependency>
-
- <!-- Quickstart -->
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>5.1.4</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>eclipse</groupId>
- <artifactId>jdtcore</artifactId>
- <version>3.1.0</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>5.5.12</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>5.5.12</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>5.5.12</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -195,21 +144,6 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.1</version>
- <optional>true</optional>
- </dependency>
-
- <!-- QuickStart -->
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.1.2</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.7</version>
<optional>true</optional>
</dependency>
Added: struts/struts2/trunk/toolbox/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/toolbox/pom.xml?view=auto&rev=452920
==============================================================================
--- struts/struts2/trunk/toolbox/pom.xml (added)
+++ struts/struts2/trunk/toolbox/pom.xml Wed Oct 4 08:55:08 2006
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-parent</artifactId>
+ <version>2.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-toolbox</artifactId>
+ <packaging>jar</packaging>
+ <name>Struts 2 - Toolbox</name>
+
+ <distributionManagement>
+ <site>
+ <id>apache-site</id>
+
<url>scp://people.apache.org/www/struts.apache.org/2.x/struts-toolbox</url>
+ </site>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Quickstart -->
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>org.mortbay.jetty</artifactId>
+ <version>5.1.4</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>eclipse</groupId>
+ <artifactId>jdtcore</artifactId>
+ <version>3.1.0</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.12</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.12</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>5.5.12</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- QuickStart -->
+ <dependency>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.1.2</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.7</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.9</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ <version>3.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>1.2.8</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-mock</artifactId>
+ <version>1.2.8</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ </dependencies>
+</project>
Copied: struts/struts2/trunk/toolbox/src/main/java/org/apache/struts2/Main.java
(from r452721,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/Main.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/toolbox/src/main/java/org/apache/struts2/Main.java?view=diff&rev=452920&p1=struts/struts2/trunk/core/src/main/java/org/apache/struts2/Main.java&r1=452721&p2=struts/struts2/trunk/toolbox/src/main/java/org/apache/struts2/Main.java&r2=452920
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/Main.java
(original)
+++ struts/struts2/trunk/toolbox/src/main/java/org/apache/struts2/Main.java Wed
Oct 4 08:55:08 2006
@@ -44,7 +44,7 @@
public static void main(String[] args) {
if (args.length == 0) {
System.out.println("Usage:");
- System.out.println(" java -jar struts.jar [command] (optional
command args)");
+ System.out.println(" java -jar struts-toolbox.jar [command]
(optional command args)");
System.out.println("");
System.out.println("Where [command] is one of the following:");
System.out.println(" quickstart");
