geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r697918 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate/ assemblies/geronimo-boilerplate/src/main/assembly/ assemblies/geronimo-boilerplate/src/main/underlay/bin/ buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus...
Date Mon, 22 Sep 2008 17:52:16 GMT
Author: djencks
Date: Mon Sep 22 10:52:15 2008
New Revision: 697918

URL: http://svn.apache.org/viewvc?rev=697918&view=rev
Log:
GERONIMO-4239, GERONIMO-4302.  Fix more classpath issues in console, revert broken attempt
to have client-system.jar self-install itself

Added:
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/bin/client.bat
      - copied unchanged from r697436, geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/bin/client.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/bin/client.sh
      - copied unchanged from r697436, geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/bin/client.sh
Removed:
    geronimo/server/trunk/framework/configs/client-system/src/main/resources/content/
Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
    geronimo/server/trunk/framework/configs/client-system/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java
    geronimo/server/trunk/plugingroups/framework/pom.xml
    geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
    geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml Mon Sep 22 10:52:15 2008
@@ -132,12 +132,12 @@
             <type>car</type>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>client-system</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>client-system</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
Mon Sep 22 10:52:15 2008
@@ -71,23 +71,23 @@
             </includes>
         </dependencySet>
         
-        <!--<dependencySet>-->
-            <!--<outputDirectory>contents/lib</outputDirectory>-->
-            <!--<outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>-->
-            <!--<useStrictFiltering>true</useStrictFiltering>-->
-            <!--<includes>-->
-                <!--<include>org.apache.geronimo.framework:jsr88-deploymentfactory</include>-->
-            <!--</includes>-->
-        <!--</dependencySet>-->
-
-        <!--<dependencySet>-->
-            <!--<outputDirectory>contents/bin</outputDirectory>-->
-            <!--<outputFileNameMapping>client.jar</outputFileNameMapping>-->
-            <!--<useStrictFiltering>true</useStrictFiltering>-->
-            <!--<includes>-->
-                <!--<include>org.apache.geronimo.framework:client-system</include>-->
-            <!--</includes>-->
-        <!--</dependencySet>-->
+        <dependencySet>
+            <outputDirectory>contents/lib</outputDirectory>
+            <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
+            <includes>
+                <include>org.apache.geronimo.framework:jsr88-deploymentfactory</include>
+            </includes>
+        </dependencySet>
+
+        <dependencySet>
+            <outputDirectory>contents/bin</outputDirectory>
+            <outputFileNameMapping>client.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
+            <includes>
+                <include>org.apache.geronimo.framework:client-system</include>
+            </includes>
+        </dependencySet>
 
         <dependencySet>
             <outputDirectory>contents/bin</outputDirectory>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
Mon Sep 22 10:52:15 2008
@@ -22,7 +22,7 @@
 
 <component-set>
     <components>
-
+        
         <!--
         Deprecated, use geronimo-module instead.
         -->
@@ -41,11 +41,11 @@
                             <compile>
                                 org.apache.geronimo.buildsupport:car-maven-plugin:validate-configuration,
                                 org.apache.geronimo.buildsupport:car-maven-plugin:prepare-plan,
-                                org.apache.geronimo.buildsupport:car-maven-plugin:verify-no-dependency-change,
-                                org.apache.geronimo.buildsupport:car-maven-plugin:package,
-                                org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata
+                                org.apache.geronimo.buildsupport:car-maven-plugin:verify-no-dependency-change
                             </compile>
                             <package>
+                                org.apache.geronimo.buildsupport:car-maven-plugin:package,
+                                org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata,
                                 org.apache.geronimo.buildsupport:car-maven-plugin:archive-car
                             </package>
                             <install>
@@ -60,12 +60,12 @@
                 </lifecycles>
             </configuration>
         </component>
-
+        
         <!--
         FIXME: For some crazy reason, when the following are enabled it causes other packagings
                picked up from tools-maven-plugin to now configure their artifact handlers?!?!!
         -->
-
+        
         <!--
         Custom packaging for geronimo modules.
         -->
@@ -90,7 +90,7 @@
             </configuration>
         </component>
         -->
-
+        
         <!--
         Install geronimo-module artifact files as .car files
         -->
@@ -108,7 +108,7 @@
             </configuration>
         </component>
         -->
-
+        
         <!--
         Custom packaging for server assembly modules.
         -->
@@ -123,12 +123,6 @@
                         <phases>
                             <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
                             <compile>org.apache.geronimo.buildsupport:car-maven-plugin:install-modules</compile>
-                            <!-- possible way to track assembly content changes
-                            <compile>
-                                org.apache.geronimo.buildsupport:car-maven-plugin:verify-no-dependency-change,
-                                org.apache.geronimo.buildsupport:car-maven-plugin:install-modules
-                            </compile>
-                            -->
                             <package>org.apache.geronimo.buildsupport:car-maven-plugin:archive</package>
                             <install>org.apache.maven.plugins:maven-install-plugin:install</install>
                             <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>

Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Mon Sep 22 10:52:15 2008
@@ -109,33 +109,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <id>create-startup-jar</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy toDir="${project.build.directory}/resources/META-INF">
-                                    <fileset dir="${project.build.directory}/repository"
includes="**/META-INF/**"/>
-                                    <flattenmapper/>
-                                </copy>
-                                <mkdir dir="${project.build.directory}/resources/content"/>
-                                <jar destfile="${project.build.directory}/resources/content/client.jar">
-                                    <fileset dir="${project.build.directory}/resources"
includes="META-INF/**"/>
-                                    <fileset dir="${project.build.directory}/classes"
includes="META-INF/**"/>
-                                </jar>
-                            </tasks>
-                        </configuration>
-                    </execution>
-
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
@@ -224,7 +197,6 @@
                             <config-xml-content load="false"/>
                             <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system//car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system/${version}/car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
-                            <copy-file dest-dir="bin/">content/</copy-file>
                         </plugin-artifact>
                     </instance>
 

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java
Mon Sep 22 10:52:15 2008
@@ -69,6 +69,8 @@
     private final static int classLoaderSearchMode;
     private final static int ORIGINAL_SEARCH = 1;
     private final static int OPTIMIZED_SEARCH = 2;
+
+    private final static boolean LONG_CLASSLOADER_TO_STRING = false;
      
     static {
     	// Extract the classLoaderSearchMode if specified.  If not, default to "safe".
@@ -648,7 +650,11 @@
 
     public String toString() {
         StringBuilder b = new StringBuilder();
-        toBuilder(b, "");
+        if (LONG_CLASSLOADER_TO_STRING) {
+            toBuilder(b, "");
+        } else {
+            b.append("[").append(getClass().getName()).append(" id=").append(id).append("]");
+        }
         return b.toString();
     }
 

Modified: geronimo/server/trunk/plugingroups/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/framework/pom.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/framework/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/framework/pom.xml Mon Sep 22 10:52:15 2008
@@ -79,46 +79,45 @@
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>rmi-naming</artifactId>
+            <artifactId>client-system</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>plugin</artifactId>
+            <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>j2ee-security</artifactId>
+            <artifactId>plugin</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>server-security-config</artifactId>
+            <artifactId>j2ee-security</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>shutdown</artifactId>
+            <artifactId>server-security-config</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        <!-- not really part of framework -->
+
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>client-system</artifactId>
+            <artifactId>shutdown</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml Mon Sep
22 10:52:15 2008
@@ -18,6 +18,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>client-system</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>jsr88-deploymentfactory</artifactId>
         <type>car</type>
     </dependency>
@@ -107,16 +112,16 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-rmi-spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>j2ee-system</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.yoko</groupId>
+        <artifactId>yoko-rmi-spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>hot-deployer</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml Mon Sep
22 10:52:15 2008
@@ -18,6 +18,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>client-system</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>jsr88-deploymentfactory</artifactId>
         <type>car</type>
     </dependency>
@@ -107,16 +112,16 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-rmi-spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>j2ee-system</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.yoko</groupId>
+        <artifactId>yoko-rmi-spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>hot-deployer</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml Mon Sep 22 10:52:15
2008
@@ -129,7 +129,18 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
+        </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${version}</version>
+        </dependency>
+ 
         <!-- for jspc. why is this needed? -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml
Mon Sep 22 10:52:15 2008
@@ -12,6 +12,11 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>activemq-ra</artifactId>
         <type>car</type>
@@ -37,6 +42,11 @@
         <type>rar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-test-ddbean</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>connector-deployer</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml Mon Sep 22 10:52:15
2008
@@ -129,6 +129,16 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml
Mon Sep 22 10:52:15 2008
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console-tomcat</artifactId>
         <type>car</type>
@@ -32,6 +37,11 @@
         <type>rar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-test-ddbean</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>connector-deployer</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml Mon Sep 22 10:52:15 2008
@@ -65,6 +65,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
@@ -96,14 +103,14 @@
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
-		<dependency>
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-activemq</artifactId>
-			<version>${version}</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <resources>
             <resource>

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml Mon Sep 22
10:52:15 2008
@@ -27,11 +27,11 @@
         <artifactId>connector</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-connector-builder</artifactId>
     <name>Geronimo Plugins, Connector :: Builder</name>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -67,8 +67,9 @@
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-test-ddbean</artifactId>
             <version>${version}</version>
+            <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
@@ -77,14 +78,14 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
+
             <!--
             HACK: Copy XmlBeans generated schemas.
             -->
@@ -99,7 +100,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -117,7 +118,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -128,10 +129,10 @@
                             <value>${basedir}/src/test/resources/data/login.config</value>
                         </property>
                     </systemProperties>
-                    
+
                     <excludes>
                         <exclude>**/Abstract*.java</exclude>
-                        
+
                         <!--
                         FIXME: This test was disabled because it is failing in non-obvious
ways
                                and requires someone with more insight to resolve

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml Mon Sep 22 10:52:15
2008
@@ -50,6 +50,7 @@
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-test-ddbean</artifactId>
             <version>${version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml Mon Sep 22 10:52:15 2008
@@ -34,12 +34,12 @@
     <packaging>car</packaging>
     
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>jsr88-cli</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>jsr88-cli</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -64,12 +64,12 @@
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>jsr88-cli</artifactId>
-                            <type>car</type>
-                            <import>classes</import>
-                        </dependency>
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>jsr88-cli</artifactId>-->
+                            <!--<type>car</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
                     </dependencies>
                     <category>Deployment</category>
                     <instance>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
Mon Sep 22 10:52:15 2008
@@ -22,6 +22,11 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-test-ddbean</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
Mon Sep 22 10:52:15 2008
@@ -91,4 +91,9 @@
         <artifactId>tranql-connector-oracle-local</artifactId>
         <type>rar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-test-ddbean</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml Mon Sep 22 10:52:15
2008
@@ -70,12 +70,12 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector-builder</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-connector-builder</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -101,7 +101,7 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
             <version>${version}</version>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
 
         <dependency>
@@ -110,17 +110,30 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>commons-io</groupId>-->
+            <!--<artifactId>commons-io</artifactId>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-rar-configurer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java?rev=697918&r1=697917&r2=697918&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
(original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
Mon Sep 22 10:52:15 2008
@@ -41,6 +41,11 @@
         selenium.type("newRepository", actualLink);
         selenium.click("//input[@value='Add Repository']");
         waitForPageLoad();
+
+        if (selenium.isTextPresent("Already have an entry for repository " + actualLink))
{
+            selenium.click("link=Cancel");
+            waitForPageLoad();
+        }
         
         selenium.select("repository", "label=" + actualLink);
         selenium.type("username", "system");



Mime
View raw message