You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2006/07/02 02:44:13 UTC

svn commit: r418537 - in /struts/struts1/trunk: ./ apps/ apps/blank/ apps/cookbook/ apps/examples/ apps/faces-example1/ apps/faces-example2/ apps/mailreader/ apps/scripting-mailreader/ apps/strutsel-exercise-taglib/ assembly/ core/ el/ extras/ faces/ i...

Author: mrdon
Date: Sat Jul  1 17:44:12 2006
New Revision: 418537

URL: http://svn.apache.org/viewvc?rev=418537&view=rev
Log:
Fixing poms to new group id of org.apache.struts

Modified:
    struts/struts1/trunk/apps/blank/pom.xml
    struts/struts1/trunk/apps/cookbook/pom.xml
    struts/struts1/trunk/apps/examples/pom.xml
    struts/struts1/trunk/apps/faces-example1/pom.xml
    struts/struts1/trunk/apps/faces-example2/pom.xml
    struts/struts1/trunk/apps/mailreader/pom.xml
    struts/struts1/trunk/apps/pom.xml
    struts/struts1/trunk/apps/scripting-mailreader/pom.xml
    struts/struts1/trunk/apps/strutsel-exercise-taglib/pom.xml
    struts/struts1/trunk/assembly/pom.xml
    struts/struts1/trunk/core/pom.xml
    struts/struts1/trunk/el/pom.xml
    struts/struts1/trunk/extras/pom.xml
    struts/struts1/trunk/faces/pom.xml
    struts/struts1/trunk/integration/apps-it/pom.xml
    struts/struts1/trunk/integration/pom.xml
    struts/struts1/trunk/integration/tg4w/pom.xml
    struts/struts1/trunk/mailreader-dao/pom.xml
    struts/struts1/trunk/pom.xml
    struts/struts1/trunk/scripting/pom.xml
    struts/struts1/trunk/taglib/pom.xml
    struts/struts1/trunk/tiles/pom.xml

Modified: struts/struts1/trunk/apps/blank/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/blank/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/apps/blank/pom.xml (original)
+++ struts/struts1/trunk/apps/blank/pom.xml Sat Jul  1 17:44:12 2006
@@ -23,16 +23,16 @@
       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>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-apps</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-blank</artifactId>
    <packaging>war</packaging>
-   <name>Struts Action - Apps - Blank</name>
+   <name>Struts 1 - Apps - Blank</name>
    
    <dependencies>
       <dependency>

Modified: struts/struts1/trunk/apps/cookbook/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/cookbook/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/apps/cookbook/pom.xml (original)
+++ struts/struts1/trunk/apps/cookbook/pom.xml Sat Jul  1 17:44:12 2006
@@ -23,16 +23,16 @@
       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>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-apps</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-cookbook</artifactId>
    <packaging>war</packaging>
-   <name>Struts Action - Apps - Cookbook</name>
+   <name>Struts 1 - Apps - Cookbook</name>
    
    <dependencies>
       <dependency>

Modified: struts/struts1/trunk/apps/examples/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/apps/examples/pom.xml (original)
+++ struts/struts1/trunk/apps/examples/pom.xml Sat Jul  1 17:44:12 2006
@@ -23,16 +23,16 @@
       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>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-apps</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-examples</artifactId>
    <packaging>war</packaging>
-   <name>Struts Action - Apps - Examples</name>
+   <name>Struts 1 - Apps - Examples</name>
    
    <dependencies>
       <dependency>

Modified: struts/struts1/trunk/apps/faces-example1/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/pom.xml (original)
+++ struts/struts1/trunk/apps/faces-example1/pom.xml Sat Jul  1 17:44:12 2006
@@ -23,16 +23,16 @@
       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>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-apps</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-faces-example1</artifactId>
    <packaging>war</packaging>
-   <name>Struts Action - Apps - Faces Example 1</name>
+   <name>Struts 1 - Apps - Faces Example 1</name>
    
    <dependencies>
       <dependency>

Modified: struts/struts1/trunk/apps/faces-example2/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example2/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/apps/faces-example2/pom.xml (original)
+++ struts/struts1/trunk/apps/faces-example2/pom.xml Sat Jul  1 17:44:12 2006
@@ -23,16 +23,16 @@
       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>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-apps</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-faces-example2</artifactId>
    <packaging>war</packaging>
-   <name>Struts Action - Apps - Faces Example 2</name>
+   <name>Struts 1 - Apps - Faces Example 2</name>
    
    <dependencies>
       <dependency>
@@ -86,7 +86,7 @@
 
       <!-- This example needs Tiles as well -->
       <dependency>
-          <groupId>org.apache.struts.action</groupId>
+          <groupId>org.apache.struts</groupId>
           <artifactId>struts-tiles</artifactId>
           <version>${pom.version}</version>
       </dependency>

Modified: struts/struts1/trunk/apps/mailreader/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/mailreader/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts1/trunk/apps/mailreader/pom.xml Sat Jul  1 17:44:12 2006
@@ -23,16 +23,16 @@
       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>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-apps</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-mailreader</artifactId>
    <packaging>war</packaging>
-   <name>Struts Action - Apps - Mailreader</name>
+   <name>Struts 1 - Apps - Mailreader</name>
    
    <dependencies>
       <dependency>

Modified: struts/struts1/trunk/apps/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/apps/pom.xml (original)
+++ struts/struts1/trunk/apps/pom.xml Sat Jul  1 17:44:12 2006
@@ -23,21 +23,21 @@
       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>
-      <artifactId>struts-action-parent</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts-parent</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-apps</artifactId>
    <packaging>pom</packaging>
-   <name>Struts Action - Apps</name>
+   <name>Struts 1 - Apps</name>
 
    <distributionManagement>
        <site>
            <id>apache-site</id>
-           <url>scp://people.apache.org/www/struts.apache.org/struts-action/struts-apps</url>
+           <url>scp://people.apache.org/www/struts.apache.org/struts/struts-apps</url>
        </site>
    </distributionManagement>
 

Modified: struts/struts1/trunk/apps/scripting-mailreader/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/scripting-mailreader/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/apps/scripting-mailreader/pom.xml (original)
+++ struts/struts1/trunk/apps/scripting-mailreader/pom.xml Sat Jul  1 17:44:12 2006
@@ -23,16 +23,16 @@
       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>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-apps</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-scripting-mailreader</artifactId>
    <packaging>war</packaging>
-   <name>Struts Action - Apps - Scripting Mailreader</name>
+   <name>Struts 1 - Apps - Scripting Mailreader</name>
 
    <dependencies>
       <dependency>

Modified: struts/struts1/trunk/apps/strutsel-exercise-taglib/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/strutsel-exercise-taglib/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/apps/strutsel-exercise-taglib/pom.xml (original)
+++ struts/struts1/trunk/apps/strutsel-exercise-taglib/pom.xml Sat Jul  1 17:44:12 2006
@@ -23,16 +23,16 @@
       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>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-apps</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>strutsel-exercise-taglib</artifactId>
    <packaging>war</packaging>
-   <name>Struts Action - Apps - Struts EL Exercise</name>
+   <name>Struts 1 - Apps - Struts EL Exercise</name>
    
    <dependencies>
       <dependency>

Modified: struts/struts1/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/assembly/pom.xml (original)
+++ struts/struts1/trunk/assembly/pom.xml Sat Jul  1 17:44:12 2006
@@ -22,17 +22,17 @@
 <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>
-  <groupId>org.apache.struts.action</groupId>
-  <artifactId>struts-action-assembly</artifactId>
+  <groupId>org.apache.struts</groupId>
+  <artifactId>struts-assembly</artifactId>
   <packaging>pom</packaging>
-  <name>Struts Action - Assembly</name>
+  <name>Struts 1 - Assembly</name>
   <description>
-  	Struts Action Assembly
+  	Struts 1 Assembly
   </description>
 
   <parent>
-    <groupId>org.apache.struts.action</groupId>
-    <artifactId>struts-action-parent</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts-parent</artifactId>
     <version>1.3.5-SNAPSHOT</version>
   </parent>
 
@@ -57,49 +57,49 @@
                     <configuration>
                         <artifactItems>
                             <artifactItem>
-                                <groupId>org.apache.struts.action</groupId>
+                                <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-blank</artifactId>
                                 <version>${version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
-                                <groupId>org.apache.struts.action</groupId>
+                                <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-cookbook</artifactId>
                                 <version>${version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
-                                <groupId>org.apache.struts.action</groupId>
+                                <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-examples</artifactId>
                                 <version>${version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
-                                <groupId>org.apache.struts.action</groupId>
+                                <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-faces-example1</artifactId>
                                 <version>${version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
-                                <groupId>org.apache.struts.action</groupId>
+                                <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-faces-example2</artifactId>
                                 <version>${version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
-                                <groupId>org.apache.struts.action</groupId>
+                                <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-mailreader</artifactId>
                                 <version>${version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
-                                <groupId>org.apache.struts.action</groupId>
+                                <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-scripting-mailreader</artifactId>
                                 <version>${version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
-                                <groupId>org.apache.struts.action</groupId>
+                                <groupId>org.apache.struts</groupId>
                                 <artifactId>strutsel-exercise-taglib</artifactId>
                                 <version>${version}</version>
                                 <type>war</type>
@@ -118,7 +118,7 @@
             <descriptor>src/main/assembly/dist.xml</descriptor>
             <descriptor>src/main/assembly/lib.xml</descriptor>
           </descriptors>
-          <finalName>struts-action-${version}</finalName>
+          <finalName>struts-${version}</finalName>
           <outputDirectory>target/assembly/out</outputDirectory>
           <workDirectory>target/assembly/work</workDirectory>
         </configuration>
@@ -129,42 +129,42 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.apache.struts.action</groupId>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-core</artifactId>
       <version>${version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.struts.action</groupId>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-extras</artifactId>
       <version>${version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.struts.action</groupId>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-el</artifactId>
       <version>${version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.struts.action</groupId>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-faces</artifactId>
       <version>${version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.struts.action</groupId>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-scripting</artifactId>
       <version>${version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.struts.action</groupId>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-taglib</artifactId>
       <version>${version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.struts.action</groupId>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-tiles</artifactId>
       <version>${version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.struts.action</groupId>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-mailreader-dao</artifactId>
       <version>${version}</version>
     </dependency>

Modified: struts/struts1/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/core/pom.xml (original)
+++ struts/struts1/trunk/core/pom.xml Sat Jul  1 17:44:12 2006
@@ -24,16 +24,16 @@
          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>
-        <artifactId>struts-action-parent</artifactId>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts-parent</artifactId>
         <version>1.3.5-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.struts.action</groupId>
+    <groupId>org.apache.struts</groupId>
     <artifactId>struts-core</artifactId>
     <packaging>jar</packaging>
-    <name>Struts Action - Core</name>
+    <name>Struts 1 - Core</name>
     <url>http://struts.apache.org</url>
 
     <scm>
@@ -45,7 +45,7 @@
     <distributionManagement>
         <site>
             <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/struts-action/struts-core</url>
+            <url>scp://people.apache.org/www/struts.apache.org/struts/struts-core</url>
         </site>
     </distributionManagement>
 

Modified: struts/struts1/trunk/el/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/el/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/el/pom.xml (original)
+++ struts/struts1/trunk/el/pom.xml Sat Jul  1 17:44:12 2006
@@ -24,22 +24,22 @@
          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>
-      <artifactId>struts-action-parent</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts-parent</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-el</artifactId>
    <packaging>jar</packaging>
-   <name>Struts Action - EL</name>
+   <name>Struts 1 - EL</name>
    <url>http://struts.apache.org</url>
    
    <distributionManagement>
       <site>
          <id>apache-site</id>
-         <url>scp://people.apache.org/www/struts.apache.org/struts-action/struts-el</url>
+         <url>scp://people.apache.org/www/struts.apache.org/struts/struts-el</url>
       </site>
    </distributionManagement>
    
@@ -67,19 +67,19 @@
       </dependency>
 
       <dependency>
-         <groupId>org.apache.struts.action</groupId>
+         <groupId>org.apache.struts</groupId>
          <artifactId>struts-core</artifactId>
          <version>${pom.version}</version>
       </dependency>
 
       <dependency>
-         <groupId>org.apache.struts.action</groupId>
+         <groupId>org.apache.struts</groupId>
          <artifactId>struts-taglib</artifactId>
          <version>${pom.version}</version>
       </dependency>
 
       <dependency>
-         <groupId>org.apache.struts.action</groupId>
+         <groupId>org.apache.struts</groupId>
          <artifactId>struts-tiles</artifactId>
          <version>${pom.version}</version>
          <optional>true</optional>

Modified: struts/struts1/trunk/extras/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/extras/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/extras/pom.xml (original)
+++ struts/struts1/trunk/extras/pom.xml Sat Jul  1 17:44:12 2006
@@ -24,22 +24,22 @@
          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>
-      <artifactId>struts-action-parent</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts-parent</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
    
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-extras</artifactId>
    <packaging>jar</packaging>
-   <name>Struts Action - Extras</name>
+   <name>Struts 1 - Extras</name>
    <url>http://struts.apache.org</url>
 
    <distributionManagement>
       <site>
          <id>apache-site</id>
-         <url>scp://people.apache.org/www/struts.apache.org/struts-action/struts-extras</url>
+         <url>scp://people.apache.org/www/struts.apache.org/struts/struts-extras</url>
       </site>
    </distributionManagement>
 
@@ -74,7 +74,7 @@
       </dependency>
 
       <dependency>
-         <groupId>org.apache.struts.action</groupId>
+         <groupId>org.apache.struts</groupId>
          <artifactId>struts-core</artifactId>
          <version>${pom.version}</version>
       </dependency>

Modified: struts/struts1/trunk/faces/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/faces/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/faces/pom.xml (original)
+++ struts/struts1/trunk/faces/pom.xml Sat Jul  1 17:44:12 2006
@@ -24,22 +24,22 @@
          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>
-      <artifactId>struts-action-parent</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts-parent</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-faces</artifactId>
    <packaging>jar</packaging>
-   <name>Struts Action - Faces</name>
+   <name>Struts 1 - Faces</name>
    <url>http://struts.apache.org</url>
 
    <distributionManagement>
       <site>
          <id>apache-site</id>
-         <url>scp://people.apache.org/www/struts.apache.org/struts-action/struts-faces</url>
+         <url>scp://people.apache.org/www/struts.apache.org/struts/struts-faces</url>
       </site>
    </distributionManagement>
 
@@ -82,19 +82,19 @@
       </dependency>
 
       <dependency>
-         <groupId>org.apache.struts.action</groupId>
+         <groupId>org.apache.struts</groupId>
          <artifactId>struts-core</artifactId>
          <version>${pom.version}</version>
       </dependency>
 
       <dependency>
-         <groupId>org.apache.struts.action</groupId>
+         <groupId>org.apache.struts</groupId>
          <artifactId>struts-taglib</artifactId>
          <version>${pom.version}</version>
       </dependency>
 
       <dependency>
-         <groupId>org.apache.struts.action</groupId>
+         <groupId>org.apache.struts</groupId>
          <artifactId>struts-tiles</artifactId>
          <version>${pom.version}</version>  
       </dependency>

Modified: struts/struts1/trunk/integration/apps-it/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/integration/apps-it/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/integration/apps-it/pom.xml (original)
+++ struts/struts1/trunk/integration/apps-it/pom.xml Sat Jul  1 17:44:12 2006
@@ -23,16 +23,16 @@
       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>
-      <artifactId>struts-action-it</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts-it</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
-   <artifactId>struts-action-it-apps</artifactId>
+   <groupId>org.apache.struts</groupId>
+   <artifactId>struts-it-apps</artifactId>
    <packaging>pom</packaging>
-   <name>Struts Action - Integration - Apps Tests</name>
+   <name>Struts 1 - Integration - Apps Tests</name>
    <url>http://struts.apache.org</url>
 
    <dependencies>

Modified: struts/struts1/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/integration/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/integration/pom.xml (original)
+++ struts/struts1/trunk/integration/pom.xml Sat Jul  1 17:44:12 2006
@@ -23,16 +23,16 @@
       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>
-      <artifactId>struts-action-parent</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts-parent</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
-   <artifactId>struts-action-it</artifactId>
+   <groupId>org.apache.struts</groupId>
+   <artifactId>struts-it</artifactId>
    <packaging>pom</packaging>
-   <name>Struts Action - Integration Tests</name>
+   <name>Struts 1 - Integration Tests</name>
 
    <modules>
       <module>apps-it</module>

Modified: struts/struts1/trunk/integration/tg4w/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/integration/tg4w/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/integration/tg4w/pom.xml (original)
+++ struts/struts1/trunk/integration/tg4w/pom.xml Sat Jul  1 17:44:12 2006
@@ -23,11 +23,11 @@
       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
-   <artifactId>struts-action-it-httpunit-taglib</artifactId>
+   <groupId>org.apache.struts</groupId>
+   <artifactId>struts-it-httpunit-taglib</artifactId>
    <version>0.1-SNAPSHOT</version>
    <packaging>jar</packaging>
-   <name>Struts Action - Taglib (HttpUnit) Tests</name>
+   <name>Struts 1 - Taglib (HttpUnit) Tests</name>
 
    <build>
    	    <sourceDirectory>src/main/java</sourceDirectory>

Modified: struts/struts1/trunk/mailreader-dao/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/mailreader-dao/pom.xml (original)
+++ struts/struts1/trunk/mailreader-dao/pom.xml Sat Jul  1 17:44:12 2006
@@ -24,16 +24,16 @@
          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>
-      <artifactId>struts-action-parent</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts-parent</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-mailreader-dao</artifactId>
    <packaging>jar</packaging>
-   <name>Struts Action - Mailreader DAO</name>
+   <name>Struts 1 - Mailreader DAO</name>
    <url>http://struts.apache.org</url>
 
    <build>

Modified: struts/struts1/trunk/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Sat Jul  1 17:44:12 2006
@@ -25,25 +25,25 @@
 
    <parent>
       <groupId>org.apache.struts</groupId>
-      <artifactId>struts-parent</artifactId>
-      <version>2</version>
+      <artifactId>struts-master</artifactId>
+      <version>3-SNAPSHOT</version>
    </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.struts.action</groupId>
-    <artifactId>struts-action-parent</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts-parent</artifactId>
     <version>1.3.5-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Struts Action</name>
+    <name>Struts 1</name>
     <url>http://struts.apache.org</url>
-    <description>Apache Struts Action Framework</description>
+    <description>Apache Struts</description>
 
     <inceptionYear>2000</inceptionYear>
 
     <scm>
-       <connection>scm: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/viewcvs.cgi/struts/action/trunk</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts1/trunk</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts1/trunk</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts1/trunk</url>
     </scm>
 
     <issueManagement>
@@ -60,7 +60,7 @@
         </repository>
         <site>
             <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/struts-action/</url>
+            <url>scp://people.apache.org/www/struts.apache.org/struts/</url>
         </site>
     </distributionManagement>
 

Modified: struts/struts1/trunk/scripting/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/scripting/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/scripting/pom.xml (original)
+++ struts/struts1/trunk/scripting/pom.xml Sat Jul  1 17:44:12 2006
@@ -24,22 +24,22 @@
          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>
-      <artifactId>struts-action-parent</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts-parent</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-scripting</artifactId>
    <packaging>jar</packaging>
-   <name>Struts Action - Scripting</name>
+   <name>Struts 1 - Scripting</name>
    <url>http://struts.apache.org</url>
 
    <distributionManagement>
       <site>
          <id>apache-site</id>
-         <url>scp://people.apache.org/www/struts.apache.org/struts-action/struts-scripting</url>
+         <url>scp://people.apache.org/www/struts.apache.org/struts/struts-scripting</url>
       </site>
    </distributionManagement>
    
@@ -68,7 +68,7 @@
       </dependency>
 
       <dependency>
-         <groupId>org.apache.struts.action</groupId>
+         <groupId>org.apache.struts</groupId>
          <artifactId>struts-core</artifactId>
          <version>${pom.version}</version>
       </dependency>

Modified: struts/struts1/trunk/taglib/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/pom.xml (original)
+++ struts/struts1/trunk/taglib/pom.xml Sat Jul  1 17:44:12 2006
@@ -24,22 +24,22 @@
          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>
-      <artifactId>struts-action-parent</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts-parent</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-taglib</artifactId>
    <packaging>jar</packaging>
-   <name>Struts Action - Taglib</name>
+   <name>Struts 1 - Taglib</name>
    <url>http://struts.apache.org</url>
 
    <distributionManagement>
       <site>
          <id>apache-site</id>
-         <url>scp://people.apache.org/www/struts.apache.org/struts-action/struts-taglib</url>
+         <url>scp://people.apache.org/www/struts.apache.org/struts/struts-taglib</url>
       </site>
    </distributionManagement>
 
@@ -84,7 +84,7 @@
       </dependency>
 
       <dependency>
-         <groupId>org.apache.struts.action</groupId>
+         <groupId>org.apache.struts</groupId>
          <artifactId>struts-core</artifactId>
          <version>${pom.version}</version>
       </dependency>

Modified: struts/struts1/trunk/tiles/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/pom.xml?rev=418537&r1=418536&r2=418537&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/pom.xml (original)
+++ struts/struts1/trunk/tiles/pom.xml Sat Jul  1 17:44:12 2006
@@ -24,22 +24,22 @@
          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>
-      <artifactId>struts-action-parent</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts-parent</artifactId>
       <version>1.3.5-SNAPSHOT</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.struts.action</groupId>
+   <groupId>org.apache.struts</groupId>
    <artifactId>struts-tiles</artifactId>
    <packaging>jar</packaging>
-   <name>Struts Action - Tiles</name>
+   <name>Struts 1 - Tiles</name>
    <url>http://struts.apache.org</url>
    
    <distributionManagement>
       <site>
          <id>apache-site</id>
-         <url>scp://people.apache.org/www/struts.apache.org/struts-action/struts-tiles</url>
+         <url>scp://people.apache.org/www/struts.apache.org/struts/struts-tiles</url>
       </site>
    </distributionManagement>
 
@@ -77,7 +77,7 @@
       </dependency>
 
       <dependency>
-         <groupId>org.apache.struts.action</groupId>
+         <groupId>org.apache.struts</groupId>
          <artifactId>struts-core</artifactId>
          <version>${pom.version}</version>
       </dependency>