Index: cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicyMBean.java
===================================================================
--- cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicyMBean.java	(.../branches/Branch_4_0)	(revision 58015)
+++ cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicyMBean.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,82 +0,0 @@
-/*
- * 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.ha.singleton;
-
-
-import org.jboss.ha.framework.interfaces.ClusterNode;
-import org.jboss.ha.framework.interfaces.HAPartition;
-
-/** 
- *   Management Bean for HASinigleton Election Policy.
-
- *   @author <a href="mailto:Alex.Fu@novell.com">Alex Fu</a>.
- *   @version $Revision: 46010 $
- *
- */
-public interface HASingletonElectionPolicyMBean 
-   extends org.jboss.system.ServiceMBean
-{
-   /**
-    * Called by the HASingleton to provide the election policy a reference to 
-    * itself.  A policy that was designed to elect a particular kind of singleton
-    * could downcast this object to a particular type and then access the
-    * singleton for state information needed for the election decision.
-    */
-   void setManagedSingleton(Object singleton);
-   Object getManagedSingleton();
-
-   /**
-    * Sets the HAPartition; from this the election policy can gain
-    * access to the DistributedReplicantManager for tracking the 
-    * deployment topology for the singleton service and to the HAPartition 
-    * for making group RPC calls.
-    */
-   void setHAPartition(HAPartition partition);
-   HAPartition getHAPartition();
-
-   /**
-    * Return the elected master node.
-    * @return the master node
-    */
-   ClusterNode pickSingleton();
-   
-   /**
-    * Given the HAPartition, return the elected master node.
-    * @param partition
-    * @return the master node
-    */
-   ClusterNode pickSingleton(HAPartition partition);
-   
-   /**
-    * Conducts an election and returns whether the managed service
-    * is the master, based on the current view of partition.
-    * @return true only if the managed service is the master
-    */
-   public boolean isElectedMaster();
-   
-   /**
-    * Given the HAPartition, return whether the managed service is the master.
-    * @param partition
-    * @return true only if the managed service is the master
-    */
-   public boolean isElectedMaster(HAPartition partiton); 
-}
Index: cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicySimple.java
===================================================================
--- cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicySimple.java	(.../branches/Branch_4_0)	(revision 58015)
+++ cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicySimple.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,88 +0,0 @@
-/*
- * 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.ha.singleton;
-
-
-import org.jboss.ha.framework.interfaces.ClusterNode;
-import org.jboss.ha.framework.interfaces.HAPartition;
-
-/**
- * A simple concrete policy service that decides which node in the cluster should be 
- * the master node to run certain HASingleton service based on attribute "Position".
- * The value will be divided by partition size and only remainder will be used. 
- * 
- * Let's say partition size is n:
- * 0 means the first oldest node.
- * 1 means the 2nd oldest node. 
- * ...
- * n-1 means the nth oldest node.
- * 
- * -1 means the youngest node.
- * -2 means the 2nd youngest node.
- * ...
- * -n means the nth youngest node.
- * 
- * E.g. the following attribute says the singleton will be running on the 3rd oldest node of 
- * the current partition:
- * <attribute name="Position">2</attribute>
- * 
- * @author <a href="mailto:Alex.Fu@novell.com">Alex Fu</a>
- * @version $Revision: 46010 $
- */
-public class HASingletonElectionPolicySimple 
-   extends HASingletonElectionPolicyBase 
-   implements HASingletonElectionPolicySimpleMBean
-{
-   // Attributes
-   private int mPosition = 0; // Default
-   
-   /**
-    * @see HASingletonElectionPolicySimpleMBean#setPosition(int)
-    */
-   public void setPosition(int pos)
-   {
-      this.mPosition = pos;
-   }
-
-   /**
-    * @see HASingletonElectionPolicySimpleMBean#getPosition()
-    */
-   public int getPosition()
-   {
-      return this.mPosition;
-   }
-
-   public ClusterNode pickSingleton()
-   {
-      return pickSingleton(getHAPartition());
-   }
-   
-   public ClusterNode pickSingleton(HAPartition partition) 
-   {
-      ClusterNode[] nodes = partition.getClusterNodes();
-      
-      int size = nodes.length;
-      int remainder = ((this.mPosition % size) + size) % size;
-      
-      return nodes[remainder];
-   }
-}
Index: cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicyBase.java
===================================================================
--- cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicyBase.java	(.../branches/Branch_4_0)	(revision 58015)
+++ cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicyBase.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,97 +0,0 @@
-/*
- * 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.ha.singleton;
-
-
-import org.jboss.ha.framework.interfaces.HAPartition;
-import org.jboss.ha.framework.server.ClusterPartition;
-import org.jboss.logging.Logger;
-import org.jboss.system.ServiceMBeanSupport;
-
-/**
- * A base class for policy service that decides which node in the cluster should be 
- * the master node to run certain HASingleton service.
- * 
- * @author <a href="mailto:afu@novell.com">Alex Fu</a>
- * @version $Revision: 46010 $
- */
-public abstract class HASingletonElectionPolicyBase 
-   extends ServiceMBeanSupport
-   implements HASingletonElectionPolicyMBean
-{
-   private Object mManagedSingleton;
-   private HAPartition mPartition;
-   
-   /**
-    * @see HASingletonElectionPolicyMBean#setManagedSingleton(Object)
-    */
-   public void setManagedSingleton(Object singleton)
-   {
-      this.mManagedSingleton = singleton;
-   }
-
-   /**
-    * @see HASingletonElectionPolicyMBean#getManagedSingleton()
-    */
-   public Object getManagedSingleton()
-   {
-      return this.mManagedSingleton;
-   }
-
-   /**
-    * @see HASingletonElectionPolicyMBean#setHAPartition(HAPartition)
-    */
-   public void setHAPartition(HAPartition partition)
-   {
-      this.mPartition = partition;
-   }
-
-   /**
-    * @see HASingletonElectionPolicyMBean#getHAPartition()
-    */
-   public HAPartition getHAPartition()
-   {
-      return this.mPartition;
-   }
-   
-   /**
-    * @see HASingletonElectionPolicyMBean#isElectedMaster()
-    */
-   public boolean isElectedMaster()
-   {
-      if (null == this.mPartition)
-         throw new IllegalStateException("HAPartition is not set");
-      
-      return pickSingleton().equals(this.mPartition.getClusterNode());
-   }
-    
-   /**
-    * @see HASingletonElectionPolicyMBean#isElectedMaster(HAPartition)
-    */
-   public boolean isElectedMaster(HAPartition partition) 
-   {
-      if (null == partition)
-         throw new IllegalStateException("parameter cannot be null");
-
-      return pickSingleton(partition).equals(partition.getClusterNode());
-   }
-}
Index: cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicySimpleMBean.java
===================================================================
--- cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicySimpleMBean.java	(.../branches/Branch_4_0)	(revision 58015)
+++ cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicySimpleMBean.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,41 +0,0 @@
-/*
- * 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.ha.singleton;
-
-/** 
- *   Management Bean for the simple Election Policy.
-
- *   @author <a href="mailto:Alex.Fu@novell.com">Alex Fu</a>.
- *   @version $Revision: 46010 $
- *
- */
-public interface HASingletonElectionPolicySimpleMBean 
-   extends HASingletonElectionPolicyMBean 
-{
-   /**
-    * Attribute: position. 
-    * 0 means the oldest node, 1 means 2nd oldest, ...
-    * -1 means the youngest node, -2 means 2nd youngest, ...
-    */
-   void setPosition(int pos);
-   int getPosition();
-}
Index: cluster/src/main/org/jboss/ha/singleton/HASingletonSupportMBean.java
===================================================================
--- cluster/src/main/org/jboss/ha/singleton/HASingletonSupportMBean.java	(.../branches/Branch_4_0)	(revision 58015)
+++ cluster/src/main/org/jboss/ha/singleton/HASingletonSupportMBean.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,35 +0,0 @@
-/*
- * 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.ha.singleton;
-
-/** 
- * The management interface for the singleton support service.
- * 
- * @author <a href="mailto:Alex.Fu@novell.com">Alex Fu</a>
- * @version $Revision$
- */
-public interface HASingletonSupportMBean extends HASingletonMBean 
-{
-   /** The HASingleton election policy MBean */
-   void setHASingletonElectionPolicyMBean(HASingletonElectionPolicyMBean mb);
-   HASingletonElectionPolicyMBean getHASingletonElectionPolicyMBean();
-}
Index: cluster/src/main/org/jboss/ha/singleton/HASingletonControllerMBean.java
===================================================================
--- cluster/src/main/org/jboss/ha/singleton/HASingletonControllerMBean.java	(.../branches/Branch_4_0)	(revision 58015)
+++ cluster/src/main/org/jboss/ha/singleton/HASingletonControllerMBean.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -34,7 +34,7 @@
  * @author <a href="mailto:dimitris@jboss.org">Dimitris Andreadis</a>
  * @version $Revision$
  */
-public interface HASingletonControllerMBean extends HASingletonSupportMBean
+public interface HASingletonControllerMBean  extends HASingletonMBean
 {
    /** The controlled target Singleton MBean */
    ObjectName getTargetName();
Index: cluster/src/main/org/jboss/ha/singleton/HASingletonSupport.java
===================================================================
--- cluster/src/main/org/jboss/ha/singleton/HASingletonSupport.java	(.../branches/Branch_4_0)	(revision 58015)
+++ cluster/src/main/org/jboss/ha/singleton/HASingletonSupport.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -41,7 +41,6 @@
    // Private Data --------------------------------------------------
    
    private boolean isMasterNode = false;
-   private HASingletonElectionPolicyMBean mElectionPolicyMB = null;
 
    // Constructors --------------------------------------------------
    
@@ -65,22 +64,6 @@
       return isMasterNode;
    }
 
-   /**
-    * @see HASingletonSupportMBean#setHASingletonElectionPolicyMBean(HASingletonElectionPolicyMBean)
-    */
-   public void setHASingletonElectionPolicyMBean(HASingletonElectionPolicyMBean mb)
-   {
-      this.mElectionPolicyMB = mb;
-   }
-   
-   /**
-    * @see HASingletonSupportMBean#getHASingletonElectionPolicyMBean()
-    */
-   public HASingletonElectionPolicyMBean getHASingletonElectionPolicyMBean()
-   {
-      return this.mElectionPolicyMB;
-   }
-
    // Public --------------------------------------------------------
 
    /**
@@ -131,11 +114,7 @@
     */
    public void partitionTopologyChanged(List newReplicants, int newViewID)
    {
-      boolean isElectedNewMaster;
-      if (this.mElectionPolicyMB != null)
-         isElectedNewMaster = this.mElectionPolicyMB.isElectedMaster(this.getPartition());
-      else
-         isElectedNewMaster = isDRMMasterReplica();
+      boolean isElectedNewMaster = isDRMMasterReplica();
       
       if (log.isDebugEnabled())
       {
Index: ejb3/src/main/org/jboss/ejb3/tx/TxUtil.java
===================================================================
--- ejb3/src/main/org/jboss/ejb3/tx/TxUtil.java	(.../branches/Branch_4_0)	(revision 58015)
+++ ejb3/src/main/org/jboss/ejb3/tx/TxUtil.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -27,9 +27,8 @@
 import javax.naming.NamingException;
 import javax.transaction.TransactionManager;
 import org.jboss.aop.Advisor;
+import org.jboss.tm.TxManager;
 
-import org.jboss.ejb3.InitialContextFactory;
-
 /**
  * Comment
  *
@@ -42,7 +41,7 @@
    {
       try
       {
-         InitialContext jndiContext = InitialContextFactory.getInitialContext();
+         InitialContext jndiContext = new InitialContext();
          TransactionManager tm = (TransactionManager)jndiContext.lookup("java:TransactionManager");
          return tm;
       } 
Index: server/src/resources/dtd/jboss-web_4_0.dtd
===================================================================
--- server/src/resources/dtd/jboss-web_4_0.dtd	(.../branches/Branch_4_0)	(revision 58015)
+++ server/src/resources/dtd/jboss-web_4_0.dtd	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -382,7 +382,7 @@
       or
          <replication-field-batch-mode>FALSE</replication-field-batch-mode>
 -->
-<!ELEMENT replication-field-batch-mode (#PCDATA)>
+<!ELEMENT replication-field-batch-mode (true|false)>
 
 <!-- The service-ref element provides jboss specific deployment values to
 the web service reference in web.xml.
Index: remoting-int/.classpath
===================================================================
--- remoting-int/.classpath	(.../branches/Branch_4_0)	(revision 58015)
+++ remoting-int/.classpath	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="tests/" kind="src" path="src/main"/>
-	<classpathentry kind="src" path="src/main/tests"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/security"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
-	<classpathentry kind="output" path="output/classes"/>
-</classpath>
Index: remoting-int/.project
===================================================================
--- remoting-int/.project	(.../branches/Branch_4_0)	(revision 58015)
+++ remoting-int/.project	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>remoting-int</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
Index: testsuite/src/main/org/jboss/test/cluster/test/HASingletonElectionPolicyTestCase.java
===================================================================
--- testsuite/src/main/org/jboss/test/cluster/test/HASingletonElectionPolicyTestCase.java	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/src/main/org/jboss/test/cluster/test/HASingletonElectionPolicyTestCase.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,118 +0,0 @@
-/*
- * 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.test.cluster.test;
-
-import javax.management.ObjectName;
-
-import junit.framework.Test;
-
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
-import org.jboss.test.JBossClusteredTestCase;
-
-/**
- * Unit tests for HASingletonElectionPolicy.
- * The testing deployment is under resources/ha/electionpolicy. 
- *
- * @author <a href="mailto:Alex.Fu@novell.com">Alex Fu</a>
- * @version $Revision: 46010 $
- *
- */
-public class HASingletonElectionPolicyTestCase extends JBossClusteredTestCase 
-{
-   public HASingletonElectionPolicyTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public static Test suite() throws Exception
-   {
-      // Refer to jboss-service.xml under resources/ha/electionpolicy
-      Test t1 = JBossClusteredTestCase.getDeploySetup(HASingletonElectionPolicyTestCase.class, "ha-electionpolicy.sar");
-      return t1;
-   }
-   
-   public void testElectionPolicy() throws Exception
-   {
-      // Get MBeanServerConnections
-      RMIAdaptor[] adaptors = this.getAdaptors();
-      int size = adaptors.length;
-      assertTrue(size > 1);   // cluster size must be at least 2
-      
-      // Restart partition to ensure the ordering of the cluster, which is important for testing the simple policy
-      // This is to avoid the mis-ordering caused by partition restart unit test
-      for (int i = 0; i < size; i++) 
-        restartPartition(adaptors[i]);
-      
-      // First policy is to elect the oldest node (position = 0)
-      {
-         ObjectName mbean = new ObjectName("jboss.examples:service=HASingletonMBeanExample_1");
-         
-         Boolean n1 = (Boolean)adaptors[0].getAttribute(mbean, "MasterNode");
-         Boolean n2 = (Boolean)adaptors[size - 1].getAttribute(mbean, "MasterNode");
-
-         assertEquals(n1, Boolean.TRUE);
-         assertEquals(n2, Boolean.FALSE);
-      }
-      // Second policy is the youngest (position = -1)
-      {
-         ObjectName mbean = new ObjectName("jboss.examples:service=HASingletonMBeanExample_2");
-         
-         Boolean n1 = (Boolean)adaptors[0].getAttribute(mbean, "MasterNode");
-         Boolean n2 = (Boolean)adaptors[size - 1].getAttribute(mbean, "MasterNode");
-         
-         assertEquals(n1, Boolean.FALSE);
-         assertEquals(n2, Boolean.TRUE);
-      }
-      // 3rd policy is the 2nd oldest (position = 1)
-      {
-         ObjectName mbean = new ObjectName("jboss.examples:service=HASingletonMBeanExample_3");
-         
-         Boolean n1 = (Boolean)adaptors[0].getAttribute(mbean, "MasterNode");
-         Boolean n2 = (Boolean)adaptors[1].getAttribute(mbean, "MasterNode");
-         
-         assertEquals(n1, Boolean.FALSE);
-         assertEquals(n2, Boolean.TRUE);
-      }
-      // 4th policy is not set, default is oldest
-      {
-         ObjectName mbean = new ObjectName("jboss.examples:service=HASingletonMBeanExample_4");
-         
-         Boolean n1 = (Boolean)adaptors[0].getAttribute(mbean, "MasterNode");
-         Boolean n2 = (Boolean)adaptors[size - 1].getAttribute(mbean, "MasterNode");
-         
-         assertEquals(n1, Boolean.TRUE);
-         assertEquals(n2, Boolean.FALSE);
-      }
-      
-      return;
-   }
-
-   private void restartPartition(RMIAdaptor adaptor) throws Exception
-   {
-      ObjectName partition = new ObjectName("jboss:service=DefaultPartition");
-      
-      Object[] params = new Object[0];
-      String[] types = new String[0];
-      adaptor.invoke(partition, "stop", params, types);
-      adaptor.invoke(partition, "start", params, types);
-   }
-}
Index: testsuite/src/main/org/jboss/test/cluster/test/DistributedStateTestCase.java
===================================================================
--- testsuite/src/main/org/jboss/test/cluster/test/DistributedStateTestCase.java	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/src/main/org/jboss/test/cluster/test/DistributedStateTestCase.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -23,7 +23,6 @@
 
 import java.rmi.RemoteException;
 import java.rmi.server.UnicastRemoteObject;
-import java.util.Collection;
 import java.util.Vector;
 import javax.management.MBeanServerInvocationHandler;
 import javax.management.ObjectName;
@@ -106,29 +105,12 @@
       assertTrue("server1: value == value1("+value+")", value.equals("value1"));
       value = (String) ds0.get("key0");
       assertTrue("server0: value == value1("+value+")", value.equals("value1"));
-      
-      ds1.put("key1", "value11");
-      Collection categories = ds0.listAllCategories();
-      assertEquals("server0 categories size", 1, categories.size());
-      categories = ds1.listAllCategories();
-      assertEquals("server1 categories size", 1, categories.size());
-      
-      String category = (String)categories.iterator().next();
-      Collection keys = ds0.listAllKeys(category);
-      assertEquals("server0 keys size", 2, keys.size());
-      keys = ds1.listAllKeys(category);
-      assertEquals("server1 keys size", 2, keys.size());
-      Collection vals = ds0.listAllValues(category);
-      assertEquals("server0 values size", 2, vals.size());
-      vals = ds1.listAllValues(category);
-      assertEquals("server1 values size", 2, vals.size());
 
       ds0.remove("key0");
       value = (String) ds1.get("key0");
       assertTrue("server1: value == null("+value+")", value == null);
       value = (String) ds0.get("key0");
       assertTrue("server0: value == null("+value+")", value == null);
-      
    }
 
 }
Index: testsuite/src/main/org/jboss/test/cluster/ds/DistributedStateUser.java
===================================================================
--- testsuite/src/main/org/jboss/test/cluster/ds/DistributedStateUser.java	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/src/main/org/jboss/test/cluster/ds/DistributedStateUser.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -33,7 +33,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.mx.util.JBossNotificationBroadcasterSupport;
 
-/** Tests of the DistributedState service  
+/** Tests of the  
 
     @author <a href="mailto:Scott.Stark@jboss.org">Scott Stark</a>.
     @version $Revision$
@@ -102,48 +102,6 @@
       Object value = entryMap.remove(category, key, false);
       log.debug("Removed: "+key+", value: "+value);
    }
-   
-   public Collection listAllCategories()
-   {
-      // return results as a vector to avoid hashmap.keyset serialization error
-      Collection cats = entryMap.getAllCategories();
-      if (cats == null || cats.isEmpty()) {
-         return new java.util.Vector();
-      }
-      java.util.Vector vcats = new java.util.Vector();
-      java.util.Iterator iter = cats.iterator();
-      while (iter.hasNext())
-         vcats.add(iter.next());
-      return vcats;
-   }
-   
-   public Collection listAllKeys(String category)
-   {
-      // return results as a vector to avoid hashmap.keyset serialization error
-      Collection keys = entryMap.getAllKeys(category);
-      if (keys == null || keys.isEmpty()) {
-         return new java.util.Vector();
-      }
-      java.util.Vector vkeys = new java.util.Vector();
-      java.util.Iterator iter = keys.iterator();
-      while (iter.hasNext())
-         vkeys.add(iter.next());
-      return vkeys;
-   }
-   
-   public Collection listAllValues(String category)
-   {
-      // return results as a vector to avoid hashmap.keyset serialization error
-      Collection vals = entryMap.getAllKeys(category);
-      if (vals == null || vals.isEmpty()) {
-         return new java.util.Vector();
-      }
-      java.util.Vector vvals = new java.util.Vector();
-      java.util.Iterator iter = vals.iterator();
-      while (iter.hasNext())
-         vvals.add(iter.next());
-      return vvals;
-   }
 
    /** Remove all entries from the cache.
     */
Index: testsuite/src/main/org/jboss/test/cluster/ds/IDistributedState.java
===================================================================
--- testsuite/src/main/org/jboss/test/cluster/ds/IDistributedState.java	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/src/main/org/jboss/test/cluster/ds/IDistributedState.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -22,7 +22,6 @@
 package org.jboss.test.cluster.ds;
 
 import java.io.Serializable;
-import java.util.Collection;
 
 /** The public DistributedStateUser interface
  * 
@@ -57,9 +56,6 @@
       throws Exception;
    public void remove(Serializable key)
       throws Exception;
-   public Collection listAllCategories();
-   public Collection listAllKeys(String category);
-   public Collection listAllValues(String category);
 
    public void flush();
    public int size();
Index: testsuite/src/main/org/jboss/test/jca/test/JcaXidUnitTestCase.java
===================================================================
--- testsuite/src/main/org/jboss/test/jca/test/JcaXidUnitTestCase.java	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/src/main/org/jboss/test/jca/test/JcaXidUnitTestCase.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,78 +0,0 @@
-package org.jboss.test.jca.test;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Arrays;
-
-import javax.transaction.xa.Xid;
-
-import org.jboss.resource.connectionmanager.xa.JcaXid;
-import org.jboss.test.JBossTestCase;
-import org.jboss.tm.XidFactory;
-
-
-/**
- * A JcaXidUnitTestCase.
- * 
- * @author <a href="weston.price@jboss.org">Weston Price</a>
- * @version $Revision: 1.1 $
- */
-public class JcaXidUnitTestCase extends JBossTestCase
-{
-   public JcaXidUnitTestCase(String name)
-   {
-      super(name);
-      
-   }
-
-   public void testPadXid() throws Exception
-   {
-      XidFactory factory = new XidFactory();
-      factory.setPad(true);
-      Xid candidate = factory.newXid();
-      JcaXid jca = new JcaXid(candidate, true);
-      
-      assertTrue(Arrays.equals(candidate.getGlobalTransactionId(), jca.getGlobalTransactionId()));
-      factory.setPad(false);
-      Xid noPad = factory.newXid();
-      JcaXid padded = new JcaXid(noPad, true);
-      assertFalse(Arrays.equals(noPad.getGlobalTransactionId(), padded.getGlobalTransactionId()));
-      
-      
-      JcaXid notPadded = new JcaXid(noPad, false);
-      assertTrue(Arrays.equals(noPad.getGlobalTransactionId(), notPadded.getGlobalTransactionId()));
-      
-   }
-
-   public void testSerializableXid() throws Exception
-   {
-      
-      XidFactory factory = new XidFactory();
-      factory.setPad(true);
-      Xid candidate = factory.newXid();
-      JcaXid write = new JcaXid(candidate, true);
-      ObjectOutputStream os = new ObjectOutputStream(new FileOutputStream("xid"));
-      os.writeObject(write);
-      os.close();
-      ObjectInputStream is = new ObjectInputStream(new FileInputStream("xid"));
-      JcaXid read = (JcaXid)is.readObject();      
-      assertTrue(read.equals(write));      
-      
-   }
-   
-   public void testJcaXidObjectModel() throws Exception
-   {
-      XidFactory factory = new XidFactory();
-      factory.setPad(true);
-      Xid candidate = factory.newXid();
-      
-      JcaXid jca = new JcaXid(candidate, true);
-      
-      assertFalse(candidate.equals(jca));
-      
-      
-   }
-
-}
Index: testsuite/src/main/org/jboss/test/aop/test/ExtenderTestCase.java
===================================================================
--- testsuite/src/main/org/jboss/test/aop/test/ExtenderTestCase.java	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/src/main/org/jboss/test/aop/test/ExtenderTestCase.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,58 +0,0 @@
-/*
-* 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.test.aop.test;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.jboss.test.JBossTestCase;
-
-public class ExtenderTestCase extends JBossTestCase
-{
-
-   public ExtenderTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testMethod() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName testerName = new ObjectName("jboss.aop:name=ExtenderTester");
-      Object[] params = {};
-      String[] sig = {};
-      server.invoke(testerName, "testMethod", params, sig);
-   }
-   
-   public static Test suite() throws Exception
-   {
-      TestSuite suite = new TestSuite();
-      suite.addTest(new TestSuite(ExtenderTestCase.class));
-
-      AOPTestSetup setup = new AOPTestSetup(suite, "aop-extendertest.sar");
-      return setup;
-   }
-
-}
Index: testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java
===================================================================
--- testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -90,24 +90,7 @@
       server.invoke(testerName, "testScoped", params, sig);
    }
    
-   public void testAnnotations1() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName testerName = new ObjectName("jboss.aop:name=ScopedTester1");
-      Object[] params = {};
-      String[] sig = {};
-      server.invoke(testerName, "testAnnotatedScopedAnnotationsDeployed", params, sig);
-   }
    
-   public void testAnnotations2() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName testerName = new ObjectName("jboss.aop:name=ScopedTester2");
-      Object[] params = {};
-      String[] sig = {};
-      server.invoke(testerName, "testAnnotatedScopedAnnotationsNotDeployed", params, sig);
-   }
-   
    public void testIntroduction1() throws Exception
    {
       MBeanServerConnection server = getServer();
Index: testsuite/src/main/org/jboss/test/aop/scoped/AnnotatedInterceptor.java
===================================================================
--- testsuite/src/main/org/jboss/test/aop/scoped/AnnotatedInterceptor.java	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/src/main/org/jboss/test/aop/scoped/AnnotatedInterceptor.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,48 +0,0 @@
-/*
-* 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.test.aop.scoped;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-
-/**
- * 
- * @author <a href="kabir.khan@jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- * @@org.jboss.aop.InterceptorDef (scope=org.jboss.aop.advice.Scope.PER_VM)
- * @@org.jboss.aop.Bind (pointcut="all(org.jboss.test.aop.scoped.POJO)")
- */
-public class AnnotatedInterceptor implements Interceptor
-{
-   static boolean invoked;
-   public String getName()
-   {
-      return this.getClass().getName();
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      invoked = true;
-      return invocation.invokeNext();
-   }
-
-}
Index: testsuite/src/main/org/jboss/test/aop/scoped/ScopedTester.java
===================================================================
--- testsuite/src/main/org/jboss/test/aop/scoped/ScopedTester.java	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/src/main/org/jboss/test/aop/scoped/ScopedTester.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -138,25 +138,6 @@
       }
    }
    
-   public void testAnnotatedScopedAnnotationsDeployed()
-   {
-      AnnotatedInterceptor.invoked = false;
-      POJO pojo = new POJO();
-      if (!AnnotatedInterceptor.invoked) throw new RuntimeException("AnnotatedInterceptor should have been invoked");
-   }
-   
-   public void testAnnotatedScopedAnnotationsNotDeployed()
-   {
-      try
-      {
-         AnnotatedInterceptor.invoked = false;
-         throw new RuntimeException("AnnotatedInterceptor should not be available in this deployment");
-      }
-      catch (NoClassDefFoundError expected)
-      {
-      }
-   }
-   
    public void testIntroduction1()
    {
       IntroducedPOJO pojo = new IntroducedPOJO();
Index: testsuite/src/main/org/jboss/test/aop/scoped/ScopedTesterMBean.java
===================================================================
--- testsuite/src/main/org/jboss/test/aop/scoped/ScopedTesterMBean.java	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/src/main/org/jboss/test/aop/scoped/ScopedTesterMBean.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -38,6 +38,4 @@
    void testScoped() throws Exception;
    void testIntroduction1();
    void testIntroduction2();
-   void testAnnotatedScopedAnnotationsDeployed();
-   void testAnnotatedScopedAnnotationsNotDeployed();
 }
Index: testsuite/src/resources/cluster/ds/jboss-service.xml
===================================================================
--- testsuite/src/resources/cluster/ds/jboss-service.xml	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/src/resources/cluster/ds/jboss-service.xml	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -74,26 +74,6 @@
             <name>size</name>
             <return-type>int</return-type>
          </operation>
-          <operation>
-            <name>listAllCategories</name>
-            <return-type>java.util.Collection</return-type>
-         </operation>
-         <operation>
-            <name>listAllKeys</name>
-            <parameter>
-               <name>category</name>
-               <type>java.lang.String</type>
-            </parameter>
-            <return-type>java.util.Collection</return-type>
-         </operation>
-        <operation>
-            <name>listAllValues</name>
-            <parameter>
-               <name>category</name>
-               <type>java.lang.String</type>
-            </parameter>
-            <return-type>java.util.Collection</return-type>
-         </operation>
       </xmbean>
    </mbean>
 
Index: testsuite/src/etc/serialVersionUID/404.ser
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: testsuite/src/etc/serialVersionUID/403SP1.ser
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: testsuite/imports/sections/hapolicy.xml
===================================================================
--- testsuite/imports/sections/hapolicy.xml	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/imports/sections/hapolicy.xml	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,14 +0,0 @@
-<project name="tests-hapolicy-jars">
-   <!-- jmx test -->
-   <target name="_jars-hapolicy">
-      <mkdir dir="${build.lib}"/>
-      
-      <!--build sar for testing mbean deployment -->
-      <jar destfile="${build.lib}/ha-electionpolicy.sar">
-         <fileset dir="${build.resources}/ha/electionpolicy">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-      </jar>
-
-   </target>
-</project>
Index: testsuite/imports/sections/aop.xml
===================================================================
--- testsuite/imports/sections/aop.xml	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/imports/sections/aop.xml	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,5 +1,5 @@
 <project name="tests-aop-jars">
-
+   
   <!-- aop test -->
   <target name="_jars-aop">
     <mkdir dir="${build.lib}"/>
@@ -19,7 +19,6 @@
       <include name="org/jboss/test/aop/bean/AnnotatedSecuredPOJO.java"/>
       <include name="org/jboss/test/aop/bean/AnnotatedTxPOJO.java"/>
       <include name="org/jboss/test/aop/bean/AnnotatedTxLockedPOJO.java"/>
-      <include name="org/jboss/test/aop/scoped/AnnotatedInterceptor.java"/>
     </annotationc>
     <!-- build aopest.jar -->
     <jar destfile="${build.lib}/aoptest.jar"
@@ -192,7 +191,6 @@
     <jar destfile="${build.lib}/aop-scopedtest2.sar">
       <fileset dir="${build.classes}">
         <include name="org/jboss/test/aop/scoped/*.class"/>
-        <exclude name="org/jboss/test/aop/scoped/Annotated*.class"/>
       </fileset>
       <fileset dir="${build.resources}/aop/scoped/sar2/META-INF">
         <include name="scoped-aop.xml"/>
@@ -201,7 +199,7 @@
         <include name="META-INF/jboss-service.xml"/>
       </fileset>
     </jar>
-
+    
     <jar destfile="${build.lib}/aop-scopedear1-ejb.jar">
       <fileset dir="${build.classes}">
         <include name="org/jboss/test/aop/scoped/ear/ejb/*.class"/>
@@ -238,7 +236,7 @@
         <include name="META-INF/jboss-app.xml"/>
       </fileset>
     </jar>
-
+    
     <jar destfile="${build.lib}/aop-scopedear2-ejb.jar">
       <fileset dir="${build.classes}">
         <include name="org/jboss/test/aop/scoped/ear/ejb/*.class"/>
@@ -275,31 +273,8 @@
         <include name="META-INF/jboss-app.xml"/>
       </fileset>
     </jar>
-
-    <!-- ************************ -->
-    <!-- jars for extender test   -->
-    <!-- ***********************  -->
-    <jar destfile="${build.lib}/aop-extendertest.aop">
-       <fileset dir="${build.classes}">
-          <include name="org/jboss/test/aop/extender/*.class"/>
-          <exclude name="org/jboss/test/aop/extender/ExtenderTester*.class"/>
-       </fileset>
-       <fileset dir="${build.resources}/aop/extender">
-          <include name="META-INF/jboss-aop.xml"/>
-       </fileset>
-    </jar>
-    <jar destfile="${build.lib}/aop-extendertest.sar">
-       <fileset dir="${build.lib}">
-          <include name="aop-extendertest.aop"/>
-       </fileset>
-       <fileset dir="${build.classes}">
-          <include name="org/jboss/test/aop/extender/ExtenderTester*.class"/>
-       </fileset>
-       <fileset dir="${build.resources}/aop/extender">
-          <include name="META-INF/jboss-service.xml"/>
-       </fileset>
-    </jar>
-
+    
+    
     <!-- ok, we have created the loadtime jars, let us now precompile the classes for standalone test  -->
 
     <!--
Index: testsuite/imports/test-jars.xml
===================================================================
--- testsuite/imports/test-jars.xml	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/imports/test-jars.xml	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -68,7 +68,6 @@
 	<import file="sections/xa.xml"/>
 	<import file="sections/xslt.xml"/>
 	<import file="sections/byvalue.xml"/>
-    <import file="sections/hapolicy.xml"/>
 
 	<!--
 	| Build all jar files.
@@ -148,8 +147,7 @@
       _jars-wsrp,
       _jars-xa,
       _jars-xslt,
-      _jars-byvalue,
-      _jars-hapolicy
+      _jars-byvalue
       ">
 	</target>
 
Index: testsuite/build.xml
===================================================================
--- testsuite/build.xml	(.../branches/Branch_4_0)	(revision 58015)
+++ testsuite/build.xml	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -104,7 +104,7 @@
     <path refid="jacorb.jacorb.classpath"/>
     <path refid="javassist.classpath"/>
     <path refid="jboss.remoting.classpath"/>
-    <path refid="jboss.jbossretro.rt.classpath"/>
+    <path refid="jboss.jbossretro.rt.classpath"/>       
     <path refid="jboss.backport.concurrent.classpath"/>
     <path refid="jgroups.jgroups.classpath"/>
   	<path refid="joesnmp.joesnmp.classpath"/>
@@ -237,7 +237,7 @@
     <pathelement path="${jboss.jbossws14.lib}/jboss-saaj.jar"/>
   </path>
   <path id="webservice.classpath" refid="${webservice.classpath}"/>
-
+	
   <!-- classpath and local.classpath must have a value using with a path -->
   <property name="classpath" value=""/>
   <property name="local.classpath" value=""/>
@@ -373,7 +373,6 @@
          JDK 5 version of the annotation types
     -->
     <path id="annotations.classpath">
-      <pathelement path="${jboss.aop.lib}/jboss-aop-jdk50.jar"/>
       <pathelement path="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/>
       <path refid="tests.classpath"/>
     </path>
@@ -566,7 +565,6 @@
     <exclude name="org/jboss/test/cluster/test/*FieldBasedTestCase.class"/>
     <exclude name="org/jboss/test/cluster/test/StateTransferTestCase.class"/>
     <exclude name="org/jboss/test/cluster/test/UndeployFieldTestCase.class"/>
-    <exclude name="org/jboss/test/cluster/test/HASingletonElectionPolicyTestCase.class"/>
   </patternset>
   <patternset id="cluster.http.jk.includes">
     <include name="org/jboss/test/cluster/web/jk/test/*TestCase.class"/>
@@ -583,7 +581,6 @@
     <include name="org/jboss/test/cluster/jmx/test/*TestCase.class"/>
     <include name="org/jboss/test/testbeancluster/test/*TestCase.class"/>
     <include name="org/jboss/test/ha/farm/test/*TestCase.class" />
-    <include name="org/jboss/test/cluster/test/HASingletonElectionPolicyTestCase.class"/>
   </patternset>
   <!-- With JG 2.2.7, only run this test with UDP; known failure with TCP -->
   <patternset id="cluster.non.http.udp.includes">
@@ -654,7 +651,7 @@
     <exclude name="**/test/jacc/test/*"/>
   </patternset>
   <patternset id="jacc.external.includes">
-    <include name="org/jboss/test/jacc/test/external/*TestCase.class"/>
+    <include name="org/jboss/test/jacc/test/external/*TestCase.class"/> 
   </patternset>
   <patternset id="custom-secmgr.includes">
     <include name="**/test/**/CustomSecurityManagerTestCase.class"/>
@@ -753,13 +750,13 @@
     <exclude name="org/jboss/test/cache/test/local/ConcurrentTransactionalUnitTestCase.class"/>
   </patternset>
 
-   <patternset id="aop-with-classloader.excludes">
-      <!-- Needs to be started either with the bootclasspath or -javaagent classloader hooks -->
-      <exclude name="org/jboss/test/aop/test/Scoped*.class"/>
-   </patternset>
-   <patternset id="aop-with-classloader.includes">
-      <include name="org/jboss/test/aop/test/ScopedUnitTestCase.class"/>
-   </patternset>
+  <patternset id="aop-with-classloader.excludes">
+     <!-- Needs to be started either with the bootclasspath or -javaagent classloader hooks -->
+     <exclude name="org/jboss/test/aop/test/ScopedUnitTestCase.class"/>
+  </patternset>
+  <patternset id="aop-with-classloader.includes">
+     <include name="org/jboss/test/aop/test/ScopedUnitTestCase.class"/>
+  </patternset>
 
   <!-- The union of the excludes -->
   <patternset id="all.excludes">
@@ -823,7 +820,7 @@
       		<replacefilter token="&lt;interceptor call-by-value=&quot;true&quot;&gt;org.jboss.invocation.MarshallingInvokerInterceptor&lt;/interceptor&gt;"
       		               value="&lt;interceptor call-by-value=&quot;true&quot;&gt;org.jboss.invocation.DataContainerMarshallingInvokerInterceptor&lt;/interceptor&gt;"/>
       	</replace>
-
+  	
     <server:start name="unified-jboss"/>
 
      <antcall target="test-unified-unit">
@@ -1059,13 +1056,13 @@
     <antcall target="tests-clustering">
       <param name="jboss-junit-configuration" value="UDP"/>
     </antcall>
-
+    
     <!-- Test a TCP stack. -->
     <antcall target="tests-clustering">
       <param name="jgroups-stack" value="TCP"/>
       <param name="jboss-junit-configuration" value="TCP"/>
     </antcall>
-
+    
   </target>
 
   <!-- Depending on the value of the ${jboss-junit-configuration} variable, uses different JGroups stacks -->
@@ -1079,18 +1076,18 @@
 
     <server:start name="cluster-${jboss-junit-configuration}-0"/>
     <server:start name="cluster-${jboss-junit-configuration}-1"/>
-
+ 
     <echo message="Going to call target tests-clustering-unit for non-HTTP tests"/>
 
     <antcall target="tests-clustering-udp" inheritRefs="true"/>
-
+    
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.non.http.includes"/>
       <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
       <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
       <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
-    </antcall>
-
+    </antcall>    
+    
     <echo message="Going to call target tests-clustering-unit for HTTP tests (ASYNC, no BR)"/>
 
     <antcall target="tests-clustering-unit">
@@ -1213,7 +1210,7 @@
       <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
       <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
     </antcall>
-
+    
   </target>
 
   <target name="tests-clustering-configure" unless="${tests.clustering.skip.startup}">
@@ -1327,7 +1324,7 @@
       </patternset>
     </create-config>
     <server:start name="tomcat-sso"/>
-    <run-junit junit.patternset="tc-sso.includes"
+    <run-junit junit.patternset="tc-sso.includes" 
 	junit.configuration="tomcat-sso"/>
     <server:stop name="tomcat-sso"/>
   </target>
@@ -1337,14 +1334,14 @@
     <!-- Create the sso enabled tomcat config starting with the all config -->
     <create-cluster-sso-node newconf="tomcat-sso-cluster0"/>
     <create-cluster-sso-node newconf="tomcat-sso-cluster1"/>
-
+    
     <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
     <http-cluster-node-config-change conf="tomcat-sso-cluster0" useBuddyRepl="false"/>
     <http-cluster-node-config-change conf="tomcat-sso-cluster1" useBuddyRepl="false"/>
 
     <server:start name="tomcat-sso-cluster0"/>
     <server:start name="tomcat-sso-cluster1"/>
-
+    
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="tc-sso-clustered.includes"/>
       <param name="jboss-junit-configuration" value="tomcat-sso-cluster"/>
@@ -1352,7 +1349,7 @@
 
     <server:stop name="tomcat-sso-cluster0"/>
     <server:stop name="tomcat-sso-cluster1"/>
-
+    
   </target>
 
   <!-- Tests that require the attribute "UseJBossWebLoader" set to true -->
@@ -1409,7 +1406,7 @@
     <server:start name="binding-manager1"/>
     <server:start name="binding-manager2"/>
 
-    <run-junit junit.patternset="binding-manager.includes"
+    <run-junit junit.patternset="binding-manager.includes" 
        junit.configuration="binding-manager" />
 
     <server:stop name="binding-manager1"/>
@@ -1883,8 +1880,8 @@
   </target>
 
   <target name="tests-jacc-security-external"
-    description="Tests run against a jboss server with JACC configured with an
-                        external policy provider">
+    description="Tests run against a jboss server with JACC configured with an 
+                        external policy provider"> 
     <create-config baseconf="default" newconf="jacc-security-external" newconf-src="jacc">
       <patternset>
         <include name="conf/**"/>
@@ -1959,7 +1956,7 @@
         junit.syspropertyset="jacc-tests-props" />
 
     <stop-jboss/>
-    <wait-on-shutdown conf="jacc-security-external"/>
+    <wait-on-shutdown conf="jacc-security-external"/> 
   </target>
 
 
@@ -2693,7 +2690,7 @@
         junit.syspropertyset="tests-webservice-ssl-props"
 	junit.configuration="webservice-ssl" />
      <run-junit junit.patternset="webservice-ssl.noenv.includes"
-        junit.syspropertyset="tests-webservice-ssl-noenv-props"
+        junit.syspropertyset="tests-webservice-ssl-noenv-props" 
 	junit.configuration="webservice-ssl" />
      <server:stop name="webservice-ssl"/>
   </target>
@@ -3206,7 +3203,7 @@
         fork="${junit.batchtest.fork}"/>
     </junit>
   </target>
-
+   
    <target name="one-cluster-test" if="test">
 
     <property name="jboss-junit-configuration" value="UDP"/>
@@ -3228,7 +3225,7 @@
     <server:stop name="cluster-${jboss-junit-configuration}-0"/>
     <server:stop name="cluster-${jboss-junit-configuration}-1"/>
    </target>
-
+   
   <target name="one-cluster-test-tcp">
      <property name="jgroups-stack" value="TCP"/>
      <property name="jboss-junit-configuration" value="TCP"/>
@@ -3289,7 +3286,7 @@
     <target name="tests-matrix"
       description="Executes only the version check compatibility suite. Use -Dmatrix-versions=[version container] for this task" depends="maybejars" if="matrix-versions">
 
-      <test-compatibility client-version="3_2_8SP1" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dorg.jboss.j2ee.Serialization"/>
+      <test-compatibility client-version="3_2_8SP1" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dorg.jboss.j2ee.Serialization"/>      
       <test-compatibility client-version="3_2_x"    serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dorg.jboss.j2ee.Serialization"/>
       <test-compatibility client-version="4_0_1SP1" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy -Dorg.jboss.j2ee.LegacySerialization" client-serialization-flag="-Dnone"/>
       <test-compatibility client-version="4_0_2"    serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
@@ -3301,7 +3298,7 @@
       <test-compatibility-pooledInvokers client-version="4_0_3"    serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
       <test-compatibility-pooledInvokers client-version="4_0_3SP1" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
       <test-compatibility-pooledInvokers client-version="4_0_4_GA" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
-      <test-compatibility-pooledInvokers client-version="4_0_x"    serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
+      <test-compatibility-pooledInvokers client-version="4_0_x"    serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>      
     </target>
 
     <macrodef name="test-compatibility-pooledInvokers">
@@ -3346,12 +3343,12 @@
         <execute-matrix-unit test-name="cmp2" parameter-filter="org/jboss/test/cmp2/**/*TestCase.class"/>
         <execute-matrix-unit test-name="jms" parameter-filter="org/jboss/test/jbossmq/test/JBossMQUnitTest.class"/>
     </target>
-
+    
     <target name="tests-standard-unit-matrix-version-pooled">
         <execute-matrix-unit test-name="pooled-invoker" parameter-filter="org/jboss/test/pooled/test/**/BeanStressTestCase.class"/>
     </target>
+    
 
-
     <macrodef name="execute-matrix-unit">
         <attribute name="test-name"/>
         <attribute name="parameter-filter"/>
Index: connector/src/main/org/jboss/resource/adapter/jdbc/GenericExceptionSorter.java
===================================================================
--- connector/src/main/org/jboss/resource/adapter/jdbc/GenericExceptionSorter.java	(.../branches/Branch_4_0)	(revision 58015)
+++ connector/src/main/org/jboss/resource/adapter/jdbc/GenericExceptionSorter.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,19 +0,0 @@
-package org.jboss.resource.adapter.jdbc;
-
-import java.sql.SQLException;
-
-/**
- * A GenericExceptionSorter returning true for all exceptions.
- * 
- * @author <a href="mailto:weston.price@jboss.org>Weston Price</a>
- * @version $Revision: 1.1 $
- */
-public class GenericExceptionSorter implements ExceptionSorter
-{
-
-   public boolean isExceptionFatal(final SQLException e)
-   {
-      return true;
-   }
-
-}
Index: connector/src/main/org/jboss/resource/adapter/jdbc/ValidConnectionChecker.java
===================================================================
--- connector/src/main/org/jboss/resource/adapter/jdbc/ValidConnectionChecker.java	(.../branches/Branch_4_0)	(revision 58015)
+++ connector/src/main/org/jboss/resource/adapter/jdbc/ValidConnectionChecker.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -28,7 +28,6 @@
  * Checks that a connection is valid
  *
  * @author <a href="mailto:adrian@jboss.org">Adrian Brock</a>
- * @author <a href="mailto:weston.price@jboss.org>Weston Price</a>
  * @version $Revision$
  */
 public interface ValidConnectionChecker
Index: connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java
===================================================================
--- connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java	(.../branches/Branch_4_0)	(revision 58015)
+++ connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -192,6 +192,11 @@
 
    public boolean isSameRM(XAResource other) throws XAException
    {
+      Boolean overrideValue = ((XAManagedConnectionFactory) mcf).getIsSameRMOverrideValue();
+      if (overrideValue != null)
+      {
+         return overrideValue.booleanValue();
+      }
 
       // compare apples to apples
       return (other instanceof XAManagedConnection)
Index: connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnectionFactory.java
===================================================================
--- connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnectionFactory.java	(.../branches/Branch_4_0)	(revision 58015)
+++ connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnectionFactory.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -124,6 +124,26 @@
       }
    }
 
+   /**
+    * Get the IsSameRMOverrideValue value.
+    * 
+    * @return the IsSameRMOverrideValue value.
+    */
+   public Boolean getIsSameRMOverrideValue()
+   {
+      return isSameRMOverrideValue;
+   }
+
+   /**
+    * Set the IsSameRMOverrideValue value.
+    * 
+    * @param isSameRMOverrideValue The new IsSameRMOverrideValue value.
+    */
+   public void setIsSameRMOverrideValue(Boolean isSameRMOverrideValue)
+   {
+      this.isSameRMOverrideValue = isSameRMOverrideValue;
+   }
+
    public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo cri)
          throws javax.resource.ResourceException
    {
Index: connector/src/main/org/jboss/resource/adapter/mail/inflow/MailActivation.java
===================================================================
--- connector/src/main/org/jboss/resource/adapter/mail/inflow/MailActivation.java	(.../branches/Branch_4_0)	(revision 58015)
+++ connector/src/main/org/jboss/resource/adapter/mail/inflow/MailActivation.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -129,9 +129,8 @@
       }
       catch (Exception e)
       {
-         log.error("Failed to execute folder check, spec="+ spec, e);
+         log.error("Failed to execute folder check, spec="+spec);
       }
-      
       if( trace )
          log.trace("End new msgs check");
    }
Index: connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionPool.java
===================================================================
--- connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionPool.java	(.../branches/Branch_4_0)	(revision 58015)
+++ connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionPool.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -31,8 +31,6 @@
  * A managed connection pool
  *
  * @author <a href="mailto:d_jencks@users.sourceforge.net">David Jencks</a>
- * @author <a href="mailto:weston.price@jboss.org>Weston Price</a>
- * 
  * @version $Revision$
  */
 public interface ManagedConnectionPool
Index: connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java
===================================================================
--- connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java	(.../branches/Branch_4_0)	(revision 58015)
+++ connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -47,7 +47,6 @@
 
 import org.jboss.logging.Logger;
 import org.jboss.resource.JBossResourceException;
-import org.jboss.resource.connectionmanager.xa.JcaXAResourceWrapper;
 import org.jboss.tm.LastResource;
 import org.jboss.tm.TransactionTimeoutConfiguration;
 import org.jboss.tm.TxUtils;
@@ -142,11 +141,7 @@
    private boolean localTransactions;
    
    private int xaResourceTimeout = 0;
-   
-   private Boolean isSameRMOverrideValue;
-   
-   private boolean pad;
-   
+
    protected static void rethrowAsSystemException(String context, Transaction tx, Throwable t)
       throws SystemException
    {
@@ -250,26 +245,6 @@
       this.xaResourceTimeout = timeout;
    }
    
-   public Boolean getIsSameRMOverrideValue()
-   {
-      return isSameRMOverrideValue;
-   }
-   
-   public void setIsSameRMOverrideValue(Boolean isSameRMOverride)
-   {
-      this.isSameRMOverrideValue = isSameRMOverride;
-   }
-   
-   public boolean getPadXid()
-   {
-      return this.pad;
-      
-   }
-   public void setPadXid(boolean pad)
-   {
-      this.pad = pad;
-      
-   }
    public long getTimeLeftBeforeTransactionTimeout(boolean errorRollback) throws RollbackException
    {
       if (tm == null)
@@ -383,7 +358,6 @@
       throws ResourceException
    {
       XAResource xaResource = null;
-      
       if (localTransactions)
       {
          xaResource = new LocalXAResource(log);
@@ -392,8 +366,7 @@
       }
       else
       {
-         xaResource = new JcaXAResourceWrapper(mc.getXAResource(), pad, isSameRMOverrideValue);
-         
+         xaResource = mc.getXAResource();
          if (xaResourceTimeout != 0)
          {
             try
Index: connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java
===================================================================
--- connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java	(.../branches/Branch_4_0)	(revision 58015)
+++ connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -96,12 +96,4 @@
    int getXAResourceTransactionTimeout();
    
    void setXAResourceTransactionTimeout(int timeout);
-
-   Boolean getIsSameRMOverrideValue();
-   
-   void setIsSameRMOverrideValue(Boolean override);
-
-   boolean getPadXid();
-   
-   void setPadXid(boolean pad);
 }
Index: connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl
===================================================================
--- connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl	(.../branches/Branch_4_0)	(revision 58015)
+++ connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -42,14 +42,6 @@
          <attribute name="XAResourceTransactionTimeout"><xsl:value-of select="normalize-space(xa-resource-timeout)"/></attribute>
       </xsl:if>
 
-      <xsl:if test="isSameRM-override-value">
-        <config-property name="IsSameRMOverrideValue" type="java.lang.Boolean"><xsl:value-of select="normalize-space(isSameRM-override-value)"/></config-property>
-      </xsl:if>
-      
-      <xsl:if test="pad-xid">
-        <attribute name="PadXid"><xsl:value-of select="normalize-space(pad-xid)"/></attribute>        
-      </xsl:if>
-      
       <xsl:call-template name="pool">
         <xsl:with-param name="mcf-template">generic-mcf</xsl:with-param>
       </xsl:call-template>
@@ -153,15 +145,7 @@
           <attribute name="LocalTransactions">false</attribute>
         </xsl:otherwise>
       </xsl:choose>
-      
-      <xsl:if test="isSameRM-override-value">
-        <config-property name="IsSameRMOverrideValue" type="java.lang.Boolean"><xsl:value-of select="normalize-space(isSameRM-override-value)"/></config-property>
-      </xsl:if>
-      
-      <xsl:if test="pad-xid">
-        <attribute name="PadXid"><xsl:value-of select="normalize-space(pad-xid)"/></attribute>        
-      </xsl:if>
-      
+
       <xsl:if test="xa-resource-timeout">
          <attribute name="XAResourceTransactionTimeout"><xsl:value-of select="normalize-space(xa-resource-timeout)"/></attribute>
       </xsl:if>
@@ -281,6 +265,10 @@
                 <xsl:apply-templates select="xa-datasource-property"/>
               </config-property>
 
+              <xsl:if test="isSameRM-override-value">
+                <config-property name="IsSameRMOverrideValue" type="java.lang.Boolean"><xsl:value-of select="normalize-space(isSameRM-override-value)"/></config-property>
+              </xsl:if>
+
               <xsl:call-template name="wrapper-common-properties"/>
 
             </properties>
@@ -680,7 +668,6 @@
          <attribute name="XAResourceTransactionTimeout"><xsl:value-of select="normalize-space(xa-resource-timeout)"/></attribute>
       </xsl:if>
 
-      
        <xsl:call-template name="pool">
          <xsl:with-param name="mcf-template">ha-xa-wrapper</xsl:with-param>
        </xsl:call-template>
@@ -718,6 +705,10 @@
                  <xsl:apply-templates select="xa-datasource-property"/>
                </config-property>
 
+               <xsl:if test="isSameRM-override-value">
+                 <config-property name="IsSameRMOverrideValue" type="java.lang.Boolean"><xsl:value-of select="normalize-space(isSameRM-override-value)"/></config-property>
+               </xsl:if>
+
                 <xsl:if test="url-property">
                   <config-property name="URLProperty" type="java.lang.String"><xsl:value-of select="normalize-space(url-property)"/></config-property>
                 </xsl:if>
Index: build/build-thirdparty.xml
===================================================================
--- build/build-thirdparty.xml	(.../branches/Branch_4_0)	(revision 58015)
+++ build/build-thirdparty.xml	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -85,7 +85,7 @@
       <componentref name="jacorb" version="2.2.4jboss.patch1"/>
       <componentref name="javassist" version="3.3.0.GA"/>
       <componentref name="jaxen" version="1.1-beta-9"/>      
-      <componentref name="jboss/aop" version="snapshot-Branch_AOP_1_5"/>
+      <componentref name="jboss/aop" version="1.5.2.GA"/>
       <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
       <componentref name="jboss/cache" version="1.4.0.SP1"/>
       <componentref name="jboss/common" version="1.0.0.GA"/>
Index: build/docs/JBossORG-EULA.txt
===================================================================
--- build/docs/JBossORG-EULA.txt	(.../branches/Branch_4_0)	(revision 58015)
+++ build/docs/JBossORG-EULA.txt	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,107 +0,0 @@
-LICENSE AGREEMENT
-JBOSS(r)
-
-This License Agreement governs the use of the Software Packages and any updates to the Software 
-Packages, regardless of the delivery mechanism.  Each Software Package is a collective work 
-under U.S. Copyright Law.  Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to 
-the user ("Client") a license to the applicable collective work(s) pursuant to the 
-GNU Lesser General Public License v. 2.1 except for the following Software Packages: 
-(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the 
-GNU General Public License v.2; 
-
-(b) JBoss Rules, which is licensed pursuant to the Apache  License v.2.0;
-
-(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the 
-(open source) Sleepycat License (if Client does not wish to use the open source version of this database, 
-it may purchase a license from Sleepycat Software); 
-
-and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, 
-and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various 
-royalty-free patent licenses.  
-
-Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
-
-1.  The Software.  "Software Packages" refer to the various software modules that are created and made available 
-for distribution by the JBoss.org open source community at http://www.jboss.org.   Each of the Software Packages 
-may be comprised of hundreds of software components.  The end user license agreement for each component is located in 
-the component's source code.  With the exception of certain image files identified in Section 2 below, 
-the license terms for the components permit Client to copy, modify, and redistribute the component, 
-in both source code and binary code forms.  This agreement does not limit Client's rights under, 
-or grant Client rights that supersede, the license terms of any particular component.
-
-2.  Intellectual Property Rights.  The Software Packages are owned by Red Hat and others and are protected under copyright 
-and other laws.  Title to the Software Packages and any component, or to any copy, modification, or merged portion shall 
-remain with the aforementioned, subject to the applicable license.  The "JBoss" trademark, "Red Hat" trademark, the 
-individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates 
-in the U.S. and other countries.  This agreement permits Client to distribute unmodified copies of the Software Packages 
-using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's 
-trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/.  Client must abide by 
-these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. 
-If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at 
-http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted.  
-Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.  
-
-3.  Limited Warranty.  Except as specifically stated in this Paragraph 3 or a license for a particular 
-component, to the maximum extent permitted under applicable law, the Software Packages and the 
-components are provided and licensed "as is" without warranty of any kind, expressed or implied, 
-including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.  
-Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in 
-materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.  
-Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements 
-or that the operation of the Software Packages will be entirely error free or appear precisely as described 
-in the accompanying documentation. This warranty extends only to the party that purchases the Services 
-pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. 
-
-4.  Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies 
-described below are accepted by Client as its only remedies.  Red Hat's entire liability, and Client's 
-exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of 
-delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or 
-refund the money paid by Client for the Software.  To the maximum extent permitted by applicable law, 
-Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential 
-damages, including lost profits or lost savings arising out of the use or inability to use the Software, 
-even if Red Hat or such dealer has been advised of the possibility of such damages.  In no event shall 
-Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this 
-Agreement during the twelve months preceding the action.
-
-5.  Export Control.  As required by U.S. law, Client represents and warrants that it: 
-(a) understands that the Software Packages are subject to export controls under the 
-U.S. Commerce Department's Export Administration Regulations ("EAR"); 
-
-(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations 
-(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); 
-
-(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, 
-or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; 
-
-(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or 
-biological weapons, or missile technology end-uses unless authorized by the U.S. Government by 
-regulation or specific license; 
-
-(e) understands and agrees that if it is in the United States and exports or transfers the Software 
-Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual 
-reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and 
-address (including country) of each transferee; 
-
-and (f) understands that countries other than the United States may restrict the import, use, or 
-export of encryption products and that it shall be solely responsible for compliance with any such 
-import, use, or export restrictions.
-
-6.  Third Party Programs. Red Hat may distribute third party software programs with the Software Packages 
-that are not part of the Software Packages and which Client must install separately.  These third party 
-programs are subject to their own license terms.  The license terms either accompany the programs or 
-can be viewed at http://www.redhat.com/licenses/.  If Client does not agree to abide by the applicable 
-license terms for such programs, then Client may not install them.  If Client wishes to install the programs 
-on more than one system or transfer the programs to another party, then Client must contact the licensor 
-of the programs.
-
-7.  General.  If any provision of this agreement is held to be unenforceable, that shall not affect the 
-enforceability of the remaining provisions.  This License Agreement shall be governed by the laws of the 
-State of North Carolina and of the United States, without regard to any conflict of laws provisions, 
-except that the United Nations Convention on the International Sale of Goods shall not apply.
-
-Copyright 2006 Red Hat, Inc.  All rights reserved.  
-"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.  
-All other trademarks are the property of their respective owners. 
-
-	Page 1 of 1	18 October 2006
-
Index: build/build-release.xml
===================================================================
--- build/build-release.xml	(.../branches/Branch_4_0)	(revision 58015)
+++ build/build-release.xml	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -210,7 +210,8 @@
       <copy todir="${jboss.dist}/docs/licenses">
          <fileset dir="${jboss.thirdparty}/licenses"/>
       </copy>
-      <!-- Copy the build/docs to the dist root, including the jboss EULA -->
+      <copy file="${jboss.build.dir}/docs/JBossEULA.txt" todir="${jboss.dist}/docs/licenses"/>
+      <!-- Copy the build/docs to the dist root -->
       <copy todir="${jboss.dist}">
          <fileset dir="${jboss.build.dir}/docs"/>
       </copy>
Index: aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
===================================================================
--- aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java	(.../branches/Branch_4_0)	(revision 58015)
+++ aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -46,10 +46,10 @@
    ConcurrentReaderHashMap myPerVMAspects = new ConcurrentReaderHashMap();
    ConcurrentReaderHashMap notMyPerVMAspects = new ConcurrentReaderHashMap();
    
-   public ScopedClassLoaderDomain(ClassLoader loader, String name, boolean parentDelegation, AspectManager manager, boolean parentFirst)
+   public ScopedClassLoaderDomain(ClassLoader loader, boolean parentDelegation, AspectManager manager, boolean parentFirst)
    {
       // FIXME ScopedClassLoaderDomain constructor
-      super(manager, name, parentFirst);
+      super(manager, parentFirst);
       this.loader = new WeakReference(loader);
       this.parentDelegation = parentDelegation;
    }
Index: aspects/src/main/org/jboss/aop/deployment/AspectDeployer.java
===================================================================
--- aspects/src/main/org/jboss/aop/deployment/AspectDeployer.java	(.../branches/Branch_4_0)	(revision 58015)
+++ aspects/src/main/org/jboss/aop/deployment/AspectDeployer.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -160,9 +160,7 @@
          if (!di.isXML)
          {
             Iterator it = ArchiveBrowser.getBrowser(di.localUrl, new ClassFileFilter());
-            AspectManager manager = (scl != null) ? AspectManager.instance(scl) : AspectManager.instance();
-            AspectAnnotationLoader loader = new AspectAnnotationLoader(manager);
-            loader.setClassLoader(scl);
+            AspectAnnotationLoader loader = new AspectAnnotationLoader(AspectManager.instance());
             loader.deployInputStreamIterator(it);
          }
          
Index: aspects/src/main/org/jboss/aop/deployment/JBossScopedClassLoaderHelper.java
===================================================================
--- aspects/src/main/org/jboss/aop/deployment/JBossScopedClassLoaderHelper.java	(.../branches/Branch_4_0)	(revision 58015)
+++ aspects/src/main/org/jboss/aop/deployment/JBossScopedClassLoaderHelper.java	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -95,8 +95,7 @@
          HeirarchicalLoaderRepository3 repository = (HeirarchicalLoaderRepository3)((RepositoryClassLoader)cl).getLoaderRepository();
          parentDelegation = repository.getUseParentFirst();
       }
-      String name = String.valueOf(System.identityHashCode(cl));
-      return new ScopedClassLoaderDomain(cl, name, parentDelegation, parent, false);
+      return new ScopedClassLoaderDomain(cl, parentDelegation, parent, false);
    }
 
 }
Index: aspects/src/etc/base-aop.xml
===================================================================
--- aspects/src/etc/base-aop.xml	(.../branches/Branch_4_0)	(revision 58015)
+++ aspects/src/etc/base-aop.xml	(.../tags/JBoss_4_0_5_GA)	(revision 58015)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE aop PUBLIC
    "-//JBoss//DTD JBOSS AOP 1.0//EN"
-   "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
+   "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
 
 <aop>
    <!-- custom configuration for AOP Security -->