JBoss Remoting SVN: r4641 - remoting2/tags.
                                
                                
                                
                                    
                                        by jboss-remoting-commits@lists.jboss.org
                                    
                                
                                
                                        Author: ron.sigal(a)jboss.com
Date: 2008-10-30 01:00:22 -0400 (Thu, 30 Oct 2008)
New Revision: 4641
Added:
   remoting2/tags/2.5.0.SP1/
Log:
Copied: remoting2/tags/2.5.0.SP1 (from rev 4640, remoting2/branches/2.x)
                                
                         
                        
                                
                                17 years
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Remoting SVN: r4640 - remoting2/branches/2.x.
                                
                                
                                
                                    
                                        by jboss-remoting-commits@lists.jboss.org
                                    
                                
                                
                                        Author: ron.sigal(a)jboss.com
Date: 2008-10-30 00:53:12 -0400 (Thu, 30 Oct 2008)
New Revision: 4640
Modified:
   remoting2/branches/2.x/build.xml
Log:
JBREM-1048: Updated version to 2.5.0.SP1; JBREM-1049: updated versioning tests to download old versions of jboss-remoting.jar.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml	2008-10-30 04:44:35 UTC (rev 4639)
+++ remoting2/branches/2.x/build.xml	2008-10-30 04:53:12 UTC (rev 4640)
@@ -224,9 +224,9 @@
       <!-- Module name(s) & version -->
       <property name="module.name" value="remoting"/>
       <property name="module.Name" value="JBoss Remoting"/>
-      <property name="module.version" value="2.5.0.GA"/>
+      <property name="module.version" value="2.5.0.SP1"/>
       <!-- extension is for the file suffix to use for dtribution build -->
-      <property name="module.version.extension" value="2_5_0_GA"/>
+      <property name="module.version.extension" value="2_5_0_SP1"/>
 
       <property name="implementation.url" value="http://www.jboss.org/products/remoting"/>
       <property name="root.dir" value="${basedir}"/>
@@ -1705,8 +1705,16 @@
       <property name="oec4" value="${jdk14.dir}servlet-api.jar"/>
       <property name="old.extended.classpath" value="${path.separator}${oec1}${oec2}${oec3}${oec4}"/>
       
+      <property name="versioning.repository" value="http://repository.jboss.com/jboss/remoting"/>
+      <property name="versioning.dir" value="${basedir}${file.separator}src${file.separator}etc${file.separator}lib"/>
    </target>
    
+   <target name="download.version">
+     <mkdir dir="${versioning.dir}${file.separator}${version}"/>
+     <get src="${versioning.repository}/${version}/lib/jboss-remoting.jar"
+          dest="${versioning.dir}${file.separator}${version}${file.separator}jboss-remoting.jar" usetimestamp="true" verbose="true"/>
+   </target>
+      
    <!-- This runs all the versioning tests -->
    <target name="tests.versioning.all"
            description="Runs remoting fuctional tests with different remoting versions for client and server."
@@ -1722,25 +1730,94 @@
       </antcall>
       
       <!-- ******************************************************************************** -->
+      <!--  Current <- -> 2.5.0.GA -->
+        <antcall target="download.version">
+           <param name="version" value="2.5.0.GA"/>
+        </antcall>
+        <antcall target="tests.versioning.all_transports" inheritrefs="true">
+           <param name="jboss-junit-configuration" value="2_5_0_GA-client"/>
+           <param name="client.classpath" value="${etc.dir}/lib/2.5.0.GA/jboss-remoting.jar${extended.classpath}"/>
+           <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+           <param name="check_content_type" value="true"/>
+        </antcall>
+        <antcall target="tests.versioning.all_transports" inheritrefs="true">
+           <param name="jboss-junit-configuration" value="2_5_0_GA-server"/>
+           <param name="server.classpath" value="${etc.dir}/lib/2.5.0.GA/jboss-remoting.jar${extended.classpath}"/>
+           <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+           <param name="check_content_type" value="true"/>
+        </antcall>
+      
+      <!-- ******************************************************************************** -->
+      <!--  Current <- -> 2.4.0.SP1 -->
+        <antcall target="download.version">
+           <param name="version" value="2.4.0.SP1"/>
+        </antcall>
+        <antcall target="tests.versioning.all_transports" inheritrefs="true">
+           <param name="jboss-junit-configuration" value="2_4_0_SP1-client"/>
+           <param name="client.classpath" value="${etc.dir}/lib/2.4.0.SP1/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+           <param name="check_content_type" value="true"/>
+        </antcall>
+        <antcall target="tests.versioning.all_transports" inheritrefs="true">
+           <param name="jboss-junit-configuration" value="2_4_0_SP1-server"/>
+           <param name="server.classpath" value="${etc.dir}/lib/2.4.0.SP1/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+           <param name="check_content_type" value="true"/>
+        </antcall>
+      
+      <!-- ******************************************************************************** -->
       <!--  Current <- -> 2.4.0.GA -->
+        <antcall target="download.version">
+           <param name="version" value="2.4.0.GA"/>
+        </antcall>
         <antcall target="tests.versioning.all_transports" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_4_0_GA-client"/>
-           <param name="client.classpath" value="${etc.dir}/lib/remoting_2_4_0_GA/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="client.classpath" value="${etc.dir}/lib/2.4.0.GA/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="check_content_type" value="true"/>
         </antcall>
         <antcall target="tests.versioning.all_transports" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_4_0_GA-server"/>
-           <param name="server.classpath" value="${etc.dir}/lib/remoting_2_4_0_GA/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="server.classpath" value="${etc.dir}/lib/2.4.0.GA/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="check_content_type" value="true"/>
         </antcall>
            
       <!-- ******************************************************************************** -->
+      <!--  Current <- -> 2.2.2.SP10 -->
+        <antcall target="download.version">
+           <param name="version" value="2.2.2.SP10"/>
+        </antcall>
+        <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
+           <param name="jboss-junit-configuration" value="2_2_2_SP10-client"/>
+           <param name="client.classpath" value="${etc.dir}/lib/2.2.2.SP10/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+           <param name="client.pre_2_0_compatible" value=""/>
+           <param name="server.pre_2_0_compatible" value=""/>
+           <param name="client.version" value=""/>
+           <param name="server.version" value="2"/>
+           <param name="check_connection" value="false"/>
+        </antcall>
+        <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
+           <param name="jboss-junit-configuration" value="2_2_2_SP10-server"/>
+           <param name="server.classpath" value="${etc.dir}/lib/2.2.2.SP10/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+           <param name="client.pre_2_0_compatible" value=""/>
+           <param name="server.pre_2_0_compatible" value=""/>
+           <param name="client.version" value="2"/>
+           <param name="server.version" value=""/>
+           <param name="check_connection" value="false"/>
+           <param name="check_content_type" value="true"/>
+        </antcall>
+      
+      <!-- ******************************************************************************** -->
       <!--  Current <- -> 2.2.2.SP9 -->
+        <antcall target="download.version">
+           <param name="version" value="2.2.2.SP9-brew"/>
+        </antcall>
         <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_2_SP9-client"/>
-           <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP9/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="client.classpath" value="${etc.dir}/lib/2.2.2.SP9-brew/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1750,7 +1827,7 @@
         </antcall>
         <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_2_SP9-server"/>
-           <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP9/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="server.classpath" value="${etc.dir}/lib/2.2.2.SP9-brew/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1762,9 +1839,12 @@
               
       <!-- ******************************************************************************** -->
       <!--  Current <- -> 2.2.2.SP7 -->
+        <antcall target="download.version">
+           <param name="version" value="2.2.2.SP7"/>
+        </antcall>
         <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_2_SP7-client"/>
-           <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP7/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="client.classpath" value="${etc.dir}/lib/2.2.2.SP7/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1774,7 +1854,7 @@
         </antcall>
         <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_2_SP7-server"/>
-           <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP7/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="server.classpath" value="${etc.dir}/lib/2.2.2.SP7/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1786,9 +1866,12 @@
       
       <!-- ******************************************************************************** -->
       <!--  Current <- -> 2.2.2.SP4 -->
+        <antcall target="download.version">
+           <param name="version" value="2.2.2.SP4-brew"/>
+        </antcall>
         <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_2_SP4-client"/>
-           <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP4/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="client.classpath" value="${etc.dir}/lib/2.2.2.SP4-brew/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1798,7 +1881,7 @@
         </antcall>
         <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_2_SP4-server"/>
-           <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP4/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="server.classpath" value="${etc.dir}/lib/2.2.2.SP4-brew/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1810,9 +1893,12 @@
            
       <!-- ******************************************************************************** -->
       <!--  Current <- -> 2.2.2.SP2 -->
+        <antcall target="download.version">
+           <param name="version" value="2.2.2.SP2"/>
+        </antcall>
         <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_2_SP2-client"/>
-           <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP2/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="client.classpath" value="${etc.dir}/lib/2.2.2.SP2/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1822,7 +1908,7 @@
         </antcall>
         <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_2_SP2-server"/>
-           <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP2/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="server.classpath" value="${etc.dir}/lib/2.2.2.SP2/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1834,9 +1920,12 @@
  
       <!-- ******************************************************************************** -->
       <!--  Current <- -> 2.2.2.SP1 -->
+        <antcall target="download.version">
+           <param name="version" value="2.2.2.SP1"/>
+        </antcall>
         <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_2_SP1-client"/>
-           <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP1/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="client.classpath" value="${etc.dir}/lib/2.2.2.SP1/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1846,7 +1935,7 @@
         </antcall>
         <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_2_SP1-server"/>
-           <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP1/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="server.classpath" value="${etc.dir}/lib/2.2.2.SP1/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1858,9 +1947,12 @@
       
       <!-- ******************************************************************************** -->
       <!--  Current <- -> 2.2.2.GA -->
+        <antcall target="download.version">
+           <param name="version" value="2.2.2.GA-brew"/>
+        </antcall>
         <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_2_GA-client"/>
-           <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_GA/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="client.classpath" value="${etc.dir}/lib/2.2.2.GA-brew/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1870,7 +1962,7 @@
         </antcall>
         <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_2_GA-server"/>
-           <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_GA/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="server.classpath" value="${etc.dir}/lib/2.2.2.GA-brew/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1882,9 +1974,12 @@
 
       <!-- ******************************************************************************** -->
       <!--  Current <- -> 2.2.1.GA -->
+        <antcall target="download.version">
+           <param name="version" value="2.2.1.GA"/>
+        </antcall>
         <antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_1_GA-client"/>
-           <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_1_GA/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="client.classpath" value="${etc.dir}/lib/2.2.1.GA/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1894,7 +1989,7 @@
         </antcall>
         <antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true">
            <param name="jboss-junit-configuration" value="2_2_1_GA-server"/>
-           <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_1_GA/jboss-remoting.jar${old.extended.classpath}"/>
+           <param name="server.classpath" value="${etc.dir}/lib/2.2.1.GA/jboss-remoting.jar${old.extended.classpath}"/>
            <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
            <param name="client.pre_2_0_compatible" value=""/>
            <param name="server.pre_2_0_compatible" value=""/>
@@ -1906,9 +2001,12 @@
       
      <!-- ******************************************************************************** -->
      <!--  Current <- -> 2.2.0.SP4 -->
+       <antcall target="download.version">
+          <param name="version" value="2.2.0.SP4"/>
+       </antcall>
        <antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true">
           <param name="jboss-junit-configuration" value="2_2_0_SP4-client"/>
-          <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_0_SP4/jboss-remoting.jar${old.extended.classpath}"/>
+          <param name="client.classpath" value="${etc.dir}/lib/2.2.0.SP4/jboss-remoting.jar${old.extended.classpath}"/>
           <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
           <param name="client.pre_2_0_compatible" value=""/>
           <param name="server.pre_2_0_compatible" value=""/>
@@ -1918,7 +2016,7 @@
        </antcall>
        <antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true">
           <param name="jboss-junit-configuration" value="2_2_0_SP4-server"/>
-          <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_0_SP4/jboss-remoting.jar${old.extended.classpath}"/>
+          <param name="server.classpath" value="${etc.dir}/lib/2.2.0.SP4/jboss-remoting.jar${old.extended.classpath}"/>
           <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
           <param name="client.pre_2_0_compatible" value=""/>
           <param name="server.pre_2_0_compatible" value=""/>
@@ -1930,9 +2028,12 @@
       
      <!-- ******************************************************************************** -->
      <!--  Current <- -> 2.0.0.GA -->
+      <antcall target="download.version">
+         <param name="version" value="2.0.0.GA"/>
+      </antcall>
       <antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true">
          <param name="jboss-junit-configuration" value="2_0_0_GA-client"/>
-         <param name="client.classpath" value="${etc.dir}/lib/remoting_2_0_0_GA/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="client.classpath" value="${etc.dir}/lib/2.0.0.GA/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value=""/>
          <param name="server.pre_2_0_compatible" value=""/>
@@ -1942,7 +2043,7 @@
       </antcall>
       <antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true">
          <param name="jboss-junit-configuration" value="2_0_0_GA-server"/>
-         <param name="server.classpath" value="${etc.dir}/lib/remoting_2_0_0_GA/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="server.classpath" value="${etc.dir}/lib/2.0.0.GA/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value=""/>
          <param name="server.pre_2_0_compatible" value=""/>
@@ -1954,9 +2055,12 @@
       
      <!-- ******************************************************************************** -->
      <!--  Current <- -> 1.4.6.GA -->
+      <antcall target="download.version">
+         <param name="version" value="1.4.6.GA"/>
+      </antcall>
       <antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true">
          <param name="jboss-junit-configuration" value="1_4_6_GA-client"/>
-         <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_6_GA/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="client.classpath" value="${etc.dir}/lib/1.4.6.GA/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value=""/>
          <param name="server.pre_2_0_compatible" value="true"/>
@@ -1966,7 +2070,7 @@
       
       <antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true">
          <param name="jboss-junit-configuration" value="1_4_6_GA-server"/>
-         <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_6_GA/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="server.classpath" value="${etc.dir}/lib/1.4.6.GA/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value="true"/>
          <param name="server.pre_2_0_compatible" value=""/>
@@ -1976,14 +2080,17 @@
       </antcall>
       
       <antcall target="tests.versioning.socket" inheritrefs="true">
-         <param name="version" value="1_4_6_GA"/>
+         <param name="version" value="1.4.6.GA"/>
       </antcall>
  
      <!-- ******************************************************************************** -->
      <!--  Current <- -> 1.4.4.GA -->
+      <antcall target="download.version">
+         <param name="version" value="1.4.4.GA"/>
+      </antcall>
       <antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true">
          <param name="jboss-junit-configuration" value="1_4_4_GA-client"/>
-         <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_4_GA/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="client.classpath" value="${etc.dir}/lib/1.4.4.GA/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value=""/>
          <param name="server.pre_2_0_compatible" value="true"/>
@@ -1993,7 +2100,7 @@
       
       <antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true">
          <param name="jboss-junit-configuration" value="1_4_4_GA-server"/>
-         <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_4_GA/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="server.classpath" value="${etc.dir}/lib/1.4.4.GA/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value="true"/>
          <param name="server.pre_2_0_compatible" value=""/>
@@ -2003,14 +2110,17 @@
       </antcall>
       
       <antcall target="tests.versioning.socket" inheritrefs="true">
-         <param name="version" value="1_4_4_GA"/>
+         <param name="version" value="1.4.4.GA"/>
       </antcall>
 
      <!-- ******************************************************************************** -->
      <!--  Current <- -> 1.4.3.GA -->
+      <antcall target="download.version">
+         <param name="version" value="1.4.3.GA"/>
+      </antcall>
       <antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true">
          <param name="jboss-junit-configuration" value="1_4_3_GA-client"/>
-         <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_3_GA/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="client.classpath" value="${etc.dir}/lib/1.4.3.GA/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value=""/>
          <param name="server.pre_2_0_compatible" value="true"/>
@@ -2020,7 +2130,7 @@
       
       <antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true">
          <param name="jboss-junit-configuration" value="1_4_3_GA-server"/>
-         <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_3_GA/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="server.classpath" value="${etc.dir}/lib/1.4.3.GA/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value="true"/>
          <param name="server.pre_2_0_compatible" value=""/>
@@ -2030,7 +2140,7 @@
       </antcall>
       
       <antcall target="tests.versioning.socket" inheritrefs="true">
-         <param name="version" value="1_4_3_GA"/>
+         <param name="version" value="1.4.3.GA"/>
       </antcall>
       
       <!-- ******************************************************************************** -->
@@ -2090,7 +2200,7 @@
        </antcall>
        -->
    </target>
-
+	
    <!-- This runs all the versioning tests against 2.x only -->
    <target name="tests.versioning.2"
            description="Runs remoting fuctional tests with different remoting 2 versions for client and server."
@@ -2146,8 +2256,7 @@
    </target>
 
    <target name="tests.versioning.all_transports"
-           description="Runs remoting fuctional tests with different remoting versions for client and server."
-           depends="jars, tests.jars">
+           description="Runs remoting fuctional tests with different remoting versions for client and server.">
       <mkdir dir="${output.tests.results}"/>
       <mkdir dir="${output.tests.tmp}"/>
       <echo>Running: ${jboss-junit-configuration}</echo>
@@ -2186,8 +2295,7 @@
    </target>
    
    <target name="tests.versioning.all_transports_pre_2.4"
-           description="Runs remoting fuctional tests with different remoting versions for client and server."
-           depends="jars, tests.jars">
+           description="Runs remoting fuctional tests with different remoting versions for client and server.">
       <mkdir dir="${output.tests.results}"/>
       <mkdir dir="${output.tests.tmp}"/>
       <echo>Running: ${jboss-junit-configuration}</echo>
@@ -2227,8 +2335,7 @@
    </target>
    
    <target name="tests.versioning.all_transports_but_bisocket"
-           description="Runs remoting fuctional tests with different remoting versions for client and server."
-           depends="jars, tests.jars">
+           description="Runs remoting fuctional tests with different remoting versions for client and server.">
       <mkdir dir="${output.tests.results}"/>
       <mkdir dir="${output.tests.tmp}"/>
       <echo>Running: ${jboss-junit-configuration}</echo>
@@ -2269,8 +2376,7 @@
    </target>
    
    <target name="tests.versioning.all_but_socket_and_bisocket"
-           description="Runs remoting fuctional tests with different remoting versions for client and server."
-           depends="jars, tests.jars">
+           description="Runs remoting fuctional tests with different remoting versions for client and server.">
       <mkdir dir="${output.tests.results}"/>
       <mkdir dir="${output.tests.tmp}"/>
       <echo>Running: ${jboss-junit-configuration}</echo>
@@ -2311,14 +2417,13 @@
    </target>
    
    <target name="tests.versioning.socket"
-           description="Runs remoting fuctional tests with different remoting versions for client and server."
-           depends="jars, tests.jars">
+           description="Runs remoting fuctional tests with different remoting versions for client and server.">
       
       <antcall target="tests.versioning.socket.1.4.0" inheritrefs="true"/>
             
       <antcall target="tests.versioning.socket.sub" inheritrefs="true">
          <param name="jboss-junit-configuration" value="${version}-client_nocheck"/>
-         <param name="client.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="client.classpath" value="${etc.dir}/lib/${version}/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value=""/>
          <param name="server.pre_2_0_compatible" value="true"/>
@@ -2330,7 +2435,7 @@
       
       <antcall target="tests.versioning.socket.sub" inheritrefs="true">
          <param name="jboss-junit-configuration" value="${version}-server_nocheck"/>
-         <param name="server.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="server.classpath" value="${etc.dir}/lib/${version}/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value="true"/>
          <param name="server.pre_2_0_compatible" value=""/>
@@ -2342,11 +2447,10 @@
    </target>
    
    <target name="tests.versioning.socket.1.4.0"
-           description="Runs remoting fuctional tests with different remoting versions for client and server."
-           depends="jars, tests.jars">
+           description="Runs remoting fuctional tests with different remoting versions for client and server.">
       <antcall target="tests.versioning.socket.sub" inheritrefs="true">
          <param name="jboss-junit-configuration" value="${version}-client_check"/>
-         <param name="client.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="client.classpath" value="${etc.dir}/lib/${version}/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value=""/>
          <param name="server.pre_2_0_compatible" value="true"/>
@@ -2358,7 +2462,7 @@
       
       <antcall target="tests.versioning.socket.sub" inheritrefs="true">
          <param name="jboss-junit-configuration" value="${version}-client_default"/>
-         <param name="client.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="client.classpath" value="${etc.dir}/lib/${version}/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value=""/>
          <param name="server.pre_2_0_compatible" value="true"/>
@@ -2370,7 +2474,7 @@
 
       <antcall target="tests.versioning.socket.sub" inheritrefs="true">
          <param name="jboss-junit-configuration" value="${version}-server_check"/>
-         <param name="server.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="server.classpath" value="${etc.dir}/lib/${version}/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value="true"/>
          <param name="server.pre_2_0_compatible" value=""/>
@@ -2382,7 +2486,7 @@
       
       <antcall target="tests.versioning.socket.sub" inheritrefs="true">
          <param name="jboss-junit-configuration" value="${version}-server_default"/>
-         <param name="server.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar${old.extended.classpath}"/>
+         <param name="server.classpath" value="${etc.dir}/lib/${version}/jboss-remoting.jar${old.extended.classpath}"/>
          <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
          <param name="client.pre_2_0_compatible" value="true"/>
          <param name="server.pre_2_0_compatible" value=""/>
@@ -2394,8 +2498,7 @@
    </target>
    
    <target name="tests.versioning.socket.sub"
-           description="Runs remoting fuctional tests with different remoting versions for client and server."
-           depends="jars, tests.jars">
+           description="Runs remoting fuctional tests with different remoting versions for client and server.">
       <mkdir dir="${output.tests.results}"/>
       <mkdir dir="${output.tests.tmp}"/>
       <echo>Running: ${jboss-junit-configuration}</echo>
@@ -2433,8 +2536,7 @@
    </target>
 
    <target name="tests.versioning.no_multiplex"
-           description="Runs remoting fuctional tests with different remoting versions for client and server."
-           depends="jars, tests.jars">
+           description="Runs remoting fuctional tests with different remoting versions for client and server.">
       <mkdir dir="${output.tests.results}"/>
       <mkdir dir="${output.tests.tmp}"/>
       <junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
@@ -3668,6 +3770,7 @@
    <target name="clean" depends="configure">
       <delete dir="${output.dir}" quiet="true"/>
       <delete dir="test_logs"/>
+      <delete dir="src${file.separator}etc${file.separator}lib"/>
    </target>
 
    <target name="most" depends="clean,jars"/>
                                
                         
                        
                                
                                17 years
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Remoting SVN: r4639 - remoting2/branches/2.x/docs.
                                
                                
                                
                                    
                                        by jboss-remoting-commits@lists.jboss.org
                                    
                                
                                
                                        Author: ron.sigal(a)jboss.com
Date: 2008-10-30 00:44:35 -0400 (Thu, 30 Oct 2008)
New Revision: 4639
Modified:
   remoting2/branches/2.x/docs/README.txt
Log:
JBREM-1048: Added release notes for 2.5.0.SP1.
Modified: remoting2/branches/2.x/docs/README.txt
===================================================================
--- remoting2/branches/2.x/docs/README.txt	2008-10-30 04:42:56 UTC (rev 4638)
+++ remoting2/branches/2.x/docs/README.txt	2008-10-30 04:44:35 UTC (rev 4639)
@@ -41,7 +41,27 @@
 
 ==========================================================================================================
 ==========================================================================================================
+Release Notes - JBoss Remoting - Version 2.5.0.SP1 (Flounder)
+
+Bug
+
+    * [JBREM-1044] - Old version of org.apache.tomcat.util.net.SocketStatus screws up JBossWeb
+    * [JBREM-1045] - ServerInvokerCallbackHandler can suffer deadlock when used with BlockingCallbackStore
+    * [JBREM-1046] - HTTPClientInvoker throws NullPointerException when HttpURLConnection.getInputStream() returns null
+    * [JBREM-1051] - CLONE [JBREM-1050] - HTTPClientInvoker does not support BASIC authentication for proxies when use of proxy is configured by system properties
+
+Release
+
+    * [JBREM-1048] - Release 2.5.0.SP1
+
+Task
+
+    * [JBREM-1047] - Assure version compatibility with earlier versions of Remoting
+    * [JBREM-1049] - Remove old versions of jboss-remoting.jar from distribution zip file
+
+==========================================================================================================
 Release Notes - JBoss Remoting - Version 2.5.0.GA (Flounder)
+
 Bug
 
     * [JBREM-1027] - CoyoteInvoker should pass URL query in InvocationRequest
                                
                         
                        
                                
                                17 years
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Remoting SVN: r4638 - remoting2/branches/2.x/docs/guide/en.
                                
                                
                                
                                    
                                        by jboss-remoting-commits@lists.jboss.org
                                    
                                
                                
                                        Author: ron.sigal(a)jboss.com
Date: 2008-10-30 00:42:56 -0400 (Thu, 30 Oct 2008)
New Revision: 4638
Modified:
   remoting2/branches/2.x/docs/guide/en/chap5.xml
Log:
JBREM-1048: Minor updates for release 2.5.0.SP1.
Modified: remoting2/branches/2.x/docs/guide/en/chap5.xml
===================================================================
--- remoting2/branches/2.x/docs/guide/en/chap5.xml	2008-10-30 04:38:07 UTC (rev 4637)
+++ remoting2/branches/2.x/docs/guide/en/chap5.xml	2008-10-30 04:42:56 UTC (rev 4638)
@@ -1691,7 +1691,7 @@
       
       <para><emphasis role="bold">Note.</emphasis> Prior to release 2.5.0.GA,
       Remoting also was compatible with the Apache implementation of
-      Tomcat.  That is no longer the case.</para>
+      Tomcat, which is no longer the case.  Since JBossWeb requires jdk 1.5 or above, it follows that the HTTP transport in Remoting 2.5.0.GA and above has the same requirement.</para>
       
       <para>The coyote Connector supports GET, POST, HEAD, OPTIONS, and HEAD
       method types and keep-alive, and most any configuration allowed for Tomcat
                                
                         
                        
                                
                                17 years
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Remoting SVN: r4637 - remoting2/branches/2.x/docs/guide/en.
                                
                                
                                
                                    
                                        by jboss-remoting-commits@lists.jboss.org
                                    
                                
                                
                                        Author: ron.sigal(a)jboss.com
Date: 2008-10-30 00:38:07 -0400 (Thu, 30 Oct 2008)
New Revision: 4637
Modified:
   remoting2/branches/2.x/docs/guide/en/chap1.xml
   remoting2/branches/2.x/docs/guide/en/chap17.xml
   remoting2/branches/2.x/docs/guide/en/chap5.xml
   remoting2/branches/2.x/docs/guide/en/master.xml
Log:
JBREM-1048: Minor updates for release 2.5.0.SP1.
Modified: remoting2/branches/2.x/docs/guide/en/chap1.xml
===================================================================
--- remoting2/branches/2.x/docs/guide/en/chap1.xml	2008-10-29 20:59:49 UTC (rev 4636)
+++ remoting2/branches/2.x/docs/guide/en/chap1.xml	2008-10-30 04:38:07 UTC (rev 4637)
@@ -187,6 +187,22 @@
     <para>Other features of Remoting 2.5.0.GA should function with jdk 1.4.
     However, it is the policy of JBoss, a division of Red Hat, no longer to
     support jdk 1.4.</para>
+    
+    <section>
+      <title>Release 2.5.0.SP1</title>
+      
+      <itemizedlist>
+        <listitem>
+           <para>The distribution zip file no longer contains previous versions of
+           jboss-remoting.jar.</para>
+        </listitem>
+        
+        <listitem>
+           <para>A few bug fixes.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+    
   </section>
   
   <section>
Modified: remoting2/branches/2.x/docs/guide/en/chap17.xml
===================================================================
--- remoting2/branches/2.x/docs/guide/en/chap17.xml	2008-10-29 20:59:49 UTC (rev 4636)
+++ remoting2/branches/2.x/docs/guide/en/chap17.xml	2008-10-30 04:38:07 UTC (rev 4637)
@@ -69,9 +69,27 @@
   
    <section>
     <title>Version 2.5</title>
+
+    <bridgehead>Release Notes - JBoss Remoting - Version 2.5.0.SP1 (Flounder)</bridgehead>
     
-    <bridgehead>Release Notes - JBoss Remoting - Version 2.5.0 (Flounder)</bridgehead>
+    <para><emphasis role="bold">Bug</emphasis></para>
+      
+        <para>* [JBREM-1044] - Old version of org.apache.tomcat.util.net.SocketStatus screws up JBossWeb</para>
+        <para>* [JBREM-1045] - ServerInvokerCallbackHandler can suffer deadlock when used with BlockingCallbackStore</para>
+        <para>* [JBREM-1046] - HTTPClientInvoker throws NullPointerException when HttpURLConnection.getInputStream() returns null</para>
+        <para>* [JBREM-1051] - CLONE [JBREM-1050] - HTTPClientInvoker does not support BASIC authentication for proxies when use of proxy is configured by system properties</para>
+        
+    <para><emphasis role="bold">Release</emphasis></para>
+      
+        <para>* [JBREM-1048] - Release 2.5.0.SP1</para>     
+      
+    <para><emphasis role="bold">Task</emphasis></para>
+      
+        <para>* [JBREM-1047] - Assure version compatibility with earlier versions of Remoting</para>
+        <para>* [JBREM-1049] - Remove old versions of jboss-remoting.jar from distribution zip file</para>   
     
+    <bridgehead>Release Notes - JBoss Remoting - Version 2.5.0.GA (Flounder)</bridgehead>
+    
     <para><emphasis role="bold">Bug</emphasis></para>
       
         <para>* [JBREM-1027] - CoyoteInvoker should pass URL query in InvocationRequest</para>
Modified: remoting2/branches/2.x/docs/guide/en/chap5.xml
===================================================================
--- remoting2/branches/2.x/docs/guide/en/chap5.xml	2008-10-29 20:59:49 UTC (rev 4636)
+++ remoting2/branches/2.x/docs/guide/en/chap5.xml	2008-10-30 04:38:07 UTC (rev 4637)
@@ -1686,14 +1686,18 @@
       <title>HTTP transport</title>
 
       <para>The HTTP server invoker implementation is based on the Coyote
-      HTTP/1.1 Connector Tomcat component, which may be supplied either by the
-      apache implementation, in jars tomcat-coyote.jar, tomcat-util.jar, and
-      tomcat-http.jar, or in the JBossWeb implementation, in jbossweb.jar. The
-      coyote Connector supports GET, POST, HEAD, OPTIONS, and HEAD method types
-      and keep-alive, and most any configuration allowed for Tomcat can be
-      configured for the remoting HTTP server invoker. For more information on
-      the configuration attributes available for the Tomcat connectors, please
-      refer to <ulink
+      HTTP/1.1 Connector Tomcat component, which is supplied by the JBossWeb
+      implementation, in jbossweb.jar.</para>
+      
+      <para><emphasis role="bold">Note.</emphasis> Prior to release 2.5.0.GA,
+      Remoting also was compatible with the Apache implementation of
+      Tomcat.  That is no longer the case.</para>
+      
+      <para>The coyote Connector supports GET, POST, HEAD, OPTIONS, and HEAD
+      method types and keep-alive, and most any configuration allowed for Tomcat
+      can be configured for the remoting HTTP server invoker. For more
+      information on the configuration attributes available for the Tomcat
+      connectors, please refer to <ulink
       url="http://tomcat.apache.org/tomcat-5.5-doc/config/http.html">http://tomcat.apache.org/tomcat-5.5-doc/config/http.html</ulink>.
       http://tomcat.apache.org/tomcat-5.5-doc/config/http.html <!--<link
       linkend="???">http://tomcat.apache.org/tomcat-5.5-doc/config/http.html</link>-->
@@ -1724,15 +1728,13 @@
       possible to switch to use the
       <code>org.apache.coyote.http11.Http11AprProtocol</code> protocol, which is
       based on the Apache Portable Runtime (see <ulink
-      url="http://tomcat.apache.org/tomcat-5.5-doc/apr.html">http://tomcat.apache.org/tomcat-5.5-doc/apr.html</ulink>
-      and <ulink url="http://apr.apache.org/">http://apr.apache.org/</ulink> for
-      more details). If want to use the APR implementation, simply put the
+      url="http://www.jboss.org/file-access/default/members/jbossweb/freezone/docs/2...">
+      http://www.jboss.org/file-access/default/members/jbossweb/freezone/docs/2...</ulink>
+      for more details). If want to use the APR implementation, simply put the
       tcnative-1.dll (or tcnative-1.so) on the system path so can be loaded. The
       JBossWeb native libraries, which include tcnative-1.dll/tcnative-1.so, may
       be downloaded from <ulink
-      url="http://www.jboss.org/jbossweb/">http://www.jboss.org/jbossweb/</ulink>.
-      The Apache versions of the APR native binaries can be found at <ulink
-      url="http://www.gtlib.gatech.edu/pub/apache">http://www.gtlib.gatech.edu/pub/apache</ulink>.</para>
+      url="http://www.jboss.org/jbossweb/">http://www.jboss.org/jbossweb/</ulink>.</para>
       
       <bridgehead>Client request headers</bridgehead>
 
Modified: remoting2/branches/2.x/docs/guide/en/master.xml
===================================================================
--- remoting2/branches/2.x/docs/guide/en/master.xml	2008-10-29 20:59:49 UTC (rev 4636)
+++ remoting2/branches/2.x/docs/guide/en/master.xml	2008-10-30 04:38:07 UTC (rev 4637)
@@ -24,9 +24,9 @@
   <bookinfo>
     <title>JBoss Remoting Guide</title>
 
-    <subtitle>JBoss Remoting version 2.5.0.GA</subtitle>
+    <subtitle>JBoss Remoting version 2.5.0.SP1</subtitle>
 
-    <releaseinfo>September 9, 2008</releaseinfo>
+    <releaseinfo>October 30, 2008</releaseinfo>
 
     <mediaobject>
       <imageobject>
                                
                         
                        
                                
                                17 years
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Remoting SVN: r4636 - remoting2/branches/2.x/src/etc.
                                
                                
                                
                                    
                                        by jboss-remoting-commits@lists.jboss.org
                                    
                                
                                
                                        Author: ron.sigal(a)jboss.com
Date: 2008-10-29 16:59:49 -0400 (Wed, 29 Oct 2008)
New Revision: 4636
Modified:
   remoting2/branches/2.x/src/etc/remoting.security.policy.tests.minimal
Log:
JBREM-1051: Added http.proxyHost permission.
Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.tests.minimal
===================================================================
--- remoting2/branches/2.x/src/etc/remoting.security.policy.tests.minimal	2008-10-29 20:59:07 UTC (rev 4635)
+++ remoting2/branches/2.x/src/etc/remoting.security.policy.tests.minimal	2008-10-29 20:59:49 UTC (rev 4636)
@@ -72,6 +72,9 @@
     permission java.util.PropertyPermission "remoting.metadata", "read";
     permission java.util.PropertyPermission "jvm.mx", "read";
     
+    // org.jboss.remoting.transport.http.HTTPClientInvoket
+    permission java.util.PropertyPermission "http.proxyHost", "read";
+    
     // org.jboss.test.taskdefs.XMLJUnitMultipleResultFormatter
     permission java.util.PropertyPermission "jboss-junit-configuration", "read";
     
                                
                         
                        
                                
                                17 years
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Remoting SVN: r4635 - remoting2/branches/2.x/src/etc.
                                
                                
                                
                                    
                                        by jboss-remoting-commits@lists.jboss.org
                                    
                                
                                
                                        Author: ron.sigal(a)jboss.com
Date: 2008-10-29 16:59:07 -0400 (Wed, 29 Oct 2008)
New Revision: 4635
Modified:
   remoting2/branches/2.x/src/etc/remoting.security.policy.core
   remoting2/branches/2.x/src/etc/remoting.security.policy.tests
Log:
JBREM-1051: Moved http.proxy permissions from test file to core file.
Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.core
===================================================================
--- remoting2/branches/2.x/src/etc/remoting.security.policy.core	2008-10-29 20:57:19 UTC (rev 4634)
+++ remoting2/branches/2.x/src/etc/remoting.security.policy.core	2008-10-29 20:59:07 UTC (rev 4635)
@@ -243,8 +243,12 @@
     permission java.util.PropertyPermission "tomcat.util.buf.StringCache.*", "read";
     
     // Used by org.jboss.remoting.transport.http.HTTPClientInvoker
+    permission java.util.PropertyPermission "http.basic.username", "read";
     permission java.util.PropertyPermission "http.basic.password", "read";
-    permission java.util.PropertyPermission "http.basic.username", "read";
+    permission java.util.PropertyPermission "http.proxy.username", "read";
+    permission java.util.PropertyPermission "http.proxy.password", "read";
+    permission java.util.PropertyPermission "http.proxyHost", "read";
+    permission java.util.PropertyPermission "http.proxyPort", "read";
     
     // Used by org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker
     permission java.util.PropertyPermission "org.jboss.security.ignoreHttpsHost" , "read";
Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.tests
===================================================================
--- remoting2/branches/2.x/src/etc/remoting.security.policy.tests	2008-10-29 20:57:19 UTC (rev 4634)
+++ remoting2/branches/2.x/src/etc/remoting.security.policy.tests	2008-10-29 20:59:07 UTC (rev 4635)
@@ -71,12 +71,6 @@
     permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#createServerSocket[jboss:type=serversocketfactory]", "invoke";
     permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#SSLSocketBuilder[jboss:type=serversocketfactory]", "getAttribute";
     permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#SSLSocketBuilder[jboss:type=serversocketfactory2]", "getAttribute";
-
-    // org.jboss.test.remoting.transport.http.proxy.ProxyAuthenticationTestCase
-    permission java.util.PropertyPermission "http.proxyHost", "read";
-    permission java.util.PropertyPermission "http.proxyPort", "read";
-    permission java.util.PropertyPermission "http.proxy.username", "read";
-    permission java.util.PropertyPermission "http.proxy.password", "read";
     
     // org.jboss.test.remoting.transport.rmi.ssl.config.FactoryConfigTestCase
     permission javax.management.MBeanPermission "org.jboss.test.remoting.transport.rmi.ssl.config.FactoryConfigTestCase$SerializableServerSocketFactory#SSLSocketBuilder[jboss:type=serversocketfactory]", "getAttribute";
@@ -101,6 +95,13 @@
     // Subclasses of org.jboss.test.remoting.transport.config.FactoryConfigTestCaseParent and FactoryConfigTestCaseSSLParent
     // org.jboss.test.remoting.transport.{http,socket}.connection.socketfactory.by_mbean.SocketFactoryTestServer
     permission javax.management.MBeanPermission "org.jboss.test.remoting.transport.socket.connection.socketfactory.by_mbean.SocketFactoryTestServer$ServerSocketFactoryMock#createServerSocket[jboss:type=serversocketfactory]", "invoke";
+
+    // org.jboss.test.remoting.transport.http.proxy.ProxyAuthenticationTestCase
+    permission java.util.PropertyPermission "http.proxyHost", "write";
+    permission java.util.PropertyPermission "http.proxyPort", "write";
+    permission java.util.PropertyPermission "proxySet", "write";
+    permission java.util.PropertyPermission "http.proxy.username", "write";
+    permission java.util.PropertyPermission "http.proxy.password", "write";
 };
 
 
@@ -174,13 +175,6 @@
     
     // org.jboss.test.remoting.transport.connector.ObjectNameWithZeroesAddressTestCase
     permission javax.management.MBeanPermission "*#-[*:*]", "queryMBeans";
-
-    // org.jboss.test.remoting.transport.http.proxy.ProxyAuthenticationTestCase
-    permission java.util.PropertyPermission "http.proxyHost", "write";
-    permission java.util.PropertyPermission "http.proxyPort", "write";
-    permission java.util.PropertyPermission "proxySet", "write";
-    permission java.util.PropertyPermission "http.proxy.username", "write";
-    permission java.util.PropertyPermission "http.proxy.password", "write";
         
     // Several test cases.
     permission java.util.PropertyPermission "jrunit.bind_addr", "read";
                                
                         
                        
                                
                                17 years
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Remoting SVN: r4634 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/proxy.
                                
                                
                                
                                    
                                        by jboss-remoting-commits@lists.jboss.org
                                    
                                
                                
                                        Author: ron.sigal(a)jboss.com
Date: 2008-10-29 16:57:19 -0400 (Wed, 29 Oct 2008)
New Revision: 4634
Modified:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/proxy/ProxyAuthenticationTestCase.java
Log:
JBREM-1051: Minor changes.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/proxy/ProxyAuthenticationTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/proxy/ProxyAuthenticationTestCase.java	2008-10-29 07:19:40 UTC (rev 4633)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/proxy/ProxyAuthenticationTestCase.java	2008-10-29 20:57:19 UTC (rev 4634)
@@ -39,6 +39,7 @@
 import org.jboss.logging.XLevel;
 import org.jboss.remoting.Client;
 import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.ServerInvoker;
 import org.jboss.remoting.util.SecurityUtility;
 import org.jboss.util.Base64;
 
@@ -213,11 +214,19 @@
       InvokerLocator clientLocator = new InvokerLocator(locatorURI);
       HashMap config = new HashMap();
       config.put(InvokerLocator.FORCE_REMOTE, "true");
+      config.put(ServerInvoker.TIMEOUT, "10000");
       Client client = new Client(clientLocator, config);
       client.connect();
       log.info("client is connected");
-      client.invoke("abc", metadata);
-      
+      try
+      {
+         client.invoke("abc", metadata);
+      }
+      catch (Throwable t)
+      {
+         log.error("invoke failed", t);
+         fail();
+      }
       // Verify correct authorization was sent.
       assertEquals(auth, server.auth);
       client.disconnect();
@@ -255,6 +264,7 @@
             System.out.println();
             auth = getAuth(request);
             
+            log.info("writing response");
             DataOutputStream dos = new DataOutputStream(s.getOutputStream());
             dos.writeBytes("HTTP/1.1 200 OK" + "\r\n");
             dos.writeBytes("Server: testServer");
@@ -262,11 +272,13 @@
             dos.writeBytes("Content-Length: 0\r\n");
             dos.writeBytes("Connection: close\r\n");
             dos.writeBytes("\r\n");
+            log.info("wrote response");
             
             ir.close();
             dos.close();
             s.close();
             ss.close();
+            log.info("closed HTTP server");
          }
          catch (EOFException e1)
          {
                                
                         
                        
                                
                                17 years
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Remoting SVN: r4633 - remoting2/branches/2.x/src/etc.
                                
                                
                                
                                    
                                        by jboss-remoting-commits@lists.jboss.org
                                    
                                
                                
                                        Author: ron.sigal(a)jboss.com
Date: 2008-10-29 03:19:40 -0400 (Wed, 29 Oct 2008)
New Revision: 4633
Removed:
   remoting2/branches/2.x/src/etc/lib/
Log:
JBREM-1049: Removed old versions of jboss-remoting.jar.
                                
                         
                        
                                
                                17 years
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Remoting SVN: r4632 - remoting2/branches/2.x/src/etc.
                                
                                
                                
                                    
                                        by jboss-remoting-commits@lists.jboss.org
                                    
                                
                                
                                        Author: ron.sigal(a)jboss.com
Date: 2008-10-29 03:10:16 -0400 (Wed, 29 Oct 2008)
New Revision: 4632
Modified:
   remoting2/branches/2.x/src/etc/remoting.security.policy.tests
Log:
JBREM-1051: Added permissions for org.jboss.test.remoting.transport.http.proxy.ProxyAuthenticationTestCase.
Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.tests
===================================================================
--- remoting2/branches/2.x/src/etc/remoting.security.policy.tests	2008-10-29 07:06:55 UTC (rev 4631)
+++ remoting2/branches/2.x/src/etc/remoting.security.policy.tests	2008-10-29 07:10:16 UTC (rev 4632)
@@ -72,6 +72,12 @@
     permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#SSLSocketBuilder[jboss:type=serversocketfactory]", "getAttribute";
     permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#SSLSocketBuilder[jboss:type=serversocketfactory2]", "getAttribute";
 
+    // org.jboss.test.remoting.transport.http.proxy.ProxyAuthenticationTestCase
+    permission java.util.PropertyPermission "http.proxyHost", "read";
+    permission java.util.PropertyPermission "http.proxyPort", "read";
+    permission java.util.PropertyPermission "http.proxy.username", "read";
+    permission java.util.PropertyPermission "http.proxy.password", "read";
+    
     // org.jboss.test.remoting.transport.rmi.ssl.config.FactoryConfigTestCase
     permission javax.management.MBeanPermission "org.jboss.test.remoting.transport.rmi.ssl.config.FactoryConfigTestCase$SerializableServerSocketFactory#SSLSocketBuilder[jboss:type=serversocketfactory]", "getAttribute";
     permission javax.management.MBeanPermission "org.jboss.test.remoting.transport.rmi.ssl.config.FactoryConfigTestCase$SerializableServerSocketFactory#SSLSocketBuilder[jboss:type=serversocketfactory2]", "getAttribute";
@@ -168,7 +174,14 @@
     
     // org.jboss.test.remoting.transport.connector.ObjectNameWithZeroesAddressTestCase
     permission javax.management.MBeanPermission "*#-[*:*]", "queryMBeans";
-    
+
+    // org.jboss.test.remoting.transport.http.proxy.ProxyAuthenticationTestCase
+    permission java.util.PropertyPermission "http.proxyHost", "write";
+    permission java.util.PropertyPermission "http.proxyPort", "write";
+    permission java.util.PropertyPermission "proxySet", "write";
+    permission java.util.PropertyPermission "http.proxy.username", "write";
+    permission java.util.PropertyPermission "http.proxy.password", "write";
+        
     // Several test cases.
     permission java.util.PropertyPermission "jrunit.bind_addr", "read";
     
                                
                         
                        
                                
                                17 years