Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

removed clogging refs

  • Loading branch information...
commit 9f16a22cef8867c15f8d9d534ac726e26ee5c241 1 parent b78ff5e
authored
1  .classpath
@@ -9,7 +9,6 @@
9 9
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
10 10
 	<classpathentry kind="lib" path="lib/ant.jar"/>
11 11
 	<classpathentry kind="lib" path="lib/bsh-1.2b3.jar"/>
12  
-	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
13 12
 	<classpathentry kind="lib" path="lib/log4j.jar"/>
14 13
 	<classpathentry kind="lib" path="lib/xalan.jar"/>
15 14
 	<classpathentry kind="lib" path="conf"/>
9  INSTALL.html
@@ -51,11 +51,6 @@
51 51
 The binary version contains<br>
52 52
 <ol>
53 53
   <li>jgroups-all.jar: the JGroups library including the demos</li>
54  
-  <li>commons-logging.jar</li>
55  
-  <li>concurrent.jar</li>
56  
-  <li>log4j.jar</li>
57  
-  <li>jmxri.jar: the JMX reference implementation, this is not needed
58  
-if running in JDK 5 or higher</li>
59 54
   <li>jgroups.bat/jgroups.sh: convenience script to start demo programs
60 55
 (set the CLASSPATH etc) - see below</li>
61 56
   <li>Some sample configuration files, udp.xml, mping.xml etc<br>
@@ -95,8 +90,6 @@
95 90
 test cases</li>
96 91
     <li><a href="http://xml.apache.org">xalan.jar</a> : to format the
97 92
 output of the JUnit tests using an XSLT converter to HTML</li>
98  
-    <li>concurrent.jar</li>
99  
-    <li>commons-logging.jar</li>
100 93
     <li>log4j.jar</li>
101 94
     <li>etc<br>
102 95
     </li>
@@ -166,7 +159,7 @@
166 159
 </b><br>
167 160
 You should see the following output (more or less) if the class is
168 161
 found:
169  
-<pre><br>Version:        2.2.8 RC1<br>CVS:            $Id: INSTALL.html,v 1.9 2006/12/27 10:17:58 belaban Exp $<br>History:        (see doc/history.txt for details)<br><br><br></pre>
  162
+<pre><br>Version:        2.2.8 RC1<br>CVS:            $Id: INSTALL.html,v 1.10 2009/05/13 13:22:05 belaban Exp $<br>History:        (see doc/history.txt for details)<br><br><br></pre>
170 163
 <h3>Running the performance tests</h3>
171 164
 <pre><br></pre>
172 165
 By default, we're running 2 senders with 10000 1K messages each, to do
2  bin/clusterperformancetest.sh
@@ -16,7 +16,7 @@ USERID=bela
16 16
 
17 17
 
18 18
 #classpath for performance tests
19  
-CLASSPATH='commons-logging.jar:log4j-1.2.6.jar:concurrent.jar:jgroups-all.jar'
  19
+CLASSPATH='jgroups-all.jar'
20 20
 
21 21
 #finds test configuration files
22 22
 #note the running directory of this script and make sure that find command can 
4  bin/concurrent.sh
@@ -5,9 +5,7 @@ BIN=`dirname $0`
5 5
 
6 6
 LIB=$BIN/../lib
7 7
 
8  
-LIBS=$LIB/commons-logging.jar
9  
-
10  
-CLASSPATH=$BIN/../classes:$CLASSPATH:$LIBS
  8
+CLASSPATH=$BIN/../classes:$CLASSPATH
11 9
 
12 10
 # OS specific support (must be 'true' or 'false').
13 11
 cygwin=false;
2  bin/draw.bat
... ...
@@ -1,7 +1,7 @@
1 1
 @rem Convenience launcher for the Draw demo (contributed by Laran Evans lc278@cornell.edu)
2 2
 @echo off
3 3
 
4  
-set CPATH=../classes;../conf;../lib/commons-logging.jar;../lib/log4j-1.2.6.jar;../lib/concurrent.jar
  4
+set CPATH=../classes;../conf;
5 5
 
6 6
 set JAVA_OPTS=
7 7
 if -debug==%1 set JAVA_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=jgc1
2  bin/draw.sh
@@ -24,7 +24,7 @@ while [ "$1" != "" ]; do
24 24
 done
25 25
 
26 26
 
27  
-CLASSPATH="$relpath/../classes$SEP$relpath/../conf$SEP$relpath/../lib/commons-logging.jar$SEP$relpath/../lib/log4j-1.2.6.jar$SEP$relpath/../lib/concurrent.jar"
  27
+CLASSPATH="$relpath/../classes$SEP$relpath/../conf$SEP"
28 28
 
29 29
 if [ "$debug" = "true" ]; then
30 30
     JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=jgc1"
13  bin/drawnio.bat
... ...
@@ -1,13 +0,0 @@
1  
-@rem Convenience launcher for the Draw demo (contributed by Laran Evans lc278@cornell.edu)
2  
-@echo off
3  
-
4  
-set CPATH=../classes;../conf;../lib/commons-logging.jar;../lib/log4j.jar;../lib/log4j-1.2.6.jar;../lib/concurrent.jar;../conf/log4j.properties
5  
-
6  
-set JAVA_OPTS=
7  
-if -debug==%1 set JAVA_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=jgc1
8  
-
9  
-if "%LOCALHOSTIP%"=="" echo Warning: You should set environment variable 'LOCALHOSTIP' to your local ip address before running this script.
10  
-if "%LOCALHOSTIP%"=="" set LOCALHOSTIP=192.168.1.103
11  
-    
12  
-@echo on
13  
-java -classpath %CPATH% %JAVA_OPTS% -Djgroups.bind_addr=%LOCALHOSTIP% -Djgroups.tcpping.initial_hosts=%LOCALHOSTIP%[7800],%LOCALHOSTIP%[7801] org.jgroups.demos.Draw -props c:\jboss\JGroups\conf\tcp-nio.xml
2  bin/jgroups.bat
@@ -7,7 +7,7 @@ REM set the value of JG to the root directory in which JGroups is located
7 7
 set JG=.
8 8
 set LIB=%JG%
9 9
 
10  
-set CP=%JG%\classes\;%JG%\conf\;%LIB%\jgroups-all.jar\;%LIB%\commons-logging.jar\;%LIB%\concurrent.jar\;%LIB%\jmxri.jar\;%LIB%\log4j.jar\;%JG%\keystore
  10
+set CP=%JG%\classes\;%JG%\conf\;%LIB%\jgroups-all.jar\;%LIB%\log4j.jar\;%JG%\keystore
11 11
 
12 12
 set VMFLAGS=-Xmx500M -Xms500M -XX:NewRatio=1 -XX:+AggressiveHeap -verbose:gc -XX:+DisableExplicitGC -XX:ThreadStackSize=32 -XX:CompileThreshold=100
13 13
 
2  bin/probe.bat
@@ -8,7 +8,7 @@ set CLASSPATH=..\classes
8 8
 
9 9
 set LIB=..\lib
10 10
 
11  
-set LIBS=%LIB%\log4j-1.2.6.jar;%LIB%\commons-logging.jar;%LIB%\concurrent.jar
  11
+set LIBS=%LIB%\log4j.jar;
12 12
 
13 13
 
14 14
 set CP=%CLASSPATH%;%LIBS%
2  bin/probe.sh
@@ -8,7 +8,7 @@ BIN=`dirname $0`
8 8
 
9 9
 LIB=$BIN/../lib
10 10
 
11  
-LIBS=$LIB/log4j-1.2.6.jar:$LIB/commons-logging.jar:$LIB/concurrent.jar
  11
+LIBS=$LIB/log4j.jar
12 12
 
13 13
 #echo $CLASSPATH
14 14
 
3  bin/runtest.sh
@@ -36,8 +36,7 @@ done
36 36
 CLASSPATH="$reldir/../classes${SEP}\
37 37
 $reldir/../conf${SEP}\
38 38
 $reldir/../lib/junit.jar${SEP}\
39  
-$reldir/../lib/log4j-1.2.6.jar${SEP}\
40  
-$reldir/../lib/commons-logging.jar"
  39
+$reldir/../lib/log4j.jar${SEP}
41 40
 
42 41
 #if [ $cygwin = "true" ]; then
43 42
 #   CP=`cygpath -wp $CLASSPATH`
2  build.bat
@@ -8,7 +8,7 @@ if "%JAVA_HOME%" == "" goto noJavaHome
8 8
 
9 9
 set LIB=lib
10 10
 
11  
-set LIBS=%LIB%\log4j-1.2.6.jar;%LIB%\commons-logging.jar;%LIB%\concurrent.jar
  11
+set LIBS=%LIB%\log4j.jar
12 12
 
13 13
 set LIBS=%LIB%\ant.jar;%LIB%\ant-junit.jar;%LIB%\ant-launcher.jar;%LIB%\junit.jar;%LIB%\xalan.jar;%LIB%\serializer.jar;
14 14
 REM echo LIBS=%LIBS%
5  build.xml
... ...
@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0"?>
2 2
 
3  
-<!-- $Id: build.xml,v 1.202 2009/05/04 13:55:36 belaban Exp $ -->
  3
+<!-- $Id: build.xml,v 1.203 2009/05/13 13:22:05 belaban Exp $ -->
4 4
 
5 5
 <project name="JGroups" default="compile" basedir=".">
6 6
     <description>
@@ -198,8 +198,6 @@
198 198
                 <include name="EULA"/>
199 199
             </fileset>
200 200
             <fileset dir="${lib.dir}">
201  
-                <include name="commons-logging*.jar"/>
202  
-                <include name="log4j*.jar"/>
203 201
                 <include name="licenses/*"/>
204 202
             </fileset>
205 203
             <fileset dir="${dist.dir}">
@@ -246,7 +244,6 @@
246 244
             description="Creates the service archive used to deploy a JGroups channel as a JBoss MBean">
247 245
         <jar jarfile="${dist.dir}/jgroups-service.sar">
248 246
             <fileset dir="${dist.dir}" includes="jgroups-core.jar"/>
249  
-            <fileset dir="${lib.dir}" includes="commons-logging*.jar,log4j*.jar"/>
250 247
             <metainf dir="${conf.dir}"
251 248
                      includes="jboss-service.xml"/>
252 249
             <fileset dir="${conf.dir}" includes="jg-magic-map.xml,stacks.xml"/>
8  doc/manual/en/modules/installation.xml
@@ -53,9 +53,6 @@
53 53
                 <para>INSTALL.html: this file</para>
54 54
             </listitem>
55 55
             <listitem>
56  
-                <para>commons-logging.jar</para>
57  
-            </listitem>
58  
-            <listitem>
59 56
                 <para>log4j.jar. This JAR is optional, for example if JDK logging is used, we don't need it.</para>
60 57
             </listitem>
61 58
         </orderedlist>
@@ -113,9 +110,6 @@
113 110
                         </para>
114 111
                     </listitem>
115 112
                     <listitem>
116  
-                        <para>commons-logging.jar</para>
117  
-                    </listitem>
118  
-                    <listitem>
119 113
                         <para>log4j.jar</para>
120 114
                     </listitem>
121 115
                     <listitem>
@@ -264,7 +258,7 @@
264 258
             $ java -jar jgroups-all.jar
265 259
 
266 260
             Version:        2.6.0 pre-alpha
267  
-            CVS:            $Id: installation.xml,v 1.5 2007/07/24 16:30:46 belaban Exp $
  261
+            CVS:            $Id: installation.xml,v 1.6 2009/05/13 13:22:08 belaban Exp $
268 262
         </screen>
269 263
 
270 264
     </section>
8  doc/tutorial/en/modules/installation.xml
@@ -28,10 +28,6 @@
28 28
                     INSTALL.html: detailed configuration instructions plus trouble shooting
29 29
                 </listitem>
30 30
                 <listitem>
31  
-                    commons-logging.jar: <emphasis>required</emphasis> JAR that provides general logging. This
32  
-                    might get dropped in 3.0
33  
-                </listitem>
34  
-                <listitem>
35 31
                     jgroups-all.jar (<emphasis>required</emphasis>): JGroups functionality, including demo and junit
36 32
                     apps. If a smaller JAR is required, this can be done by downloading the source distribution and
37 33
                     invoking the "jar" target, which creates a jgroups-core.jar file (ca 1MB).
@@ -76,7 +72,7 @@
76 72
     <section>
77 73
         <title>Configuration</title>
78 74
         <para>
79  
-            Add jgroups-all.jar and commons-logging.jar to your CLASSPATH. If you use the log4j logging system, you also
  75
+            Add jgroups-all.jar to your CLASSPATH. If you use the log4j logging system, you also
80 76
             have to add log4j.jar (this is not necessary if you use the JDK logging system).
81 77
         </para>
82 78
         <para>
@@ -107,7 +103,7 @@
107 103
             $ java -jar jgroups-all.jar
108 104
 
109 105
             Version:        2.5.0
110  
-            CVS:            $Id: installation.xml,v 1.3 2007/07/16 11:04:12 belaban Exp $
  106
+            CVS:            $Id: installation.xml,v 1.4 2009/05/13 13:22:09 belaban Exp $
111 107
             History:        (see doc/history.txt for details)
112 108
         </screen>
113 109
 

0 notes on commit 9f16a22

Please sign in to comment.
Something went wrong with that request. Please try again.