geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r657880 [2/2] - in /geronimo/server/trunk: buildsupport/ 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/mavenp...
Date Mon, 19 May 2008 17:48:14 GMT
Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java
Mon May 19 10:48:13 2008
@@ -34,6 +34,8 @@
 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.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
 
 /**
  * Maintain the geronimo-plugins.xml catalog in the local maven repository by merging in
the geronimo-plugin.xml from the current project.
@@ -51,39 +53,42 @@
      */
     protected File targetFile;
 
-    protected void doExecute() throws Exception {
-
-        InputStream min = new FileInputStream(targetFile);
-        PluginType plugin;
+    public void execute() throws MojoExecutionException, MojoFailureException {
         try {
-            plugin = PluginXmlUtil.loadPluginMetadata(min);
-        } finally {
-            min.close();
-        }
+            InputStream min = new FileInputStream(targetFile);
+            PluginType plugin;
+            try {
+                plugin = PluginXmlUtil.loadPluginMetadata(min);
+            } finally {
+                min.close();
+            }
 
-        String path = getArtifactRepository().getBasedir();
-        File baseDir = new File(path);
+            String path = getArtifactRepository().getBasedir();
+            File baseDir = new File(path);
 
-        File outFile = new File(baseDir, "geronimo-plugins.xml");
-        PluginListType pluginList;
-        if (outFile.exists()) {
-            InputStream in = new FileInputStream(outFile);
+            File outFile = new File(baseDir, "geronimo-plugins.xml");
+            PluginListType pluginList;
+            if (outFile.exists()) {
+                InputStream in = new FileInputStream(outFile);
+                try {
+                    pluginList = PluginXmlUtil.loadPluginList(in);
+                } finally {
+                    in.close();
+                }
+            } else {
+                pluginList = new PluginListType();
+                pluginList.getDefaultRepository().add(path);
+            }
+
+            updatePluginList(plugin, pluginList);
+            Writer out = new FileWriter(outFile, false);
             try {
-                pluginList = PluginXmlUtil.loadPluginList(in);
+                PluginXmlUtil.writePluginList(pluginList, out);
             } finally {
-                in.close();
+                out.close();
             }
-        } else {
-            pluginList = new PluginListType();
-            pluginList.getDefaultRepository().add(path);
-        }
-
-        updatePluginList(plugin, pluginList);
-        Writer out = new FileWriter(outFile, false);
-        try {
-            PluginXmlUtil.writePluginList(pluginList, out);
-        } finally {
-            out.close();
+        } catch (Exception e) {
+            throw new MojoExecutionException("Could not update plugin list", e);
         }
     }
 

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java
Mon May 19 10:48:13 2008
@@ -20,8 +20,11 @@
 
 package org.apache.geronimo.mavenplugins.car;
 
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
 
 /**
  * Check that all dependencies mentioned explicitly in the car-maven-plugin configuration
are present as maven dependencies.
@@ -39,7 +42,7 @@
      */
     private List<Dependency> dependencies = Collections.emptyList();
 
-    public void doExecute() {
+    public void execute() throws MojoExecutionException, MojoFailureException {
         for (Dependency dependency: dependencies) {
             checkForMatch(dependency);
         }

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=657880&r1=657879&r2=657880&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 May 19 10:48:13 2008
@@ -25,7 +25,6 @@
 
 import org.apache.geronimo.testsupport.TestSupport;
 import org.apache.maven.model.Model;
-import org.apache.maven.plugin.logging.SystemStreamLog;
 import org.apache.maven.project.MavenProject;
 
 /**
@@ -36,7 +35,7 @@
     private PlanProcessorMojo processorMojo;
 
     protected void setUp() throws Exception {
-        processorMojo = new PlanProcessorMojoTester();
+        processorMojo = new PlanProcessorMojo();
         Model model = new Model();
         MavenProject mavenProject = new MavenProject(model);
         mavenProject.setGroupId("dummy-group");
@@ -52,7 +51,7 @@
         processorMojo.planFileName = planName;
         processorMojo.targetFile = new File(processorMojo.targetDir, "actual-" + planName);
         
-        processorMojo.doExecute();
+        processorMojo.execute();
         
         assertResultingPlan(planName);
     }
@@ -62,7 +61,7 @@
         processorMojo.planFileName = planName;
         processorMojo.targetFile = new File(processorMojo.targetDir, "actual-" + planName);
         
-        processorMojo.doExecute();
+        processorMojo.execute();
         
         assertResultingPlan(planName);
     }
@@ -81,9 +80,4 @@
         }
     }
     
-    private class PlanProcessorMojoTester extends PlanProcessorMojo {
-        public PlanProcessorMojoTester() {
-            log = new SystemStreamLog();
-        }
-    }
 }

Modified: geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml Mon May 19 10:48:13 2008
@@ -61,6 +61,12 @@
             <artifactId>surefire-api</artifactId>
             <version>2.3</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>plugin-support</artifactId>
+            <version>1.0-alpha-1</version>
+        </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/buildsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/pom.xml Mon May 19 10:48:13 2008
@@ -42,7 +42,7 @@
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-project</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.9</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -55,11 +55,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>plugin-support</artifactId>
-            <version>1.0-alpha-1</version>
-        </dependency>
     </dependencies>
 
     <modules>

Modified: geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml Mon May 19 10:48:13
2008
@@ -60,6 +60,11 @@
             <artifactId>ant-jsch</artifactId>
             <version>1.6.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>plugin-support</artifactId>
+            <version>1.0-alpha-1</version>
+        </dependency>
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml
Mon May 19 10:48:13 2008
@@ -39,7 +39,7 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml Mon May 19 10:48:13 2008
@@ -39,6 +39,14 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>gshell-framework</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/framework/configs/gshell-remote/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-remote/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-remote/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/gshell-remote/pom.xml Mon May 19 10:48:13 2008
@@ -39,6 +39,14 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>gshell-framework</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Mon May 19 10:48:13 2008
@@ -52,6 +52,12 @@
             <artifactId>geronimo-crypto</artifactId>
             <version>${version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-transformer</artifactId>
+            <version>${version}</version>
+        </dependency>
 
         <!-- Used by TemporaryClassLoader in kernel -->
         <dependency>
@@ -99,7 +105,11 @@
             <groupId>woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
         </dependency>
-        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>

Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Mon May 19 10:48:13
2008
@@ -64,6 +64,11 @@
             <artifactId>geronimo-deploy-jsr88</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
+            <version>${version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml Mon May 19 10:48:13 2008
@@ -36,6 +36,14 @@
     <description>Apache ActiveMQ integration into geronimo.  This module starts an
activemq broker embedded in geronimo.</description>
     
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml (original)
+++ geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml Mon May 19 10:48:13 2008
@@ -35,6 +35,14 @@
     
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
         </dependency>

Modified: geronimo/server/trunk/plugins/axis/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/pom.xml Mon May 19 10:48:13 2008
@@ -36,6 +36,14 @@
     <description>Apache Axis 1 integration.</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml Mon May 19 10:48:13 2008
@@ -39,6 +39,14 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis2</artifactId>
             <type>car</type>

Modified: geronimo/server/trunk/plugins/axis2/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Mon May 19 10:48:13 2008
@@ -39,6 +39,14 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <type>car</type>

Modified: geronimo/server/trunk/plugins/client/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client/pom.xml Mon May 19 10:48:13 2008
@@ -34,6 +34,14 @@
     <packaging>car</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/plugins/connector/client-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/client-transaction/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/client-transaction/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/client-transaction/pom.xml Mon May 19 10:48:13
2008
@@ -34,6 +34,14 @@
     <packaging>car</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        
         <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/plugins/connector/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/transaction/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/transaction/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/transaction/pom.xml Mon May 19 10:48:13 2008
@@ -37,6 +37,14 @@
     
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml Mon May 19 10:48:13 2008
@@ -39,6 +39,14 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf</artifactId>
             <type>car</type>

Modified: geronimo/server/trunk/plugins/cxf/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/pom.xml Mon May 19 10:48:13 2008
@@ -39,6 +39,14 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <type>car</type>

Modified: geronimo/server/trunk/plugins/jasper/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper/pom.xml Mon May 19 10:48:13 2008
@@ -37,6 +37,14 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/plugins/jetty/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6/pom.xml Mon May 19 10:48:13 2008
@@ -37,6 +37,14 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/plugins/mejb/mejb/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/mejb/mejb/src/main/plan/plan.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/mejb/mejb/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/mejb/mejb/src/main/plan/plan.xml Mon May 19 10:48:13 2008
@@ -26,19 +26,19 @@
         </session>
     </enterprise-beans>
 
-    <security xmlns="http://geronimo.apache.org/xml/ns/security-2.0">
-        <role-mappings>
-            <role role-name="mejbuser">
-                <principal name="admin"
+    <s:security xmlns:s="http://geronimo.apache.org/xml/ns/security-2.0">
+        <s:role-mappings>
+            <s:role role-name="mejbuser">
+                <s:principal name="admin"
                     class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
-                <principal name="mejb-admin"
+                <s:principal name="mejb-admin"
                     class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
-            </role>
+            </s:role>
 
-            <role role-name="mejbadmin">
-                <principal name="mejb-admin"
+            <s:role role-name="mejbadmin">
+                <s:principal name="mejb-admin"
                     class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
-            </role>
-        </role-mappings>
-    </security>
+            </s:role>
+        </s:role-mappings>
+    </s:security>
 </openejb-jar>

Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Mon May 19 10:48:13 2008
@@ -37,6 +37,14 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml Mon May 19 10:48:13 2008
@@ -39,6 +39,14 @@
     
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
         </dependency>

Modified: geronimo/server/trunk/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/pom.xml Mon May 19 10:48:13
2008
@@ -39,10 +39,19 @@
     
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>derby</artifactId>
+            <artifactId>j2ee-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -50,7 +59,14 @@
             <artifactId>connector-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>test</scope>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>derby</artifactId>
+            <version>${version}</version>
+            <type>car</type>
         </dependency>
 
         <dependency>
@@ -78,13 +94,6 @@
             <type>rar</type>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml Mon May 19 10:48:13 2008
@@ -37,6 +37,14 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml?rev=657880&r1=657879&r2=657880&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml Mon May 19 10:48:13
2008
@@ -37,6 +37,14 @@
     
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <version>${version}</version>



Mime
View raw message