From portal-commits at lists.jboss.org Wed Jul 23 06:56:17 2008
Content-Type: multipart/mixed; boundary="===============5301641917398450285=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r11552 -
 tags/JBoss_Portal_2_6_6/server/src/main/org/jboss/portal/server/deployment/jboss.
Date: Wed, 23 Jul 2008 06:56:17 -0400
Message-ID: <E1KLc13-0006U1-Cl@committer01.frg.pub.inap.atl.jboss.com>

--===============5301641917398450285==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: thomas.heute(a)jboss.com
Date: 2008-07-23 06:56:17 -0400 (Wed, 23 Jul 2008)
New Revision: 11552

Modified:
   tags/JBoss_Portal_2_6_6/server/src/main/org/jboss/portal/server/deployme=
nt/jboss/PortalDeploymentInfoContext.java
Log:
JBPORTAL-1832: -object.xml files should be orderable
Contribution from Sylvain FRANCOIS (syllant), thanks !


Modified: tags/JBoss_Portal_2_6_6/server/src/main/org/jboss/portal/server/d=
eployment/jboss/PortalDeploymentInfoContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tags/JBoss_Portal_2_6_6/server/src/main/org/jboss/portal/server/deploym=
ent/jboss/PortalDeploymentInfoContext.java	2008-07-23 10:50:46 UTC (rev 115=
51)
+++ tags/JBoss_Portal_2_6_6/server/src/main/org/jboss/portal/server/deploym=
ent/jboss/PortalDeploymentInfoContext.java	2008-07-23 10:56:17 UTC (rev 115=
52)
@@ -30,10 +30,12 @@
 =

 import java.io.IOException;
 import java.net.URL;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Set;
+import java.util.TreeSet;
 =

 /**
  * @author <a href=3D"mailto:julien(a)jboss.org">Julien Viet</a>
@@ -189,10 +191,14 @@
 =

    public void create() throws DeploymentException
    {
-      for (Iterator i =3D deployments.keySet().iterator(); i.hasNext();)
+      // @syllant-patch@ : patch to sort -object.xml files
+      Set<URL> sortedDeploymentKeys =3D new TreeSet<URL>(new URLComparator=
());
+      sortedDeploymentKeys.addAll(deployments.keySet());
+      for (Iterator<URL> i =3D sortedDeploymentKeys.iterator(); i.hasNext(=
);)
       {
          URL url =3D (URL)i.next();
-         for (Iterator j =3D deployments.iterator(url); j.hasNext();)
+         =

+         for (Iterator<DeploymentContext> j =3D deployments.iterator(url);=
 j.hasNext();)
          {
             DeploymentContext ctx =3D (DeploymentContext)j.next();
             ctx.create();
@@ -202,10 +208,13 @@
 =

    public void start() throws DeploymentException
    {
-      for (Iterator i =3D deployments.keySet().iterator(); i.hasNext();)
+      // @syllant-patch@ : patch to sort -object.xml files
+      Set<URL> sortedDeploymentKeys =3D new TreeSet<URL>(new URLComparator=
());
+      sortedDeploymentKeys.addAll(deployments.keySet());
+      for (Iterator<URL> i =3D sortedDeploymentKeys.iterator(); i.hasNext(=
);)
       {
          URL url =3D (URL)i.next();
-         for (Iterator j =3D deployments.iterator(url); j.hasNext();)
+         for (Iterator<DeploymentContext> j =3D deployments.iterator(url);=
 j.hasNext();)
          {
             DeploymentContext ctx =3D (DeploymentContext)j.next();
             ctx.start();
@@ -215,10 +224,13 @@
 =

    public void stop() throws DeploymentException
    {
-      for (Iterator i =3D deployments.keySet().iterator(); i.hasNext();)
+      // @syllant-patch@ : patch to sort -object.xml files
+      Set<URL> sortedDeploymentKeys =3D new TreeSet<URL>(new OppositeURLCo=
mparator());
+      sortedDeploymentKeys.addAll(deployments.keySet());
+      for (Iterator<URL> i =3D sortedDeploymentKeys.iterator(); i.hasNext(=
);)
       {
          URL url =3D (URL)i.next();
-         for (Iterator j =3D deployments.iterator(url); j.hasNext();)
+         for (Iterator<DeploymentContext> j =3D deployments.iterator(url);=
 j.hasNext();)
          {
             DeploymentContext ctx =3D (DeploymentContext)j.next();
             ctx.stop();
@@ -228,14 +240,34 @@
 =

    public void destroy() throws DeploymentException
    {
-      for (Iterator i =3D deployments.keySet().iterator(); i.hasNext();)
+      // @syllant-patch@ : patch to sort -object.xml files
+      Set<URL> sortedDeploymentKeys =3D new TreeSet<URL>(new OppositeURLCo=
mparator());
+      sortedDeploymentKeys.addAll(deployments.keySet());
+      for (Iterator<URL> i =3D sortedDeploymentKeys.iterator(); i.hasNext(=
);)
       {
          URL url =3D (URL)i.next();
-         for (Iterator j =3D deployments.iterator(url); j.hasNext();)
+         for (Iterator<DeploymentContext> j =3D deployments.iterator(url);=
 j.hasNext();)
          {
             DeploymentContext ctx =3D (DeploymentContext)j.next();
             ctx.destroy();
          }
       }
    }
+   =

+   // @syllant-patch@ : patch to sort -object.xml files
+   private class URLComparator implements Comparator<URL>
+   {
+      public int compare(URL o1, URL o2)
+      {
+         return o1.getPath().compareTo(o2.getPath());
+      }
+   }
+
+   private class OppositeURLComparator implements Comparator<URL>
+   {
+      public int compare(URL o1, URL o2)
+      {
+         return - o1.getPath().compareTo(o2.getPath());
+      }
+   }
 }


--===============5301641917398450285==--