geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r573412 - in /geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it: j2ee-system/ j2ee-system/src/test/ j2ee-system/src/test/resources/ j2ee-system/src/test/resources/META-INF/ metadatageneration/ metadatageneration/src/ metadatagener...
Date Thu, 06 Sep 2007 23:53:18 GMT
Author: djencks
Date: Thu Sep  6 16:53:14 2007
New Revision: 573412

URL: http://svn.apache.org/viewvc?rev=573412&view=rev
Log:
GERONIMO-3453 Add some tests for geronimo-plugin.xml generation

Added:
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
  (with props)
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/validate.groovy
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
  (with props)
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/validate.groovy
Modified:
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/pom.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/pom.xml?rev=573412&r1=573411&r2=573412&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/pom.xml Thu Sep
 6 16:53:14 2007
@@ -214,14 +214,6 @@
                     <category>Geronimo Core</category>
                     <osiApproved>true</osiApproved>
                     <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
-<!--
-                    <geronimoVersions>
-                        <value>2.1-SNAPSHOT</value>
-                    </geronimoVersions>
--->
-                    <jvmVersions>
-                        <value>1.5</value>
-                    </jvmVersions>
                     <dependencies>
                         <dependency>
                           <groupId>com.sun.xml.bind</groupId>
@@ -322,10 +314,6 @@
                           <import>classes</import>
                         </dependency>
                     </dependencies>
-                    <sourceRepositories>
-                        <value>http://foo.com</value>
-                        <value>http://bar.com</value>
-                    </sourceRepositories>
 
                 </configuration>
             </plugin>

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml?rev=573412&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
(added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
Thu Sep  6 16:53:14 2007
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+    <name>Geronimo Configs :: J2EE System</name>
+    <category>Geronimo Core</category>
+    <description>Apache Geronimo, the J2EE server project of the Apache Software Foundation.</description>
+    <url>http://geronimo.apache.org/</url>
+    <author>The Apache Geronimo development community</author>
+    <license osi-approved="true">The Apache Software License, Version 2.0</license>
+    <plugin-artifact>
+        <module-id>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>j2ee-system</artifactId>
+            <version>2.1-SNAPSHOT</version>
+            <type>car</type>
+        </module-id>
+        <dependency start="false">
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.0.5</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="false">
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <version>1.0</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="false">
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>2.1-SNAPSHOT</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="false">
+            <groupId>jline</groupId>
+            <artifactId>jline</artifactId>
+            <version>0.9.91</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="false">
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-util</artifactId>
+            <version>2.1-SNAPSHOT</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="false">
+            <groupId>ognl</groupId>
+            <artifactId>ognl</artifactId>
+            <version>2.6.9</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="false">
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>2.2.3</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="false">
+            <groupId>commons-jexl</groupId>
+            <artifactId>commons-jexl</artifactId>
+            <version>1.1</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="false">
+            <groupId>asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>2.2.3</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="false">
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.0</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="false">
+            <groupId>woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.1</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="false">
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.0</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="false">
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <version>1.0</version>
+            <type>jar</type>
+        </dependency>
+        <dependency start="false">
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>2.1-SNAPSHOT</version>
+            <type>jar</type>
+        </dependency>
+    </plugin-artifact>
+</geronimo-plugin>

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/validate.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/validate.groovy?rev=573412&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/validate.groovy
(added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/validate.groovy
Thu Sep  6 16:53:14 2007
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+
+def expected = new File(basedir, "src/test/resources/META-INF/geronimo-plugin.xml").text
+def found = new File(basedir, "target/resources/META-INF/geronimo-plugin.xml").text
+
+assert expected == found
\ No newline at end of file

Modified: 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=573412&r1=573411&r2=573412&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
(original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
Thu Sep  6 16:53:14 2007
@@ -110,18 +110,6 @@
                 <configuration>
                     <category>Test</category>
                     <osiApproved>true</osiApproved>
-                    <geronimoVersion>2.0.1</geronimoVersion>
-                    <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
-                    <!--
-                                        <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>
@@ -137,54 +125,6 @@
                             <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>
-                    <configSubstitutions>
-                        key1=value1
-                        key2=value2
-                    </configSubstitutions>
-                    <artifactAliases>
-                        org.apache.geronimo.test/foo//car=org.apache.geronimo.test/bar/1.0/car
-                    </artifactAliases>
                     <instance>
                         <plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2"
xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
                             <jvm-version>1.5</jvm-version>
@@ -201,6 +141,12 @@
                                 <groupId>commons-logging</groupId>
                                 <artifactId>commons-logging</artifactId>
                             </obsoletes>
+                            <config-xml-content>
+                                <gbean name="DownloadedPluginRepos">
+                                    <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</attribute>
+                                    <attribute name="userRepositories">~/.m2/repository</attribute>
+                                </gbean>
+                            </config-xml-content>
                             <source-repository>http://foo.com</source-repository>
                             <source-repository>http://bar.com</source-repository>
                             <copy-file relative-to="WEB-INF" dest-dir="bar">META-INF/foo.xml</copy-file>

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml?rev=573412&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
(added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
Thu Sep  6 16:53:14 2007
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+    <name>Geronimo Maven2 Plugins :: CAR</name>
+    <category>Test</category>
+    <description>Apache Geronimo, the J2EE server project of the Apache Software Foundation.</description>
+    <url>http://geronimo.apache.org/</url>
+    <author>The Apache Geronimo development community</author>
+    <license osi-approved="true">The Apache Software License, Version 2.0</license>
+    <plugin-artifact>
+        <module-id>
+            <groupId>org.apache.geronimo.plugins.it</groupId>
+            <artifactId>car-maven-plugin</artifactId>
+            <version>2.1-SNAPSHOT</version>
+            <type>jar</type>
+        </module-id>
+        <jvm-version>1.5</jvm-version>
+        <jvm-version>1.5.2</jvm-version>
+        <prerequisite>
+            <id>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+            </id>
+            <resource-type>joke</resource-type>
+            <description>this is an explanation</description>
+        </prerequisite>
+        <dependency start="false">
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <type>jar</type>
+        </dependency>
+        <dependency start="true">
+            <groupId>velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.4</version>
+            <type>jar</type>
+        </dependency>
+        <obsoletes>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </obsoletes>
+        <source-repository>http://foo.com</source-repository>
+        <source-repository>http://bar.com</source-repository>
+        <copy-file relative-to="WEB-INF" dest-dir="bar">META-INF/foo.xml</copy-file>
+        <config-xml-content>
+            <ns2:gbean>
+                <ns2:attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</ns2:attribute>
+                <ns2:attribute name="userRepositories">~/.m2/repository</ns2:attribute>
+            </ns2:gbean>
+        </config-xml-content>
+        <artifact-alias key="org.apache.geronimo.test/foo//car">org.apache.geronimo.test/bar/1.0/car</artifact-alias>
+        <config-substitution key="key2">value2</config-substitution>
+        <config-substitution key="key1">value1</config-substitution>
+    </plugin-artifact>
+</geronimo-plugin>

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

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

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

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/validate.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/validate.groovy?rev=573412&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/validate.groovy
(added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/validate.groovy
Thu Sep  6 16:53:14 2007
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+
+def expected = new File(basedir, "src/test/resources/META-INF/geronimo-plugin.xml").text
+def found = new File(basedir, "target/resources/META-INF/geronimo-plugin.xml").text
+
+assert expected == found
\ No newline at end of file



Mime
View raw message