geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r572395 [11/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/gero...
Date Mon, 03 Sep 2007 17:39:06 GMT
Modified: geronimo/server/trunk/modules/geronimo-system/src/test/data/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/test/data/geronimo-plugins.xml?rev=572395&r1=572394&r2=572395&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/test/data/geronimo-plugins.xml (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/test/data/geronimo-plugins.xml Mon Sep
 3 10:38:54 2007
@@ -17,206 +17,289 @@
 -->
 
 <geronimo-plugin-list xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
-<plugin>
-<name>DayTrader Performance Testing App (Jetty/Derby)</name>
-<module-id>geronimo/daytrader-derby-jetty/1.2-SNAPSHOT/car</module-id>
-<category>Examples</category>
-<description>Test Data</description>
-<geronimo-versions>
-	<version>1.2-SNAPSHOT</version>
-</geronimo-versions>
-<prerequisite><id>geronimo/jetty/*/car</id><description>
-		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
-</description></prerequisite>
-<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-<dependency>geronimo/geronimo-daytrader-derby-db/1.2-SNAPSHOT/jar</dependency>
-</plugin>
-
-<plugin>
-<name>DayTrader Client (Jetty/Derby)</name>
-<module-id>geronimo/daytrader-derby-jetty-streamer-client/1.1-SNAPSHOT/car</module-id>
-<category>Examples</category>
-<description>Test Data</description>
-<geronimo-versions>
-	<version>1.2-SNAPSHOT</version>
-</geronimo-versions>
-<prerequisite><id>geronimo/jetty/*/car</id><description>
-		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
-</description></prerequisite>
-<dependency>geronimo/client/1.2-SNAPSHOT/car</dependency>
-</plugin>
-
-<plugin>
-<name>Jakarta JSP Examples (Jetty)</name>
-<module-id>geronimo/jsp-examples-jetty/1.2-SNAPSHOT/car</module-id>
-<category>Examples</category>
-<description>Test Data</description>
-<geronimo-versions>
-	<version>1.2-SNAPSHOT</version>
-</geronimo-versions>
-<prerequisite><id>geronimo/jetty/*/car</id><description>
-		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
-</description></prerequisite>
-<dependency>commons-collections/commons-collections/3.1/jar</dependency>
-<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-<dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
-</plugin>
-
-<plugin>
-<name>LDAP Demo Web App (Jetty)</name>
-<module-id>geronimo/ldap-demo-jetty/1.2-SNAPSHOT/car</module-id>
-<category>Examples</category>
-<description>Test Data</description>
-<geronimo-versions>
-	<version>1.2-SNAPSHOT</version>
-</geronimo-versions>
-<prerequisite><id>geronimo/jetty/*/car</id><description>
-		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
-</description></prerequisite>
-<dependency>geronimo/ldap-realm/1.2-SNAPSHOT/car</dependency>
-<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-<dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
-</plugin>
-
-<plugin>
-<name>LDAP Demo Security Realm</name>
-<module-id>geronimo/ldap-realm/1.2-SNAPSHOT/car</module-id>
-<category>Examples</category>
-<description>Test Data</description>
-<geronimo-versions>
-	<version>1.2-SNAPSHOT</version>
-</geronimo-versions>
-<jvm-version>1.5</jvm-version>
-<dependency>geronimo/j2ee-security/1.2-SNAPSHOT/car</dependency>
-</plugin>
-
-<plugin>
-<name>Jakarta Servlet Examples (Jetty)</name>
-<module-id>geronimo/servlets-examples-jetty/1.2-SNAPSHOT/car</module-id>
-<category>Examples</category>
-<description>Test Data</description>
-<geronimo-versions>
-	<version>1.2-SNAPSHOT</version>
-</geronimo-versions>
-<prerequisite><id>geronimo/jetty/*/car</id><description>
-		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
-</description></prerequisite>
-<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-<dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
-</plugin>
-
-<plugin>
-<name>jUDDI Server 0.9rc4 for Geronimo</name>
-<module-id>geronimo/uddi-jetty/1.2-SNAPSHOT/car</module-id>
-<category>Integration</category>
-<description>Test Data</description>
-<geronimo-versions>
-	<version>1.2-SNAPSHOT</version>
-</geronimo-versions>
-<prerequisite><id>geronimo/jetty/*/car</id><description>
-		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
-</description></prerequisite>
-<dependency>geronimo/system-database/1.2-SNAPSHOT/car</dependency>
-<dependency>juddi/juddi/0.9rc4/jar</dependency>
-<dependency>geronimo/geronimo-uddi-db/1.2-SNAPSHOT/jar</dependency>
-<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-</plugin>
-
-<plugin>
-<name>Geronimo Admin Console (Jetty)</name>
-<module-id>geronimo/webconsole-jetty/1.2-SNAPSHOT/car</module-id>
-<category>Core Geronimo</category>
-<description>Test Data</description>
-<geronimo-versions>
-	<version>1.2-SNAPSHOT</version>
-</geronimo-versions>
-<prerequisite><id>geronimo/jetty/*/car</id><description>
-		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
-</description></prerequisite>
-<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-<dependency>geronimo/j2ee-security/1.2-SNAPSHOT/car</dependency>
-<dependency>portlet-api/portlet-api/1.0/jar</dependency>
-<dependency>org.apache.pluto/pluto/1.0.1/jar</dependency>
-<dependency>geronimo/geronimo-console-core/1.2-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-management/1.2-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-test-ddbean/1.2-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-deploy-jsr88/1.2-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-deploy-config/1.2-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-service-builder/1.2-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-connector-builder/1.2-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-naming-builder/1.2-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-security-builder/1.2-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-j2ee-schema/1.2-SNAPSHOT/jar</dependency>
-<dependency>xmlbeans/xbean/2.0.0/jar</dependency>
-<dependency>stax/stax-api/1.0/jar</dependency>
-<dependency>activemq/activemq-gbean-management/3.2.4-SNAPSHOT/jar</dependency>
-<dependency>activemq/activemq-gbean/3.2.4-SNAPSHOT/jar</dependency>
-<dependency>activemq/activemq-core/3.2.4-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-converter/1.2-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-util/1.2-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-jetty/1.2-SNAPSHOT/jar</dependency>
-</plugin>
-
-<plugin>
-<name>Geronimo Remote Deployment Support (Jetty)</name>
-<module-id>geronimo/remote-deploy-jetty/1.2-SNAPSHOT/car</module-id>
-<category>Core Geronimo</category>
-<description>Test Data</description>
-<geronimo-versions>
-	<version>1.2-SNAPSHOT</version>
-</geronimo-versions>
-<prerequisite><id>geronimo/jetty/*/car</id><description>
-		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
-</description></prerequisite>
-<dependency>geronimo/geronimo-remote-deploy-lib/1.2-SNAPSHOT/jar</dependency>
-<dependency>xmlbeans/xbean/2.0.0/jar</dependency>
-<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-<dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
-</plugin>
-
-<plugin>
-<name>Geronimo JMX Debug Tool (Jetty)</name>
-<module-id>geronimo/jmxdebug-jetty/1.2-SNAPSHOT/car</module-id>
-<category>Core Geronimo</category>
-<description>Test Data</description>
-<geronimo-versions>
-	<version>1.2-SNAPSHOT</version>
-</geronimo-versions>
-<prerequisite><id>geronimo/jetty/*/car</id><description>
-		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
-</description></prerequisite>
-<dependency>commons-collections/commons-collections/3.1/jar</dependency>
-<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-<dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
-</plugin>
-
-<plugin>
-<name>Geronimo Welcome App (Jetty)</name>
-<module-id>geronimo/welcome-jetty/1.2-SNAPSHOT/car</module-id>
-<category>Core Geronimo</category>
-<description>Test Data</description>
-<geronimo-versions>
-	<version>1.2-SNAPSHOT</version>
-</geronimo-versions>
-<prerequisite><id>geronimo/jetty/*/car</id><description>
-		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
-</description></prerequisite>
-<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-<dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
-</plugin>
-
-<plugin>
-<name>Apache Directory 0.92 for Geronimo</name>
-<module-id>geronimo/directory/1.2-SNAPSHOT/car</module-id>
-<category>Security</category>
-<description>Test Data</description>
-<geronimo-versions>
-	<version>1.2-SNAPSHOT</version>
-</geronimo-versions>
-<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-<dependency>geronimo/geronimo-directory/1.2-SNAPSHOT/jar</dependency>
-</plugin>
+    <plugin>
+        <name>DayTrader Performance Testing App (Jetty/Derby)</name>
+        <category>Examples</category>
+        <description>Test Data</description>
+        <plugin-artifact>
+            <module-id>
+                <groupId>geronimo</groupId>
+                <artifactId>daytrader-derby-jetty</artifactId>
+                <version>1.2-SNAPSHOT</version>
+                <type>car</type>
+            </module-id>
+            <geronimo-versions>
+                <version>1.2-SNAPSHOT</version>
+            </geronimo-versions>
+            <prerequisite>
+                <id>
+                    <groupId>geronimo</groupId>
+                    <artifactId>jetty</artifactId>
+                    <type>car</type>
+                </id>
+                <description>
+                    This is a web application or web-related module, configured for the Jetty
web container. It will not
+                    run
+                    on Tomcat versions of Geronimo. If you need a Tomcat version of this
application, you'll need to get
+                    it
+                    from another Tomcat Geronimo installation.
+                </description>
+            </prerequisite>
+            <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+            <dependency>geronimo/geronimo-daytrader-derby-db/1.2-SNAPSHOT/jar</dependency>
+        </plugin-artifact>
+    </plugin>
+
+    <plugin>
+        <name>DayTrader Client (Jetty/Derby)</name>
+        <category>Examples</category>
+        <description>Test Data</description>
+        <plugin-artifact>
+            <module-id>
+                <groupId>geronimo</groupId>
+                <artifactId>daytrader-derby-jetty-streamer-client</artifactId>
+                <version>1.2-SNAPSHOT</version>
+                <type>car</type>
+            </module-id>
+            <geronimo-versions>
+                <version>1.2-SNAPSHOT</version>
+            </geronimo-versions>
+            <prerequisite>
+                <id>
+                    <groupId>geronimo</groupId>
+                    <artifactId>jetty</artifactId>
+                    <type>car</type>
+                </id>
+                <description>
+                    This is a web application or web-related module, configured for the Jetty
web container. It will not
+                    run
+                    on Tomcat versions of Geronimo. If you need a Tomcat version of this
application, you'll need to get
+                    it
+                    from another Tomcat Geronimo installation.
+                </description>
+            </prerequisite>
+            <dependency>
+                <groupId>geronimo</groupId>
+                <artifactId>client</artifactId>
+                <version>1.2-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+        </plugin-artifact>
+    </plugin>
+
+<!--
+    <plugin>
+        <name>Jakarta JSP Examples (Jetty)</name>
+        <module-id>geronimo/jsp-examples-jetty/1.2-SNAPSHOT/car</module-id>
+        <category>Examples</category>
+        <description>Test Data</description>
+        <geronimo-versions>
+            <version>1.2-SNAPSHOT</version>
+        </geronimo-versions>
+        <prerequisite>
+            <id>geronimo/jetty/*/car</id>
+            <description>
+                This is a web application or web-related module, configured for the Jetty
web container. It will not run
+                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
+                from another Tomcat Geronimo installation.
+            </description>
+        </prerequisite>
+        <dependency>commons-collections/commons-collections/3.1/jar</dependency>
+        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+        <dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
+    </plugin>
+
+    <plugin>
+        <name>LDAP Demo Web App (Jetty)</name>
+        <module-id>geronimo/ldap-demo-jetty/1.2-SNAPSHOT/car</module-id>
+        <category>Examples</category>
+        <description>Test Data</description>
+        <geronimo-versions>
+            <version>1.2-SNAPSHOT</version>
+        </geronimo-versions>
+        <prerequisite>
+            <id>geronimo/jetty/*/car</id>
+            <description>
+                This is a web application or web-related module, configured for the Jetty
web container. It will not run
+                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
+                from another Tomcat Geronimo installation.
+            </description>
+        </prerequisite>
+        <dependency>geronimo/ldap-realm/1.2-SNAPSHOT/car</dependency>
+        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+        <dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
+    </plugin>
+
+    <plugin>
+        <name>LDAP Demo Security Realm</name>
+        <module-id>geronimo/ldap-realm/1.2-SNAPSHOT/car</module-id>
+        <category>Examples</category>
+        <description>Test Data</description>
+        <geronimo-versions>
+            <version>1.2-SNAPSHOT</version>
+        </geronimo-versions>
+        <jvm-version>1.5</jvm-version>
+        <dependency>geronimo/j2ee-security/1.2-SNAPSHOT/car</dependency>
+    </plugin>
+
+    <plugin>
+        <name>Jakarta Servlet Examples (Jetty)</name>
+        <module-id>geronimo/servlets-examples-jetty/1.2-SNAPSHOT/car</module-id>
+        <category>Examples</category>
+        <description>Test Data</description>
+        <geronimo-versions>
+            <version>1.2-SNAPSHOT</version>
+        </geronimo-versions>
+        <prerequisite>
+            <id>geronimo/jetty/*/car</id>
+            <description>
+                This is a web application or web-related module, configured for the Jetty
web container. It will not run
+                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
+                from another Tomcat Geronimo installation.
+            </description>
+        </prerequisite>
+        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+        <dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
+    </plugin>
+
+    <plugin>
+        <name>jUDDI Server 0.9rc4 for Geronimo</name>
+        <module-id>geronimo/uddi-jetty/1.2-SNAPSHOT/car</module-id>
+        <category>Integration</category>
+        <description>Test Data</description>
+        <geronimo-versions>
+            <version>1.2-SNAPSHOT</version>
+        </geronimo-versions>
+        <prerequisite>
+            <id>geronimo/jetty/*/car</id>
+            <description>
+                This is a web application or web-related module, configured for the Jetty
web container. It will not run
+                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
+                from another Tomcat Geronimo installation.
+            </description>
+        </prerequisite>
+        <dependency>geronimo/system-database/1.2-SNAPSHOT/car</dependency>
+        <dependency>juddi/juddi/0.9rc4/jar</dependency>
+        <dependency>geronimo/geronimo-uddi-db/1.2-SNAPSHOT/jar</dependency>
+        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+    </plugin>
+
+    <plugin>
+        <name>Geronimo Admin Console (Jetty)</name>
+        <module-id>geronimo/webconsole-jetty/1.2-SNAPSHOT/car</module-id>
+        <category>Core Geronimo</category>
+        <description>Test Data</description>
+        <geronimo-versions>
+            <version>1.2-SNAPSHOT</version>
+        </geronimo-versions>
+        <prerequisite>
+            <id>geronimo/jetty/*/car</id>
+            <description>
+                This is a web application or web-related module, configured for the Jetty
web container. It will not run
+                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
+                from another Tomcat Geronimo installation.
+            </description>
+        </prerequisite>
+        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+        <dependency>geronimo/j2ee-security/1.2-SNAPSHOT/car</dependency>
+        <dependency>portlet-api/portlet-api/1.0/jar</dependency>
+        <dependency>org.apache.pluto/pluto/1.0.1/jar</dependency>
+        <dependency>geronimo/geronimo-console-core/1.2-SNAPSHOT/jar</dependency>
+        <dependency>geronimo/geronimo-management/1.2-SNAPSHOT/jar</dependency>
+        <dependency>geronimo/geronimo-test-ddbean/1.2-SNAPSHOT/jar</dependency>
+        <dependency>geronimo/geronimo-deploy-jsr88/1.2-SNAPSHOT/jar</dependency>
+        <dependency>geronimo/geronimo-deploy-config/1.2-SNAPSHOT/jar</dependency>
+        <dependency>geronimo/geronimo-service-builder/1.2-SNAPSHOT/jar</dependency>
+        <dependency>geronimo/geronimo-connector-builder/1.2-SNAPSHOT/jar</dependency>
+        <dependency>geronimo/geronimo-naming-builder/1.2-SNAPSHOT/jar</dependency>
+        <dependency>geronimo/geronimo-security-builder/1.2-SNAPSHOT/jar</dependency>
+        <dependency>geronimo/geronimo-j2ee-schema/1.2-SNAPSHOT/jar</dependency>
+        <dependency>xmlbeans/xbean/2.0.0/jar</dependency>
+        <dependency>stax/stax-api/1.0/jar</dependency>
+        <dependency>activemq/activemq-gbean-management/3.2.4-SNAPSHOT/jar</dependency>
+        <dependency>activemq/activemq-gbean/3.2.4-SNAPSHOT/jar</dependency>
+        <dependency>activemq/activemq-core/3.2.4-SNAPSHOT/jar</dependency>
+        <dependency>geronimo/geronimo-converter/1.2-SNAPSHOT/jar</dependency>
+        <dependency>geronimo/geronimo-util/1.2-SNAPSHOT/jar</dependency>
+        <dependency>geronimo/geronimo-jetty/1.2-SNAPSHOT/jar</dependency>
+    </plugin>
+
+    <plugin>
+        <name>Geronimo Remote Deployment Support (Jetty)</name>
+        <module-id>geronimo/remote-deploy-jetty/1.2-SNAPSHOT/car</module-id>
+        <category>Core Geronimo</category>
+        <description>Test Data</description>
+        <geronimo-versions>
+            <version>1.2-SNAPSHOT</version>
+        </geronimo-versions>
+        <prerequisite>
+            <id>geronimo/jetty/*/car</id>
+            <description>
+                This is a web application or web-related module, configured for the Jetty
web container. It will not run
+                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
+                from another Tomcat Geronimo installation.
+            </description>
+        </prerequisite>
+        <dependency>geronimo/geronimo-remote-deploy-lib/1.2-SNAPSHOT/jar</dependency>
+        <dependency>xmlbeans/xbean/2.0.0/jar</dependency>
+        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+        <dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
+    </plugin>
+
+    <plugin>
+        <name>Geronimo JMX Debug Tool (Jetty)</name>
+        <module-id>geronimo/jmxdebug-jetty/1.2-SNAPSHOT/car</module-id>
+        <category>Core Geronimo</category>
+        <description>Test Data</description>
+        <geronimo-versions>
+            <version>1.2-SNAPSHOT</version>
+        </geronimo-versions>
+        <prerequisite>
+            <id>geronimo/jetty/*/car</id>
+            <description>
+                This is a web application or web-related module, configured for the Jetty
web container. It will not run
+                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
+                from another Tomcat Geronimo installation.
+            </description>
+        </prerequisite>
+        <dependency>commons-collections/commons-collections/3.1/jar</dependency>
+        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+        <dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
+    </plugin>
+
+    <plugin>
+        <name>Geronimo Welcome App (Jetty)</name>
+        <module-id>geronimo/welcome-jetty/1.2-SNAPSHOT/car</module-id>
+        <category>Core Geronimo</category>
+        <description>Test Data</description>
+        <geronimo-versions>
+            <version>1.2-SNAPSHOT</version>
+        </geronimo-versions>
+        <prerequisite>
+            <id>geronimo/jetty/*/car</id>
+            <description>
+                This is a web application or web-related module, configured for the Jetty
web container. It will not run
+                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
+                from another Tomcat Geronimo installation.
+            </description>
+        </prerequisite>
+        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+        <dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
+    </plugin>
+
+    <plugin>
+        <name>Apache Directory 0.92 for Geronimo</name>
+        <module-id>geronimo/directory/1.2-SNAPSHOT/car</module-id>
+        <category>Security</category>
+        <description>Test Data</description>
+        <geronimo-versions>
+            <version>1.2-SNAPSHOT</version>
+        </geronimo-versions>
+        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+        <dependency>geronimo/geronimo-directory/1.2-SNAPSHOT/jar</dependency>
+    </plugin>
+-->
 
-<default-repository>http://nowhere.com/</default-repository>
+    <default-repository>http://nowhere.com/</default-repository>
 
 </geronimo-plugin-list>

Modified: geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java?rev=572395&r1=572394&r2=572395&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java
Mon Sep  3 10:38:54 2007
@@ -38,6 +38,9 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.Version;
+import org.apache.geronimo.system.plugin.model.PluginArtifactType;
+import org.apache.geronimo.system.plugin.model.PluginListType;
+import org.apache.geronimo.system.plugin.model.PluginType;
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
 import org.apache.geronimo.system.threads.ThreadPool;
 
@@ -47,16 +50,16 @@
  * @version $Rev$ $Date$
  */
 public class PluginInstallerTest extends TestCase {
-    private URL fakeRepo;
-    private URL testRepo;
+    private String fakeRepo;
+    private String testRepo;
     private PluginInstaller installer;
 
     protected void setUp() throws Exception {
         super.setUp();
-        fakeRepo = new URL("http://nowhere.com/");
+        fakeRepo = "http://nowhere.com/";
         String url = getClass().getResource("/geronimo-plugins.xml").toString();
         int pos = url.lastIndexOf("/");
-        testRepo = new URL(url.substring(0, pos));
+        testRepo = url.substring(0, pos);
         installer = new PluginInstallerGBean(new MockConfigManager(), new MockWritableListableRepository(),
new MockConfigStore(),
                 new BasicServerInfo("."), new ThreadPool() {
             public int getPoolSize() {
@@ -82,19 +85,18 @@
     }
 
     public void testParsing() throws Exception {
-        PluginList list = installer.listPlugins(testRepo, null, null);
+        PluginListType list = installer.listPlugins(new URL(testRepo), null, null);
         assertNotNull(list);
-        assertEquals(1, list.getRepositories().length);
-        assertEquals(fakeRepo, list.getRepositories()[0]);
-        assertTrue(list.getPlugins().length > 0);
+        assertEquals(1, list.getDefaultRepository().size());
+        assertEquals(fakeRepo, list.getDefaultRepository().get(0));
+        assertTrue(list.getPlugin().size() > 0);
         int prereqCount = 0;
-        for (int i = 0; i < list.getPlugins().length; i++) {
-            PluginMetadata metadata = list.getPlugins()[i];
-            prereqCount += metadata.getPrerequisites().length;
-            for (int j = 0; j < metadata.getPrerequisites().length; j++) {
-                PluginMetadata.Prerequisite prerequisite = metadata.getPrerequisites()[j];
-                assertFalse(prerequisite.isPresent());
-            }
+        for (PluginType metadata: list.getPlugin()) {
+            PluginArtifactType instance = metadata.getPluginArtifact().get(0);
+            prereqCount += instance.getPrerequisite().size();
+//            for (PrerequisiteType prerequisite: instance.getPrerequisite()) {
+//                assertFalse(prerequisite.getId());
+//            }
         }
         assertTrue(prereqCount > 0);
     }

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=572395&r1=572394&r2=572395&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Sep  3 10:38:54 2007
@@ -38,6 +38,10 @@
     <description>
         Apache Geronimo, the J2EE server project of the Apache Software Foundation.
     </description>
+    <organization>
+        <name>The Apache Geronimo development community</name>
+        <url>http://geronimo.apache.org/</url>
+    </organization>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/server/trunk</connection>
@@ -77,7 +81,7 @@
         HACK: Used by uddi-jetty and uddi-tomcat config plans
         -->
         <tranqlVendorsVersion>1.3</tranqlVendorsVersion>
-        
+
         <!--
         HACK: Used by applications/geronimo-dojo
         -->
@@ -215,7 +219,7 @@
                 <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
                 <version>1.1.1</version>
             </dependency>
-            
+
             <!--
             NOTE: The full source for this artifact is private due to Sun licensing issues.
                   To view the generated XmlBeans source please see the -src artifact in the
repository:
@@ -223,7 +227,7 @@
                   http://people.apache.org/repo/m2-snapshot-repository/org/apache/geronimo/schema
 
                   The full source is here with restricted access:
-                  
+
                   https://svn.apache.org/repos/tck/geronimo-tck/schema/geronimo-schema-jee_5/trunk
             -->
             <dependency>
@@ -231,7 +235,7 @@
                 <artifactId>geronimo-schema-jee_5</artifactId>
                 <version>1.1</version>
             </dependency>
-            
+
             <!--
             NOTE: The full source for this artifact is private due to Sun licensing issues.
                   To view the generated XmlBeans source please see the -src artifact in the
repository:
@@ -332,7 +336,7 @@
                 <artifactId>asm-commons</artifactId>
                 <version>2.2.3</version>
             </dependency>
-            
+
             <!--
             NOTE: This is included for AMQ 4.1 support only.  Need to use 2.2 to
                   be compatible with AMQ 4.1, latest 3.0 causes CCE problems.
@@ -342,7 +346,7 @@
                 <artifactId>backport-util-concurrent</artifactId>
                 <version>2.2</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>com.agical.rmock</groupId>
                 <artifactId>rmock</artifactId>
@@ -398,7 +402,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            
+
             <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib-nodep</artifactId>
@@ -452,19 +456,19 @@
                 <artifactId>log4j</artifactId>
                 <version>1.2.14</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
                 <version>1.4.3</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-jcl</artifactId>
                 <version>1.4.3</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
@@ -476,13 +480,13 @@
                 <artifactId>slf4j-log4j12</artifactId>
                 <version>1.4.3</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl104-over-slf4j</artifactId>
                 <version>1.4.3</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>mockobjects</groupId>
                 <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
@@ -530,7 +534,7 @@
                 <artifactId>regexp</artifactId>
                 <version>1.3</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.ws.scout</groupId>
                 <artifactId>scout</artifactId>
@@ -637,7 +641,7 @@
                 <artifactId>pluto-descriptors</artifactId>
                 <version>1.0.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-core</artifactId>
@@ -1389,7 +1393,7 @@
                <artifactId>jaxws-rt</artifactId>
                 <version>2.0</version>
            </dependency>
- 
+
            <dependency>
                <groupId>com.sun.xml.bind</groupId>
                <artifactId>jaxb-xjc</artifactId>
@@ -1456,27 +1460,27 @@
                 <version>${dojoVersion}</version>
                 <type>tgz</type>
             </dependency>
-            
+
             <!-- GShell Support -->
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-bootstrap</artifactId>
                 <version>1.0-alpha-1-SNAPSHOT</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-api</artifactId>
                 <version>1.0-alpha-1-SNAPSHOT</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-core</artifactId>
                 <version>1.0-alpha-1-SNAPSHOT</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-cli</artifactId>
@@ -1488,7 +1492,7 @@
                 <artifactId>gshell-builtins</artifactId>
                 <version>1.0-alpha-1-SNAPSHOT</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.codehaus.groovy</groupId>
                 <artifactId>groovy-all</artifactId>



Mime
View raw message