You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by jm...@apache.org on 2006/04/28 01:18:45 UTC
svn commit: r397674 - in /struts/action/trunk: apps/scripting-mailreader/
core/ core/src/main/resources/ faces/ mailreader-dao/ scripting/ taglib/
tiles/
Author: jmitchell
Date: Thu Apr 27 16:18:41 2006
New Revision: 397674
URL: http://svn.apache.org/viewcvs?rev=397674&view=rev
Log:
making action1 src consistent
Added:
struts/action/trunk/core/LICENSE.txt
- copied unchanged from r397671, struts/action/trunk/core/src/main/resources/LICENSE.txt
struts/action/trunk/core/NOTICE.txt
- copied unchanged from r397671, struts/action/trunk/core/src/main/resources/NOTICE.txt
Removed:
struts/action/trunk/core/src/main/resources/LICENSE.txt
struts/action/trunk/core/src/main/resources/NOTICE.txt
Modified:
struts/action/trunk/apps/scripting-mailreader/ (props changed)
struts/action/trunk/core/pom.xml
struts/action/trunk/faces/pom.xml
struts/action/trunk/mailreader-dao/pom.xml
struts/action/trunk/scripting/pom.xml
struts/action/trunk/taglib/pom.xml
struts/action/trunk/tiles/pom.xml
Propchange: struts/action/trunk/apps/scripting-mailreader/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 27 16:18:41 2006
@@ -1,3 +1,4 @@
+target
.project
.classpath
Modified: struts/action/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/core/pom.xml?rev=397674&r1=397673&r2=397674&view=diff
==============================================================================
--- struts/action/trunk/core/pom.xml (original)
+++ struts/action/trunk/core/pom.xml Thu Apr 27 16:18:41 2006
@@ -37,10 +37,8 @@
<url>http://struts.apache.org</url>
<scm>
- <connection>
- svm:svn:http://svn.apache.org/repos/asf/struts/action/trunk</connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/struts/action/trunk</developerConnection>
+ <connection>svm:svn:http://svn.apache.org/repos/asf/struts/action/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/action/trunk</developerConnection>
<url>http://svn.apache.org/repos/asf/struts/action/trunk</url>
</scm>
@@ -52,22 +50,11 @@
</distributionManagement>
<build>
-
<resources>
<resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>../build</directory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
</includes>
</resource>
</resources>
Modified: struts/action/trunk/faces/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/faces/pom.xml?rev=397674&r1=397673&r2=397674&view=diff
==============================================================================
--- struts/action/trunk/faces/pom.xml (original)
+++ struts/action/trunk/faces/pom.xml Thu Apr 27 16:18:41 2006
@@ -32,7 +32,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.struts.action</groupId>
<artifactId>struts-faces</artifactId>
-
<packaging>jar</packaging>
<name>Struts Action - Faces</name>
<url>http://struts.apache.org</url>
Modified: struts/action/trunk/mailreader-dao/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/mailreader-dao/pom.xml?rev=397674&r1=397673&r2=397674&view=diff
==============================================================================
--- struts/action/trunk/mailreader-dao/pom.xml (original)
+++ struts/action/trunk/mailreader-dao/pom.xml Thu Apr 27 16:18:41 2006
@@ -19,20 +19,9 @@
*/
-->
-<!--
- Experimental Maven 2 Build for Apache Struts
- ============================================
-
-To build and install this module into your local repo:
-
- $ mvn install
-
-For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
-
--->
-
-<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">
+<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">
<parent>
<groupId>org.apache.struts.action</groupId>
Modified: struts/action/trunk/scripting/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/scripting/pom.xml?rev=397674&r1=397673&r2=397674&view=diff
==============================================================================
--- struts/action/trunk/scripting/pom.xml (original)
+++ struts/action/trunk/scripting/pom.xml Thu Apr 27 16:18:41 2006
@@ -19,8 +19,9 @@
*/
-->
-<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">
+<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">
<parent>
<groupId>org.apache.struts.action</groupId>
@@ -62,7 +63,7 @@
<targetPath>META-INF/tlds</targetPath>
</resource>
<resource>
- <directory>build</directory>
+ <directory>../build</directory>
<includes>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
Modified: struts/action/trunk/taglib/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/taglib/pom.xml?rev=397674&r1=397673&r2=397674&view=diff
==============================================================================
--- struts/action/trunk/taglib/pom.xml (original)
+++ struts/action/trunk/taglib/pom.xml Thu Apr 27 16:18:41 2006
@@ -19,8 +19,9 @@
*/
-->
-<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">
+<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">
<parent>
<groupId>org.apache.struts.action</groupId>
Modified: struts/action/trunk/tiles/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/tiles/pom.xml?rev=397674&r1=397673&r2=397674&view=diff
==============================================================================
--- struts/action/trunk/tiles/pom.xml (original)
+++ struts/action/trunk/tiles/pom.xml Thu Apr 27 16:18:41 2006
@@ -19,21 +19,22 @@
*/
-->
+<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">
-<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.action</groupId>
<artifactId>struts-action-parent</artifactId>
<version>1.3.3-SNAPSHOT</version>
- </parent>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-tiles</artifactId>
<packaging>jar</packaging>
<name>Struts Action - Tiles</name>
+ <url>http://struts.apache.org</url>
<distributionManagement>
<site>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org