portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r771625 - /portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
Date Tue, 05 May 2009 08:48:37 GMT
Author: ate
Date: Tue May  5 08:48:36 2009
New Revision: 771625

URL: http://svn.apache.org/viewvc?rev=771625&view=rev
Log:
Target contextName needs to be derived too if the target name itself is specified, otherwise
it will lead to a NPE in JetspeedDeploy.  

Modified:
    portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java

Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java?rev=771625&r1=771624&r2=771625&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
Tue May  5 08:48:36 2009
@@ -262,23 +262,23 @@
                         dobj.deployment.targetName = dobj.deployment.targetName.substring(0,
index);
                     }
                 }
-                if (dobj.deployment.infuse.booleanValue())
+            }
+            if (dobj.deployment.infuse.booleanValue())
+            {                    
+                if (dobj.deployment.expand.booleanValue())
                 {
-                    if (dobj.deployment.expand.booleanValue())
+                    dobj.contextName = dobj.deployment.targetName;
+                }
+                else
+                {
+                    int index = dobj.deployment.targetName.lastIndexOf(".");
+                    if (index > -1)
                     {
-                        dobj.contextName = dobj.deployment.targetName;
+                        dobj.contextName = dobj.deployment.targetName.substring(0, index);
                     }
                     else
                     {
-                        int index = dobj.deployment.targetName.lastIndexOf(".");
-                        if (index > -1)
-                        {
-                            dobj.contextName = dobj.deployment.targetName.substring(0, index);
-                        }
-                        else
-                        {
-                            dobj.contextName = dobj.deployment.targetName;
-                        }
+                        dobj.contextName = dobj.deployment.targetName;
                     }
                 }
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message