[Jboss-cvs] JBossAS SVN: r56397 - branches/Branch_4_0/server/src/main/org/jboss/deployment

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

Author: dimitris at jboss.org
Date: 2006-08-29 06:45:38 -0400 (Tue, 29 Aug 2006)
New Revision: 56397

Modified:
   branches/Branch_4_0/server/src/main/org/jboss/deployment/EARDeployer.java
   branches/Branch_4_0/server/src/main/org/jboss/deployment/J2eeApplicationMetaData.java
Log:
fix the formatting

Modified: branches/Branch_4_0/server/src/main/org/jboss/deployment/EARDeployer.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/deployment/EARDeployer.java	2006-08-29 09:55:54 UTC (rev 56396)
+++ branches/Branch_4_0/server/src/main/org/jboss/deployment/EARDeployer.java	2006-08-29 10:45:38 UTC (rev 56397)
@@ -1,24 +1,24 @@
 /*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jboss.deployment;
 
 import java.io.File;
@@ -270,15 +270,17 @@
             }
          }
          
-         // Check for the Deployment Ordering style .
+         // Check for deployment order style
          String moduleOrder = metaData.getModuleOrder();
-         if("strict".equalsIgnoreCase(moduleOrder))
-        	 di.sortedSubDeployments=true;
+         if ("strict".equalsIgnoreCase(moduleOrder))
+        	 di.sortedSubDeployments = true;
          else
          {
-        	 di.sortedSubDeployments=false;
-        	 if(!"implicit".equalsIgnoreCase(moduleOrder))
-        		 log.warn("Module Order should be set to strict or implicit , it is set to "+moduleOrder);
+        	 di.sortedSubDeployments = false;
+        	 
+             if (!"implicit".equalsIgnoreCase(moduleOrder))
+        		 log.warn("supported values for <module-order> are 'strict' and 'implicit'; currently set to:  "
+                       + moduleOrder);
          }
       }
       catch (Exception e)

Modified: branches/Branch_4_0/server/src/main/org/jboss/deployment/J2eeApplicationMetaData.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/deployment/J2eeApplicationMetaData.java	2006-08-29 09:55:54 UTC (rev 56396)
+++ branches/Branch_4_0/server/src/main/org/jboss/deployment/J2eeApplicationMetaData.java	2006-08-29 10:45:38 UTC (rev 56397)
@@ -72,11 +72,10 @@
    private String jmxName;
 
    /** 
-    * Deployment Ordering nature will be based on Deployment Sorter 
-    * or on the ordering of modules defined in application.xml and 
-    * jboss-app.xml. 
+    * Module order will be based on the deployment sorter (implicit) or on the
+    * ordering of modules defined in application.xml and jboss-app.xml (strict). 
     */
-   private String moduleOrder="implicit";
+   private String moduleOrder = "implicit";
 
    // Static --------------------------------------------------------