Author: mrdon
Date: Sat May 6 21:48:10 2006
New Revision: 400415
URL: http://svn.apache.org/viewcvs?rev=400415&view=rev
Log:
Moved webapps to apps to match Struts Action 1
WW-1305
Added:
incubator/webwork2/apps/
- copied from r400413, incubator/webwork2/webapps/
Removed:
incubator/webwork2/webapps/
Modified:
incubator/webwork2/apps/pom.xml
incubator/webwork2/apps/portlet/pom.xml
incubator/webwork2/apps/showcase/pom.xml
incubator/webwork2/build.xml
incubator/webwork2/core/src/main/java/org/apache/struts/action2/Main.java
incubator/webwork2/osbuild.xml
incubator/webwork2/pom.xml
Modified: incubator/webwork2/apps/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/apps/pom.xml?rev=400415&r1=400413&r2=400415&view=diff
==============================================================================
--- incubator/webwork2/apps/pom.xml (original)
+++ incubator/webwork2/apps/pom.xml Sat May 6 21:48:10 2006
@@ -22,7 +22,7 @@
<distributionManagement>
<site>
<id>apache-site</id>
-
<url>scp://people.apache.org/www/struts.apache.org/struts-action2/webapps</url>
+
<url>scp://people.apache.org/www/struts.apache.org/struts-action2/apps</url>
</site>
</distributionManagement>
Modified: incubator/webwork2/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/apps/portlet/pom.xml?rev=400415&r1=400413&r2=400415&view=diff
==============================================================================
--- incubator/webwork2/apps/portlet/pom.xml (original)
+++ incubator/webwork2/apps/portlet/pom.xml Sat May 6 21:48:10 2006
@@ -37,5 +37,12 @@
<version>2.4</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+
</dependencies>
</project>
Modified: incubator/webwork2/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/apps/showcase/pom.xml?rev=400415&r1=400413&r2=400415&view=diff
==============================================================================
--- incubator/webwork2/apps/showcase/pom.xml (original)
+++ incubator/webwork2/apps/showcase/pom.xml Sat May 6 21:48:10 2006
@@ -41,7 +41,37 @@
<artifactId>sitemesh</artifactId>
<version>2.2.1</version>
</dependency>
-
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.9</version>
+ </dependency>
+ <!-- Spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>1.2.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>1.2.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>1.2.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>1.2.6</version>
+ </dependency>
+
+
</dependencies>
<build>
Modified: incubator/webwork2/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/build.xml?rev=400415&r1=400414&r2=400415&view=diff
==============================================================================
--- incubator/webwork2/build.xml (original)
+++ incubator/webwork2/build.xml Sat May 6 21:48:10 2006
@@ -71,9 +71,9 @@
<macrodef name="webapp">
<attribute name="name"/>
<sequential>
- <mkdir dir="${dist}/webapps/@{name}/src"/>
- <copy todir="${dist}/webapps/@{name}/src">
- <fileset dir="webapps/@{name}/src" includes="**/**"/>
+ <mkdir dir="${dist}/apps/@{name}/src"/>
+ <copy todir="${dist}/apps/@{name}/src">
+ <fileset dir="apps/@{name}/src" includes="**/**"/>
</copy>
</sequential>
</macrodef>
@@ -88,8 +88,8 @@
<!-- prepare the template project -->
<webapp name="blank"/>
- <copy todir="${dist}/webapps/blank">
- <fileset dir="webapps/blank/" includes="*.iml" />
+ <copy todir="${dist}/apps/blank">
+ <fileset dir="apps/blank/" includes="*.iml" />
</copy>
<!-- prepare each tutorial/example -->
@@ -99,7 +99,7 @@
<webapp name="portlet"/>
<!-- copy over elements required to build the final wars -->
- <copy file="webapps/build.xml" todir="${dist}/webapps"/>
+ <copy file="apps/build.xml" todir="${dist}/apps"/>
</target>
<target name="xdoclet-taglib" depends="init">
@@ -214,15 +214,15 @@
</target>
<target name="clean" depends="common.clean">
- <delete dir="webapps/base/build"/>
- <delete dir="webapps/blank/build"/>
- <delete dir="webapps/showcase/build"/>
- <delete dir="webapps/starter/build"/>
- <delete dir="webapps/ajax/build"/>
- <delete dir="webapps/shopping-cart/build"/>
- <delete dir="webapps/portlet/build"/>
+ <delete dir="apps/base/build"/>
+ <delete dir="apps/blank/build"/>
+ <delete dir="apps/showcase/build"/>
+ <delete dir="apps/starter/build"/>
+ <delete dir="apps/ajax/build"/>
+ <delete dir="apps/shopping-cart/build"/>
+ <delete dir="apps/portlet/build"/>
<!--
- <delete dir="webapps/wwia/build"/>
+ <delete dir="apps/wwia/build"/>
-->
</target>
Modified:
incubator/webwork2/core/src/main/java/org/apache/struts/action2/Main.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/core/src/main/java/org/apache/struts/action2/Main.java?rev=400415&r1=400414&r2=400415&view=diff
==============================================================================
--- incubator/webwork2/core/src/main/java/org/apache/struts/action2/Main.java
(original)
+++ incubator/webwork2/core/src/main/java/org/apache/struts/action2/Main.java
Sat May 6 21:48:10 2006
@@ -54,7 +54,7 @@
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
webapps dir.");
+ 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;
@@ -131,8 +131,8 @@
command = "quickstart";
String name = checkWebAppArgs(args);
programArgs = new String[]{"/" + name,
- "webapps/" + name + "/src/main/webapp",
- "webapps/" + name + "/src/main/java"};
+ "apps/" + name + "/src/main/webapp",
+ "apps/" + name + "/src/main/java"};
}
if ("quickstart".equals(command)) {
@@ -151,8 +151,8 @@
if (command.startsWith("sitegraph:")) {
command = "sitegraph";
String name = checkWebAppArgs(args);
- programArgs = new String[]{"-config", "webapps/" + name +
"/src/webapp/WEB-INF/classes",
- "-views", "webapps/" + name + "/src/webapp",
+ programArgs = new String[]{"-config", "apps/" + name +
"/src/webapp/WEB-INF/classes",
+ "-views", "apps/" + name + "/src/webapp",
"-output", "."};
}
@@ -172,7 +172,7 @@
if (name == null || name.equals("")) {
System.out.println("Error: you must specify the webapp you wish");
System.out.println(" to deploy. The webapp name must be
the");
- System.out.println(" name of the directory found in
webapps/.");
+ System.out.println(" name of the directory found in apps/.");
System.out.println("");
System.out.println("Example: java -jar struts.jar
quickstart:sandbox");
System.exit(1);
Modified: incubator/webwork2/osbuild.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/osbuild.xml?rev=400415&r1=400414&r2=400415&view=diff
==============================================================================
--- incubator/webwork2/osbuild.xml (original)
+++ incubator/webwork2/osbuild.xml Sat May 6 21:48:10 2006
@@ -359,7 +359,7 @@
**/*.xsl,
**/*.xslt,
**/*.html" />
- <fixcrlf eol="lf" srcdir="${basedir}/webapps"
+ <fixcrlf eol="lf" srcdir="${basedir}/apps"
includes="**/*.sh,
**/*.properties,
**/*.sql,
Modified: incubator/webwork2/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/pom.xml?rev=400415&r1=400414&r2=400415&view=diff
==============================================================================
--- incubator/webwork2/pom.xml (original)
+++ incubator/webwork2/pom.xml Sat May 6 21:48:10 2006
@@ -87,7 +87,7 @@
<modules>
<module>core</module>
<module>thirdparty</module>
- <module>webapps</module>
+ <module>apps</module>
</modules>
<repositories>
<repository>
