Author: eric
Date: Wed Oct 19 20:10:10 2011
New Revision: 1186449

URL: http://svn.apache.org/viewvc?rev=1186449&view=rev
Log:
Move configuration files to the resources maven folder to be treated as part of 
the classpath (JAMESAPP-3)

Added:
    james/app/trunk/src/main/resources/META-INF/
      - copied from r1186443, james/app/trunk/src/main/config/james/META-INF/
    james/app/trunk/src/main/resources/dnsservice.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/dnsservice.xml
    james/app/trunk/src/main/resources/domainlist.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/domainlist.xml
    james/app/trunk/src/main/resources/fetchmail.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/fetchmail.xml
    james/app/trunk/src/main/resources/hbase-site.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/hbase-site.xml
    james/app/trunk/src/main/resources/imapserver.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/imapserver.xml
    james/app/trunk/src/main/resources/jcr-repository.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/jcr-repository.xml
    james/app/trunk/src/main/resources/jmx.properties
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/jmx.properties
    james/app/trunk/src/main/resources/lib/
      - copied from r1186443, james/app/trunk/src/main/config/james/lib/
    james/app/trunk/src/main/resources/lmtpserver.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/lmtpserver.xml
    james/app/trunk/src/main/resources/log4j.properties
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/log4j.properties
    james/app/trunk/src/main/resources/mailbox.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/mailbox.xml
    james/app/trunk/src/main/resources/mailetcontainer.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/mailetcontainer.xml
    james/app/trunk/src/main/resources/mailrepositorystore.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/mailrepositorystore.xml
    james/app/trunk/src/main/resources/pop3server.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/pop3server.xml
    james/app/trunk/src/main/resources/recipientrewritetable.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/recipientrewritetable.xml
    james/app/trunk/src/main/resources/smtpserver.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/smtpserver.xml
    james/app/trunk/src/main/resources/sqlResources.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/sqlResources.xml
    james/app/trunk/src/main/resources/usersrepository.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/usersrepository.xml
    james/app/trunk/src/main/resources/usersrepository23.xml
      - copied unchanged from r1186443, 
james/app/trunk/src/main/config/james/usersrepository23.xml
Removed:
    james/app/trunk/src/main/config/james/META-INF/
    james/app/trunk/src/main/config/james/dnsservice.xml
    james/app/trunk/src/main/config/james/domainlist.xml
    james/app/trunk/src/main/config/james/fetchmail.xml
    james/app/trunk/src/main/config/james/hbase-site.xml
    james/app/trunk/src/main/config/james/imapserver.xml
    james/app/trunk/src/main/config/james/jcr-repository.xml
    james/app/trunk/src/main/config/james/jmx.properties
    james/app/trunk/src/main/config/james/lib/
    james/app/trunk/src/main/config/james/lmtpserver.xml
    james/app/trunk/src/main/config/james/log4j.properties
    james/app/trunk/src/main/config/james/mailbox.xml
    james/app/trunk/src/main/config/james/mailetcontainer.xml
    james/app/trunk/src/main/config/james/mailrepositorystore.xml
    james/app/trunk/src/main/config/james/pop3server.xml
    james/app/trunk/src/main/config/james/recipientrewritetable.xml
    james/app/trunk/src/main/config/james/smtpserver.xml
    james/app/trunk/src/main/config/james/sqlResources.xml
    james/app/trunk/src/main/config/james/usersrepository.xml
    james/app/trunk/src/main/config/james/usersrepository23.xml
Modified:
    james/app/trunk/pom.xml
    james/app/trunk/src/assemble/app.xml

Modified: james/app/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/app/trunk/pom.xml?rev=1186449&r1=1186448&r2=1186449&view=diff
==============================================================================
--- james/app/trunk/pom.xml (original)
+++ james/app/trunk/pom.xml Wed Oct 19 20:10:10 2011
@@ -663,7 +663,7 @@
                 <configuration>
                     <webResources>
                         <resource>
-                            <directory>src/main/config/james</directory>
+                            <directory>src/main/resources</directory>
                             <!-- override the destination directory for this 
resource -->
                             <targetPath>WEB-INF/conf/</targetPath>
                             <excludes>
@@ -672,7 +672,7 @@
                             </excludes>
                         </resource>
                         <resource>
-                            <directory>src/main/config/james</directory>
+                            <directory>src/main/resources</directory>
                             <!-- override the destination directory for this 
resource -->
                             <targetPath>WEB-INF/classes/</targetPath>
                             <includes>

Modified: james/app/trunk/src/assemble/app.xml
URL: 
http://svn.apache.org/viewvc/james/app/trunk/src/assemble/app.xml?rev=1186449&r1=1186448&r2=1186449&view=diff
==============================================================================
--- james/app/trunk/src/assemble/app.xml (original)
+++ james/app/trunk/src/assemble/app.xml Wed Oct 19 20:10:10 2011
@@ -36,7 +36,7 @@
     </fileSet>
     <!-- include configs -->
     <fileSet>
-      <directory>src/main/config/james</directory>
+      <directory>src/main/resources</directory>
       <directoryMode>0755</directoryMode>
       <outputDirectory>conf</outputDirectory>
       <!-- set some sane security defaults for config files -->



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to