geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r737650 - in /geronimo/server/trunk: ./ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/ frame...
Date Mon, 26 Jan 2009 08:32:49 GMT
Author: djencks
Date: Mon Jan 26 08:32:48 2009
New Revision: 737650

URL: http://svn.apache.org/viewvc?rev=737650&view=rev
Log:
GERONIMO-4522 filter dependency history using maven, also switch to maven filtering from velocity
for plan filtering

Modified:
    geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojoTest.java
    geronimo/server/trunk/framework/configs/jee-specs/pom.xml
    geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml
    geronimo/server/trunk/plugingroups/clustering-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml?rev=737650&r1=737649&r2=737650&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml Mon Jan 26 08:32:48 2009
@@ -19,15 +19,15 @@
 <!-- $Rev$ $Date$ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.buildsupport</groupId>
         <artifactId>buildsupport</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>car-maven-plugin</artifactId>
     <name>Geronimo Build Support :: CAR</name>
     <packaging>maven-plugin</packaging>
@@ -37,7 +37,7 @@
         As part of this it processes plan files to include the module Id and dependencies,
and generates geronimo-plugin.xml metadata files and
         manages a geronimo-plugins.xml catalog in the local maven repository.
     </description>
-    
+
     <dependencies>
         <dependency>
             <groupId>javax.xml.bind</groupId>
@@ -67,19 +67,19 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-common</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-plugin</artifactId>
@@ -96,7 +96,7 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-tool</artifactId>
             <version>${version}</version>
-            
+
             <!-- exclude transitive deps -->
             <exclusions>
                 <exclusion>
@@ -109,7 +109,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-project</artifactId>
@@ -139,16 +139,35 @@
         </dependency>
 
         <dependency>
-            <groupId>velocity</groupId>
-            <artifactId>velocity</artifactId>
-            <version>1.4</version>
+            <groupId>org.apache.maven.shared</groupId>
+            <artifactId>maven-filtering</artifactId>
+            <version>1.0-beta-2</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+          <version>1.0-alpha-9-stable-1</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+          <version>1.5.6</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-interpolation</artifactId>
+          <version>1.7</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
@@ -158,7 +177,7 @@
             <groupId>xpp3</groupId>
             <artifactId>xpp3_min</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.codehaus.groovy.maven.support</groupId>
             <artifactId>slf4j-gossip</artifactId>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=737650&r1=737649&r2=737650&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
Mon Jan 26 08:32:48 2009
@@ -23,17 +23,16 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.LinkedHashSet;
-import java.util.HashMap;
-import java.util.Collection;
 
-import org.apache.geronimo.kernel.repository.*;
+import org.apache.geronimo.kernel.repository.ImportType;
 import org.apache.geronimo.system.plugin.model.ArtifactType;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -42,6 +41,7 @@
 import org.apache.maven.artifact.resolver.ArtifactCollector;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.Mojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -52,7 +52,12 @@
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.shared.dependency.tree.DependencyNode;
 import org.apache.maven.shared.dependency.tree.DependencyTreeResolutionListener;
+import org.apache.maven.shared.filtering.MavenFileFilter;
+import org.apache.maven.shared.filtering.MavenFilteringException;
+import org.apache.maven.shared.filtering.MavenResourcesFiltering;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * Support for <em>packaging</em> Mojos.
@@ -124,6 +129,43 @@
 
     protected String treeListing;
 
+    //filtering support
+    /**
+     * The character encoding scheme to be applied when filtering resources.
+     *
+     * @parameter expression="${encoding}" default-value="${project.build.sourceEncoding}"
+     */
+    protected String encoding;
+
+    /**
+     * @component role="org.apache.maven.shared.filtering.MavenResourcesFiltering" role-hint="default"
+     * @required
+     */
+    protected MavenResourcesFiltering mavenResourcesFiltering;
+
+    /**
+     * @parameter expression="${session}"
+     * @readonly
+     * @required
+     */
+    protected MavenSession session;
+
+    /**
+     * Expression preceded with the String won't be interpolated
+     * \${foo} will be replaced with ${foo}
+     *
+     * @parameter expression="${maven.resources.escapeString}"
+     * @since 2.3
+     */
+    protected String escapeString = "\\";
+
+    /**
+     * @plexus.requirement role-hint="default"
+     * @component
+     * @required
+     */
+    protected MavenFileFilter mavenFileFilter;
+
     //
     // MojoSupport Hooks
     //
@@ -316,7 +358,7 @@
 
 
             getDependencies(project, useMavenDependencies.isUseTransitiveDependencies());
-            for (org.apache.maven.artifact.Artifact artifact: localDependencies) {
+            for (org.apache.maven.artifact.Artifact artifact : localDependencies) {
                 Dependency explicitDependency = explicitDependencyMap.get(getKey(artifact));
                 dependencies.add(toDependency(artifact, useMavenDependencies.isIncludeVersion(),
explicitDependency, includeImport));
             }
@@ -345,6 +387,7 @@
     private String getKey(Dependency dependency) {
         return dependency.getGroupId() + "/" + dependency.getArtifactId() + "/" + dependency.getType();
     }
+
     private String getKey(Artifact dependency) {
         return dependency.getGroupId() + "/" + dependency.getArtifactId() + "/" + dependency.getType();
     }
@@ -518,4 +561,23 @@
         return true;
     }
 
+
+    protected void filter(File sourceFile, File targetFile)
+            throws MojoExecutionException {
+        try {
+
+            if (StringUtils.isEmpty(encoding)) {
+                getLog().warn(
+                        "File encoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING
+                                + ", i.e. build is platform dependent!");
+            }
+            targetFile.getParentFile().mkdirs();
+            List filters = mavenFileFilter.getDefaultFilterWrappers(project, null, true,
session, null);
+            mavenFileFilter.copyFile(sourceFile, targetFile, true, filters, encoding, true);
+        }
+        catch (MavenFilteringException e) {
+            throw new MojoExecutionException(e.getMessage(), e);
+        }
+    }
+
 }

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java?rev=737650&r1=737649&r2=737650&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
Mon Jan 26 08:32:48 2009
@@ -74,6 +74,14 @@
     private File dependencyFile;
 
     /**
+     * Location of filtered dependency file.
+     *
+     * @parameter expression="${basedir}/target/history/dependencies.xml"
+     * @required
+     */
+    private File filteredDependencyFile;
+
+    /**
      * Configuration of use of maven dependencies.  If missing or if value element is false,
use the explicit list in the car-maven-plugin configuration.
      * If present and true, use the maven dependencies in the current pom file of scope null,
runtime, or compile.  In addition, the version of the maven
      * dependency can be included or not depending on the includeVersion element.
@@ -88,8 +96,10 @@
         try {
             Collection<Dependency> dependencies = toDependencies(this.dependencies,
useMavenDependencies, false);
             if (dependencyFile.exists()) {
+                //filter dependencies file
+                filter(dependencyFile, filteredDependencyFile);
                 //read dependency types, convert to dependenciees, compare.
-                FileReader in = new FileReader(dependencyFile);
+                FileReader in = new FileReader(filteredDependencyFile);
                 try {
                     PluginArtifactType pluginArtifactType = PluginXmlUtil.loadPluginArtifactMetadata(in);
                     PluginArtifactType removed = new PluginArtifactType();

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java?rev=737650&r1=737649&r2=737650&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
Mon Jan 26 08:32:48 2009
@@ -20,11 +20,9 @@
 package org.apache.geronimo.mavenplugins.car;
 
 import java.io.File;
-import java.io.StringWriter;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Properties;
 
 import javax.xml.namespace.QName;
 
@@ -38,10 +36,6 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.app.VelocityEngine;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
@@ -65,10 +59,10 @@
     /**
      * Location of unproccesed plan, normally missing moduleId and dependencies.
      *
-     * @parameter expression="${basedir}/src/main/plan"
+     * @parameter expression="${basedir}/src/main/plan/plan.xml"
      * @required
      */
-    protected File sourceDir = null;
+    protected File sourceFile = null;
 
     /**
      * Directory to put the processed plan in.
@@ -79,14 +73,6 @@
     protected File targetDir = null;
 
     /**
-     * Name of the unprocessed source and processed target plan file.
-     *
-     * @parameter default-value="plan.xml"
-     * @required
-     */
-    protected String planFileName = null;
-
-    /**
      * XXX
      *
      * @parameter expression="${project.build.directory}/resources/META-INF/plan.xml"
@@ -110,58 +96,24 @@
      */
     UseMavenDependencies useMavenDependencies = new UseMavenDependencies(true, false, true);
 
-    private VelocityContext createContext() {
-        VelocityContext context = new VelocityContext();
-
-        // Load properties, It inherits them all!
-        Properties props = project.getProperties();
-        for (Object o : props.keySet()) {
-            String key = (String) o;
-            String value = props.getProperty(key);
-
-            getLog().debug("Setting " + key + "=" + value);
-            context.put(key, value);
-        }
-
-        context.put("pom", project);
+    /**
+     * we copy the plan here for filtering, then add env stuff.
+     *
+     * @parameter expression="${project.build.directory}/fliteredplan/plan.xml"
+     * @required
+     */
+    protected File filteredPlanFile;
 
-        return context;
-    }
 
     public void execute() throws MojoExecutionException, MojoFailureException {
-        File source = new File(sourceDir, planFileName);
-        if (!source.exists()) {
+        if (!sourceFile.exists()) {
             getLog().info("No plan found, plugin will have no classloader");
             return;
         }
         try {
-//
-            // FIXME: Do not need velocity here, we only need to filter,
-            //        could use resources plugin to do this for us, or
-            //        implement what resources plugin does here
-            //
-            //        Also velocity does not handle property expansion of expressions like
-            //        ${foo.bar} to the value of the "foo.bar" property :-(
-            //
-            //        Might be better of just hand rolling something...
-            //
-
-            VelocityContext context = createContext();
-
-            VelocityEngine velocity = new VelocityEngine();
-            velocity.setProperty(Velocity.FILE_RESOURCE_LOADER_PATH, sourceDir.getAbsolutePath());
-
-            // Don't spit out any logs
-            velocity.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.NullLogSystem");
-            velocity.init();
-
-            Template template = velocity.getTemplate(planFileName);
-            StringWriter writer = new StringWriter();
-            template.merge(context, writer);
-
-            String plan = writer.toString();
+            filter(sourceFile, filteredPlanFile);
 
-            XmlObject doc = XmlObject.Factory.parse(plan);
+            XmlObject doc = XmlObject.Factory.parse(filteredPlanFile);
             XmlCursor xmlCursor = doc.newCursor();
             LinkedHashSet<org.apache.geronimo.kernel.repository.Dependency> dependencies
= toKernelDependencies(this.dependencies, useMavenDependencies);
             Artifact configId = new Artifact(project.getGroupId(), project.getArtifactId(),
project.getVersion(), "car");

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojoTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojoTest.java?rev=737650&r1=737649&r2=737650&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojoTest.java
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojoTest.java
Mon Jan 26 08:32:48 2009
@@ -26,15 +26,24 @@
 import org.apache.geronimo.testsupport.TestSupport;
 import org.apache.maven.model.Model;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.filtering.MavenResourcesFiltering;
+import org.apache.maven.shared.filtering.DefaultMavenResourcesFiltering;
+import org.apache.maven.shared.filtering.DefaultMavenFileFilter;
+import org.apache.maven.shared.filtering.MavenFileFilter;
+import org.apache.maven.execution.MavenSession;
+import org.codehaus.plexus.PlexusTestCase;
 
 /**
  * @version $Rev$ $Date$
  */
-public class PlanProcessorMojoTest extends TestSupport {
+public class PlanProcessorMojoTest extends PlexusTestCase {
 
     private PlanProcessorMojo processorMojo;
+    private File sourceDir;
+    private File filteredPlanDir;
 
     protected void setUp() throws Exception {
+        super.setUp();
         processorMojo = new PlanProcessorMojo();
         processorMojo.useMavenDependencies = new UseMavenDependencies(false, false, false);
         Model model = new Model();
@@ -43,13 +52,17 @@
         mavenProject.setArtifactId("dummy-artifact-id");
         mavenProject.setVersion("dummy-version");
         processorMojo.project = mavenProject;
-        processorMojo.sourceDir = new File(BASEDIR, "src/test/resources");
-        processorMojo.targetDir = new File(BASEDIR, "target/PlanProcessorMojoTest");
+        File basedir = getBaseDir();
+        sourceDir = new File(basedir, "src/test/resources");
+        processorMojo.targetDir = new File(basedir, "target/PlanProcessorMojoTest");
+        filteredPlanDir = new File(processorMojo.targetDir, "filteredPlan");
+        processorMojo.mavenFileFilter = (MavenFileFilter) lookup( MavenFileFilter.class.getName(),
"default" );
     }
     
     public void testEmptyPlanProcessing() throws Exception {
         String planName = "empty-plan.xml";
-        processorMojo.planFileName = planName;
+        processorMojo.sourceFile = new File(sourceDir, planName);
+        processorMojo.filteredPlanFile = new File(filteredPlanDir, planName);
         processorMojo.targetFile = new File(processorMojo.targetDir, "actual-" + planName);
         
         processorMojo.execute();
@@ -59,7 +72,8 @@
 
     public void testNoEnvironmentPlanProcessing() throws Exception {
         String planName = "no-env-plan.xml";
-        processorMojo.planFileName = planName;
+        processorMojo.sourceFile = new File(sourceDir, planName);
+        processorMojo.filteredPlanFile = new File(filteredPlanDir, planName);
         processorMojo.targetFile = new File(processorMojo.targetDir, "actual-" + planName);
         
         processorMojo.execute();
@@ -68,7 +82,7 @@
     }
 
     private void assertResultingPlan(String planName) throws Exception {
-        InputStream expectedIn = new FileInputStream(new File(processorMojo.sourceDir, "expected-"
+ planName));
+        InputStream expectedIn = new FileInputStream(new File(sourceDir, "expected-" + planName));
         InputStream actualIn = new FileInputStream(new File(processorMojo.targetDir, "actual-"
+ planName));
         
         int read;
@@ -80,5 +94,29 @@
             assertEquals(read, actualRead);
         }
     }
-    
+
+    protected final File getBaseDir() {
+        File dir;
+
+        // If ${basedir} is set, then honor it
+        String tmp = System.getProperty("basedir");
+        if (tmp != null) {
+            dir = new File(tmp);
+        }
+        else {
+            // Find the directory which this class (or really the sub-class of TestSupport)
is defined in.
+            String path = getClass().getProtectionDomain().getCodeSource().getLocation().getFile();
+
+            // We expect the file to be in target/test-classes, so go up 2 dirs
+            dir = new File(path).getParentFile().getParentFile();
+
+            // Set ${basedir} which is needed by logging to initialize
+            System.setProperty("basedir", dir.getPath());
+        }
+
+        // System.err.println("Base Directory: " + dir);
+
+        return dir;
+    }
+
 }

Modified: geronimo/server/trunk/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/pom.xml?rev=737650&r1=737649&r2=737650&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/pom.xml Mon Jan 26 08:32:48 2009
@@ -131,7 +131,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>${servletSpec}</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml?rev=737650&r1=737649&r2=737650&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml Mon
Jan 26 08:32:48 2009
@@ -33,7 +33,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        <artifactId>${connectorSpec}</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -88,7 +88,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-servlet_2.5_spec</artifactId>
+        <artifactId>${servletSpec}</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugingroups/clustering-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/clustering-jetty/src/main/history/dependencies.xml?rev=737650&r1=737649&r2=737650&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/clustering-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugingroups/clustering-jetty/src/main/history/dependencies.xml
Mon Jan 26 08:32:48 2009
@@ -8,7 +8,7 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jetty6-clustering-builder-wadi</artifactId>
+        <artifactId>${jetty}-clustering-builder-wadi</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

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=737650&r1=737649&r2=737650&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 Jan
26 08:32:48 2009
@@ -13,7 +13,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jetty6-deployer</artifactId>
+        <artifactId>${jetty}-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml?rev=737650&r1=737649&r2=737650&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
Mon Jan 26 08:32:48 2009
@@ -7,23 +7,13 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jasper</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.directwebremoting</groupId>
-        <artifactId>dwr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>j2ee-security</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jetty6</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>pluto-support</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -32,11 +22,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>pluto-support</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
         <type>jar</type>
@@ -46,4 +31,19 @@
         <artifactId>console-core</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.directwebremoting</groupId>
+        <artifactId>dwr</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jasper</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>${jetty}</artifactId>
+        <type>car</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=737650&r1=737649&r2=737650&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Jan 26 08:32:48 2009
@@ -94,6 +94,7 @@
         <connectorSuffix></connectorSuffix>
         <!--<connectorSuffix>-1_6</connectorSuffix>-->
         <connectorSpec>geronimo-j2ee-connector_1.5_spec</connectorSpec>
+        <servletSpec>geronimo-servlet_2.5_spec</servletSpec>
         <!--<connectorSpec>geronimo-j2ee-connector_1.6_spec</connectorSpec>-->
         <txmanagerVersion>2.1.2-SNAPSHOT</txmanagerVersion>
         <!--<txmanagerVersion>2.2-SNAPSHOT</txmanagerVersion>-->
@@ -253,11 +254,11 @@
                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
                 <version>1.2</version>
             </dependency>
-            <!--<dependency>-->
-                <!--<groupId>org.apache.geronimo.specs</groupId>-->
-                <!--<artifactId>geronimo-servlet_3.0_spec</artifactId>-->
-                <!--<version>1.0-EA-SNAPSHOT</version>-->
-            <!--</dependency>-->
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-servlet_3.0_spec</artifactId>
+                <version>1.0-EA-SNAPSHOT</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -3653,6 +3654,7 @@
                 <connectorSuffix>-1_6</connectorSuffix>
                 <!--<connectorSpec>geronimo-j2ee-connector_1.5_spec</connectorSpec>-->
                 <connectorSpec>geronimo-j2ee-connector_1.6_spec</connectorSpec>
+                <servletSpec>geronimo-servlet_3.0_spec</servletSpec>
                 <!--<txmanagerVersion>2.1.1</txmanagerVersion>-->
                 <txmanagerVersion>2.2-SNAPSHOT</txmanagerVersion>
             </properties>



Mime
View raw message