geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r667975 - in /geronimo/plugins/james/trunk: geronimo-james/src/test/james-diff geronimo-james/src/test/resources/var/james/config/README james/src/main/james-diff james/src/main/resources/var/james/config/README
Date Sun, 15 Jun 2008 17:05:34 GMT
Author: djencks
Date: Sun Jun 15 10:05:34 2008
New Revision: 667975

URL: http://svn.apache.org/viewvc?rev=667975&view=rev
Log:
more info on config file changes from james originals

Added:
    geronimo/plugins/james/trunk/geronimo-james/src/test/james-diff
    geronimo/plugins/james/trunk/james/src/main/james-diff
Modified:
    geronimo/plugins/james/trunk/geronimo-james/src/test/resources/var/james/config/README
    geronimo/plugins/james/trunk/james/src/main/resources/var/james/config/README

Added: geronimo/plugins/james/trunk/geronimo-james/src/test/james-diff
URL: http://svn.apache.org/viewvc/geronimo/plugins/james/trunk/geronimo-james/src/test/james-diff?rev=667975&view=auto
==============================================================================
--- geronimo/plugins/james/trunk/geronimo-james/src/test/james-diff (added)
+++ geronimo/plugins/james/trunk/geronimo-james/src/test/james-diff Sun Jun 15 10:05:34 2008
@@ -0,0 +1,348 @@
+
+Property changes on: miResources.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: james-smtphandlerchain.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: mailboxManagerSqlResources.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+Index: james-config.xml
+===================================================================
+--- james-config.xml	(.../james/server/trunk/spring-deployment/src/main/config/james)	(revision
667971)
++++ james-config.xml	(.../geronimo/plugins/james/trunk/geronimo-james/src/test/resources/var/james/config)
(revision 667971)
+@@ -18,11 +18,11 @@
+   under the License.                                           
+  -->
+ <!DOCTYPE config [
+-<!ENTITY listserverConfig SYSTEM "../conf/james-listmanager.xml">
+-<!ENTITY listserverStores SYSTEM "../conf/james-liststores.xml">
+-<!ENTITY fetchmailConfig SYSTEM "../conf/james-fetchmail.xml">
+-<!ENTITY jmsConfig SYSTEM "../conf/james-jms.xml">
+-<!ENTITY smtphandlerchainConfig SYSTEM "../conf/james-smtphandlerchain.xml">
++<!ENTITY listserverConfig SYSTEM "james-listmanager.xml">
++<!ENTITY listserverStores SYSTEM "james-liststores.xml">
++<!ENTITY fetchmailConfig SYSTEM "james-fetchmail.xml">
++<!ENTITY jmsConfig SYSTEM "james-jms.xml">
++<!ENTITY smtphandlerchainConfig SYSTEM "james-smtphandlerchain.xml">
+ ]>
+ 
+ <!--  Configuration file for the ASF James server -->
+@@ -41,7 +41,7 @@
+ <!-- For production use you will probably need to make more extensive changes, see -->
+ <!-- http://james.apache.org/server/2.3.0/ -->
+ 
+-<!-- $Revision: 602733 $ Committed on $Date: 2007-12-09 22:37:20 +0100 (Sun, 09 Dec 2007)
$ by: $Author: rdonkin $ -->
++<!-- $Revision$ Committed on $Date$ by: $Author: rdonkin $ -->
+ 
+ <config>
+    <James>
+@@ -128,6 +128,8 @@
+       <!-- will use the specified value. -->
+       <!-- Set the default helloName which is used in all services if not overridden
in the specific service-->
+       <helloName autodetect="true">myMailServer</helloName>
++       <!-- according to the James code the need for this might be a temporary hack -->
++       <configuration-directory>file://</configuration-directory>
+    </James>
+ 
+     <!--
+@@ -140,6 +142,7 @@
+         </namespaces>
+         <factory
+             class="org.apache.james.mailboxmanager.torque.TorqueMailboxManagerFactory">
++                   <configFile>mailboxManagerSqlResources.xml</configFile>
+                    <torque-properties>
+                        <property name="torque.database.default"
+                            value="mailboxmanager"/>
+@@ -154,7 +157,7 @@
+                            value="org.apache.derby.jdbc.EmbeddedDriver"/>
+                        <property
+                            name="torque.dsfactory.mailboxmanager.connection.url"
+-                           value="jdbc:derby:../apps/james/var/mailboxmanager-derbydb;create=true"/>
++                           value="jdbc:derby:mailboxmanager-derbydb;create=true"/>
+                        <property
+                            name="torque.dsfactory.mailboxmanager.connection.user"
+                            value="app"/>
+@@ -909,7 +912,8 @@
+    <!-- This is needed by the RemoteManager to enable the BayesianAnaylyzerManagement
commands --> 
+    <bayesiananalyzermanagement> 
+       <repositoryPath> db://maildb </repositoryPath>
+-   </bayesiananalyzermanagement>  
++      <sqlFile>sqlResources.xml</sqlFile>
++   </bayesiananalyzermanagement>
+     
+ 
+    <!-- The RemoteManager server is enabled by default -->
+@@ -953,7 +957,7 @@
+    <pop3server enabled="true">
+       <!-- port 995 is the well-known/IANA registered port for POP3S  ie over SSL/TLS
-->
+       <!-- port 110 is the well-known/IANA registered port for Standard POP3 -->
+-      <port>110</port>
++      <port>8110</port>
+ 
+       <!-- Uncomment this if you want to bind to a specific inetaddress -->
+       <!--
+@@ -982,7 +986,7 @@
+     <!-- but does not free as many resources as removing them would -->
+    <smtpserver enabled="true">
+       <!-- port 25 is the well-known/IANA registered port for SMTP -->
+-      <port>25</port>
++      <port>8025</port>
+ 
+       <!-- Uncomment this if you want to bind to a specific inetaddress -->
+       <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork -->
+@@ -1084,7 +1088,7 @@
+         service.  -->
+       <!-- port 563 is the well-known/IANA registered port for NNTP over SSL/TLS -->
+       <!-- port 119 is the well-known/IANA registered port for Standard NNTP -->
+-      <port>119</port>
++      <port>8119</port>
+ 
+       <!-- Uncomment this if you want to bind to a specific inetaddress -->
+       <!--
+@@ -1114,9 +1118,9 @@
+       <!-- If this is set to true, posting will be disallowed. -->
+       <readOnly>false</readOnly>
+ 
+-      <rootPath>file://var/nntp/groups</rootPath>
+-      <tempPath>file://var/nntp/temp</tempPath>
+-      <articleIDPath>file://var/nntp/articleid</articleIDPath>
++      <rootPath>file://</rootPath>
++      <tempPath>file://</tempPath>
++      <articleIDPath>file://</articleIDPath>
+       <articleIDDomainSuffix>news.james.apache.org</articleIDDomainSuffix>
+ 
+       <!-- The news groups hosted in this NNTP repository. -->
+@@ -1133,7 +1137,7 @@
+ 
+       <spool>
+          <configuration>
+-            <spoolPath>file://var/nntp/spool</spoolPath>
++            <spoolPath>file://</spoolPath>
+             <!-- The number of threads that process spooler related tasks. -->
+             <threadCount>1</threadCount>
+             <!-- The spool thread(s) should idle for some time, if it has nothing to
do  -->
+@@ -1171,7 +1175,7 @@
+                <type>MAIL</type>
+             </types>
+             <config>
+-               <sqlFile>file://conf/mailboxManagerSqlResources.xml</sqlFile>
++               <sqlFile>file://mailboxManagerSqlResources.xml</sqlFile>
+             </config>
+          </repository>
+          <!-- File based repositories.  These repositories store all message data -->
+@@ -1205,7 +1209,7 @@
+                <type>MAIL</type>
+             </types>
+             <config>
+-               <sqlFile>file://conf/sqlResources.xml</sqlFile>
++               <sqlFile>file://sqlResources.xml</sqlFile>
+                <!-- Set the size threshold for in memory handling of storing operations
-->
+                <!-- Default is currently 409600000 due to a bug with mysql and binary
stream -->
+                <!-- currently under investigation. Please change this only if you know
what -->
+@@ -1224,7 +1228,7 @@
+                <type>SPOOL</type>
+             </types>
+             <config>
+-               <sqlFile>file://conf/sqlResources.xml</sqlFile>
++               <sqlFile>file://sqlResources.xml</sqlFile>
+                <maxcache>1000</maxcache>
+             </config>
+          </repository>
+@@ -1238,8 +1242,8 @@
+                <type>MAIL</type>
+             </types>
+             <config>
+-               <sqlFile>file://conf/sqlResources.xml</sqlFile>
+-               <filestore>file://var/dbmail</filestore>
++               <sqlFile>file://sqlResources.xml</sqlFile>
++               <filestore>file://dbmail</filestore>
+             </config>
+          </repository>
+ 
+@@ -1251,8 +1255,8 @@
+                <type>SPOOL</type>
+             </types>
+             <config>
+-               <sqlFile>file://conf/sqlResources.xml</sqlFile>
+-               <filestore>file://var/dbmail</filestore>
++               <sqlFile>file://sqlResources.xml</sqlFile>
++               <filestore>file://dbmail</filestore>
+                <maxcache>1000</maxcache>
+             </config>
+          </repository>
+@@ -1338,7 +1342,7 @@
+       <!-- The LocalUsers repository, for storing James' User info. -->
+       <!-- TEMPORARY DEFAULT: db using Derby  -->
+       <repository name="LocalUsers" class="org.apache.james.userrepository.JamesUsersJdbcRepository"
destinationURL="db://maildb/users">
+-         <sqlFile>file://conf/sqlResources.xml</sqlFile>
++         <sqlFile>file://sqlResources.xml</sqlFile>
+          <!-- Set whether user names are case sensitive or case insensitive -->
+          <ignoreCase>true</ignoreCase>
+          <!-- Set whether to enable local aliases -->
+@@ -1386,7 +1390,7 @@
+       <table name="DefaultVirtualUserTable" class="org.apache.james.vut.JDBCVirtualUserTable"
destinationURL="db://maildb/VirtualUserTable">
+          <recursiveMapping> true </recursiveMapping>
+          <mappingLimit> 10 </mappingLimit>
+-         <sqlFile>file://conf/sqlResources.xml</sqlFile>
++         <sqlFile>file://sqlResources.xml</sqlFile>
+       </table>
+    </virtualusertable-store>
+ 
+@@ -1415,7 +1419,7 @@
+       <!-- -->
+       <data-source name="maildb" class="org.apache.james.util.dbcp.JdbcDataSource">
+          <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+-         <dburl>jdbc:derby:../apps/james/var/derbydb;create=true</dburl>
++         <dburl>jdbc:derby:derbydb;create=true</dburl>
+          <user></user>
+          <password></password>
+          <poolPreparedStatements>true</poolPreparedStatements>
+
+Property changes on: james-config.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: james-listmanager.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: james-jms.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: james-liststores.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+Index: spring-beans.xml
+===================================================================
+--- spring-beans.xml	(.../james/server/trunk/spring-deployment/src/main/config/james)	(revision
667971)
++++ spring-beans.xml	(.../geronimo/plugins/james/trunk/geronimo-james/src/test/resources/var/james/config)
(revision 667971)
+@@ -27,7 +27,7 @@
+          beans which replace Avalon specific container logic
+     -->
+ 
+-    <bean id="fileSystemOverride" class="org.apache.james.container.spring.adaptor.FileSystemBridge"/>
++    <bean id="fileSystemOverride" class="org.apache.geronimo.plugins.james.TestFileSystemBridge"/>
+          
+     <bean id="serviceManager" class="org.apache.james.container.spring.adaptor.DefaultServiceManagerFactory"
>
+         <property name="replacements">
+@@ -79,13 +79,14 @@
+ 
+ 
+     <bean id="configurationProvider" class="org.apache.james.container.spring.adaptor.AvalonConfigurationFileProvider"
>
+-        <property name="configurationResource" value="classpath:james-config.xml" />
++        <property name="configurationResource" value="james-config.xml" />
+         <property name="configurationInterceptors">
+             <list>
+                 <ref bean="stringRemapperConfigurationInterceptor" />
+                 <!--<ref bean="privilegedPortsConfigurationInterceptor" />-->
+             </list>
+         </property>
++        <property name="fileSystem" ref="fileSystemOverride"/>
+     </bean>
+ 
+     <bean id="avalonContext" class="org.apache.james.container.spring.adaptor.AvalonContext"
>
+
+Property changes on: spring-beans.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: james-fetchmail.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: sqlResources.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: log4j.properties
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/plain
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: james-assembly.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+Index: README
+===================================================================
+--- README	(.../james/server/trunk/spring-deployment/src/main/config/james)	(revision 0)
++++ README	(.../geronimo/plugins/james/trunk/geronimo-james/src/test/resources/var/james/config)
(revision 667971)
+@@ -0,0 +1,2 @@
++The files in this directory are from
++https://svn.apache.org/repos/asf/james/server/trunk/spring-deployment/src/main/config/james
+\ No newline at end of file

Modified: geronimo/plugins/james/trunk/geronimo-james/src/test/resources/var/james/config/README
URL: http://svn.apache.org/viewvc/geronimo/plugins/james/trunk/geronimo-james/src/test/resources/var/james/config/README?rev=667975&r1=667974&r2=667975&view=diff
==============================================================================
--- geronimo/plugins/james/trunk/geronimo-james/src/test/resources/var/james/config/README
(original)
+++ geronimo/plugins/james/trunk/geronimo-james/src/test/resources/var/james/config/README
Sun Jun 15 10:05:34 2008
@@ -1,2 +1,5 @@
 The files in this directory are from
-https://svn.apache.org/repos/asf/james/server/trunk/spring-deployment/src/main/config/james
\ No newline at end of file
+https://svn.apache.org/repos/asf/james/server/trunk/spring-deployment/src/main/config/james
+
+See ../../../james-diff generated by running
+svn diff https://svn.apache.org/repos/asf/james/server/trunk/spring-deployment/src/main/config/james
https://svn.apache.org/repos/asf/geronimo/plugins/james/trunk/geronimo-james/src/test/resources/var/james/config>james-diff

Added: geronimo/plugins/james/trunk/james/src/main/james-diff
URL: http://svn.apache.org/viewvc/geronimo/plugins/james/trunk/james/src/main/james-diff?rev=667975&view=auto
==============================================================================
--- geronimo/plugins/james/trunk/james/src/main/james-diff (added)
+++ geronimo/plugins/james/trunk/james/src/main/james-diff Sun Jun 15 10:05:34 2008
@@ -0,0 +1,403 @@
+
+Property changes on: miResources.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: james-smtphandlerchain.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: mailboxManagerSqlResources.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+Index: james-config.xml
+===================================================================
+--- james-config.xml	(.../james/server/trunk/spring-deployment/src/main/config/james)	(revision
667971)
++++ james-config.xml	(.../geronimo/plugins/james/trunk/james/src/main/resources/var/james/config)
(revision 667971)
+@@ -17,12 +17,19 @@
+   specific language governing permissions and limitations      
+   under the License.                                           
+  -->
++<!--<!DOCTYPE config [-->
++<!--<!ENTITY listserverConfig SYSTEM "var/james/config/james-listmanager.xml">-->
++<!--<!ENTITY listserverStores SYSTEM "var/james/config/james-liststores.xml">-->
++<!--<!ENTITY fetchmailConfig SYSTEM "var/james/config/james-fetchmail.xml">-->
++<!--<!ENTITY jmsConfig SYSTEM "var/james/config/james-jms.xml">-->
++<!--<!ENTITY smtphandlerchainConfig SYSTEM "var/james/config/james-smtphandlerchain.xml">-->
++<!--]>-->
+ <!DOCTYPE config [
+-<!ENTITY listserverConfig SYSTEM "../conf/james-listmanager.xml">
+-<!ENTITY listserverStores SYSTEM "../conf/james-liststores.xml">
+-<!ENTITY fetchmailConfig SYSTEM "../conf/james-fetchmail.xml">
+-<!ENTITY jmsConfig SYSTEM "../conf/james-jms.xml">
+-<!ENTITY smtphandlerchainConfig SYSTEM "../conf/james-smtphandlerchain.xml">
++<!ENTITY listserverConfig SYSTEM "james-listmanager.xml">
++<!ENTITY listserverStores SYSTEM "james-liststores.xml">
++<!ENTITY fetchmailConfig SYSTEM "james-fetchmail.xml">
++<!ENTITY jmsConfig SYSTEM "james-jms.xml">
++<!ENTITY smtphandlerchainConfig SYSTEM "james-smtphandlerchain.xml">
+ ]>
+ 
+ <!--  Configuration file for the ASF James server -->
+@@ -41,7 +48,7 @@
+ <!-- For production use you will probably need to make more extensive changes, see -->
+ <!-- http://james.apache.org/server/2.3.0/ -->
+ 
+-<!-- $Revision: 602733 $ Committed on $Date: 2007-12-09 22:37:20 +0100 (Sun, 09 Dec 2007)
$ by: $Author: rdonkin $ -->
++<!-- $Revision$ Committed on $Date$ by: $Author: rdonkin $ -->
+ 
+ <config>
+    <James>
+@@ -128,6 +135,8 @@
+       <!-- will use the specified value. -->
+       <!-- Set the default helloName which is used in all services if not overridden
in the specific service-->
+       <helloName autodetect="true">myMailServer</helloName>
++       <!-- according to the James code the need for this might be a temporary hack -->
++       <configuration-directory>file://config</configuration-directory>
+    </James>
+ 
+     <!--
+@@ -140,6 +149,7 @@
+         </namespaces>
+         <factory
+             class="org.apache.james.mailboxmanager.torque.TorqueMailboxManagerFactory">
++                   <configFile>config/mailboxManagerSqlResources.xml</configFile>
+                    <torque-properties>
+                        <property name="torque.database.default"
+                            value="mailboxmanager"/>
+@@ -154,7 +164,7 @@
+                            value="org.apache.derby.jdbc.EmbeddedDriver"/>
+                        <property
+                            name="torque.dsfactory.mailboxmanager.connection.url"
+-                           value="jdbc:derby:../apps/james/var/mailboxmanager-derbydb;create=true"/>
++                           value="jdbc:derby:mailboxmanager-derbydb;create=true"/>
+                        <property
+                            name="torque.dsfactory.mailboxmanager.connection.user"
+                            value="app"/>
+@@ -529,7 +539,7 @@
+ 
+          <!-- Logs any messages to the repository specified -->
+          <mailet match="All" class="ToRepository">
+-            <repositoryPath> file://var/mail/error/</repositoryPath>
++            <repositoryPath> file://mail/error/</repositoryPath>
+             <!-- An alternative database repository example follows. -->
+             <!--
+             <repositoryPath> db://maildb/deadletter/error </repositoryPath>
+@@ -637,7 +647,7 @@
+          <!-- Attempt remote delivery using the specified repository for the spool, -->
+          <!-- using delay time to retry delivery and the maximum number of retries -->
+          <mailet match="All" class="RemoteDelivery">
+-            <outgoing> file://var/mail/outgoing/ </outgoing>
++            <outgoing> file://mail/outgoing/ </outgoing>
+             <!-- alternative database repository example below -->
+             <!--
+             <outgoing> db://maildb/spool/outgoing </outgoing>
+@@ -725,7 +735,7 @@
+          <!-- To log the message to a repository, this matcher/mailet configuration should
be uncommented. -->
+          <!-- This is the default configuration. -->
+          <mailet match="All" class="ToRepository">
+-            <repositoryPath>file://var/mail/spam/</repositoryPath>
++            <repositoryPath>file://mail/spam/</repositoryPath>
+ 
+             <!-- Changing the repositoryPath, as in this commented out example, will
-->
+             <!-- cause the mails to be stored in a database repository.  -->
+@@ -778,7 +788,7 @@
+          -->
+ 
+          <mailet match="All" class="ToRepository">
+-            <repositoryPath> file://var/mail/address-error/</repositoryPath>
++            <repositoryPath> file://mail/address-error/</repositoryPath>
+             <!-- An alternative database repository example follows. -->
+             <!--
+             <repositoryPath> db://maildb/deadletter/address-error </repositoryPath>
+@@ -804,7 +814,7 @@
+          -->
+ 
+          <mailet match="All" class="ToRepository">
+-            <repositoryPath>file://var/mail/relay-denied/</repositoryPath>
++            <repositoryPath>file://mail/relay-denied/</repositoryPath>
+             <!-- An alternative database repository example follows. -->
+             <!--
+             <repositoryPath> db://maildb/deadletter/relay-denied </repositoryPath>
+@@ -909,7 +919,8 @@
+    <!-- This is needed by the RemoteManager to enable the BayesianAnaylyzerManagement
commands --> 
+    <bayesiananalyzermanagement> 
+       <repositoryPath> db://maildb </repositoryPath>
+-   </bayesiananalyzermanagement>  
++      <sqlFile>config/sqlResources.xml</sqlFile>
++   </bayesiananalyzermanagement>
+     
+ 
+    <!-- The RemoteManager server is enabled by default -->
+@@ -953,7 +964,7 @@
+    <pop3server enabled="true">
+       <!-- port 995 is the well-known/IANA registered port for POP3S  ie over SSL/TLS
-->
+       <!-- port 110 is the well-known/IANA registered port for Standard POP3 -->
+-      <port>110</port>
++      <port>8110</port>
+ 
+       <!-- Uncomment this if you want to bind to a specific inetaddress -->
+       <!--
+@@ -982,7 +993,7 @@
+     <!-- but does not free as many resources as removing them would -->
+    <smtpserver enabled="true">
+       <!-- port 25 is the well-known/IANA registered port for SMTP -->
+-      <port>25</port>
++      <port>8025</port>
+ 
+       <!-- Uncomment this if you want to bind to a specific inetaddress -->
+       <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork -->
+@@ -1084,7 +1095,7 @@
+         service.  -->
+       <!-- port 563 is the well-known/IANA registered port for NNTP over SSL/TLS -->
+       <!-- port 119 is the well-known/IANA registered port for Standard NNTP -->
+-      <port>119</port>
++      <port>8119</port>
+ 
+       <!-- Uncomment this if you want to bind to a specific inetaddress -->
+       <!--
+@@ -1114,9 +1125,9 @@
+       <!-- If this is set to true, posting will be disallowed. -->
+       <readOnly>false</readOnly>
+ 
+-      <rootPath>file://var/nntp/groups</rootPath>
+-      <tempPath>file://var/nntp/temp</tempPath>
+-      <articleIDPath>file://var/nntp/articleid</articleIDPath>
++       <rootPath>file://nntp/groups</rootPath>
++       <tempPath>file://nntp/temp</tempPath>
++       <articleIDPath>file://nntp/articleid</articleIDPath>
+       <articleIDDomainSuffix>news.james.apache.org</articleIDDomainSuffix>
+ 
+       <!-- The news groups hosted in this NNTP repository. -->
+@@ -1133,7 +1144,7 @@
+ 
+       <spool>
+          <configuration>
+-            <spoolPath>file://var/nntp/spool</spoolPath>
++             <spoolPath>file://nntp/spool</spoolPath>
+             <!-- The number of threads that process spooler related tasks. -->
+             <threadCount>1</threadCount>
+             <!-- The spool thread(s) should idle for some time, if it has nothing to
do  -->
+@@ -1171,7 +1182,7 @@
+                <type>MAIL</type>
+             </types>
+             <config>
+-               <sqlFile>file://conf/mailboxManagerSqlResources.xml</sqlFile>
++               <sqlFile>file://config/mailboxManagerSqlResources.xml</sqlFile>
+             </config>
+          </repository>
+          <!-- File based repositories.  These repositories store all message data -->
+@@ -1205,7 +1216,7 @@
+                <type>MAIL</type>
+             </types>
+             <config>
+-               <sqlFile>file://conf/sqlResources.xml</sqlFile>
++               <sqlFile>file://config/sqlResources.xml</sqlFile>
+                <!-- Set the size threshold for in memory handling of storing operations
-->
+                <!-- Default is currently 409600000 due to a bug with mysql and binary
stream -->
+                <!-- currently under investigation. Please change this only if you know
what -->
+@@ -1224,7 +1235,7 @@
+                <type>SPOOL</type>
+             </types>
+             <config>
+-               <sqlFile>file://conf/sqlResources.xml</sqlFile>
++               <sqlFile>file://config/sqlResources.xml</sqlFile>
+                <maxcache>1000</maxcache>
+             </config>
+          </repository>
+@@ -1238,8 +1249,8 @@
+                <type>MAIL</type>
+             </types>
+             <config>
+-               <sqlFile>file://conf/sqlResources.xml</sqlFile>
+-               <filestore>file://var/dbmail</filestore>
++               <sqlFile>file://config/sqlResources.xml</sqlFile>
++               <filestore>file://dbmail</filestore>
+             </config>
+          </repository>
+ 
+@@ -1251,8 +1262,8 @@
+                <type>SPOOL</type>
+             </types>
+             <config>
+-               <sqlFile>file://conf/sqlResources.xml</sqlFile>
+-               <filestore>file://var/dbmail</filestore>
++               <sqlFile>file://config/sqlResources.xml</sqlFile>
++               <filestore>file://dbmail</filestore>
+                <maxcache>1000</maxcache>
+             </config>
+          </repository>
+@@ -1338,7 +1349,7 @@
+       <!-- The LocalUsers repository, for storing James' User info. -->
+       <!-- TEMPORARY DEFAULT: db using Derby  -->
+       <repository name="LocalUsers" class="org.apache.james.userrepository.JamesUsersJdbcRepository"
destinationURL="db://maildb/users">
+-         <sqlFile>file://conf/sqlResources.xml</sqlFile>
++         <sqlFile>file://config/sqlResources.xml</sqlFile>
+          <!-- Set whether user names are case sensitive or case insensitive -->
+          <ignoreCase>true</ignoreCase>
+          <!-- Set whether to enable local aliases -->
+@@ -1386,7 +1397,7 @@
+       <table name="DefaultVirtualUserTable" class="org.apache.james.vut.JDBCVirtualUserTable"
destinationURL="db://maildb/VirtualUserTable">
+          <recursiveMapping> true </recursiveMapping>
+          <mappingLimit> 10 </mappingLimit>
+-         <sqlFile>file://conf/sqlResources.xml</sqlFile>
++         <sqlFile>file://config/sqlResources.xml</sqlFile>
+       </table>
+    </virtualusertable-store>
+ 
+@@ -1415,7 +1426,7 @@
+       <!-- -->
+       <data-source name="maildb" class="org.apache.james.util.dbcp.JdbcDataSource">
+          <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+-         <dburl>jdbc:derby:../apps/james/var/derbydb;create=true</dburl>
++         <dburl>jdbc:derby:derbydb;create=true</dburl>
+          <user></user>
+          <password></password>
+          <poolPreparedStatements>true</poolPreparedStatements>
+
+Property changes on: james-config.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: james-listmanager.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: james-jms.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: james-liststores.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+Index: spring-beans.xml
+===================================================================
+--- spring-beans.xml	(.../james/server/trunk/spring-deployment/src/main/config/james)	(revision
667971)
++++ spring-beans.xml	(.../geronimo/plugins/james/trunk/james/src/main/resources/var/james/config)
(revision 667971)
+@@ -27,7 +27,9 @@
+          beans which replace Avalon specific container logic
+     -->
+ 
+-    <bean id="fileSystemOverride" class="org.apache.james.container.spring.adaptor.FileSystemBridge"/>
++    <bean id="fileSystemOverride" class="org.apache.geronimo.plugins.james.FileSystemBridge">
++        <property name="baseDir" value="var/james/"/>
++    </bean>
+          
+     <bean id="serviceManager" class="org.apache.james.container.spring.adaptor.DefaultServiceManagerFactory"
>
+         <property name="replacements">
+@@ -79,13 +81,14 @@
+ 
+ 
+     <bean id="configurationProvider" class="org.apache.james.container.spring.adaptor.AvalonConfigurationFileProvider"
>
+-        <property name="configurationResource" value="classpath:james-config.xml" />
++        <property name="configurationResource" value="config/james-config.xml" />
+         <property name="configurationInterceptors">
+             <list>
+                 <ref bean="stringRemapperConfigurationInterceptor" />
+                 <!--<ref bean="privilegedPortsConfigurationInterceptor" />-->
+             </list>
+         </property>
++        <property name="fileSystem" ref="fileSystemOverride"/>
+     </bean>
+ 
+     <bean id="avalonContext" class="org.apache.james.container.spring.adaptor.AvalonContext"
>
+
+Property changes on: spring-beans.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: james-fetchmail.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: sqlResources.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: log4j.properties
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/plain
+Name: svn:keywords
+   + Date Revision
+
+
+Property changes on: james-assembly.xml
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+Name: svn:mime-type
+   + text/xml
+Name: svn:keywords
+   + Date Revision
+
+Index: README
+===================================================================
+--- README	(.../james/server/trunk/spring-deployment/src/main/config/james)	(revision 0)
++++ README	(.../geronimo/plugins/james/trunk/james/src/main/resources/var/james/config)	(revision
667971)
+@@ -0,0 +1,2 @@
++The files in this directory are from
++https://svn.apache.org/repos/asf/james/server/trunk/spring-deployment/src/main/config/james
+\ No newline at end of file

Modified: geronimo/plugins/james/trunk/james/src/main/resources/var/james/config/README
URL: http://svn.apache.org/viewvc/geronimo/plugins/james/trunk/james/src/main/resources/var/james/config/README?rev=667975&r1=667974&r2=667975&view=diff
==============================================================================
--- geronimo/plugins/james/trunk/james/src/main/resources/var/james/config/README (original)
+++ geronimo/plugins/james/trunk/james/src/main/resources/var/james/config/README Sun Jun
15 10:05:34 2008
@@ -1,2 +1,5 @@
 The files in this directory are from
-https://svn.apache.org/repos/asf/james/server/trunk/spring-deployment/src/main/config/james
\ No newline at end of file
+https://svn.apache.org/repos/asf/james/server/trunk/spring-deployment/src/main/config/james
+
+See ../../../james-diff generated by running
+svn diff https://svn.apache.org/repos/asf/james/server/trunk/spring-deployment/src/main/config/james
https://svn.apache.org/repos/asf/geronimo/plugins/james/trunk/james/src/main/resources/var/james/config>james-diff



Mime
View raw message