geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r496988 - in /geronimo/server/trunk: maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
Date Wed, 17 Jan 2007 10:59:50 GMT
Author: vamsic007
Date: Wed Jan 17 02:59:50 2007
New Revision: 496988

URL: http://svn.apache.org/viewvc?view=rev&rev=496988
Log:
GERONIMO-438 Deployer.deploy arguments inconsistent
  o Looks like PackageMojo.invokeDeployer() is the only place where Deployer.deploy() method
with "long signature" is called.
  o See the JIRA for more information and observations
  o Concluding the hunt for the method usage and updating Deployer and PackageMojo classes
to make the arguments consistent

Modified:
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
    geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?view=diff&rev=496988&r1=496987&r2=496988
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
(original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
Wed Jan 17 02:59:50 2007
@@ -649,8 +649,8 @@
     private List invokeDeployer(final Kernel kernel, final AbstractName deployer, final String
targetConfigStore) throws Exception {
         Object[] args = {
             Boolean.FALSE, // Not in-place
-            planFile,
             moduleFile,
+            planFile,
             null, // Target file
             Boolean.TRUE, // Install
             null, // main-class

Modified: geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java?view=diff&rev=496988&r1=496987&r2=496988
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
(original)
+++ geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
Wed Jan 17 02:59:50 2007
@@ -121,7 +121,7 @@
         }
 
         try {
-            return deploy(inPlace, planFile, moduleFile, null, true, null, null, null, null,
null, null, null, targetConfigStore);
+            return deploy(inPlace, moduleFile, planFile, null, true, null, null, null, null,
null, null, null, targetConfigStore);
         } catch (DeploymentException e) {
             log.debug("Deployment failed: plan=" + planFile + ", module=" + originalModuleFile,
e);
             throw e.cleanse();
@@ -185,8 +185,8 @@
     }
 
     public List deploy(boolean inPlace,
-            File planFile,
             File moduleFile,
+            File planFile,
             File targetFile,
             boolean install,
             String mainClass,



Mime
View raw message