james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r526092 - in /james/server/trunk/phoenix-deployment: JAMES_PHOENIX.txt phoenix-bin/bin/lib/phoenix-engine.jar phoenix-bin/lib/phoenix-engine.jar src/conf/james-server.xml
Date Fri, 06 Apr 2007 08:24:00 GMT
Author: bago
Date: Fri Apr  6 01:23:59 2007
New Revision: 526092

URL: http://svn.apache.org/viewvc?view=rev&rev=526092
Log:
Changed org.apache.avalon.phoenix.components.classloader.DefaultLoaderResolver from avalon
phoenix to avoid a full scan of the apps/james folder when only SAR-INF/lib should be scanned.
Changed james-server.xml (environment.xml) to declare a proper classloader (JAMES-781)

Modified:
    james/server/trunk/phoenix-deployment/JAMES_PHOENIX.txt
    james/server/trunk/phoenix-deployment/phoenix-bin/bin/lib/phoenix-engine.jar
    james/server/trunk/phoenix-deployment/phoenix-bin/lib/phoenix-engine.jar
    james/server/trunk/phoenix-deployment/src/conf/james-server.xml

Modified: james/server/trunk/phoenix-deployment/JAMES_PHOENIX.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/JAMES_PHOENIX.txt?view=diff&rev=526092&r1=526091&r2=526092
==============================================================================
--- james/server/trunk/phoenix-deployment/JAMES_PHOENIX.txt (original)
+++ james/server/trunk/phoenix-deployment/JAMES_PHOENIX.txt Fri Apr  6 01:23:59 2007
@@ -5,12 +5,13 @@
 Here are the differences between the svn version and this one:
 
 - removed xml libraries (we run only in java 1.4+)
-- upgraded avalon libraries to 4.3
-- upgraded cornerstone libraries to 2.1
-- upgraded logkit to 2.1
-- changed the default SystemManager to NoopSystemManager in kernel.xml
+  upgraded avalon libraries to 4.3
+  upgraded cornerstone libraries to 2.1
+  upgraded logkit to 2.1
+  upgraded wrapper.* files to 3.2.0 release (http://wrapper.tanukisoftware.org/)
+  changed the build.xml to reflect the changes (e.g: added target=1.4).
 
-- upgraded wrapper.* files to 3.2.0 release (http://wrapper.tanukisoftware.org/)
+- changed the default SystemManager to NoopSystemManager in kernel.xml
 
 - add new jar for invoke phoenix via commonns daemon.
 
@@ -22,10 +23,30 @@
         Security.setProperty("networkaddress.cache.ttl" , ttlcache);
     }
   ---------------------------------
+  ref: JAMES-679, JAMES-592
 
 - added a "-Dnetworkaddress.cache.ttl=300" to all executing scripts:
   wrapper.conf, phoenix.sh, run.bat, james-server.sh
 
-Changed the build.xml to reflect the changes.
+- changed org.apache.avalon.phoenix.components.classloader.DefaultLoaderResolver
+  ---------------------------------
+    protected final URL[] resolveFileSet( final File base,
+                                          final String baseDirectory,
+                                          final String[] includes,
+                                          final String[] excludes )
+    {
+        //woefully inefficient .. but then again - no need
+        //for efficency here
+        final String newBaseDirectory = normalize( baseDirectory );
+        File newBase = new File(base, newBaseDirectory);
+        final ArrayList urls = new ArrayList();
+        if (newBase.exists() && newBase.isDirectory()) {
+        	final PathMatcher matcher = new PathMatcher( includes, excludes );
+        	scanDir( newBase, matcher, "", urls );
+        }
+        return (URL[]) urls.toArray( new URL[urls.size()] );
+    }
+  ---------------------------------
+  ref: JAMES-781
 
 Rebuilt.

Modified: james/server/trunk/phoenix-deployment/phoenix-bin/bin/lib/phoenix-engine.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/phoenix-bin/bin/lib/phoenix-engine.jar?view=diff&rev=526092&r1=526091&r2=526092
==============================================================================
Binary files - no diff available.

Modified: james/server/trunk/phoenix-deployment/phoenix-bin/lib/phoenix-engine.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/phoenix-bin/lib/phoenix-engine.jar?view=diff&rev=526092&r1=526091&r2=526092
==============================================================================
Binary files - no diff available.

Modified: james/server/trunk/phoenix-deployment/src/conf/james-server.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-server.xml?view=diff&rev=526092&r1=526091&r2=526092
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-server.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-server.xml Fri Apr  6 01:23:59 2007
@@ -1,6 +1,22 @@
 <?xml version="1.0"?>
 
 <server>
+
+  <!-- Overrides the default behaviour of phoenix that use "." as dir --> 
+  <!-- and /SAR-INF/lib/*.jar as include resulting in a full scan -->
+  <!-- of the james folder and very slow startup when there are a lot of -->
+  <!-- messages in var -->
+  <!-- -->
+  <classloaders default="default" version="1.0">
+    <classloader name="default" parent="*system*">
+      <entry location="./SAR-INF/classes" />
+      <fileset dir="./SAR-INF/lib">
+        <include name="*.jar" />
+      </fileset>
+    </classloader>
+    <predefined name="*system*" />
+  </classloaders>
+  
   <logs version="1.1">
     <!-- see http://jakarta.apache.org/avalon/excalibur/logger/index.html -->
     <factories>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message