[jboss-cvs] JBossAS SVN: r74310 - in trunk: system/src/main/org/jboss/system/deployers and 1 other directories.

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

Author: alesj
Date: 2008-06-09 09:35:03 -0400 (Mon, 09 Jun 2008)
New Revision: 74310

Added:
   trunk/system/src/main/org/jboss/system/deployers/DsDeploymentContextComparator.java
Modified:
   trunk/server/src/etc/conf/default/deployers.xml
   trunk/testsuite/imports/sections/seam.xml
Log:
Update seam to 2.0.3-snapshot.
Handle -ds.xml and war relative order.

Modified: trunk/server/src/etc/conf/default/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/default/deployers.xml	2008-06-09 13:01:29 UTC (rev 74309)
+++ trunk/server/src/etc/conf/default/deployers.xml	2008-06-09 13:35:03 UTC (rev 74310)
@@ -21,11 +21,15 @@
       -->
    </classloader>
 
+  <!-- put -ds.xml before everything -->
+   <bean name="dsContextComparator" class="org.jboss.system.deployers.DsDeploymentContextComparator"/>
+
    <!-- The MainDeployer -->
    <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
       <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
       <property name="deployers"><inject bean="Deployers"/></property>
       <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
+      <property name="comparator"><inject bean="dsContextComparator"/></property>
    </bean>
 
    <!-- The ManagedDeploymentCreator implementation -->
@@ -51,7 +55,7 @@
    </bean>
 
    <!-- A declared structure descriptor deployer -->
-   <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"></bean>
+   <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
 
    <!-- WAR Structure -->
    <bean name="WARStructure" class="org.jboss.deployers.vfs.plugins.structure.war.WARStructure">
@@ -61,6 +65,7 @@
              <constructor><parameter class="java.lang.String">.jar</parameter></constructor>
           </bean>
        </property>
+       <property name="contextInfoOrder">1000</property>
     </bean>
 
     <!-- JAR Structure -->

Copied: trunk/system/src/main/org/jboss/system/deployers/DsDeploymentContextComparator.java (from rev 74304, trunk/system/src/main/org/jboss/system/deployers/TempBeanMetaDataDeployer.java)
===================================================================
--- trunk/system/src/main/org/jboss/system/deployers/DsDeploymentContextComparator.java	                        (rev 0)
+++ trunk/system/src/main/org/jboss/system/deployers/DsDeploymentContextComparator.java	2008-06-09 13:35:03 UTC (rev 74310)
@@ -0,0 +1,47 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.system.deployers;
+
+import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.helpers.DefaultDeploymentContextComparator;
+
+/**
+ * Put any -ds.xml before anything else.
+ *
+ * @author ales.justin at jboss.org
+ */
+public class DsDeploymentContextComparator extends DefaultDeploymentContextComparator
+{
+   private static final String DS_SUFFIX = "-ds.xml";
+
+   public int compare(DeploymentContext fst, DeploymentContext snd)
+   {
+      String fstSimpleName = fst.getSimpleName();
+      String sndSimpleName = snd.getSimpleName();
+      if (fstSimpleName.endsWith(DS_SUFFIX))
+         return -1;
+      if (sndSimpleName.endsWith(DS_SUFFIX))
+         return 1;
+
+      return super.compare(fst, snd);
+   }
+}
\ No newline at end of file

Modified: trunk/testsuite/imports/sections/seam.xml
===================================================================
--- trunk/testsuite/imports/sections/seam.xml	2008-06-09 13:01:29 UTC (rev 74309)
+++ trunk/testsuite/imports/sections/seam.xml	2008-06-09 13:35:03 UTC (rev 74310)
@@ -1,6 +1,6 @@
 <project name="tests-seam-jars" xmlns:artifact="urn:maven-artifact-ant">
 
-   <property name="seam_version" value="2.0.2.SP1"/>
+   <property name="seam_version" value="2.0.3-SNAPSHOT"/>
 
    <property name="build.seam.lib" value="${build.lib}/seam" />