Author: husted
Date: Sun Oct 8 19:08:06 2006
New Revision: 454250
URL: http://svn.apache.org/viewvc?view=rev&rev=454250
Log:
WW-1462 Break out toolbox into QuickStart and SiteGraph plugins.
Added:
struts/struts2/trunk/quickstart/
- copied from r454249, struts/struts2/trunk/toolbox/
struts/struts2/trunk/sitegraph/
- copied from r454249, struts/struts2/trunk/toolbox/
Removed:
struts/struts2/trunk/quickstart/src/main/java/org/apache/struts2/sitegraph/
struts/struts2/trunk/quickstart/src/test/java/
struts/struts2/trunk/quickstart/src/test/resources/
struts/struts2/trunk/sitegraph/src/main/java/org/apache/struts2/quickstart/
struts/struts2/trunk/toolbox/
Modified:
struts/struts2/trunk/quickstart/src/main/java/org/apache/struts2/Main.java
struts/struts2/trunk/sitegraph/pom.xml
struts/struts2/trunk/sitegraph/src/main/java/org/apache/struts2/Main.java
Modified:
struts/struts2/trunk/quickstart/src/main/java/org/apache/struts2/Main.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/quickstart/src/main/java/org/apache/struts2/Main.java?view=diff&rev=454250&r1=454249&r2=454250
==============================================================================
--- struts/struts2/trunk/quickstart/src/main/java/org/apache/struts2/Main.java
(original)
+++ struts/struts2/trunk/quickstart/src/main/java/org/apache/struts2/Main.java
Sun Oct 8 19:08:06 2006
@@ -49,8 +49,6 @@
System.out.println("Where [command] is one of the following:");
System.out.println(" quickstart");
System.out.println(" quickstart:xxx");
- System.out.println(" sitegraph");
- System.out.println(" sitegraph:xxx");
System.out.println("");
System.out.println("Execute the commands for additional usage
instructions.");
System.out.println("Note: the *:xxx commands are just shortcuts
for ");
@@ -136,19 +134,6 @@
"apps/" + name + "/src/main/resources"};
}
- if ("quickstart".equals(command)) {
- if (!jdk15) {
- System.out.println("Sorry, but QuickStart only runs on Java
1.5.");
- System.out.println("You are running: " + version);
- System.out.println("Please try again with Java 1.5, or
deploy");
- System.out.println(" as a normal J2EE webapp to use Java
1.4.");
- return;
- }
-
- launch("org.apache.struts2.quickstart.QuickStart", programArgs,
urls);
- return;
- }
-
if (command.startsWith("sitegraph:")) {
command = "sitegraph";
String name = checkWebAppArgs(args);
@@ -201,7 +186,7 @@
if (files == null) {
return;
}
-
+
for (int i = 0; i < files.length; i++) {
File f = files[i];
if (f.isDirectory()) {
Modified: struts/struts2/trunk/sitegraph/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/sitegraph/pom.xml?view=diff&rev=454250&r1=454249&r2=454250
==============================================================================
--- struts/struts2/trunk/sitegraph/pom.xml (original)
+++ struts/struts2/trunk/sitegraph/pom.xml Sun Oct 8 19:08:06 2006
@@ -8,14 +8,14 @@
<version>2.0.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-toolbox</artifactId>
+ <artifactId>struts2-sitegraph</artifactId>
<packaging>jar</packaging>
- <name>Struts 2 - Toolbox</name>
+ <name>Struts 2 - sitegraph</name>
<distributionManagement>
<site>
<id>apache-site</id>
-
<url>scp://people.apache.org/www/struts.apache.org/2.x/struts-toolbox</url>
+
<url>scp://people.apache.org/www/struts.apache.org/2.x/struts-sitegraph</url>
</site>
</distributionManagement>
@@ -102,28 +102,6 @@
<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 -->
Modified:
struts/struts2/trunk/sitegraph/src/main/java/org/apache/struts2/Main.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/sitegraph/src/main/java/org/apache/struts2/Main.java?view=diff&rev=454250&r1=454249&r2=454250
==============================================================================
--- struts/struts2/trunk/sitegraph/src/main/java/org/apache/struts2/Main.java
(original)
+++ struts/struts2/trunk/sitegraph/src/main/java/org/apache/struts2/Main.java
Sun Oct 8 19:08:06 2006
@@ -47,16 +47,12 @@
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");
- System.out.println(" quickstart:xxx");
System.out.println(" sitegraph");
System.out.println(" sitegraph:xxx");
System.out.println("");
System.out.println("Execute the commands for additional usage
instructions.");
System.out.println("Note: the *:xxx commands are just shortcuts
for ");
System.out.println(" running the command on a webapp in the
apps dir.");
- System.out.println(" For example, 'quickstart:sandbox' will
start QuickStart");
- System.out.println(" automatically for the webapp
'sandbox'.");
return;
}
@@ -127,27 +123,6 @@
String command = args[0];
String[] programArgs = new String[args.length - 1];
System.arraycopy(args, 1, programArgs, 0, programArgs.length);
- if (command.startsWith("quickstart:")) {
- command = "quickstart";
- String name = checkWebAppArgs(args);
- programArgs = new String[]{"/" + name,
- "apps/" + name + "/src/main/webapp",
- "apps/" + name + "/src/main/java",
- "apps/" + name + "/src/main/resources"};
- }
-
- if ("quickstart".equals(command)) {
- if (!jdk15) {
- System.out.println("Sorry, but QuickStart only runs on Java
1.5.");
- System.out.println("You are running: " + version);
- System.out.println("Please try again with Java 1.5, or
deploy");
- System.out.println(" as a normal J2EE webapp to use Java
1.4.");
- return;
- }
-
- launch("org.apache.struts2.quickstart.QuickStart", programArgs,
urls);
- return;
- }
if (command.startsWith("sitegraph:")) {
command = "sitegraph";
@@ -201,7 +176,7 @@
if (files == null) {
return;
}
-
+
for (int i = 0; i < files.length; i++) {
File f = files[i];
if (f.isDirectory()) {
