[jboss-cvs] JBossAS SVN: r90755 - in branches/dml-log-service-integration: server/src/main/org/jboss/web and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-07-01 22:16:29 -0400 (Wed, 01 Jul 2009)
New Revision: 90755

Modified:
   branches/dml-log-service-integration/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
   branches/dml-log-service-integration/server/src/main/org/jboss/web/WebPermissionMapping.java
   branches/dml-log-service-integration/testsuite/build.xml
Log:
Merge from trunk: -r90705:90754

Modified: branches/dml-log-service-integration/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- branches/dml-log-service-integration/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2009-07-02 02:01:39 UTC (rev 90754)
+++ branches/dml-log-service-integration/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2009-07-02 02:16:29 UTC (rev 90755)
@@ -100,21 +100,22 @@
    @Override
    public void deploy(VFSDeploymentUnit unit, JBossMetaData metaData) throws DeploymentException
    {
+      // Pickup any deployment which doesn't have metaData or metaData with ejbVersion unknown or 3
+      if(metaData != null && !metaData.isEJB3x())
+      {
+         log.debug("Ignoring legacy EJB deployment " + unit);
+         return;
+      }
+
+      // If this is a war, check scanWars
+      if(unit.getAttachment(JBossWebMetaData.class) != null && scanWars == false)
+      {
+         log.trace("Skipping web deployment: "+unit.getSimpleName());
+         return;            
+      }
+
       try
       {
-         // Pickup any deployment which doesn't have metaData or metaData with ejbVersion unknown or 3
-         if(metaData != null && (metaData.isEJB2x() || metaData.isEJB1x()))
-         {
-            log.debug("Ignoring legacy EJB deployment " + unit);
-            return;
-         }
-         // If this is a war, check scanWars
-         if(unit.getAttachment(JBossWebMetaData.class) != null && scanWars == false)
-         {
-            log.trace("Skipping web deployment: "+unit.getSimpleName());
-            return;            
-         }
-
          VirtualFile jar = unit.getRoot();
          if (jar.isLeaf() || ignoredJarsSet.contains(jar.getName()))
          {

Modified: branches/dml-log-service-integration/server/src/main/org/jboss/web/WebPermissionMapping.java
===================================================================
--- branches/dml-log-service-integration/server/src/main/org/jboss/web/WebPermissionMapping.java	2009-07-02 02:01:39 UTC (rev 90754)
+++ branches/dml-log-service-integration/server/src/main/org/jboss/web/WebPermissionMapping.java	2009-07-02 02:16:29 UTC (rev 90755)
@@ -217,8 +217,18 @@
             //JACC 1.1: create !(httpmethods) in unchecked perms
             if(httpMethods != null)
             {
-               WebResourcePermission wrpUnchecked = new WebResourcePermission(info.pattern, 
-                     "!" + getCommaSeparatedString(httpMethods));
+               final String pattern = info.pattern;
+               final String methodsAsString = "!" + getCommaSeparatedString(httpMethods);
+               WebResourcePermission wrpUnchecked = null;
+               try
+               {
+                  wrpUnchecked = new WebResourcePermission(pattern, methodsAsString);
+               }
+               catch (final IllegalArgumentException iae)
+               {
+                  throw new IllegalArgumentException("Could not create resource permission with pattern \"" + pattern
+                        + "\" and methods: " + methodsAsString, iae);
+               }
                pc.addToUncheckedPolicy(wrpUnchecked); 
             }
          }

Modified: branches/dml-log-service-integration/testsuite/build.xml
===================================================================
--- branches/dml-log-service-integration/testsuite/build.xml	2009-07-02 02:01:39 UTC (rev 90754)
+++ branches/dml-log-service-integration/testsuite/build.xml	2009-07-02 02:16:29 UTC (rev 90755)
@@ -3722,7 +3722,7 @@
     </sequential>
   </macrodef>
  
-   <target name="tests-standard-unit-matrix-version">
+   <target name="tests-standard-unit-matrix-version" depends="init">
      <execute-matrix-unit test-name="testbyvalue" parameter-filter="org/jboss/test/testbyvalue/test/**/*TestCase.class"/>
      <execute-matrix-unit test-name="bmp" parameter-filter="org/jboss/test/bmp/**/*TestCase.class"/>
      <execute-matrix-unit test-name="cmp2" parameter-filter="org/jboss/test/cmp2/**/*TestCase.class"/>