svn commit: r804032 - in /ode/branches/APACHE_ODE_1.X: axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java

[rr]

Author: rr
Date: Thu Aug 13 21:22:44 2009
New Revision: 804032

URL: http://svn.apache.org/viewvc?rev=804032&view=rev
Log:
Bundle names validation test fix

Modified:
    
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
    
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java

Modified: 
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java?rev=804032&r1=804031&r2=804032&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
 Thu Aug 13 21:22:44 2009
@@ -33,6 +33,8 @@
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import javax.xml.namespace.QName;
 import java.io.ByteArrayOutputStream;
@@ -41,6 +43,7 @@
 import java.util.Iterator;
 
 public class DeploymentTest extends Axis2TestBase {
+    private static final Log __log = LogFactory.getLog(DeploymentTest.class);
 
     private OMFactory _factory;
     private ServiceClientUtil _client;
@@ -148,7 +151,8 @@
             undeploy(null);
             fail("Undeploying a null or empty package must fail");
         } catch (Exception e) {
-            String expectedMsg = "Empty package name received!";
+            __log.debug("got exception from deployment" + e.getMessage());
+            String expectedMsg = "Invalid bundle name";
             assertTrue("Unexpected exception received", 
e.getMessage().contains("operation undeploy") && 
e.getMessage().contains(expectedMsg));
         }
     }

Modified: 
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java?rev=804032&r1=804031&r2=804032&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
 Thu Aug 13 21:22:44 2009
@@ -317,8 +317,13 @@
         }
 
         private boolean validBundleName(String bundle) {
-            if (StringUtils.isBlank(bundle)) return false;
-            return bundle.matches("[\\p{L}0-9_\\-]*");
+            boolean valid;
+            if (StringUtils.isBlank(bundle)) valid = false;
+            else valid = bundle.matches("[\\p{L}0-9_\\-]*");
+            if (__log.isDebugEnabled()) {
+                __log.debug("Validating bundle " + bundle + " valid: " + 
valid);
+            }
+            return valid;
         }
     }