geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r601152 [3/4] - in /geronimo/server/trunk: ./ applications/welcome/geronimo-welcome/src/main/java/org/apache/geronimo/welcome/ assemblies/geronimo-boilerplate-minimal/src/main/underlay/META-INF/ assemblies/geronimo-boilerplate-minimal/src/m...
Date Tue, 04 Dec 2007 23:49:09 GMT
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java Tue Dec  4 15:49:03 2007
@@ -38,14 +38,14 @@
 /**
  * @version $Rev$ $Date$
  */
-public class ExplicitDefaultArtifactResolver extends DefaultArtifactResolver implements AliasedArtifactResolver {
+public class ExplicitDefaultArtifactResolver extends DefaultArtifactResolver implements LocalAliasedArtifactResolver {
     private static final String COMMENT = "#You can use this file to indicate that you want to substitute one module for another.\n" +
             "#format is oldartifactid=newartifactId e.g.\n" +
             "#org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/transaction-jta11/1.2-SNAPSHOT/car\n" +
             "#versions can be ommitted on the left side but not the right.\n" +
             "#This can also specify explicit versions in the same format.";
 
-    private final String versionMapLocation;
+    private final String artifactAliasesFile;
     private final ServerInfo serverInfo;
 
     public ExplicitDefaultArtifactResolver(String versionMapLocation,
@@ -53,10 +53,15 @@
             Collection<? extends ListableRepository> repositories,
             ServerInfo serverInfo ) throws IOException {
         super(artifactManager, repositories, buildExplicitResolution(versionMapLocation, serverInfo));
-        this.versionMapLocation = versionMapLocation;
+        this.artifactAliasesFile = versionMapLocation;
         this.serverInfo = serverInfo;
     }
 
+
+    public String getArtifactAliasesFile() {
+        return artifactAliasesFile;
+    }
+
     private static Map<Artifact, Artifact> buildExplicitResolution(String versionMapLocation, ServerInfo serverInfo) throws IOException {
         if (versionMapLocation == null) {
             return null;
@@ -123,7 +128,7 @@
     public synchronized void addAliases(Properties properties) throws IOException {
         Map<Artifact, Artifact> explicitResolutions = propertiesToArtifactMap(properties);
         getExplicitResolution().putAll(explicitResolutions);
-        saveExplicitResolution(getExplicitResolution(), versionMapLocation, serverInfo);
+        saveExplicitResolution(getExplicitResolution(), artifactAliasesFile, serverInfo);
     }
 
     public static final GBeanInfo GBEAN_INFO;

Added: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java?rev=601152&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java Tue Dec  4 15:49:03 2007
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.system.resolver;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public interface LocalAliasedArtifactResolver extends AliasedArtifactResolver {
+    String getArtifactAliasesFile();
+}

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java Tue Dec  4 15:49:03 2007
@@ -74,7 +74,7 @@
         }
 
         baseURI = base.toURI();
-        baseServer = deriveBaseServer();
+        baseServer = deriveBaseServer(useSystemProperties);
         baseServerURI = baseServer.toURI();
         if (useSystemProperties) {
             System.setProperty(HOME_DIR_SYS_PROP, base.getAbsolutePath());
@@ -161,16 +161,16 @@
         return new File(baseDir, filename);
     }
 
-    private File deriveBaseServer() {
+    private File deriveBaseServer(boolean useSystemProperties) {
         File baseServerDir;
         
         // first check if the base server directory has been provided via
         // system property override.
         String baseServerDirPath = System.getProperty(SERVER_DIR_SYS_PROP);
-        if (null == baseServerDirPath) {
+        if (!useSystemProperties || null == baseServerDirPath) {
             // then check if a server name has been provided
             String serverName = System.getProperty(SERVER_NAME_SYS_PROP);
-            if (null == serverName) {
+            if (!useSystemProperties || null == serverName) {
                 // default base server directory.
                 baseServerDir = base;
             } else {

Added: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/ArchiverGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/ArchiverGBeanTest.java?rev=601152&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/ArchiverGBeanTest.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/ArchiverGBeanTest.java Tue Dec  4 15:49:03 2007
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.system.plugin;
+
+import java.io.File;
+
+import org.apache.geronimo.testsupport.TestSupport;
+import org.apache.geronimo.system.serverinfo.BasicServerInfo;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.kernel.repository.Artifact;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class ArchiverGBeanTest extends TestSupport {
+
+    private static int count = 0;
+    private ServerInfo serverInfo;
+    private File serverBase;
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        //set up test server location
+
+        for (int i = 0; i < 100; i++) {
+            serverBase = new File(new File(new File(new File(getBaseDir(), "target"), "test-resources"), "ArchiverGBeanTest"), "server" + ++count);
+            if (serverBase.mkdirs()) {
+                break;
+            }
+            if (i == 100) {
+                throw new RuntimeException("Could not create server base: " + serverBase);
+            }
+        }
+        serverInfo = new BasicServerInfo(getBaseDir().getAbsolutePath(), false);
+    }
+    
+    public void testArchiverTgz() throws Exception {
+        ArchiverGBean archiver = new ArchiverGBean(serverInfo);
+        File dest = archiver.archive("src/test/resources/archivertest", serverBase.getAbsolutePath(), new Artifact("foo","bar", "1.0", "tar.gz"));
+        assertTrue(dest.exists());
+        assertEquals("bar-1.0-bin.tar.gz", dest.getName());
+    }
+    public void testArchiverZip() throws Exception {
+        ArchiverGBean archiver = new ArchiverGBean(serverInfo);
+        File dest = archiver.archive("src/test/resources/archivertest", serverBase.getAbsolutePath(), new Artifact("foo","bar", "1.0", "zip"));
+        assertTrue(dest.exists());
+        assertEquals("bar-1.0-bin.zip", dest.getName());
+    }
+}

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/ArchiverGBeanTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/ArchiverGBeanTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/ArchiverGBeanTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyFileTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyFileTest.java?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyFileTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyFileTest.java Tue Dec  4 15:49:03 2007
@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.geronimo.gbean.AbstractName;
@@ -40,6 +41,7 @@
 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.kernel.repository.Repository;
 import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
 import org.apache.geronimo.system.plugin.model.CopyFileType;
 import org.apache.geronimo.system.repository.Maven2Repository;
@@ -307,6 +309,10 @@
         }
 
         public void setOnline(boolean online) {
+        }
+
+        public Collection<? extends Repository> getRepositories() {
+            return null;
         }
     }
 }

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java Tue Dec  4 15:49:03 2007
@@ -18,9 +18,10 @@
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 
 import junit.framework.TestCase;
@@ -38,6 +39,7 @@
 import org.apache.geronimo.kernel.mock.MockWritableListableRepository;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
+import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.Version;
 import org.apache.geronimo.system.plugin.model.PluginArtifactType;
 import org.apache.geronimo.system.plugin.model.PluginListType;
@@ -242,5 +244,10 @@
 
         public void setOnline(boolean online) {
         }
+
+        public Collection<? extends Repository> getRepositories() {
+            return null;
+        }
     }
+
 }

Added: geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/bin/gsh
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/bin/gsh?rev=601152&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/bin/gsh (added)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/bin/gsh Tue Dec  4 15:49:03 2007
@@ -0,0 +1,63 @@
+#!/bin/sh
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##  http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+##
+## $Rev: 539227 $ $Date: 2007-05-17 19:48:49 -0700 (Thu, 17 May 2007) $
+##
+
+DIRNAME=`dirname "$0"`
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+case "`uname`" in
+    CYGWIN*)
+        cygwin=true
+        ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+    [ -n "$GSHELL_HOME" ] && GSHELL_HOME=`cygpath --unix "$GSHELL_HOME"`
+    [ -n "$JAVACMD" ] && JAVACMD=`cygpath --unix "$JAVACMD"`
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Locate GSHELL_HOME if not it is not set
+if [ "x$GSHELL_HOME" = "x" ]; then
+    GSHELL_HOME=`cd "$DIRNAME/.."; pwd`
+fi
+
+# Determine the Java command to use to start the JVM
+if [ -z "$JAVACMD" ]; then
+    if [ -n "$JAVA_HOME" ]; then
+        JAVACMD="$JAVA_HOME/bin/java"
+    else
+        JAVACMD="java"
+    fi
+fi
+
+BOOTJAR="$GSHELL_HOME/lib/boot/gshell-bootstrap.jar"
+if $cygwin ; then
+    BOOTJAR=`cygpath --windows "$BOOTJAR"`
+fi
+
+# Start the JVM
+exec "$JAVACMD" $JAVA_OPTS -jar "$BOOTJAR" "$@"
+

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/bin/gsh
------------------------------------------------------------------------------
    svn:executable = *

Added: geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/bin/gsh.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/bin/gsh.bat?rev=601152&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/bin/gsh.bat (added)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/bin/gsh.bat Tue Dec  4 15:49:03 2007
@@ -0,0 +1,81 @@
+@if "%DEBUG%" == "" @echo off
+rem 
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements.  See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership.  The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License.  You may obtain a copy of the License at
+rem 
+rem  http://www.apache.org/licenses/LICENSE-2.0
+rem 
+rem Unless required by applicable law or agreed to in writing,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied.  See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+rem 
+
+rem 
+rem $Rev: 570296 $ $Date: 2007-08-27 23:03:18 -0400 (Mon, 27 Aug 2007) $
+rem 
+
+if "%OS%"=="Windows_NT" setlocal
+
+:begin
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.\
+
+:check_JAVACMD
+if not "%JAVACMD%" == "" goto check_GSHELL_HOME
+
+:check_JAVA_HOME
+if not "%JAVA_HOME%" == "" goto have_JAVA_HOME
+set JAVACMD=java
+goto check_GSHELL_HOME
+
+:have_JAVA_HOME
+set JAVACMD=%JAVA_HOME%\bin\java
+goto check_GSHELL_HOME
+
+:check_GSHELL_HOME
+if "%GSHELL_HOME%" == "" set GSHELL_HOME=%DIRNAME%..
+
+:init
+rem Get command-line arguments, handling Windowz variants
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%eval[2+2]" == "4" goto 4NT_args
+
+rem Regular WinNT shell
+set ARGS=%*
+goto execute
+
+:win9xME_args
+rem Slurp the command line arguments.  This loop allows for an unlimited number
+set ARGS=
+
+:win9xME_args_slurp
+if "x%1" == "x" goto execute
+set ARGS=%ARGS% %1
+shift
+goto win9xME_args_slurp
+
+:4NT_args
+rem Get arguments from the 4NT Shell from JP Software
+set ARGS=%$
+
+:execute
+
+set BOOTJAR=%GSHELL_HOME%\lib\boot\gshell-bootstrap.jar
+
+rem Start the JVM
+"%JAVACMD%" %JAVA_OPTS% -jar "%BOOTJAR%" %ARGS%
+
+:end
+
+if "%OS%"=="Windows_NT" endlocal
+if "%GSHELL_BATCH_PAUSE%" == "on" pause
+

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/bin/gsh.bat
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/bin/gsh.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml Tue Dec  4 15:49:03 2007
@@ -133,7 +133,13 @@
             <artifactId>maven-artifact</artifactId>
             <version>2.0.4</version>
         </dependency>
-        
+
+        <!-- HACK try to use our archiver version -->
+        <!--<dependency>-->
+            <!--<groupId>org.codehaus.plexus</groupId>-->
+            <!--<artifactId>plexus-archiver</artifactId>-->
+            <!--<version>1.0-alpha-9</version>-->
+        <!--</dependency>-->
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Tue Dec  4 15:49:03 2007
@@ -19,29 +19,26 @@
 
 package org.apache.geronimo.mavenplugins.car;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.IOException;
 import java.io.FileOutputStream;
-import java.io.BufferedOutputStream;
-
+import java.io.IOException;
 import java.util.Iterator;
-import java.util.Properties;
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 
-import org.codehaus.mojo.pluginsupport.MojoSupport;
-import org.codehaus.mojo.pluginsupport.util.ArtifactItem;
-import org.codehaus.mojo.pluginsupport.dependency.DependencyHelper;
-import org.codehaus.mojo.pluginsupport.dependency.DependencyTree;
-import org.codehaus.mojo.pluginsupport.dependency.DependencyTree.Node;
-
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.*;
+import org.codehaus.mojo.pluginsupport.MojoSupport;
+import org.codehaus.mojo.pluginsupport.dependency.DependencyHelper;
+import org.codehaus.mojo.pluginsupport.dependency.DependencyTree;
+import org.codehaus.mojo.pluginsupport.dependency.DependencyTree.Node;
+import org.codehaus.mojo.pluginsupport.util.ArtifactItem;
 
 /**
  * Support for <em>packaging</em> Mojos.

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java?rev=601152&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java Tue Dec  4 15:49:03 2007
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.mavenplugins.car;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.system.plugin.ArchiverGBean;
+import org.apache.geronimo.system.serverinfo.BasicServerInfo;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
+import org.codehaus.mojo.pluginsupport.MojoSupport;
+import org.codehaus.plexus.archiver.ArchiverException;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @goal archive
+ */
+public class ArchiveMojo extends MojoSupport {
+
+    /**
+     * The maven project.
+     *
+     * @parameter expression="${project}"
+     * @required
+     * @readonly
+     */
+    private MavenProject project;
+
+    /**
+     * The target directory of the project.
+     *
+     * @parameter expression="${project.build.directory}"
+     * @required
+     * @readonly
+     */
+    private File destDir;
+
+    /**
+     * The maven project's helper.
+     *
+     * @component
+     * @required
+     * @readonly
+     */
+    private MavenProjectHelper projectHelper;
+
+    /**
+     * The location of the server repository.
+     *
+     * @parameter expression="${project.build.directory}/assembly"
+     * @required
+     */
+    private File targetServerDirectory;
+
+    protected void doExecute() throws Exception {
+        ServerInfo serverInfo = new BasicServerInfo(targetServerDirectory.getAbsolutePath(), false);
+        ArchiverGBean archiver = new ArchiverGBean(serverInfo);
+        archive("tar.gz", archiver);
+        archive("zip", archiver);
+    }
+
+    private void archive(String type, ArchiverGBean archiver) throws ArchiverException, IOException {
+        Artifact artifact1 = new Artifact(project.getArtifact().getGroupId(), project.getArtifact().getArtifactId(), project.getArtifact().getVersion(), type);
+        File target1 = archiver.archive("", destDir.getAbsolutePath(), artifact1);
+        projectHelper.attachArtifact( project, artifact1.getType(), "bin", target1 );
+    }
+}

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

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

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

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java Tue Dec  4 15:49:03 2007
@@ -19,56 +19,26 @@
 
 package org.apache.geronimo.mavenplugins.car;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import java.util.jar.JarFile;
-import java.util.zip.ZipEntry;
 
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.basic.BasicKernel;
-import org.apache.geronimo.kernel.config.ConfigurationData;
-import org.apache.geronimo.kernel.config.ConfigurationManager;
-import org.apache.geronimo.kernel.config.InvalidConfigException;
-import org.apache.geronimo.kernel.config.KernelConfigurationManager;
-import org.apache.geronimo.kernel.config.NoSuchConfigException;
-import org.apache.geronimo.kernel.config.PersistentConfigurationList;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.ArtifactManager;
-import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
-import org.apache.geronimo.kernel.repository.Dependency;
-import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.FileWriteMonitor;
-import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.WritableListableRepository;
 import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
+import org.apache.geronimo.system.plugin.DownloadResults;
+import org.apache.geronimo.system.plugin.PluginInstallerGBean;
 import org.apache.geronimo.system.plugin.model.ArtifactType;
 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.plugin.PluginInstallerGBean;
-import org.apache.geronimo.system.plugin.DownloadResults;
-import org.apache.geronimo.system.repository.Maven2Repository;
 import org.apache.geronimo.system.resolver.AliasedArtifactResolver;
-import org.apache.geronimo.system.serverinfo.BasicServerInfo;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.system.threads.ThreadPool;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.codehaus.mojo.pluginsupport.dependency.DependencyTree;
-import org.codehaus.plexus.util.FileUtils;
 
 /**
  * Installs Geronimo module CAR files into a target repository to support assembly.
@@ -94,7 +64,6 @@
      * @required
      */
     private String targetRepositoryPath = null;
-    private File targetRepositoryDirectory = null;
 
     /**
      * The location of the target config files.
@@ -103,7 +72,6 @@
      * @required
      */
     private String targetConfigPath = null;
-    private File targetConfigDirectory = null;
 
     /**
      * ServerInstance specific in plugin configuration, to specify where config.xml and properties updates go.
@@ -146,9 +114,9 @@
      */
     private AliasedArtifactResolver geronimoArtifactResolver;
 
-    private WritableListableRepository targetRepo;
+//    private WritableListableRepository targetRepo;
 
-    private RepositoryConfigurationStore targetStore;
+//    private RepositoryConfigurationStore targetStore;
 
     private WritableListableRepository sourceRepo;
 
@@ -160,10 +128,7 @@
     private Set installedArtifacts = new HashSet();
 
     protected void doExecute() throws Exception {
-        targetRepositoryDirectory = new File(targetServerDirectory, targetRepositoryPath);
-        targetConfigDirectory = new File(targetServerDirectory, targetConfigPath);
         DependencyTree dependencies = dependencyHelper.getDependencies(project);
-//        generateExplicitVersionProperties(explicitResolutionProperties, dependencies);
 
         //
         // TODO: Check if we need to use the Maven2RepositoryAdapter here or not...
@@ -173,48 +138,6 @@
         sourceRepo = new Maven2RepositoryAdapter(dependencies, lookup);
         // sourceRepo = new Maven2RepositoryAdapter(new File(sourceRepository.getBasedir()));
         sourceStore = new RepositoryConfigurationStore(sourceRepo);
-
-        FileUtils.forceMkdir(targetRepositoryDirectory);
-        FileUtils.forceMkdir(targetConfigDirectory);
-
-        targetRepo = new Maven2Repository(targetRepositoryDirectory);
-        targetStore = new RepositoryConfigurationStore(targetRepo);
-
-        ArtifactManager artifactManager = new DefaultArtifactManager();
-
-        Kernel kernel = new BasicKernel("assembly");
-        ServerInfo serverInfo = new BasicServerInfo(targetServerDirectory.getAbsolutePath(), false);
-        ThreadPool threadPool = null;
-        ConfigurationManager configurationManager = null;
-        Map<String, org.apache.geronimo.system.plugin.ServerInstance> servers = new HashMap<String, org.apache.geronimo.system.plugin.ServerInstance>();
-        for (ServerInstance serverInstance: this.servers) {
-            org.apache.geronimo.system.plugin.ServerInstance instance = serverInstance.getServerInstance(artifactManager, targetRepo, serverInfo, servers);
-            servers.put(instance.getServerName(), instance);
-            if ("default".equals(instance.getServerName())) {
-                configurationManager = new KernelConfigurationManager(kernel,
-                        Collections.singleton(targetStore),
-                        instance.getAttributeStore(),
-                        (PersistentConfigurationList)instance.getAttributeStore(),
-                        artifactManager,
-                        instance.getArtifactResolver(),
-                        Collections.singleton(targetRepo),
-                        null,
-                        getClass().getClassLoader());
-
-            }
-        }
-
-        if (configurationManager == null) {
-            throw new IllegalArgumentException("No default server instance set up");
-        }
-        PluginInstallerGBean installer = new PluginInstallerGBean(configurationManager,
-                targetRepo,
-                targetStore,
-                serverInfo,
-                threadPool,
-                servers.values());
-        DownloadResults downloadPoller = new DownloadResults();
-
         PluginListType pluginList = new PluginListType();
         String localRepo = sourceRepository.getUrl();
         if ("file".equals(sourceRepository.getProtocol())) {
@@ -231,11 +154,15 @@
         } else {
             addDependencies(pluginList);
         }
+        DownloadResults downloadPoller = new DownloadResults();
+        String targetServerPath = targetServerDirectory.getAbsolutePath();
 
-        installer.install(pluginList, null, null, downloadPoller);
-        //ensure config.xml is saved.
-        for (org.apache.geronimo.system.plugin.ServerInstance serverInstance: servers.values()) {
-            serverInstance.getAttributeStore().save();
+        Kernel kernel = new BasicKernel("Assembly");
+        try {
+            PluginInstallerGBean installer = new PluginInstallerGBean(targetRepositoryPath, targetServerPath, servers, kernel, getClass().getClassLoader());
+            installer.install(pluginList, localRepo, true, null, null, downloadPoller);
+        } finally {
+            kernel.shutdown();
         }
         log.info("Installed plugins: ");
         for (Artifact artifact: downloadPoller.getInstalledConfigIDs()) {
@@ -250,6 +177,7 @@
         }
     }
 
+
     private PluginType toPluginType(Artifact artifact) {
         PluginType plugin = new PluginType();
         PluginArtifactType instance = new PluginArtifactType();
@@ -282,262 +210,4 @@
 
     }
 
-    /**
-     * Install the given artifact into the target Geronimo repository.
-     *
-     * @param artifact The artifact to be installed; must not be null
-     * @throws Exception Failed to install artifact
-     */
-    private void install(final Artifact artifact) throws Exception {
-        assert artifact != null;
-
-        if (installedArtifacts.contains(artifact)) {
-            log.debug("Skipping artifact; already installed: " + artifact);
-        } else {
-            // The artifact must exist in the source repository
-            if (!sourceRepo.contains(artifact)) {
-                throw new Exception("Missing artifact in source repository: " + artifact);
-            }
-
-            if (isModuleArtifact(artifact)) {
-                installModule(artifact);
-            } else {
-                installDependency(artifact);
-            }
-        }
-    }
-
-    /**
-     * Install a Geornimo module artifact.
-     *
-     * @param artifact The Geronimo module artifact to be installed; must not be null, must be a module
-     * @throws Exception Failed to insall Geronimo module artifact
-     */
-    private void installModule(final Artifact artifact) throws Exception {
-        assert artifact != null;
-        assert isModuleArtifact(artifact);
-
-        boolean install = true;
-
-        // The source store must contain the module artifact
-        if (!sourceStore.containsConfiguration(artifact)) {
-            throw new Exception("Missing module artifact in source repository: " + artifact);
-        }
-
-        // If the target store already contains the module, check if we need to reinstall it
-        if (targetStore.containsConfiguration(artifact)) {
-            if (hasModuleChanged(artifact)) {
-                log.debug("Old module exists in target store; uninstalling: " + artifact);
-                targetStore.uninstall(artifact);
-            } else {
-                log.debug("Same module exists in target store; skipping: " + artifact);
-                install = false;
-            }
-        }
-
-        // Copy the configuration into the target configuration store
-        if (install) {
-            log.info("Installing module: " + artifact);
-
-            File file = sourceRepo.getLocation(artifact);
-            InputStream input = new BufferedInputStream(new FileInputStream(file));
-
-            try {
-                FileWriteMonitor monitor = new FileWriteMonitor() {
-                    public void writeStarted(final String file, final int bytes) {
-                        log.debug("Installing module: " + file + " (" + bytes + " bytes)");
-                    }
-
-                    public void writeProgress(int bytes) {
-                        // empty
-                    }
-
-                    public void writeComplete(int bytes) {
-                        // empty
-                    }
-                };
-
-                targetStore.install(input, (int) file.length(), artifact, monitor);
-
-                installedArtifacts.add(artifact);
-            }
-            finally {
-                input.close();
-            }
-        }
-
-        // Install all dependencies of this module
-        installModuleDependencies(artifact);
-    }
-
-    /**
-     * Install all of the dependencies of the given Geronimo module artifact.
-     *
-     * @param artifact The Geronimo module artifact to be installed; must not be null, must be a module
-     * @throws Exception Failed to install Geronimo module dependencies
-     */
-    private void installModuleDependencies(final Artifact artifact) throws Exception {
-        assert artifact != null;
-        assert isModuleArtifact(artifact);
-
-        log.debug("Installing module dependencies for artifact: " + artifact);
-
-        try {
-            ConfigurationData config = targetStore.loadConfiguration(artifact);
-            Environment env = config.getEnvironment();
-            LinkedHashSet deps = new LinkedHashSet();
-
-            Iterator iter = env.getDependencies().iterator();
-            while (iter.hasNext()) {
-                Dependency dep = (Dependency) iter.next();
-                deps.add(dep.getArtifact());
-            }
-
-            installDependencies(deps);
-        }
-        catch (IOException e) {
-            throw new InvalidConfigException("Unable to load module: " + artifact, e);
-        }
-        catch (NoSuchConfigException e) {
-            throw new InvalidConfigException("Unable to load module: " + artifact, e);
-        }
-    }
-
-    /**
-     * Install a dependency artifact into the Geronimo repository.
-     *
-     * @param artifact The artifact to be installed; must not be null, or a module artifact
-     * @throws Exception Failed to install artifact dependencies
-     */
-    private void installDependency(final Artifact artifact) throws Exception {
-        assert artifact != null;
-        assert !isModuleArtifact(artifact);
-
-        boolean install = true;
-
-        // If the dep already exists, then check if we need to reinstall it
-        if (targetRepo.contains(artifact)) {
-            if (hasDependencyChanged(artifact)) {
-                File file = targetRepo.getLocation(artifact);
-                log.debug("Old dependency exists in target repo; deleting: " + file);
-                FileUtils.forceDelete(file);
-            } else {
-                log.debug("Same dependency exists in target repo; skipping: " + artifact);
-                install = false;
-            }
-        }
-
-        if (install) {
-            log.info("Installing dependency: " + artifact);
-
-            // Copy the artifact into the target repo
-            File file = sourceRepo.getLocation(artifact);
-            InputStream input = new BufferedInputStream(new FileInputStream(file));
-            try {
-                FileWriteMonitor monitor = new FileWriteMonitor() {
-                    public void writeStarted(final String file, final int bytes) {
-                        log.debug("Copying dependency: " + file + " (" + bytes + " bytes)");
-                    }
-
-                    public void writeProgress(int bytes) {
-                        // empty
-                    }
-
-                    public void writeComplete(int bytes) {
-                        // empty
-                    }
-                };
-
-                targetRepo.copyToRepository(input, (int) file.length(), artifact, monitor);
-
-                installedArtifacts.add(artifact);
-            }
-            finally {
-                input.close();
-            }
-        }
-
-        // Install all dependencies of this artifact
-        installDependencies(sourceRepo.getDependencies(artifact));
-    }
-
-    /**
-     * Install a set of dependency artifacts into the Geronimo repository.
-     *
-     * @param dependencies The set of artifacts to be installed; must not be null.
-     * @throws Exception Failed to install artifacts
-     */
-    private void installDependencies(final Set/*<Artifact>*/ dependencies) throws Exception {
-        assert dependencies != null;
-
-        Set resolved = geronimoArtifactResolver.resolveInClassLoader(dependencies);
-        Iterator iter = resolved.iterator();
-
-        while (iter.hasNext()) {
-            Artifact a = (Artifact) iter.next();
-            install(a);
-        }
-    }
-
-    /**
-     * Check if a module has changed by comparing the checksum in the source and target repos.
-     *
-     * @param module The module to inspect; must not be null.
-     * @return Returns true if the module has changed
-     * @throws IOException Failed to load checksum
-     */
-    private boolean hasModuleChanged(final Artifact module) throws IOException {
-        assert module != null;
-
-        String sourceChecksum = loadChecksum(sourceRepo, module);
-        String targetChecksum = loadChecksum(targetRepo, module);
-
-        return !sourceChecksum.equals(targetChecksum);
-    }
-
-    /**
-     * Load the <tt>config.ser</tt> checksum for the given artifact.
-     *
-     * @param repo     The repository to resolve the artifacts location; must not be null.
-     * @param artifact The artifact to retrieve a checksum for; must not be null.
-     * @return Thr artifacts checksum
-     * @throws IOException Failed to load checksums
-     */
-    private String loadChecksum(final Repository repo, final Artifact artifact) throws IOException {
-        assert repo != null;
-        assert artifact != null;
-
-        File file = repo.getLocation(artifact);
-        BufferedReader reader;
-
-        if (file.isDirectory()) {
-            File serFile = new File(file, "META-INF/config.ser.sha1");
-            reader = new BufferedReader(new FileReader(serFile));
-        } else {
-            JarFile jarFile = new JarFile(file);
-            ZipEntry entry = jarFile.getEntry("META-INF/config.ser.sha1");
-            reader = new BufferedReader(new InputStreamReader(jarFile.getInputStream(entry)));
-        }
-
-        String checksum = reader.readLine();
-        reader.close();
-
-        return checksum;
-    }
-
-    /**
-     * Check if a dependency has changed by checking the file size and last modified for source and target.
-     *
-     * @param artifact The artifact to check; must not be null
-     * @return True if the dependency has changed
-     */
-    private boolean hasDependencyChanged(final Artifact artifact) {
-        assert artifact != null;
-
-        File source = sourceRepo.getLocation(artifact);
-        File target = targetRepo.getLocation(artifact);
-
-        return (source.length() != target.length()) ||
-                (source.lastModified() > target.lastModified());
-    }
 }

Added: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ServerInstance.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ServerInstance.java?rev=601152&view=auto
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ServerInstance.java (added)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ServerInstance.java Tue Dec  4 15:49:03 2007
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.mavenplugins.car;
+
+import org.apache.geronimo.system.plugin.ServerInstanceData;
+
+/**
+ * This class exists only to help maven set the values.
+ * @version $Rev:$ $Date:$
+ */
+public class ServerInstance extends ServerInstanceData {
+}

Modified: geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -87,11 +87,13 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openejb-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>axis</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
@@ -110,6 +112,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/plugins/axis/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/pom.xml Tue Dec  4 15:49:03 2007
@@ -102,11 +102,13 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>server-security-config</artifactId>
+                          <version>${version}</version>
                         <type>car</type>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>webservices-common</artifactId>
+                          <version>${version}</version>
                         <type>car</type>
                       </dependency>
                       <dependency>
@@ -142,6 +144,7 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>openejb</artifactId>
+                          <version>${version}</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>

Modified: geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -72,11 +72,13 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>jaxws-deployer</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>axis2</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>

Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -81,17 +81,20 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>jaxws-ejb-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>axis2-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>axis2-ejb</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/plugins/client/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -98,6 +98,7 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>client</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
@@ -111,12 +112,14 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>client-transaction</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>j2ee-deployer</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -83,12 +83,14 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>transaction</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>j2ee-deployer</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java Tue Dec  4 15:49:03 2007
@@ -52,6 +52,7 @@
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Version;
+import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlException;
@@ -195,6 +196,10 @@
         }
 
         public void setOnline(boolean online) {
+        }
+
+        public Collection<? extends Repository> getRepositories() {
+            return null;
         }
 
         public boolean isLoaded(Artifact configurationId) {

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/DownloadCARHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/DownloadCARHandler.java?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/DownloadCARHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/DownloadCARHandler.java Tue Dec  4 15:49:03 2007
@@ -130,10 +130,9 @@
             PluginType copy = PluginInstallerGBean.copy(plugin, instance);
             PluginListType installList = new PluginListType();
             installList.getPlugin().add(copy);
-            installList.getDefaultRepository().add(repo);
 
             PluginInstaller configInstaller = PortletManager.getCurrentServer(request).getPluginInstaller();
-            Object downloadKey = configInstaller.startInstall(installList, user, pass);
+            Object downloadKey = configInstaller.startInstall(installList, repo, false, user, pass);
             DownloadResults results = configInstaller.checkOnInstall(downloadKey);
             request.getPortletSession(true).setAttribute(DOWNLOAD_RESULTS_SESSION_KEY, results);
             response.setRenderParameter("configId", configId);

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java Tue Dec  4 15:49:03 2007
@@ -203,7 +203,7 @@
         if(!repo.endsWith("/")) repo += "/";
         ConfigurationManager mgr = ConfigurationUtil.getConfigurationManager(kernel);
         PluginInstaller installer = getInstaller(kernel);
-        PluginListType pluginList = installer.createPluginListForRepositories(mgr, repo);
+        PluginListType pluginList = installer.createPluginListForRepositories(repo);
         PluginXmlUtil.writePluginList(pluginList, out);
     }
 

Modified: geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -83,6 +83,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openejb-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
@@ -95,6 +96,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>

Modified: geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -74,11 +74,13 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>jaxws-deployer</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>cxf</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -81,17 +81,20 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>jaxws-ejb-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>cxf-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>cxf-ejb</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java Tue Dec  4 15:49:03 2007
@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Collections;
+import java.util.Collection;
 import java.io.IOException;
 import java.io.File;
 import java.net.URI;
@@ -34,6 +35,7 @@
 import org.apache.geronimo.kernel.repository.Version;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.config.NoSuchStoreException;
@@ -54,7 +56,7 @@
 import org.apache.xmlbeans.XmlException;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class LoginConfigBuilderTest extends TestCase {
     //2.0 namespace, with server-side
@@ -145,6 +147,10 @@
         }
 
         public void setOnline(boolean online) {
+        }
+
+        public Collection<? extends Repository> getRepositories() {
+            return null;
         }
 
         public boolean isLoaded(Artifact configurationId) {

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -158,6 +158,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-server</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
@@ -185,6 +186,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-security</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
@@ -198,6 +200,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>geronimo-gbean-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </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=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml Tue Dec  4 15:49:03 2007
@@ -73,6 +73,7 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>jsr88-cli</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>

Modified: geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -73,6 +73,7 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>jasper</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
@@ -86,6 +87,7 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>j2ee-deployer</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java Tue Dec  4 15:49:03 2007
@@ -31,6 +31,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ListableRepository;
+import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.Version;
 
 public class JAXWSTools {
@@ -94,7 +95,7 @@
         return buf.toString();
     }
     
-    public File[] getClasspath(Collection<ListableRepository> repositories) throws Exception {
+    public File[] getClasspath(Collection<? extends Repository> repositories) throws Exception {
         ArrayList<File> jars = new ArrayList<File>();
         jars.add(getLocation(repositories, JAXB_API_ARTIFACT));
         jars.add(getLocation(repositories, JAXB_IMPL_ARTIFACT));
@@ -116,19 +117,22 @@
         return jars.toArray(new File[jars.size()]);
     }
        
-    private static File getLocation(Collection<ListableRepository> repositories, Artifact artifactQuery) throws Exception {
+    private static File getLocation(Collection<? extends Repository> repositories, Artifact artifactQuery) throws Exception {
         File file = null;
         
-        for (ListableRepository repository : repositories) {
-            SortedSet artifactSet = repository.list(artifactQuery);
-            // if we have exactly one artifact found
-            if (artifactSet.size() == 1) {
-                file = repository.getLocation((Artifact) artifactSet.first());                
-                return file.getAbsoluteFile();
-            } else if (artifactSet.size() > 1) {// if we have more than 1 artifacts found use the latest one.
-                file = repository.getLocation((Artifact) artifactSet.last());
-                return file.getAbsoluteFile();
-            } 
+        for (Repository arepository : repositories) {
+            if (arepository instanceof ListableRepository) {
+                ListableRepository repository = (ListableRepository) arepository;
+                SortedSet artifactSet = repository.list(artifactQuery);
+                // if we have exactly one artifact found
+                if (artifactSet.size() == 1) {
+                    file = repository.getLocation((Artifact) artifactSet.first());
+                    return file.getAbsoluteFile();
+                } else if (artifactSet.size() > 1) {// if we have more than 1 artifacts found use the latest one.
+                    file = repository.getLocation((Artifact) artifactSet.last());
+                    return file.getAbsoluteFile();
+                }
+            }
         }
         
         throw new Exception("Missing artifact in repositories: " + artifactQuery.toString());

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java Tue Dec  4 15:49:03 2007
@@ -37,7 +37,7 @@
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.jaxws.PortInfo;
-import org.apache.geronimo.kernel.repository.ListableRepository;
+import org.apache.geronimo.kernel.repository.Repository;
 
 public class WsdlGenerator {
 
@@ -111,7 +111,7 @@
     
     private URL[] getWsgenClasspath(DeploymentContext context) throws Exception {               
         DeploymentConfigurationManager cm = (DeploymentConfigurationManager)context.getConfigurationManager();
-        Collection<ListableRepository> repositories = cm.getRepositories();        
+        Collection<? extends Repository> repositories = cm.getRepositories();
         File[] jars = this.jaxwsTools.getClasspath(repositories);
         return JAXWSTools.toURL(jars);
     }

Modified: geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -88,17 +88,20 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>connector-deployer</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>jetty6</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>j2ee-deployer</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                       <dependency>

Modified: geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml Tue Dec  4 15:49:03 2007
@@ -127,6 +127,7 @@
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
                         <artifactId>jetty6</artifactId>
+                        <version>${version}</version>
                         <type>car</type>
                     </dependency>
                 </dependencies>

Modified: geronimo/server/trunk/plugins/jetty/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6/pom.xml Tue Dec  4 15:49:03 2007
@@ -125,10 +125,84 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
+                        <value>false</value>
                     </useMavenDependencies>
                     <category>Jetty</category>
+                    <dependencies>
+                        <dependency start="true">
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>j2ee-server</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>car</type>
+                        </dependency>
+                        <dependency start="true">
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>server-security-config</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>car</type>
+                        </dependency>
+                        <dependency start="true">
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>transaction</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>car</type>
+                        </dependency>
+                        <dependency start="true">
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-jetty6</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency start="true">
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>clustering</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency start="true">
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>slf4j-api</artifactId>
+                            <version>1.4.3</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency start="true">
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>slf4j-jcl</artifactId>
+                            <version>1.4.3</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency start="true">
+                            <groupId>org.mortbay.jetty</groupId>
+                            <artifactId>jetty</artifactId>
+                            <version>6.1.5</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency start="true">
+                            <groupId>org.mortbay.jetty</groupId>
+                            <artifactId>jetty-ajp</artifactId>
+                            <version>6.1.5</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency start="true">
+                            <groupId>org.mortbay.jetty</groupId>
+                            <artifactId>jetty-sslengine</artifactId>
+                            <version>6.1.5</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency start="true">
+                            <groupId>org.mortbay.jetty</groupId>
+                            <artifactId>jetty-util</artifactId>
+                            <version>6.1.5</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency start="true">
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>webservices-common</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>car</type>
+                        </dependency>
+                    </dependencies>
                     <instance>
                         <plugin-artifact>
                             <config-xml-content>

Modified: geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -76,12 +76,14 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>myfaces</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>j2ee-deployer</artifactId>
+                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -95,6 +95,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>connector-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
@@ -114,11 +115,13 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openejb</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -85,6 +85,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>transaction</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
@@ -98,6 +99,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml Tue Dec  4 15:49:03 2007
@@ -96,6 +96,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>connector-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
@@ -108,6 +109,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
@@ -120,6 +122,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>tomcat6</artifactId>
+                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/plan/plan.xml?rev=601152&r1=601151&r2=601152&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/plan/plan.xml Tue Dec  4 15:49:03 2007
@@ -67,6 +67,7 @@
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
                         <artifactId>tomcat6</artifactId>
+                        <version>${version}</version>
                         <type>car</type>
                     </dependency>
                 </dependencies>



Mime
View raw message