Author: mrdon
Date: Fri Sep 29 14:11:27 2006
New Revision: 451439
URL: http://svn.apache.org/viewvc?view=rev&rev=451439
Log:
Backing out accidently committed files
Modified:
struts/struts2/trunk/apps/showcase/quickstart.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp
struts/struts2/trunk/assembly/src/main/assembly/all.xml
struts/struts2/trunk/assembly/src/main/assembly/src.xml
struts/struts2/trunk/pom.xml
struts/struts2/trunk/uber/pom.xml
Modified: struts/struts2/trunk/apps/showcase/quickstart.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/quickstart.xml?view=diff&rev=451439&r1=451438&r2=451439
==============================================================================
--- struts/struts2/trunk/apps/showcase/quickstart.xml (original)
+++ struts/struts2/trunk/apps/showcase/quickstart.xml Fri Sep 29 14:11:27 2006
@@ -18,7 +18,7 @@
<context>/showcase</context>
<!-- The port in which to deploy the web application -->
- <port>8090</port>
+ <port>8080</port>
<!--
The libs directories can be a jar, a directory of jars, or even
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp?view=diff&rev=451439&r1=451438&r2=451439
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp Fri Sep 29
14:11:27 2006
@@ -16,18 +16,6 @@
<p>The given examples will demonstrate the usages of all Struts tags as well
as validations etc.</p>
-<!--
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:dc="http://purl.org/dc/elements/1.1/";
-
xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/";>
- <rdf:Description
- rdf:about="http://www.foo.com/archive.html#foo";
- dc:identifier="http://www.foo.com/archive.html#foo";
- dc:title="Foo Bar"
- trackback:ping="http://localhost:8090/showcase/debug.jsp"; />
- </rdf:RDF>
--->
-<a href="http://localhost:8080/display/ds/Confluence+Overview";>Confluence
overview</a>
<p>
<ul>
<!-- config-browser -->
Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?view=diff&rev=451439&r1=451438&r2=451439
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Fri Sep 29 14:11:27
2006
@@ -47,13 +47,13 @@
</includes>
</fileSet>
- <!-- Include the XWork Javadoc in the unijar -->
+ <!-- Include the XWork Javadoc in the assembly -->
<fileSet>
<directory>target/xwork-apidocs</directory>
<outputDirectory>docs/xwork-apidocs</outputDirectory>
</fileSet>
- <!-- Include the website in the unijar -->
+ <!-- Include the website in the assembly -->
<fileSet>
<directory>../target/site</directory>
<outputDirectory>docs</outputDirectory>
@@ -71,7 +71,7 @@
<outputDirectory>docs/struts2-extras</outputDirectory>
</fileSet>
- <!-- Include the source code in the unijar -->
+ <!-- Include the source code in the assembly -->
<fileSet>
<directory>../</directory>
<outputDirectory>src/</outputDirectory>
Modified: struts/struts2/trunk/assembly/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/src.xml?view=diff&rev=451439&r1=451438&r2=451439
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/src.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/src.xml Fri Sep 29 14:11:27
2006
@@ -51,7 +51,7 @@
</includes>
</fileSet>
- <!-- Include the source code in the unijar -->
+ <!-- Include the source code in the assembly -->
<fileSet>
<directory>../</directory>
<outputDirectory>src/</outputDirectory>
Modified: struts/struts2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?view=diff&rev=451439&r1=451438&r2=451439
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Fri Sep 29 14:11:27 2006
@@ -77,7 +77,7 @@
<modules>
<module>core</module>
- <!--<module>unijar</module>-->
+ <!--<module>assembly</module>-->
<module>api</module>
</modules>
Modified: struts/struts2/trunk/uber/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/uber/pom.xml?view=diff&rev=451439&r1=451438&r2=451439
==============================================================================
--- struts/struts2/trunk/uber/pom.xml (original)
+++ struts/struts2/trunk/uber/pom.xml Fri Sep 29 14:11:27 2006
@@ -16,7 +16,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-unijar-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptor>src/assemble/main.xml</descriptor>
</configuration>
@@ -24,7 +24,7 @@
<execution>
<phase>package</phase>
<goals>
- <goal>unijar</goal>
+ <goal>assembly</goal>
</goals>
</execution>
</executions>
