geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r512979 - in /geronimo/server/trunk: ./ configs/geronimo-gbean-deployer/ configs/jsr88-cli/ modules/geronimo-deploy-config/ modules/geronimo-deploy-jsr88-bootstrapper/ modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployme...
Date Wed, 28 Feb 2007 21:28:29 GMT
Author: djencks
Date: Wed Feb 28 13:28:28 2007
New Revision: 512979

URL: http://svn.apache.org/viewvc?view=rev&rev=512979
Log:
GERONIMO-2904 add impl of new jsr-88 method

Modified:
    geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml
    geronimo/server/trunk/configs/jsr88-cli/pom.xml
    geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
    geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/DistributeCommand.java
    geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
    geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
    geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml Wed Feb 28 13:28:28 2007
@@ -51,7 +51,7 @@
         <!-- required for environment dconfigbean support -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
 
         <!-- jsr88 dconfigbean support base classes -->

Modified: geronimo/server/trunk/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-cli/pom.xml?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/trunk/configs/jsr88-cli/pom.xml Wed Feb 28 13:28:28 2007
@@ -73,7 +73,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml Wed Feb 28 13:28:28 2007
@@ -52,7 +52,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
         
     </dependencies>

Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml Wed Feb 28 13:28:28
2007
@@ -42,7 +42,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
         
     </dependencies>

Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
(original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
Wed Feb 28 13:28:28 2007
@@ -34,8 +34,6 @@
 import javax.enterprise.deploy.spi.exceptions.TargetException;
 import javax.enterprise.deploy.spi.status.ProgressObject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.deployment.ModuleConfigurer;
 
 /**
@@ -45,7 +43,6 @@
  * @version $Rev$ $Date$
  */
 public class DisconnectedDeploymentManager implements DeploymentManager {
-    private static final Log log = LogFactory.getLog(DisconnectedDeploymentManager.class);
 
     private final Collection<ModuleConfigurer> moduleConfigurers;
 
@@ -129,7 +126,14 @@
         throw new IllegalStateException("Disconnected");
     }
 
+    /**
+     * @deprecated
+     */
     public ProgressObject distribute(Target[] targets, InputStream inputStream, InputStream
inputStream1) throws IllegalStateException {
+        throw new IllegalStateException("Disconnected");
+    }
+
+    public ProgressObject distribute(Target[] targets, ModuleType moduleType, InputStream
inputStream, InputStream inputStream1) throws IllegalStateException {
         throw new IllegalStateException("Disconnected");
     }
 

Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
(original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
Wed Feb 28 13:28:28 2007
@@ -35,8 +35,6 @@
 import javax.enterprise.deploy.spi.exceptions.TargetException;
 import javax.enterprise.deploy.spi.status.ProgressObject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.deployment.ModuleConfigurer;
 import org.apache.geronimo.deployment.plugin.TargetImpl;
 import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
@@ -59,7 +57,6 @@
  * @version $Rev$ $Date$
  */
 public abstract class JMXDeploymentManager implements DeploymentManager {
-    private static final Log log = LogFactory.getLog(JMXDeploymentManager.class);
 
     protected Kernel kernel;
     private ConfigurationManager configurationManager;
@@ -173,7 +170,7 @@
                 }
             }
             CommandSupport.addWebURLs(kernel, result);
-            return result.size() == 0 ? null : (TargetModuleID[]) result.toArray(new TargetModuleID[result.size()]);
+            return result.size() == 0 ? null : result.toArray(new TargetModuleID[result.size()]);
         } catch (Exception e) {
             throw (TargetException) new TargetException(e.getMessage()).initCause(e);
         }
@@ -189,11 +186,18 @@
         return command;
     }
 
+    /**
+     * @deprecated
+     */
     public ProgressObject distribute(Target[] targetList, InputStream moduleArchive, InputStream
deploymentPlan) {
+        return distribute(targetList, null, moduleArchive, deploymentPlan);
+    }
+
+    public ProgressObject distribute(Target[] targetList, ModuleType moduleType, InputStream
moduleArchive, InputStream deploymentPlan) throws IllegalStateException {
         if (kernel == null) {
             throw new IllegalStateException("Disconnected");
         }
-        DistributeCommand command = createDistributeCommand(targetList, moduleArchive, deploymentPlan);
+        DistributeCommand command = createDistributeCommand(targetList, moduleType, moduleArchive,
deploymentPlan);
         command.setCommandContext(commandContext);
         new Thread(command).start();
         return command;
@@ -308,8 +312,8 @@
         return new DistributeCommand(kernel, targetList, moduleArchive, deploymentPlan);
     }
 
-    protected DistributeCommand createDistributeCommand(Target[] targetList, InputStream
moduleArchive, InputStream deploymentPlan) {
-        return new DistributeCommand(kernel, targetList, moduleArchive, deploymentPlan);
+    protected DistributeCommand createDistributeCommand(Target[] targetList, ModuleType moduleType,
InputStream moduleArchive, InputStream deploymentPlan) {
+        return new DistributeCommand(kernel, targetList, moduleType, moduleArchive, deploymentPlan);
     }
 
     protected RedeployCommand createRedeployCommand(TargetModuleID[] moduleIDList, File moduleArchive,
File deploymentPlan) {

Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
(original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
Wed Feb 28 13:28:28 2007
@@ -32,6 +32,7 @@
 import java.util.Set;
 
 import javax.enterprise.deploy.shared.CommandType;
+import javax.enterprise.deploy.shared.ModuleType;
 import javax.enterprise.deploy.spi.Target;
 import javax.enterprise.deploy.spi.TargetModuleID;
 import javax.enterprise.deploy.spi.status.ProgressEvent;
@@ -129,11 +130,11 @@
         }
     }
 
-    protected DistributeCommand createDistributeCommand(Target[] targetList, InputStream
moduleArchive, InputStream deploymentPlan) {
+    protected DistributeCommand createDistributeCommand(Target[] targetList, ModuleType moduleType,
InputStream moduleArchive, InputStream deploymentPlan) {
         if(isSameMachine) {
-            return super.createDistributeCommand(targetList, moduleArchive, deploymentPlan);
+            return super.createDistributeCommand(targetList, moduleType, moduleArchive, deploymentPlan);
         } else {
-            return new org.apache.geronimo.deployment.plugin.remote.DistributeCommand(kernel,
targetList, moduleArchive, deploymentPlan);
+            return new org.apache.geronimo.deployment.plugin.remote.DistributeCommand(kernel,
targetList, moduleType, moduleArchive, deploymentPlan);
         }
     }
 
@@ -203,7 +204,7 @@
     public Object startInstall(File carFile, String username, String password) {
         File[] args = new File[]{carFile};
         if(!isSameMachine) {
-            AbstractDeployCommand progress = new AbstractDeployCommand(CommandType.DISTRIBUTE,
kernel, null, null, null, null, false) {
+            AbstractDeployCommand progress = new AbstractDeployCommand(CommandType.DISTRIBUTE,
kernel, null, null, null, null, null, false) {
                 public void run() {
                 }
             };

Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java
(original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java
Wed Feb 28 13:28:28 2007
@@ -44,15 +44,17 @@
     protected final boolean spool;
     protected File moduleArchive;
     protected File deploymentPlan;
+    protected final ModuleType moduleType;
     protected InputStream moduleStream;
     protected InputStream deploymentStream;
     protected AbstractName deployer;
 
-    public AbstractDeployCommand(CommandType command, Kernel kernel, File moduleArchive,
File deploymentPlan, InputStream moduleStream, InputStream deploymentStream, boolean spool)
{
+    public AbstractDeployCommand(CommandType command, Kernel kernel, File moduleArchive,
File deploymentPlan, ModuleType moduleType, InputStream moduleStream, InputStream deploymentStream,
boolean spool) {
         super(command);
         this.kernel = kernel;
         this.moduleArchive = moduleArchive;
         this.deploymentPlan = deploymentPlan;
+        this.moduleType = moduleType;
         this.moduleStream = moduleStream;
         this.deploymentStream = deploymentStream;
         this.spool = spool;
@@ -88,8 +90,8 @@
     // be careful to clean up the temp file... we tell the vm to delete this on exit
     // but VMs can't be trusted to acutally delete the file
     // Copied from DeploymentUtil
-    protected static File createTempFile() throws IOException {
-        File tempFile = File.createTempFile("geronimo-deploymentUtil", ".tmpdir");
+    protected static File createTempFile(String extension) throws IOException {
+        File tempFile = File.createTempFile("geronimo-deploymentUtil", extension == null?
".tmpdir": extension);
         tempFile.deleteOnExit();
         return tempFile;
     }

Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
(original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
Wed Feb 28 13:28:28 2007
@@ -21,6 +21,7 @@
 import java.io.InputStream;
 
 import javax.enterprise.deploy.shared.CommandType;
+import javax.enterprise.deploy.shared.ModuleType;
 import javax.enterprise.deploy.spi.Target;
 
 import org.apache.geronimo.kernel.Kernel;
@@ -32,12 +33,12 @@
     protected final Target[] targetList;
 
     public DistributeCommand(Kernel kernel, Target[] targetList, File moduleArchive, File
deploymentPlan) {
-        super(CommandType.DISTRIBUTE, kernel, moduleArchive, deploymentPlan, null, null,
false);
+        super(CommandType.DISTRIBUTE, kernel, moduleArchive, deploymentPlan, null, null,
null, false);
         this.targetList = targetList;
     }
 
-    public DistributeCommand(Kernel kernel, Target[] targetList, InputStream moduleStream,
InputStream deploymentStream) {
-        super(CommandType.DISTRIBUTE, kernel, null, null, moduleStream, deploymentStream,
true);
+    public DistributeCommand(Kernel kernel, Target[] targetList, ModuleType moduleType, InputStream
moduleStream, InputStream deploymentStream) {
+        super(CommandType.DISTRIBUTE, kernel, null, null, moduleType, moduleStream, deploymentStream,
true);    
         this.targetList = targetList;
     }
 
@@ -45,11 +46,11 @@
         try {
             if (spool) {
                 if (moduleStream != null) {
-                    moduleArchive = createTempFile();
+                    moduleArchive = createTempFile(moduleType == null? null: moduleType.getModuleExtension());
                     copyTo(moduleArchive, moduleStream);
                 }
                 if (deploymentStream != null) {
-                    deploymentPlan = createTempFile();
+                    deploymentPlan = createTempFile(null);
                     copyTo(deploymentPlan, deploymentStream);
                 }
             }

Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
(original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
Wed Feb 28 13:28:28 2007
@@ -21,6 +21,7 @@
 import java.util.Iterator;
 
 import javax.enterprise.deploy.shared.CommandType;
+import javax.enterprise.deploy.shared.ModuleType;
 import javax.enterprise.deploy.spi.Target;
 import javax.enterprise.deploy.spi.TargetModuleID;
 
@@ -46,12 +47,12 @@
     private final TargetModuleID[] modules;
 
     public RedeployCommand(Kernel kernel, TargetModuleID[] moduleIDList, File moduleArchive,
File deploymentPlan) {
-        super(CommandType.REDEPLOY, kernel, moduleArchive, deploymentPlan, null, null, false);
+        super(CommandType.REDEPLOY, kernel, moduleArchive, deploymentPlan, null, null, null,
false);
         this.modules = moduleIDList;
     }
 
     public RedeployCommand(Kernel kernel, TargetModuleID[] moduleIDList, InputStream moduleArchive,
InputStream deploymentPlan) {
-        super(CommandType.REDEPLOY, kernel, null, null, moduleArchive, deploymentPlan, true);
+        super(CommandType.REDEPLOY, kernel, null, null, null, moduleArchive, deploymentPlan,
true);
         this.modules = moduleIDList;
     }
 
@@ -63,11 +64,11 @@
         try {
             if (spool) {
                 if (moduleStream != null) {
-                    moduleArchive = createTempFile();
+                    moduleArchive = createTempFile(moduleType == null? null: moduleType.getModuleExtension());
                     copyTo(moduleArchive, moduleStream);
                 }
                 if (deploymentStream != null) {
-                    deploymentPlan = createTempFile();
+                    deploymentPlan = createTempFile(null);
                     copyTo(deploymentPlan, deploymentStream);
                 }
             }

Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/DistributeCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/DistributeCommand.java?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/DistributeCommand.java
(original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/DistributeCommand.java
Wed Feb 28 13:28:28 2007
@@ -19,6 +19,8 @@
 import org.apache.geronimo.kernel.Kernel;
 
 import javax.enterprise.deploy.spi.Target;
+import javax.enterprise.deploy.shared.ModuleType;
+
 import java.io.File;
 import java.io.InputStream;
 
@@ -33,8 +35,8 @@
         super(kernel, targetList, moduleArchive, deploymentPlan);
     }
 
-    public DistributeCommand(Kernel kernel, Target[] targetList, InputStream moduleStream,
InputStream deploymentStream) {
-        super(kernel, targetList, moduleStream, deploymentStream);
+    public DistributeCommand(Kernel kernel, Target[] targetList, ModuleType moduleType, InputStream
moduleStream, InputStream deploymentStream) {
+        super(kernel, targetList, moduleType, moduleStream, deploymentStream);
     }
 
     protected void massageFileNames(File[] inputs) {

Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml Wed Feb 28 13:28:28 2007
@@ -36,7 +36,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml Wed Feb 28 13:28:28 2007
@@ -38,7 +38,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml Wed Feb 28 13:28:28 2007
@@ -50,7 +50,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml Wed Feb 28 13:28:28 2007
@@ -36,7 +36,7 @@
     
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=512979&r1=512978&r2=512979
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Feb 28 13:28:28 2007
@@ -119,8 +119,8 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-                <version>1.0.1</version>
+                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+                <version>1.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -278,7 +278,7 @@
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-reflect</artifactId>
-                <version>2.8</version>
+                <version>2.9-SNAPSHOT</version>
             </dependency>
 
             <dependency>



Mime
View raw message