cvs commit: james-server/tools/lib LICENSE.xdoclet.txt commons-logging.jar log4j-core.jar xdoclet-20020825.jar xjavadoc-20020825.jar

2004-02-19 Thread hilmer 
hilmer  2004/02/19 02:12:36

  Modified:.build.xml
   src/java/org/apache/james JamesMBean.java
   src/java/org/apache/james/context
AvalonContextUtilities.java
   src/java/org/apache/james/core AbstractJamesService.java
   src/java/org/apache/james/dnsserver DNSServer.java
DNSServer.xinfo
   src/java/org/apache/james/fetchmail FetchScheduler.java
FetchScheduler.xinfo
   src/java/org/apache/james/fetchpop FetchScheduler.java
FetchScheduler.xinfo
   src/java/org/apache/james/nntpserver NNTPServer.java
NNTPServer.xinfo
   src/java/org/apache/james/pop3server POP3Server.java
POP3Server.xinfo
   src/java/org/apache/james/remotemanager RemoteManager.java
RemoteManager.xinfo
   src/java/org/apache/james/smtpserver SMTPServer.java
SMTPServer.xinfo
  Added:   src/java/org/apache/james/dnsserver DNSServerMBean.java
   src/java/org/apache/james/fetchmail FetchSchedulerMBean.java
   src/java/org/apache/james/fetchpop FetchSchedulerMBean.java
   src/java/org/apache/james/nntpserver NNTPServerMBean.java
   src/java/org/apache/james/pop3server POP3ServerMBean.java
   src/java/org/apache/james/remotemanager
RemoteManagerMBean.java
   src/java/org/apache/james/smtpserver SMTPServerMBean.java
   tools/lib LICENSE.xdoclet.txt commons-logging.jar
log4j-core.jar xdoclet-20020825.jar
xjavadoc-20020825.jar
  Removed: src/java/org/apache/james JamesMBean.mxinfo
  Log:
  Submitted by:Steve Short
  Reviewed by:hilmer
  More information are made available through JMX.
  .mxinfo files are autogenerated by the build process.
  needed tools for mxinfo generation are added to tools/lib these jars obtained from 
Phoenix 4.0.3
  
  Revision  ChangesPath
  1.142 +36 -4 james-server/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/james-server/build.xml,v
  retrieving revision 1.141
  retrieving revision 1.142
  diff -u -r1.141 -r1.142
  --- build.xml 21 Oct 2003 01:49:58 -  1.141
  +++ build.xml 19 Feb 2004 10:12:34 -  1.142
  @@ -41,6 +41,15 @@
   
   !--
   ===
  +Set the properties for build tools directory
  +===
  + --
  + 
  +property name=tools.dir value=tools/
  +property name=tools.lib.dir value=${tools.dir}/lib/
  +
  +!--
  +===
   Set the classpath
   ===
   --
  @@ -72,10 +81,19 @@
   /path
   
   path id=tools.class.path
  -  path refid=project.class.path/
  -  pathelement location=${phoenix-client.jar}/
  +fileset dir=${tools.lib.dir}
  +include name=*.jar/
  +/fileset
  +fileset dir=${phoenix.lib.dir}
  +include name=*.jar/
  +/fileset
   /path
  +
  +taskdef name=phoenix-mxinfo 
classname=org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet
  +classpath refid=tools.class.path/
  +/taskdef
   
  +
   taskdef name=sar classname=org.apache.avalon.phoenix.tools.tasks.Sar
   classpath refid=tools.class.path/
   /taskdef
  @@ -184,6 +202,20 @@
   
   !--
   ===
  +   jmx 
  +===
  +--
  +target name=prepare-mxinfo
  +   phoenix-mxinfo destdir=${build.classes}
  +   fileset dir=${java.dir}
  + include name=** /
  +   /fileset
  +   mxinfo/
  +   /phoenix-mxinfo
  +/target
  +
  +!--
  +===
  jdbc3 
   ===
   --
  @@ -198,7 +230,7 @@
 Prepare target
   ===
   --
  -target name=prepare depends=prepare-common,prepare-phoenix,prepare-jdbc3/
  +target name=prepare 
depends=prepare-common,prepare-phoenix,prepare-jdbc3,prepare-mxinfo/
   
   !--
   ===
  
  
  
  1.6   +4 -0  james-server/src/java/org/apache/james/JamesMBean.java
  
  Index:

cvs commit: james-server/tools/lib LICENSE.xdoclet.txt commons-logging.jar log4j-core.jar xdoclet-20020825.jar xjavadoc-20020825.jar

2004-02-18 Thread hilmer 
hilmer  2004/02/18 13:47:28

  Modified:.Tag: branch_2_1_fcs build.xml
   src/java/org/apache/james Tag: branch_2_1_fcs
JamesMBean.java
   src/java/org/apache/james/context Tag: branch_2_1_fcs
AvalonContextUtilities.java
   src/java/org/apache/james/core Tag: branch_2_1_fcs
AbstractJamesService.java
   src/java/org/apache/james/dnsserver Tag: branch_2_1_fcs
DNSServer.java DNSServer.xinfo
   src/java/org/apache/james/fetchmail Tag: branch_2_1_fcs
FetchScheduler.java FetchScheduler.xinfo
   src/java/org/apache/james/fetchpop Tag: branch_2_1_fcs
FetchScheduler.java FetchScheduler.xinfo
   src/java/org/apache/james/nntpserver Tag: branch_2_1_fcs
NNTPServer.java NNTPServer.xinfo
   src/java/org/apache/james/pop3server Tag: branch_2_1_fcs
POP3Server.java POP3Server.xinfo
   src/java/org/apache/james/remotemanager Tag: branch_2_1_fcs
RemoteManager.java RemoteManager.xinfo
   src/java/org/apache/james/smtpserver Tag: branch_2_1_fcs
SMTPServer.java SMTPServer.xinfo
  Added:   src/java/org/apache/james/dnsserver Tag: branch_2_1_fcs
DNSServerMBean.java
   src/java/org/apache/james/fetchmail Tag: branch_2_1_fcs
FetchSchedulerMBean.java
   src/java/org/apache/james/fetchpop Tag: branch_2_1_fcs
FetchSchedulerMBean.java
   src/java/org/apache/james/nntpserver Tag: branch_2_1_fcs
NNTPServerMBean.java
   src/java/org/apache/james/pop3server Tag: branch_2_1_fcs
POP3ServerMBean.java
   src/java/org/apache/james/remotemanager Tag: branch_2_1_fcs
RemoteManagerMBean.java
   src/java/org/apache/james/smtpserver Tag: branch_2_1_fcs
SMTPServerMBean.java
   tools/lib Tag: branch_2_1_fcs LICENSE.xdoclet.txt
commons-logging.jar log4j-core.jar
xdoclet-20020825.jar xjavadoc-20020825.jar
  Removed: src/java/org/apache/james Tag: branch_2_1_fcs
JamesMBean.mxinfo
  Log:
  Submitted by:Steve SHort
  Reviewed by:hilmer
  
  More information are made available through JMX.
  .mxinfo files are autogenerated by the build process.
  Needed tools for mxinfo generation are added to tools/lib these jars obtained from 
Phoenix 4.0.3
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.116.2.21 +32 -2 james-server/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/james-server/build.xml,v
  retrieving revision 1.116.2.20
  retrieving revision 1.116.2.21
  diff -u -r1.116.2.20 -r1.116.2.21
  --- build.xml 23 Oct 2003 19:00:45 -  1.116.2.20
  +++ build.xml 18 Feb 2004 21:47:26 -  1.116.2.21
  @@ -66,6 +66,14 @@
   
   !--
  ===
  +   Set the properties for build tools directory
  +   ===
  +  --
  +property name=tools.dir value=tools/
  +property name=tools.lib.dir value=${tools.dir}/lib/
  +
  +!--
  +   ===
  Set the properties for source directories and parameters
  ===
 --
  @@ -122,10 +130,24 @@
   /fileset
   pathelement path=${build.classes}/
   /path
  +
  +path id=tools.class.path
  +fileset dir=${tools.lib.dir}
  +include name=*.jar/
  +/fileset
  +fileset dir=${phoenix.lib.dir}
  +include name=*.jar/
  +/fileset
  +/path
  +
   taskdef name=sar classname=org.apache.avalon.phoenix.tools.tasks.Sar
   classpath refid=project.class.path/
   /taskdef
   
  + taskdef name=phoenix-mxinfo 
classname=org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet
  +classpath refid=tools.class.path/
  +/taskdef
  +
   !--
  ===
 Main target
  @@ -202,6 +224,14 @@
   /chmod
   /target
   
  + target name=prepare-mxinfo
  + phoenix-mxinfo destdir=${build.classes}
  + fileset dir=${java.dir}
  + include name=** /
  + /fileset
  + mxinfo/
  + /phoenix-mxinfo

Re: cvs commit: james-server/tools/lib LICENSE.xdoclet.txt commons-logging.jar log4j-core.jar xdoclet-20020825.jar xjavadoc-20020825.jar

2004-02-18 Thread Soren Hilmer 
Hi,

Yes, I plan to commit it for MAIN as well, hopefully today.

--Søren

On Thursday 19 February 2004 00:24, Steve Brewin wrote:
 Hi Soren and Noel,

 These updates look great. The only worry I have is that in order to help
 Noel with the task of merging the MAIN (3.0) and branch_2_1_fcs sources I
 had recently synchronized the two fetchmail code paths. Now they are out of
 sync. again as you have applied the JMX changes to branch_2_1_fcs only.

 Nothing wrong with that, but fetchmail cannot be resynced in MAIN without
 adding to MAIN many of the changes committed to branch_2_1_fcs by this
 commit.

 Is the intention to also commit the JMX changes to MAIN? If not, can we
 agree that for the merge branch_2_1_fcs is the definitive source for
 fetchmail and we will ignore MAIN?

 I would guess the same issues touch other areas too?

 -- Steve



 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]