Return-Path: 
 <commits-return-801-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
Delivered-To: apmail-struts-commits-archive@locus.apache.org
Received: (qmail 98827 invoked from network); 2 Jul 2006 00:16:37 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 2 Jul 2006 00:16:37 -0000
Received: (qmail 40069 invoked by uid 500); 2 Jul 2006 00:16:30 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 40030 invoked by uid 500); 2 Jul 2006 00:16:30 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 40021 invoked by uid 99); 2 Jul 2006 00:16:30 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Jul 2006 17:16:30 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Jul 2006 17:16:29 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 193D91A983A; Sat,  1 Jul 2006 17:16:09 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r418532 - in /struts/struts2/trunk: api/pom.xml
 apps/blank/pom.xml apps/pom.xml apps/portlet/pom.xml
 apps/shopping-cart/pom.xml apps/showcase/pom.xml apps/starter/pom.xml
 archetype/pom.xml core/pom.xml extras/pom.xml pom.xml uber/pom.xml
Date: Sun, 02 Jul 2006 00:16:07 -0000
To: commits@struts.apache.org
From: mrdon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060702001609.193D91A983A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: mrdon
Date: Sat Jul  1 17:16:06 2006
New Revision: 418532

URL: http://svn.apache.org/viewvc?rev=418532&view=rev
Log:
Trying putting struts2 in the artifact id rather than the group id.  This 
works better when having maven generate IDE projects so that they don't
conflict with Struts 1 artifacts.  Also fixed up a few other poms.

WW-1367

Modified:
    struts/struts2/trunk/api/pom.xml
    struts/struts2/trunk/apps/blank/pom.xml
    struts/struts2/trunk/apps/pom.xml
    struts/struts2/trunk/apps/portlet/pom.xml
    struts/struts2/trunk/apps/shopping-cart/pom.xml
    struts/struts2/trunk/apps/showcase/pom.xml
    struts/struts2/trunk/apps/starter/pom.xml
    struts/struts2/trunk/archetype/pom.xml
    struts/struts2/trunk/core/pom.xml
    struts/struts2/trunk/extras/pom.xml
    struts/struts2/trunk/pom.xml
    struts/struts2/trunk/uber/pom.xml

Modified: struts/struts2/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/api/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==============================================================================
--- struts/struts2/trunk/api/pom.xml (original)
+++ struts/struts2/trunk/api/pom.xml Sat Jul  1 17:16:06 2006
@@ -3,12 +3,12 @@
          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.action2</groupId>
-        <artifactId>struts-action2-parent</artifactId>
+        <groupId>org.apache.struts2</groupId>
+        <artifactId>struts2-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts.action2</groupId>
-    <artifactId>struts-api</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-api</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 API</name>
     <dependencies>

Modified: struts/struts2/trunk/apps/blank/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==============================================================================
--- struts/struts2/trunk/apps/blank/pom.xml (original)
+++ struts/struts2/trunk/apps/blank/pom.xml Sat Jul  1 17:16:06 2006
@@ -3,12 +3,12 @@
          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.struts2</groupId>
-      <artifactId>struts-apps</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts2-apps</artifactId>
       <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-blank</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-blank</artifactId>
     <packaging>war</packaging>
     <name>Blank Webapp</name>
     <dependencies>

Modified: struts/struts2/trunk/apps/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==============================================================================
--- struts/struts2/trunk/apps/pom.xml (original)
+++ struts/struts2/trunk/apps/pom.xml Sat Jul  1 17:16:06 2006
@@ -3,12 +3,12 @@
          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.struts2</groupId>
+        <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-apps</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>
     <name>Webapps</name>
     <modules>
@@ -121,8 +121,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>struts-core</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
             <version>${pom.version}</version>
         </dependency>
 

Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Sat Jul  1 17:16:06 2006
@@ -3,12 +3,12 @@
          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.struts2</groupId>
-      <artifactId>struts-apps</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts2-apps</artifactId>
       <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-portlet</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-portlet</artifactId>
     <packaging>war</packaging>
     <name>Portlet Webapp</name>
     <dependencies>

Modified: struts/struts2/trunk/apps/shopping-cart/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/pom.xml (original)
+++ struts/struts2/trunk/apps/shopping-cart/pom.xml Sat Jul  1 17:16:06 2006
@@ -3,12 +3,12 @@
          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.struts2</groupId>
-      <artifactId>struts-apps</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts2-apps</artifactId>
       <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-shopping-cart</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-shopping-cart</artifactId>
     <packaging>war</packaging>
     <name>Shopping Cart Webapp</name>
     <dependencies>

Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Sat Jul  1 17:16:06 2006
@@ -3,12 +3,12 @@
          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.struts2</groupId>
-        <artifactId>struts-apps</artifactId>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-apps</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-showcase</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-showcase</artifactId>
     <packaging>war</packaging>
     <name>Showcase Webapp</name>
     <profiles>

Modified: struts/struts2/trunk/apps/starter/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/starter/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==============================================================================
--- struts/struts2/trunk/apps/starter/pom.xml (original)
+++ struts/struts2/trunk/apps/starter/pom.xml Sat Jul  1 17:16:06 2006
@@ -3,12 +3,12 @@
          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.struts2</groupId>
-      <artifactId>struts-apps</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts2-apps</artifactId>
       <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-starter</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-starter</artifactId>
     <packaging>war</packaging>
     <name>Starter Webapp</name>
     <dependencies>

Modified: struts/struts2/trunk/archetype/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetype/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==============================================================================
--- struts/struts2/trunk/archetype/pom.xml (original)
+++ struts/struts2/trunk/archetype/pom.xml Sat Jul  1 17:16:06 2006
@@ -2,7 +2,7 @@
 
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.struts.action2</groupId>
+  <groupId>org.apache.struts</groupId>
   <artifactId>struts2-archetype-quickstart</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>

Modified: struts/struts2/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Sat Jul  1 17:16:06 2006
@@ -3,12 +3,12 @@
          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.struts2</groupId>
+        <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-core</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 - Core</name>
     

Modified: struts/struts2/trunk/extras/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/extras/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==============================================================================
--- struts/struts2/trunk/extras/pom.xml (original)
+++ struts/struts2/trunk/extras/pom.xml Sat Jul  1 17:16:06 2006
@@ -3,12 +3,12 @@
          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.struts2</groupId>
+        <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-extras</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-extras</artifactId>
     <packaging>jar</packaging>
     <name>Struts Extras</name>
     
@@ -29,8 +29,8 @@
         </dependency>
     
         <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>struts-core</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
             <version>${pom.version}</version>
         </dependency>
       

Modified: struts/struts2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Sat Jul  1 17:16:06 2006
@@ -30,7 +30,7 @@
    </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.struts2</groupId>
+    <groupId>org.apache.struts</groupId>
     <artifactId>struts2-parent</artifactId>
     <version>2.0-SNAPSHOT</version>
     <packaging>pom</packaging>

Modified: struts/struts2/trunk/uber/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/uber/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==============================================================================
--- struts/struts2/trunk/uber/pom.xml (original)
+++ struts/struts2/trunk/uber/pom.xml Sat Jul  1 17:16:06 2006
@@ -3,12 +3,12 @@
          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.struts2</groupId>
-        <artifactId>struts-action2-parent</artifactId>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>action-all</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-all</artifactId>
     <packaging>pom</packaging>
     <name>Uber Jar</name>
     <build>
@@ -34,28 +34,18 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>action-api</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>action</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>action-jasperreports</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>action-jfreechart</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>action-pell-file-upload</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-extras</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>