Return-Path: 
 <scm-return-21683-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 69942 invoked from network); 3 Sep 2007 17:40:21 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 3 Sep 2007 17:40:21 -0000
Received: (qmail 94369 invoked by uid 500); 3 Sep 2007 17:40:15 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 94301 invoked by uid 500); 3 Sep 2007 17:40:15 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 94290 invoked by uid 99); 3 Sep 2007 17:40:15 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Sep 2007 10:40:15 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Sep 2007 17:40:06 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id F0B7B1A9856; Mon,  3 Sep 2007 10:39:20 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r572395 [8/11] - in /geronimo/server/trunk: ./
 applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/
 applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/car/
 applications/geron...
Date: Mon, 03 Sep 2007 17:39:06 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20070903173920.F0B7B1A9856@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Added: geronimo/server/trunk/configs/webservices-common/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webservices-common/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/webservices-common/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/webservices-common/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+      <dep:artifactId>webservices-common</dep:artifactId>
+      <dep:version>2.1-SNAPSHOT</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+    <dep:dependencies>
+      <dep:dependency>
+        <dep:groupId>woodstox</dep:groupId>
+        <dep:artifactId>wstx-asl</dep:artifactId>
+        <dep:version>3.2.1</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-jaxws</dep:artifactId>
+        <dep:version>2.1-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>wsdl4j</dep:groupId>
+        <dep:artifactId>wsdl4j</dep:artifactId>
+        <dep:version>1.6.1</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>xmlbeans</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>j2ee-server</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>com.sun.xml.bind</dep:groupId>
+        <dep:artifactId>jaxb-impl</dep:artifactId>
+        <dep:version>2.0.5</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>com.sun.xml.messaging.saaj</dep:groupId>
+        <dep:artifactId>saaj-impl</dep:artifactId>
+        <dep:version>1.3</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>j2ee-security</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-webservices</dep:artifactId>
+        <dep:version>2.1-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+    </dep:dependencies>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/webservices-common/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/webservices-common/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/webservices-common/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/welcome-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-jetty/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/welcome-jetty/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/welcome-jetty/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.-->
+<!--$Rev$ $Date$-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+      <dep:artifactId>welcome-jetty</dep:artifactId>
+      <dep:version>2.1-SNAPSHOT</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+    <dep:dependencies>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>jasper</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+    </dep:dependencies>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+  <context-root>/</context-root>
+</web-app>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/welcome-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/welcome-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/welcome-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/welcome-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-tomcat/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/welcome-tomcat/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/welcome-tomcat/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.-->
+<!--$Rev$ $Date$-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+      <dep:artifactId>welcome-tomcat</dep:artifactId>
+      <dep:version>2.1-SNAPSHOT</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+    <dep:dependencies>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>jasper</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+    </dep:dependencies>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+  <context-root>/</context-root>
+</web-app>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/welcome-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/welcome-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/welcome-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/xmlbeans/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/xmlbeans/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/xmlbeans/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/xmlbeans/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.-->
+<!--$Rev$ $Date$-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+  <environment>
+    <moduleId>
+      <groupId>org.apache.geronimo.configs</groupId>
+      <artifactId>xmlbeans</artifactId>
+      <version>2.1-SNAPSHOT</version>
+      <type>car</type>
+    </moduleId>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jee-specs</artifactId>
+        <type>car</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xmlbeans</groupId>
+        <artifactId>xmlbeans</artifactId>
+        <version>2.3.0</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+    </dependencies>
+    <hidden-classes/>
+    <non-overridable-classes/>
+  </environment>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/xmlbeans/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/xmlbeans/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/xmlbeans/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml?rev=572395&r1=572394&r2=572395&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml Mon Sep  3 10:38:54 2007
@@ -109,6 +109,23 @@
             <version>2.0.4</version>
         </dependency>
         
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+        </dependency>
     </dependencies>
     
     <build>
@@ -118,6 +135,30 @@
                 <configuration>
                     <goalPrefix>car</goalPrefix>
                 </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>shitty-maven-plugin</artifactId>
+                <version>1.0-alpha-1-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>clean</goal>
+                            <goal>install</goal>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <projects>
+                                <fileset>
+                                    <directory>src/it</directory>
+                                    <includes>
+                                        <include>*/pom.xml</include>
+                                    </includes>
+                                </fileset>
+                            </projects>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

Copied: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/pom.xml (from r572392, geronimo/server/trunk/configs/j2ee-system/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/pom.xml?p2=geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/pom.xml&p1=geronimo/server/trunk/configs/j2ee-system/pom.xml&r1=572392&r2=572395&rev=572395&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/pom.xml Mon Sep  3 10:38:54 2007
@@ -21,7 +21,7 @@
 <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.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
@@ -32,9 +32,9 @@
     <artifactId>j2ee-system</artifactId>
     <name>Geronimo Configs :: J2EE System</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
@@ -48,7 +48,7 @@
             <artifactId>geronimo-common</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
@@ -81,7 +81,7 @@
             <groupId>jline</groupId>
             <artifactId>jline</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>commons-jexl</groupId>
             <artifactId>commons-jexl</artifactId>
@@ -92,8 +92,31 @@
             <artifactId>ognl</artifactId>
         </dependency>
 
+        <!-- used by plugin installer -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+        </dependency>
+
+
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -109,7 +132,7 @@
                             <mainClass>org.apache.geronimo.cli.daemon.DaemonCLI</mainClass>
                         </manifest>
                     </archive>
-                    
+
                     <!--
                     NOTE: This list of dependencies is non-transitive.
                     -->
@@ -164,11 +187,146 @@
                             <groupId>xstream</groupId>
                             <artifactId>xstream</artifactId>
                         </element>
+                        <!-- TODO bad idea... temp, for plugins -->
+                        <element>
+                            <groupId>javax.xml.bind</groupId>
+                            <artifactId>jaxb-api</artifactId>
+                        </element>
+                        <element>
+                            <groupId>com.sun.xml.bind</groupId>
+                            <artifactId>jaxb-impl</artifactId>
+                        </element>
+                        <element>
+                            <groupId>org.apache.geronimo.specs</groupId>
+                            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                        </element>
+                        <element>
+                            <groupId>woodstox</groupId>
+                            <artifactId>wstx-asl</artifactId>
+                        </element>
+                        <element>
+                            <groupId>org.apache.geronimo.specs</groupId>
+                            <artifactId>geronimo-activation_1.1_spec</artifactId>
+                        </element>
                     </classpath>
                     <classpathPrefix>../lib</classpathPrefix>
+
+                    <category>Geronimo Core</category>
+                    <osiApproved>true</osiApproved>
+                    <geronimoVersions>
+                        <value>2.1-SNAPSHOT</value>
+                    </geronimoVersions>
+                    <jvmVersions>
+                        <value>1.5</value>
+                    </jvmVersions>
+                    <dependencies>
+                        <dependency>
+                          <groupId>com.sun.xml.bind</groupId>
+                          <artifactId>jaxb-impl</artifactId>
+                          <version>2.0.5</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>org.apache.geronimo.specs</groupId>
+                          <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                          <version>1.0</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>org.apache.geronimo.modules</groupId>
+                          <artifactId>geronimo-common</artifactId>
+                          <version>2.1-SNAPSHOT</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>jline</groupId>
+                          <artifactId>jline</artifactId>
+                          <version>0.9.91</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>org.apache.geronimo.modules</groupId>
+                          <artifactId>geronimo-util</artifactId>
+                          <version>2.1-SNAPSHOT</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>ognl</groupId>
+                          <artifactId>ognl</artifactId>
+                          <version>2.6.9</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>asm</groupId>
+                          <artifactId>asm</artifactId>
+                          <version>2.2.3</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>commons-jexl</groupId>
+                          <artifactId>commons-jexl</artifactId>
+                          <version>1.1</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>asm</groupId>
+                          <artifactId>asm-commons</artifactId>
+                          <version>2.2.3</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>commons-cli</groupId>
+                          <artifactId>commons-cli</artifactId>
+                          <version>1.0</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>woodstox</groupId>
+                          <artifactId>wstx-asl</artifactId>
+                          <version>3.2.1</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>javax.xml.bind</groupId>
+                          <artifactId>jaxb-api</artifactId>
+                          <version>2.0</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>org.apache.geronimo.specs</groupId>
+                          <artifactId>geronimo-activation_1.1_spec</artifactId>
+                          <version>1.0</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>org.apache.geronimo.modules</groupId>
+                          <artifactId>geronimo-system</artifactId>
+                          <version>2.1-SNAPSHOT</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                    </dependencies>
+                    <sourceRepositories>
+                        <value>http://foo.com</value>
+                        <value>http://bar.com</value>
+                    </sourceRepositories>
+
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!--
+Configuration for the innermost ring of a Geronimo server.
+This module should only contain critical services needed to
+run other Configurations - for example, the ServerInfo, Logging
+and Repository services used to load them.
+
+This module should *NOT* be used to provide server or application
+specific services - those should be provided by children.
+-->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="EmbeddedDaemon" class="org.apache.geronimo.system.main.EmbeddedDaemon"/>
+
+    <!-- ServerInfo service -->
+    <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
+
+    <!--Repository-->
+    <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
+        <attribute name="root">repository/</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <!-- Pinged and changed when the server completes loading when all the persistent configuration is loaded -->
+    <gbean name="ServerStatus" class="org.apache.geronimo.system.main.ServerStatusGBean">
+        <attribute name="serverStarted">false</attribute>
+    </gbean>
+
+    <!--Configuration Store service-->
+    <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
+        <reference name="Repository">
+            <name>Repository</name>
+        </reference>
+    </gbean>
+
+    <!--User-editable attribute service-->
+    <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <attribute name="configFile">var/config/config.xml</attribute>
+        <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
+        <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
+    </gbean>
+
+    <!-- ArtifactManager -->
+    <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
+
+    <!-- ArtifactResolver -->
+    <gbean name="ArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">
+        <reference name="ArtifactManager">
+            <name>ArtifactManager</name>
+        </reference>
+        <reference name="Repositories"></reference>
+        <attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <!--Configuration Manager service-->
+    <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
+        <reference name="Repositories"></reference>
+        <reference name="Stores"></reference>
+        <reference name="Watchers"></reference>
+        <reference name="AttributeStore">
+            <name>AttributeManager</name>
+        </reference>
+        <reference name="PersistentConfigurationList">
+            <type>AttributeStore</type>
+            <name>AttributeManager</name>
+        </reference>
+        <reference name="ArtifactManager">
+            <name>ArtifactManager</name>
+        </reference>
+        <reference name="ArtifactResolver">
+            <name>ArtifactResolver</name>
+        </reference>
+    </gbean>
+
+    <!-- Logging service -->
+    <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
+        <attribute name="configFileName">var/log/server-log4j.properties</attribute>
+        <attribute name="refreshPeriodSeconds">60</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+</module>

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/goals.txt?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/goals.txt (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/goals.txt Mon Sep  3 10:38:54 2007
@@ -0,0 +1 @@
+org.apache.geronimo.plugins:car-maven-plugin:prepare-metadata

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/goals.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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.geronimo.plugins</groupId>
+        <artifactId>maven-plugins</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins.it</groupId>
+    <artifactId>car-maven-plugin</artifactId>
+    <name>Geronimo Maven2 Plugins :: CAR</name>
+    <packaging>jar</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-tool</artifactId>
+            <version>${version}</version>
+
+            <!-- exclude transitive deps -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                    <artifactId>geronimo-util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                    <artifactId>geronimo-deploy-jsr88</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-archiver</artifactId>
+            <version>2.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>Test</category>
+                    <osiApproved>true</osiApproved>
+                    <geronimoVersions>
+                        <value>2.0.1</value>
+                        <value>2.1-SNAPSHOT</value>
+                    </geronimoVersions>
+                    <jvmVersions>
+                        <value>1.5</value>
+                        <value>1.5.2</value>
+                    </jvmVersions>
+                    <dependencies>
+                        <dependency>
+                            <groupId>xstream</groupId>
+                            <artifactId>xstream</artifactId>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>velocity</groupId>
+                            <artifactId>velocity</artifactId>
+                            <version>1.4</version>
+                            <type>jar</type>
+                            <start>true</start>
+                            <import>classes</import>
+                        </dependency>
+                    </dependencies>
+                    <prerequisites>
+                        <prerequisite>
+                            <id>
+                                <groupId>commons-logging</groupId>
+                                <artifactId>commons-logging</artifactId>
+                            </id>
+                            <resource-type>joke</resource-type>
+                            <description>this is an explanation</description>
+                        </prerequisite>
+                    </prerequisites>
+                    <obsoletes>
+                        <moduleId>
+                            <groupId>commons-logging</groupId>
+                            <artifactId>commons-logging</artifactId>
+                        </moduleId>
+                    </obsoletes>
+                    <sourceRepositories>
+                        <value>http://foo.com</value>
+                        <value>http://bar.com</value>
+                    </sourceRepositories>
+                    <copyFiles>
+                        <copyFile>
+                            <file>META-INF/foo.xml</file>
+                            <relative-to>WEB-INF</relative-to>
+                            <dest-dir>bar</dest-dir>
+                        </copyFile>
+                    </copyFiles>
+                    <gbeans>
+                        <gbean>
+                            <name>SimpleGBean</name>
+                            <comment>this is a comment</comment>
+                            <load>false</load>
+                            <attributes>
+                                <attribute>
+                                    <name>attr</name>
+                                    <value>value</value>
+                                </attribute>
+
+                            </attributes>
+                        </gbean>
+                    </gbeans>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Attribute.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Attribute.java?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Attribute.java (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Attribute.java Mon Sep  3 10:38:54 2007
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.mavenplugins.car;
+
+import org.apache.geronimo.system.plugin.model.AttributeType;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class Attribute {
+
+    /**
+     * @parameter
+     */
+    private String name;
+    /**
+     * @parameter
+     */
+    private String value;
+
+
+    public String getName() {
+        return name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public AttributeType toAttributeType() {
+        AttributeType attributeType = new AttributeType();
+        attributeType.setName(name);
+        attributeType.getContent().add(value);
+        return attributeType;
+    }
+}

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Attribute.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Attribute.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Attribute.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CopyFile.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CopyFile.java?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CopyFile.java (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CopyFile.java Mon Sep  3 10:38:54 2007
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.mavenplugins.car;
+
+import org.apache.geronimo.system.plugin.model.CopyFileType;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class CopyFile {
+
+    /**
+     * @parameter
+     */
+    private String file;
+
+    /**
+     * @parameter
+     */
+    private String relativeTo;
+
+    /**
+     * @parameter
+     */
+    private String destDir;
+
+
+    public String getFile() {
+        return file;
+    }
+
+    public String getRelativeTo() {
+        return relativeTo;
+    }
+
+    public String getDestDir() {
+        return destDir;
+    }
+
+    CopyFileType toCopyFileType() {
+        CopyFileType copyFileType = new CopyFileType();
+        copyFileType.setValue(file);
+        copyFileType.setRelativeTo(relativeTo);
+        copyFileType.setDestDir(destDir);
+        return copyFileType;
+    }
+}

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CopyFile.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CopyFile.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CopyFile.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java Mon Sep  3 10:38:54 2007
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.mavenplugins.car;
+
+import org.apache.geronimo.kernel.repository.ImportType;
+import org.apache.geronimo.system.plugin.model.DependencyType;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class Dependency extends ModuleId {
+
+    /**
+     * @parameter
+     */
+    private boolean start;
+
+
+    public boolean isStart() {
+        return start;
+    }
+
+    public DependencyType toDependencyType() {
+        DependencyType dependency = new DependencyType();
+        dependency.setGroupId(groupId);
+        dependency.setArtifactId(artifactId);
+        dependency.setVersion(version);
+        dependency.setType(type);
+        dependency.setStart(start);
+        return dependency;
+    }
+
+    public org.apache.geronimo.kernel.repository.Dependency toDependency() {
+        org.apache.geronimo.kernel.repository.Artifact artifact = new org.apache.geronimo.kernel.repository.Artifact(groupId, artifactId, version, type);
+        ImportType importType = getImport() == null? ImportType.ALL: (ImportType) ImportType.getByName(getImport());
+        return new org.apache.geronimo.kernel.repository.Dependency(artifact, importType);
+    }
+
+    public String toString() {
+        return groupId + ":" + artifactId + ":" + version + ":" + type;
+    }
+}

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Gbean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Gbean.java?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Gbean.java (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Gbean.java Mon Sep  3 10:38:54 2007
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.mavenplugins.car;
+
+import java.util.List;
+
+import org.apache.geronimo.system.plugin.model.GbeanType;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class Gbean {
+    /**
+     * @parameter
+     */
+    private String name;
+    /**
+     * @parameter
+     */
+    private String comment;
+    /**
+     * @parameter
+     */
+    private boolean load;
+    /**
+     * @parameter
+     */
+    private List<Attribute> attributes;
+
+    public String getName() {
+        return name;
+    }
+
+    public List<Attribute> getAttributes() {
+        return attributes;
+    }
+
+    GbeanType toGBeanType() {
+        GbeanType gbeanType = new GbeanType();
+        gbeanType.setName(name);
+        gbeanType.setComment(comment);
+        gbeanType.setLoad(load);
+        for (Attribute attribute : attributes) {
+            gbeanType.getAttributeOrReference().add(attribute.toAttributeType());
+        }
+        return gbeanType;
+    }
+}

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Gbean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Gbean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Gbean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ModuleId.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ModuleId.java?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ModuleId.java (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ModuleId.java Mon Sep  3 10:38:54 2007
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.mavenplugins.car;
+
+import org.apache.geronimo.system.plugin.model.ArtifactType;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ModuleId {
+    /**
+     * @parameter
+     */
+    protected String groupId;
+    /**
+     * @parameter
+     */
+    protected String artifactId;
+    /**
+     * @parameter
+     */
+    protected String version;
+    /**
+     * @parameter
+     */
+    protected String type;
+
+    private String importType;
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public String getArtifactId() {
+        return artifactId;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+
+    /**
+     * @parameter
+     */
+    public void setImport(String importType) {
+        this.importType = importType;
+    }
+
+    public String getImport() {
+        return importType;
+    }
+
+    public ArtifactType toArtifactType() {
+        ArtifactType artifact = new ArtifactType();
+        artifact.setGroupId(groupId);
+        artifact.setArtifactId(artifactId);
+        artifact.setVersion(version);
+        artifact.setType(type);
+        return artifact;
+    }
+}

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ModuleId.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ModuleId.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ModuleId.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=572395&r1=572394&r2=572395&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java Mon Sep  3 10:38:54 2007
@@ -175,7 +175,7 @@
     /**
      * The plan file for the CAR.
      *
-     * @parameter expression="${project.build.directory}/plan/plan.xml"
+     * @parameter expression="${project.build.directory}/resources/META-INF/plan.xml"
      * @required
      */
     private File planFile = null;
@@ -232,6 +232,10 @@
     private boolean bootstrap = false;
 
     /**
+     * @parameter expression="${project.build.directory}/resources"
+     */
+    private File resourcesDir;
+    /**
      * Holds a local repo lookup instance so that we can use the current project to resolve.
      * This is required since the Kernel used to deploy is cached.
      */
@@ -355,6 +359,10 @@
             // Include the optional classes.resources
             if (classesDirectory.isDirectory()) {
                 archiver.getArchiver().addDirectory(classesDirectory);
+            }
+
+            if (resourcesDir.isDirectory()) {
+                archiver.getArchiver().addDirectory(resourcesDir);
             }
             
             //

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java?rev=572395&r1=572394&r2=572395&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java Mon Sep  3 10:38:54 2007
@@ -21,8 +21,7 @@
 
 import java.io.File;
 import java.io.StringWriter;
-
-import java.util.Iterator;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Properties;
@@ -32,17 +31,12 @@
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.deployment.xbeans.ArtifactType;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
-import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.ImportType;
-
-import org.apache.maven.model.Dependency;
-
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.app.VelocityEngine;
-
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
@@ -66,13 +60,13 @@
     private static final QName ENVIRONMENT_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.2", "environment");
 
     /**
-     * @parameter expression="${basedir}/src/plan"
+     * @parameter expression="${basedir}/src/main/plan"
      * @required
      */
     protected File sourceDir = null;
 
     /**
-     * @parameter expression="${project.build.directory}/plan"
+     * @parameter expression="${project.build.directory}/resources/META-INF"
      * @required
      */
     protected File targetDir = null;
@@ -84,18 +78,23 @@
     protected String planFileName = null;
 
     /**
-     * @parameter expression="${project.build.directory}/plan/plan.xml"
+     * @parameter expression="${project.build.directory}/resources/META-INF/plan.xml"
      * @required
      */
     protected File targetFile = null;
 
+    /**
+     * @parameter
+     */
+    private List<Dependency> dependencies = Collections.emptyList();
+
     private VelocityContext createContext() {
         VelocityContext context = new VelocityContext();
 
         // Load properties, It inherits them all!
         Properties props = project.getProperties();
-        for (Iterator iter = props.keySet().iterator(); iter.hasNext();) {
-            String key = (String) iter.next();
+        for (Object o : props.keySet()) {
+            String key = (String) o;
             String value = props.getProperty(key);
 
             log.debug("Setting " + key + "=" + value);
@@ -136,7 +135,7 @@
 
         XmlObject doc = XmlObject.Factory.parse(plan);
         XmlCursor xmlCursor = doc.newCursor();
-        LinkedHashSet dependencies = toDependencies();
+        LinkedHashSet<org.apache.geronimo.kernel.repository.Dependency> dependencies = toDependencies();
         Artifact configId = new Artifact(project.getGroupId(), project.getArtifactId(), project.getVersion(), "car");
 
         try {
@@ -162,7 +161,7 @@
         }
     }
 
-    void mergeEnvironment(final XmlCursor xmlCursor, final Artifact configId, final LinkedHashSet dependencies) {
+    void mergeEnvironment(final XmlCursor xmlCursor, final Artifact configId, final LinkedHashSet<org.apache.geronimo.kernel.repository.Dependency> dependencies) {
         moveToFirstStartElement(xmlCursor);
 
         boolean atLeastOneChild = xmlCursor.toFirstChild();
@@ -239,72 +238,15 @@
         }
     }
 
-    private LinkedHashSet toDependencies() {
-        List artifacts = project.getDependencies();
-        LinkedHashSet dependencies = new LinkedHashSet();
-
-        Iterator iter = artifacts.iterator();
-        while (iter.hasNext()) {
-            Dependency dependency = (Dependency) iter.next();
-
-            //
-            // HACK: Does not appear that we can get the "extention" status of a dependency,
-            //       so specifically exclude the ones that we know about, like genesis
-            //
-
-            if (dependency.getGroupId().startsWith("org.apache.geronimo.genesis")) {
-                continue;
-            }
+    private LinkedHashSet<org.apache.geronimo.kernel.repository.Dependency> toDependencies() {
+        LinkedHashSet<org.apache.geronimo.kernel.repository.Dependency> dependencies = new LinkedHashSet<org.apache.geronimo.kernel.repository.Dependency>();
 
-            org.apache.geronimo.kernel.repository.Dependency gdep = toGeronimoDependency(dependency);
-            if (gdep != null) {
+        for (Dependency dependency : this.dependencies) {
+            org.apache.geronimo.kernel.repository.Dependency gdep = dependency.toDependency();
                 dependencies.add(gdep);
-            }
         }
 
         return dependencies;
-    }
-
-    private static org.apache.geronimo.kernel.repository.Dependency toGeronimoDependency(final Dependency dependency) {
-        Artifact artifact = toGeronimoArtifact(dependency);
-        String type = dependency.getType();
-        String scope = dependency.getScope();
-        String groupId = dependency.getGroupId();
-
-        //!"org.apache.geronimo.specs".equals(groupId) jacc spec needed in plan.xml
-        if ("jar".equalsIgnoreCase(type) && !"junit".equals(groupId) && (scope == null || !scope.equals("provided"))) {
-            if (dependency.getVersion() != null) {
-                artifact = new Artifact(
-                    artifact.getGroupId(),
-                    artifact.getArtifactId(),
-                    dependency.getVersion(),
-                    artifact.getType());
-            }
-            return new org.apache.geronimo.kernel.repository.Dependency(artifact, ImportType.CLASSES);
-        }
-        else if ("car".equalsIgnoreCase(type) && "runtime".equalsIgnoreCase(scope)) {
-            return new org.apache.geronimo.kernel.repository.Dependency(artifact, ImportType.CLASSES);
-        }
-        //doesn't work
-//        else if ("car".equalsIgnoreCase(type) && "provided".equalsIgnoreCase(scope)) {
-//            return new org.apache.geronimo.kernel.repository.Dependency(artifact, ImportType.CLASSES);
-//        }
-        else if ("car".equalsIgnoreCase(type) && (scope == null || "compile".equalsIgnoreCase(scope))) { //parent
-            return new org.apache.geronimo.kernel.repository.Dependency(artifact, ImportType.ALL);
-        }
-        else {
-            // not one of ours
-            return null;
-        }
-    }
-
-    private static Artifact toGeronimoArtifact(final Dependency dependency) {
-        String groupId = dependency.getGroupId();
-        String artifactId = dependency.getArtifactId();
-        String version = null;
-        String type = dependency.getType();
-
-        return new Artifact(groupId, artifactId, version, type);
     }
 
     interface Inserter {

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java Mon Sep  3 10:38:54 2007
@@ -0,0 +1,175 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.mavenplugins.car;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.geronimo.deployment.xbeans.EnvironmentType;
+import org.apache.geronimo.system.plugin.PluginInstallerGBean;
+import org.apache.geronimo.system.plugin.model.ArtifactType;
+import org.apache.geronimo.system.plugin.model.LicenseType;
+import org.apache.geronimo.system.plugin.model.PluginArtifactType;
+import org.apache.geronimo.system.plugin.model.PluginType;
+import org.apache.maven.model.License;
+
+/**
+ * Add dependencies to a plan and process with velocity
+ *
+ * @goal prepare-metadata
+ *
+ * @version $Rev$ $Date$
+ */
+public class PluginMetadataGeneratorMojo
+        extends AbstractCarMojo
+{
+
+    /**
+     * @parameter expression="${project.build.directory}/resources/META-INF"
+     * @required
+     */
+    protected File targetDir = null;
+
+    /**
+     * @parameter default-value="geronimo-plugin.xml"
+     * @required
+     */
+    protected String pluginMetadataFileName = null;
+
+    /**
+     * @parameter expression="${project.build.directory}/resources/META-INF/geronimo-plugin.xml"
+     * @required
+     */
+    protected File targetFile = null;
+
+    /**
+     * @parameter default-value="false"
+     */
+    private boolean osiApproved;
+
+    /**
+     * @parameter
+     */
+    private List<String> geronimoVersions = Collections.emptyList();
+
+    /**
+     * @parameter
+     */
+    private List<String> jvmVersions = Collections.emptyList();
+
+    /**
+     * @parameter
+     */
+    private String category;
+
+    /**
+     * @parameter
+     */
+    private List<Prerequisite> prerequisites = Collections.emptyList();
+
+    /**
+     * @parameter
+     */
+    private List<Dependency> dependencies = Collections.emptyList();
+
+    /**
+     * @parameter
+     */
+    private List<ModuleId> obsoletes = Collections.emptyList();
+
+    /**
+     * @parameter
+     */
+    private List<String> sourceRepositories = Collections.emptyList();
+
+    /**
+     * @parameter
+     */
+    private List<CopyFile> copyFiles = Collections.emptyList();
+    /**
+     * @parameter
+     */
+    private List<Gbean> gbeans;
+
+    protected void doExecute() throws Exception {
+
+        PluginType metadata = new PluginType();
+        metadata.setName(project.getName());
+        metadata.setAuthor(project.getOrganization().getName());
+        metadata.setUrl(project.getOrganization().getUrl());
+        metadata.setDescription(project.getDescription());
+        metadata.setCategory(category);
+
+        for (Object licenseObj: project.getLicenses()) {
+            License license = (License) licenseObj;
+            LicenseType licenseType = new LicenseType();
+            licenseType.setValue(license.getName());
+            licenseType.setOsiApproved(osiApproved);
+            metadata.getLicense().add(licenseType);
+        }
+
+        PluginArtifactType instance = new PluginArtifactType();
+        metadata.getPluginArtifact().add(instance);
+
+        ArtifactType artifactType = new ArtifactType();
+        artifactType.setGroupId(project.getGroupId());
+        artifactType.setArtifactId(project.getArtifactId());
+        artifactType.setVersion(project.getVersion());
+        artifactType.setType(project.getArtifact().getType());
+        instance.setModuleId(artifactType);
+
+        instance.getGeronimoVersion().addAll(geronimoVersions);
+        instance.getJvmVersion().addAll(jvmVersions);
+        for (Prerequisite prerequisite: prerequisites) {
+            instance.getPrerequisite().add(prerequisite.toPrerequisiteType());
+        }
+        for (Dependency dependency: dependencies) {
+            instance.getDependency().add(dependency.toDependencyType());
+        }
+        for (ModuleId obsolete: obsoletes) {
+            instance.getObsoletes().add(obsolete.toArtifactType());
+        }
+
+        instance.getSourceRepository().addAll(sourceRepositories);
+        for (CopyFile copyFile: copyFiles) {
+            instance.getCopyFile().add(copyFile.toCopyFileType());
+        }
+        if (gbeans != null && gbeans.size() > 0) {
+            PluginArtifactType.ConfigXmlContent configXmlContent = new PluginArtifactType.ConfigXmlContent();
+            for (Gbean gbean: gbeans) {
+                configXmlContent.getGbean().add(gbean.toGBeanType());
+            }
+            instance.setConfigXmlContent(configXmlContent);
+        }
+
+        targetDir.mkdirs();
+        FileOutputStream out = new FileOutputStream(targetFile);
+        try {
+            PluginInstallerGBean.writePluginMetadata(metadata, out);
+        } finally {
+            out.close();
+        }
+        getProject().getResources().add(targetFile);
+    }
+
+}

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Prerequisite.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Prerequisite.java?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Prerequisite.java (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Prerequisite.java Mon Sep  3 10:38:54 2007
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.mavenplugins.car;
+
+import org.apache.geronimo.system.plugin.model.PrerequisiteType;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class Prerequisite {
+
+    /**
+     * @parameter
+     */
+    private ModuleId id;
+
+    /**
+     * @parameter
+     */
+    private String resourceType;
+
+    /**
+     * @parameter
+     */
+    private String description;
+
+
+    public ModuleId getId() {
+        return id;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    PrerequisiteType toPrerequisiteType() {
+        PrerequisiteType prereq = new PrerequisiteType();
+        prereq.setId(id.toArtifactType());
+        prereq.setResourceType(resourceType);
+        prereq.setDescription(description);
+        return prereq;
+    }
+
+}

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Prerequisite.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Prerequisite.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Prerequisite.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java Mon Sep  3 10:38:54 2007
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.mavenplugins.car;
+
+import java.util.List;
+import java.util.Collections;
+
+
+
+/**
+ * @goal validate-configuration
+
+ * @version $Rev$ $Date$
+ */
+public class ValidateConfigurationMojo extends AbstractCarMojo {
+
+    /**
+     * @parameter
+     */
+    private List<Dependency> dependencies = Collections.emptyList();
+
+
+    public void doExecute() {
+        for (Dependency dependency: dependencies) {
+            checkForMatch(dependency);
+        }
+    }
+
+    private void checkForMatch(Dependency dependency) {
+        for (Object o: getProject().getDependencies())  {
+            org.apache.maven.model.Dependency test = (org.apache.maven.model.Dependency) o;
+            if (matches(test, dependency)) {
+                return;
+            }
+        }
+        throw new IllegalStateException("No match for dependency: " + dependency);
+
+    }
+
+    private boolean matches(org.apache.maven.model.Dependency test, Dependency dependency) {
+        if (dependency.getGroupId() != null && !dependency.getGroupId().equals(test.getGroupId())) {
+            return false;
+        }
+        if (dependency.getArtifactId() != null && !dependency.getArtifactId().equals(test.getArtifactId())) {
+            return false;
+        }
+        if (dependency.getVersion() != null && !dependency.getVersion().equals(test.getVersion())) {
+            return false;
+        }
+        if (dependency.getType() != null && !dependency.getType().equals(test.getType())) {
+            return false;
+        }
+        return true;
+    }
+
+}

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=572395&r1=572394&r2=572395&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml Mon Sep  3 10:38:54 2007
@@ -36,7 +36,9 @@
                         <id>default</id>
                         <phases>
                             <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-                            <compile>org.apache.geronimo.plugins:car-maven-plugin:prepare-plan</compile>
+                            <compile>org.apache.geronimo.plugins:car-maven-plugin:validate-configuration,
+                            org.apache.geronimo.plugins:car-maven-plugin:prepare-plan,
+                            org.apache.geronimo.plugins:car-maven-plugin:prepare-metadata</compile>
                             <package>org.apache.geronimo.plugins:car-maven-plugin:package</package>
                             <install>org.apache.maven.plugins:maven-install-plugin:install</install>
                             <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>