You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/01/06 13:10:49 UTC
svn commit: r896414 [1/4] - in /james/server/trunk: ./
avalon-guice-bridge-api/ avalon-socket-library/
avalon-socket-library/src/main/java/org/apache/james/socket/
avalon-socket-library/src/main/resources/org/ avalon-spring-bridge-library/
avalon-user-...
Author: norman
Date: Wed Jan 6 12:10:36 2010
New Revision: 896414
URL: http://svn.apache.org/viewvc?rev=896414&view=rev
Log:
Merge pure spring deployment from sandbox to trunk
Added:
james/server/trunk/MIGRATE.txt
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/MIGRATE.txt
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AbstractStore.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/avalon-user-function/src/main/java/org/apache/james/core/AbstractStore.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/UsersStoreImpl.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/avalon-user-function/src/main/java/org/apache/james/core/UsersStoreImpl.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/VirtualUserTableStoreImpl.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/avalon-user-function/src/main/java/org/apache/james/core/VirtualUserTableStoreImpl.java
james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/AbstractJSR250LoaderService.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/core-api/src/main/java/org/apache/james/api/kernel/AbstractJSR250LoaderService.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStore.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/core-function/src/main/java/org/apache/james/mailrepository/MailStore.java
james/server/trunk/spring-deployment/lib/
- copied from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/lib/
james/server/trunk/spring-deployment/src/assemble/
- copied from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/
james/server/trunk/spring-deployment/src/assemble/bin.xml
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/bin.xml
james/server/trunk/spring-deployment/src/assemble/src.xml
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/src.xml
james/server/trunk/spring-deployment/src/main/bin/
- copied from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/bin/
james/server/trunk/spring-deployment/src/main/bin/run.sh
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/bin/run.sh
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/AvalonConfigurationProvider.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/AvalonConfigurationProvider.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/ConfigurationProvider.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/ConfigurationProvider.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesServerApplicationContext.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/JamesServerApplicationContext.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/LogProvider.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/LogProvider.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/
- copied from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifeCycleBeanPostProcessor.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifeCycleBeanPostProcessor.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AvalonConfigurableBeanPostProcessor.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AvalonConfigurableBeanPostProcessor.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AvalonInitializableBeanPostProcessor.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AvalonInitializableBeanPostProcessor.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AvalonLogEnabledBeanPostProcessor.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AvalonLogEnabledBeanPostProcessor.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AvalonServiceableBeanPostProcessor.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AvalonServiceableBeanPostProcessor.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/CommonsConfigurableBeanPostProcessor.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/CommonsConfigurableBeanPostProcessor.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/JSR250LoaderService.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/JSR250LoaderService.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringLogProvider.java
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringLogProvider.java
james/server/trunk/stage/org.apache.activemq/poms/activemq-parent-4.1.1.pom
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/stage/org.apache.activemq/poms/activemq-parent-4.1.1.pom
james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/
james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/
james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-1.pom
james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-2.pom
james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-3.pom
james/server/trunk/stage/org.apache.jackrabbit/poms/jackrabbit-1.4.pom
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/stage/org.apache.jackrabbit/poms/jackrabbit-1.4.pom
james/server/trunk/stage/org.springframework/jars/spring-beans-2.5.6.jar
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-beans-2.5.6.jar
james/server/trunk/stage/org.springframework/jars/spring-context-2.5.6.jar
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-context-2.5.6.jar
james/server/trunk/stage/org.springframework/jars/spring-core-2.5.6.jar
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-core-2.5.6.jar
james/server/trunk/stage/org.springframework/poms/spring-beans-2.5.6.pom
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-beans-2.5.6.pom
james/server/trunk/stage/org.springframework/poms/spring-context-2.5.6.pom
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-context-2.5.6.pom
james/server/trunk/stage/org.springframework/poms/spring-core-2.5.6.pom
- copied unchanged from r896410, james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-core-2.5.6.pom
Removed:
james/server/trunk/avalon-guice-bridge-api/
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonSimpleConnectionManager.java
james/server/trunk/avalon-socket-library/src/main/resources/org/
james/server/trunk/avalon-spring-bridge-library/
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AbstractAvalonStore.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AbstractGuiceStore.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonVirtualUserTableStore.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/GuiceUsersStore.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/GuiceVirtualUserTableStore.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/AvalonJDBCVirtualUserTable.java
james/server/trunk/avalon-user-function/src/main/resources/org/
james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/AvalonXMLVirtualUserTable.java
james/server/trunk/basic-user-function/src/main/resources/org/
james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/AvalonDNSServer.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractAvalonDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/AvalonJDBCDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/AvalonXMLDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStoreSpoolRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java
james/server/trunk/core-function/src/main/resources/org/
james/server/trunk/core-library/src/main/resources/org/
james/server/trunk/core-library/src/test/resources/org/
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/AvalonFetchScheduler.java
james/server/trunk/fetchmail-function/src/main/resources/org/
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/AvalonImapServer.java
james/server/trunk/imapserver-function/src/main/resources/org/
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonBayesianAnalyzerManagement.java
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonDomainListManagement.java
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonProcessorManagement.java
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonSpoolManagement.java
james/server/trunk/management-library/src/main/resources/org/
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/AvalonNNTPServer.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/AvalonNNTPRepository.java
james/server/trunk/nntpserver-function/src/main/resources/org/
james/server/trunk/nntpserver-function/src/test/java/org/apache/james/nntpserver/AvalonNNTPServerTest.java
james/server/trunk/phoenix-deployment/
james/server/trunk/phoenix-deployment-refactor/
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/AvalonPOP3Server.java
james/server/trunk/pop3server-function/src/main/resources/org/
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/AvalonPOP3ServerTest.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/AvalonRemoteManager.java
james/server/trunk/remotemanager-function/src/main/resources/org/
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/AvalonRemoteManagerTest.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/AvalonSMTPServer.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java
james/server/trunk/smtpserver-function/src/main/resources/org/
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AvalonAsyncSMTPServerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AvalonSMTPServerTest.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/AvalonJames.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractAvalonJamesLoader.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AvalonJamesMailetLoader.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AvalonJamesMatcherLoader.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AvalonJamesSpoolManager.java
james/server/trunk/spoolmanager-function/src/main/resources/org/
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/FakeLoaderService.java
james/server/trunk/spring-deployment/HOW-TO.txt
james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/
james/server/trunk/spring-deployment/stage/
james/server/trunk/spring-deployment/var/nntp/
james/server/trunk/stage/avalon-phoenix/
james/server/trunk/stage/com.google.code.guice/
james/server/trunk/stage/org.guiceyfruit/
james/server/trunk/stage/org.springframework/jars/spring-2.0.jar
james/server/trunk/stage/org.springframework/poms/spring-2.0.pom
james/server/trunk/stage/spice/
james/server/trunk/stage/spring-aopalliance/
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AvalonLocalJamesUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractAvalonVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonDefaultVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonVirtualUserTableManagement.java
james/server/trunk/user-library/src/main/resources/org/
Modified:
james/server/trunk/ (props changed)
james/server/trunk/avalon-socket-library/pom.xml
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SimpleConnectionManager.java
james/server/trunk/avalon-user-function/pom.xml
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
james/server/trunk/build-tools/common-build.xml
james/server/trunk/build-tools/delivery-smtp.mpt (props changed)
james/server/trunk/build-tools/deployment-build.xml
james/server/trunk/build-tools/function-build.xml
james/server/trunk/build-tools/imap-post-john-sieve.mpt (props changed)
james/server/trunk/build-tools/imap-prep-john-sieve.mpt (props changed)
james/server/trunk/build-tools/imap-sieve.mpt (props changed)
james/server/trunk/build-tools/john.smith.sieve (props changed)
james/server/trunk/build-tools/pop3-after-smtp.mpt (props changed)
james/server/trunk/build-tools/sieve-smtp.mpt (props changed)
james/server/trunk/build-tools/sieve.xsl (props changed)
james/server/trunk/build-tools/vut-pop3.mpt (props changed)
james/server/trunk/build-tools/vut-smtp.mpt (props changed)
james/server/trunk/build-tools/vut.xsl (props changed)
james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/ (props changed)
james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/LoaderService.java
james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Configurable.java
james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java
james/server/trunk/core-function/pom.xml
james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCSpoolRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
james/server/trunk/core-function/src/test/java/org/apache/james/dnsserver/DNSServerTest.java
james/server/trunk/core-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java
james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java
james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
james/server/trunk/core-library/src/main/java/org/apache/james/Constants.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java
james/server/trunk/fetchmail-function/pom.xml
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
james/server/trunk/imapserver-function/pom.xml
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java (props changed)
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java (contents, props changed)
james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/torque/DefaultMailboxManager.java (props changed)
james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/torque/DefaultUserManager.java (props changed)
james/server/trunk/imapserver-function/src/main/java/org/apache/james/user/impl/file/ (props changed)
james/server/trunk/imapserver-function/src/test/java/org/apache/james/user/impl/file/ (props changed)
james/server/trunk/include.properties
james/server/trunk/jcr-store/ (props changed)
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java
james/server/trunk/management-library/pom.xml
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/BayesianAnalyzerManagement.java
james/server/trunk/mina-socket-library/pom.xml
james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java
james/server/trunk/nntpserver-function/pom.xml
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPSpooler.java
james/server/trunk/nntpserver-function/src/test/java/org/apache/james/nntpserver/NNTPServerTest.java
james/server/trunk/pom.xml
james/server/trunk/pop3server-function/pom.xml
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
james/server/trunk/remotemanager-function/pom.xml
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerProtocolHandlerFactory.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/WelcomeHandler.java
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/MaxRcptHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SPFHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidSenderDomainHandler.java
james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandlerTest.java
james/server/trunk/smtpserver-function/pom.xml
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerMBeanImpl.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JDBCGreylistHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SpamAssassinHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/URIRBLHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptMX.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandlerFactory.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractSupportLoaderProtocolHandlerFactory.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java
james/server/trunk/spoolmanager-function/pom.xml
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractLoader.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesMailetLoader.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesMatcherLoader.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/StateAwareProcessorList.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java (props changed)
james/server/trunk/spoolmanager-function/src/main/resources/sieveConfig.xml (props changed)
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/JamesMailetLoaderTest.java
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java
james/server/trunk/spring-deployment/build.xml
james/server/trunk/spring-deployment/pom.xml
james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
james/server/trunk/spring-deployment/src/main/config/james/log4j.properties
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/Main.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java
james/server/trunk/stage/org.slf4j/jars/slf4j-log4j12-1.3.0.LICENSE (props changed)
james/server/trunk/stage/pom.xml
james/server/trunk/user-library/pom.xml
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java
Propchange: james/server/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -1 +1,2 @@
/james/server/sandbox/active/mina_experiments:824613-825114
+/james/server/sandbox/active/pure_spring_deployment:893986-896410
Modified: james/server/trunk/avalon-socket-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/pom.xml?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/pom.xml (original)
+++ james/server/trunk/avalon-socket-library/pom.xml Wed Jan 6 12:10:36 2010
@@ -94,23 +94,6 @@
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-thread-impl</artifactId>
<version>2.2.1</version>
Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java Wed Jan 6 12:10:36 2010
@@ -58,6 +58,8 @@
import org.apache.commons.logging.Log;
import org.apache.excalibur.thread.ThreadPool;
import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.FileSystem;
import org.apache.james.socket.api.ProtocolHandlerFactory;
import org.apache.james.socket.api.ProtocolServer;
@@ -69,7 +71,7 @@
* create using the ProtocolHandlerFactory.
*/
public class AvalonProtocolServer extends AbstractHandlerFactory
- implements ConnectionHandlerFactory, ObjectFactory, ProtocolServer {
+ implements ConnectionHandlerFactory, ObjectFactory, ProtocolServer, Configurable, LogEnabled {
/**
* The default value for the connection timeout.
@@ -244,7 +246,6 @@
return fSystem;
}
- @Resource(name="org.apache.commons.logging.Log")
public void setLog(Log logger) {
this.logger = logger;
setupLogger(this, new CommonsLogger(logger, getClass().getName()));
@@ -259,32 +260,8 @@
this.protocolHandlerFactory = protocolHandlerFactory;
}
- @Resource(name="org.apache.commons.configuration.Configuration")
- public void setConfiguration(HierarchicalConfiguration configuration) {
+ public void configure(HierarchicalConfiguration configuration) throws ConfigurationException{
this.configuration = configuration;
- }
-
- @Resource(name="thread-manager")
- public void setThreadManager(ThreadManager threadManager) {
- this.threadManager = threadManager;
- }
-
- @Resource(name="sockets")
- public void setSocketManager(SocketManager socketManager) {
- this.socketManager = socketManager;
- }
-
-
- /**
- * Subclasses should override this method todo any configuration tasks
- * @throws ConfigurationException
- */
- protected void onConfigure(HierarchicalConfiguration config) throws ConfigurationException {
-
- }
-
-
- private final void configure() throws ConfigurationException {
enabled = configuration.getBoolean("[@enabled]", true);
final Log logger = getLog();
if (!enabled) {
@@ -431,7 +408,29 @@
loadJCEProviders(configuration.configurationAt("startTLS"), getLog());
}
onConfigure(configuration);
+
+ }
+
+ @Resource(name="thread-manager")
+ public void setThreadManager(ThreadManager threadManager) {
+ this.threadManager = threadManager;
+ }
+
+ @Resource(name="sockets")
+ public void setSocketManager(SocketManager socketManager) {
+ this.socketManager = socketManager;
}
+
+
+ /**
+ * Subclasses should override this method todo any configuration tasks
+ * @throws ConfigurationException
+ */
+ protected void onConfigure(HierarchicalConfiguration config) throws ConfigurationException {
+
+ }
+
+
protected Log getLog() {
return logger;
@@ -494,9 +493,6 @@
serviceManager = new DefaultServiceManager();
}
- // parse configuration
- configure();
-
if (!isEnabled()) {
Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SimpleConnectionManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SimpleConnectionManager.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SimpleConnectionManager.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SimpleConnectionManager.java Wed Jan 6 12:10:36 2010
@@ -23,7 +23,6 @@
import java.net.ServerSocket;
import java.util.HashMap;
-import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.annotation.Resource;
@@ -31,16 +30,17 @@
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
import org.apache.excalibur.thread.ThreadPool;
+import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.LogEnabled;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.avalon.cornerstone.services.threads.ThreadManager;
-import org.apache.avalon.framework.container.ContainerUtil;
/**
* An implementation of ConnectionManager that supports configurable
* idle timeouts and a configurable value for the maximum number of
* client connections to a particular port.
*
*/
-public class SimpleConnectionManager implements JamesConnectionManager {
+public class SimpleConnectionManager implements JamesConnectionManager, LogEnabled, Configurable {
/**
* The default value for client socket idle timeouts. The
* Java default is 0, meaning no timeout. That's dangerous
@@ -88,28 +88,17 @@
*/
private volatile boolean disposed = false;
private Log logger;
- private HierarchicalConfiguration configuration;
-
+
@Resource(name="thread-manager")
public void setThreadManager(ThreadManager threadManager) {
this.threadManager = threadManager;
}
-
- @Resource(name="org.apache.commons.logging.Log")
public void setLog(Log logger) {
this.logger = logger;
}
-
- @Resource(name="org.apache.commons.configuration.Configuration")
- public void setConfiguration(HierarchicalConfiguration configuration) {
- this.configuration = configuration;
- }
-
-
- @PostConstruct
- public void init() throws Exception {
+ public void configure(HierarchicalConfiguration configuration) throws ConfigurationException{
timeout = configuration.getInt("idle-timeout", DEFAULT_SOCKET_TIMEOUT);
maxOpenConn = configuration.getInt("max-connections", DEFAULT_MAX_CONNECTIONS);
maxOpenConnPerIP = configuration.getInt("max-connections-per-ip", DEFAULT_MAX_CONNECTIONS_PER_IP);
@@ -139,9 +128,10 @@
logger.debug(
"The maximum number of simultaneously open connections is "
+ (maxOpenConn == 0 ? "unlimited" : Integer.toString(maxOpenConn)));
- }
+ }
}
+
/**
* Disconnects all the underlying ServerConnections
Modified: james/server/trunk/avalon-user-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/pom.xml?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/pom.xml (original)
+++ james/server/trunk/avalon-user-function/pom.xml Wed Jan 6 12:10:36 2010
@@ -61,11 +61,7 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
-
+
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java Wed Jan 6 12:10:36 2010
@@ -232,7 +232,7 @@
* the DataSourceSelector
*/
@Resource(name="database-connections")
- void setDatasources(DataSourceSelector datasources) {
+ public void setDatasources(DataSourceSelector datasources) {
m_datasources = datasources;
}
/**
@@ -242,7 +242,7 @@
* the new service
*/
@Resource(name="filesystem")
- void setFileSystem(FileSystem system) {
+ public void setFileSystem(FileSystem system) {
this.fileSystem = system;
}
@@ -260,9 +260,7 @@
* @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
@PostConstruct
- public void init() throws Exception {
- super.init();
-
+ public void init() throws Exception {
StringBuffer logBuffer = null;
if (getLogger().isDebugEnabled()) {
logBuffer = new StringBuffer(128).append(this.getClass().getName())
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java Wed Jan 6 12:10:36 2010
@@ -30,22 +30,11 @@
import java.sql.ResultSet;
import java.sql.SQLException;
-import javax.annotation.PostConstruct;
-
/**
* A Jdbc-backed UserRepository which handles User instances of the <CODE>DefaultJamesUser</CODE>
* class, or any superclass.
*/
public class JamesUsersJdbcRepository extends AbstractJdbcUsersRepository {
-
-
- // REMOVE ME!
- @PostConstruct
- @Override
- public void init() throws Exception {
- super.init();
- }
-
/**
* @see org.apache.james.userrepository.AbstractJdbcUsersRepository#readUserFromResultSet(java.sql.ResultSet)
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java Wed Jan 6 12:10:36 2010
@@ -83,7 +83,7 @@
protected void doConfigure( final HierarchicalConfiguration configuration )
throws ConfigurationException {
super.doConfigure(configuration);
- destination = configuration.getString( "destination/[@URL]" );
+ destination = configuration.getString( "destination.[@URL]" );
if (!destination.endsWith(urlSeparator)) {
destination += urlSeparator;
@@ -93,8 +93,6 @@
@PostConstruct
public void init()
throws Exception {
- super.init();
-
try {
//TODO Check how to remove this!
//prepare Configurations for object and stream repositories
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java Wed Jan 6 12:10:36 2010
@@ -136,7 +136,6 @@
@PostConstruct
public void init() throws Exception {
- super.init();
setDataSourceComponent((DataSourceComponent) datasources.select(dataSourceName));
StringBuffer logBuffer = null;
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java Wed Jan 6 12:10:36 2010
@@ -65,8 +65,8 @@
DefaultConfiguration configuration = new DefaultConfiguration("test");
configuration.setAttribute("destinationURL", "db://maildb/"+tableString);
configuration.addChild(new AttrValConfiguration("sqlFile","file://conf/sqlResources.xml"));
- res.setLogger(new SimpleLog("MockLog"));
- res.setConfiguration(new ConfigurationAdapter(configuration));
+ res.setLog(new SimpleLog("MockLog"));
+ res.configure(new ConfigurationAdapter(configuration));
res.init();
}
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java Wed Jan 6 12:10:36 2010
@@ -66,8 +66,8 @@
DefaultConfiguration configuration = new DefaultConfiguration("test");
configuration.setAttribute("destinationURL", "db://maildb/"+tableString);
configuration.addChild(new AttrValConfiguration("sqlFile","file://conf/sqlResources.xml"));
- res.setLogger(new SimpleLog("MockLog"));
- res.setConfiguration(new ConfigurationAdapter(configuration));
+ res.setLog(new SimpleLog("MockLog"));
+ res.configure(new ConfigurationAdapter(configuration));
res.init();
}
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java Wed Jan 6 12:10:36 2010
@@ -72,8 +72,8 @@
DefaultConfiguration configuration = new DefaultConfiguration("test");
configuration.setAttribute("destinationURL", "db://maildb/"+tableString);
configuration.addChild(new AttrValConfiguration("sqlFile","file://conf/sqlResources.xml"));
- res.setLogger(new SimpleLog("MockLog"));
- res.setConfiguration(new ConfigurationAdapter(configuration));
+ res.setLog(new SimpleLog("MockLog"));
+ res.configure(new ConfigurationAdapter(configuration));
res.init();
}
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java Wed Jan 6 12:10:36 2010
@@ -71,18 +71,18 @@
MockStore mockStore = new MockStore();
File_Persistent_Object_Repository file_Persistent_Object_Repository = new File_Persistent_Object_Repository();
file_Persistent_Object_Repository.setFileSystem(fs);
- file_Persistent_Object_Repository.setLogger(new SimpleLog("MockLog"));
+ file_Persistent_Object_Repository.setLog(new SimpleLog("MockLog"));
DefaultConfigurationBuilder defaultConfiguration22 = new DefaultConfigurationBuilder();
defaultConfiguration22.addProperty("[@destinationURL]", "file://target/var/users");
- file_Persistent_Object_Repository.setConfiguration(defaultConfiguration22);
+ file_Persistent_Object_Repository.configure(defaultConfiguration22);
file_Persistent_Object_Repository.init();
mockStore.add("OBJECT.users", file_Persistent_Object_Repository);
res.setStore(mockStore);
DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder("test");
- configuration.addProperty("destination/[@URL]", "file://target/var/users");
- res.setLogger(new SimpleLog("MockLog"));
- res.setConfiguration(configuration);
+ configuration.addProperty("destination.[@URL]", "file://target/var/users");
+ res.setLog(new SimpleLog("MockLog"));
+ res.configure(configuration);
res.init();
return res;
}
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java Wed Jan 6 12:10:36 2010
@@ -39,14 +39,14 @@
*/
protected AbstractVirtualUserTable getVirtalUserTable() throws ServiceException, ConfigurationException, Exception {
JDBCVirtualUserTable mr = new JDBCVirtualUserTable();
- mr.setLogger(new SimpleLog("MockLog"));
+ mr.setLog(new SimpleLog("MockLog"));
mr.setDataSourceSelector(Util.getDataSourceSelector());
mr.setDNSService(setUpDNSServer());
mr.setFileSystem(new MockFileSystem());
DefaultConfiguration defaultConfiguration = new DefaultConfiguration("ReposConf");
defaultConfiguration.setAttribute("destinationURL","db://maildb/VirtualUserTable");
defaultConfiguration.addChild(new AttrValConfiguration("sqlFile","file://conf/sqlResources.xml"));
- mr.setConfiguration(new ConfigurationAdapter(defaultConfiguration));
+ mr.configure(new ConfigurationAdapter(defaultConfiguration));
mr.init();
return mr;
}
Modified: james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java (original)
+++ james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java Wed Jan 6 12:10:36 2010
@@ -42,12 +42,6 @@
private List<String> domains;
private final static String WILDCARD = "*";
-
- // TODO: REMOVE ME!
- public void init() throws Exception {
- super.init();
- }
-
/**
* @see org.apache.james.impl.vut.AbstractVirtualUserTable#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration)
Modified: james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java (original)
+++ james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java Wed Jan 6 12:10:36 2010
@@ -40,7 +40,7 @@
protected AbstractVirtualUserTable getVirtalUserTable() throws Exception {
XMLVirtualUserTable mr = new XMLVirtualUserTable();
mr.setDNSService(setUpDNSServer());
- mr.setLogger(new SimpleLog("MockLog"));
+ mr.setLog(new SimpleLog("MockLog"));
return mr;
}
@@ -77,8 +77,7 @@
}
try {
- virtualUserTable.setConfiguration(new ConfigurationAdapter(defaultConfiguration));
- virtualUserTable.init();
+ virtualUserTable.configure(new ConfigurationAdapter(defaultConfiguration));
} catch (Exception e) {
if (mappings.size() > 0) {
return false;
@@ -119,8 +118,7 @@
}
try {
- virtualUserTable.setConfiguration(new ConfigurationAdapter(defaultConfiguration));
- virtualUserTable.init();
+ virtualUserTable.configure(new ConfigurationAdapter(defaultConfiguration));
} catch (Exception e) {
if (mappings.size() > 0) {
return false;
Modified: james/server/trunk/build-tools/common-build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/build-tools/common-build.xml?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/build-tools/common-build.xml (original)
+++ james/server/trunk/build-tools/common-build.xml Wed Jan 6 12:10:36 2010
@@ -235,15 +235,10 @@
<include name="${jackrabbit-commons.jar}"/>
<include name="${jackrabbit-rmi.jar}"/>
<include name="${jcr.jar}"/>
- <include name="${spring.jar}"/>
<include name="${log4j.jar}"/>
- <include name="${avalon-phoenix.jar}"/>
<include name="${jsr250.jar}"/>
<include name='${path.lib.james}/apache-james-imap*.jar'/>
<include name="${mina-core.jar}"/>
- <include name="${guice.jar}"/>
- <include name="${guiceyfruit-core.jar}"/>
-
</fileset>
</path>
<path id='classpath.jackrabbit.repo'>
Propchange: james/server/trunk/build-tools/delivery-smtp.mpt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -0,0 +1 @@
+/james/server/sandbox/active/pure_spring_deployment/build-tools/delivery-smtp.mpt:893986-896410
Modified: james/server/trunk/build-tools/deployment-build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/build-tools/deployment-build.xml?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/build-tools/deployment-build.xml (original)
+++ james/server/trunk/build-tools/deployment-build.xml Wed Jan 6 12:10:36 2010
@@ -52,27 +52,19 @@
<classpathentry combineaccessrules="false" kind='src' path='/imap-api'/>
<classpathentry combineaccessrules="false" kind="src" path="/user-api"/>
<classpathentry combineaccessrules="false" kind="src" path="/core-library"/>
- <classpathentry combineaccessrules="false" kind="src" path="/imap-codec-library"/>
- <classpathentry combineaccessrules="false" kind="src" path="/imap-command-library"/>
- <classpathentry combineaccessrules="false" kind="src" path="/imapmailbox-library"/>
- <classpathentry combineaccessrules="false" kind="src" path="/mordred-library"/>
<classpathentry combineaccessrules="false" kind="src" path="/user-library"/>
<classpathentry combineaccessrules="false" kind="src" path="/avalon-user-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/basic-user-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/experimental-activemq-function"/>
- <classpathentry combineaccessrules="false" kind="src" path="/experimental-seda-imap-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/fetchmail-function"/>
- <classpathentry combineaccessrules="false" kind="src" path="/imap-mailbox-processor-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/imapserver-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/jcr-store"/>
<classpathentry combineaccessrules="false" kind="src" path="/nntpserver-function"/>
- <classpathentry combineaccessrules="false" kind="src" path="/phoenix-deployment"/>
<classpathentry combineaccessrules="false" kind="src" path="/pop3server-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/remotemanager-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/smtpserver-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/spoolmanager-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/spring-deployment"/>
- <classpathentry combineaccessrules="false" kind="src" path="/torque-mailboxmanager-function"/>">
</dependencies>
</GenerateEclipseProject>
</target>
Modified: james/server/trunk/build-tools/function-build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/build-tools/function-build.xml?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/build-tools/function-build.xml (original)
+++ james/server/trunk/build-tools/function-build.xml Wed Jan 6 12:10:36 2010
@@ -52,11 +52,7 @@
<classpathentry combineaccessrules="false" kind='src' path='/imap-api'/>
<classpathentry combineaccessrules="false" kind="src" path="/user-api"/>
<classpathentry combineaccessrules="false" kind="src" path="/core-library"/>
- <classpathentry combineaccessrules="false" kind="src" path="/imap-codec-library"/>
- <classpathentry combineaccessrules="false" kind="src" path="/imap-command-library"/>
- <classpathentry combineaccessrules="false" kind="src" path="/imapmailbox-library"/>
- <classpathentry combineaccessrules="false" kind="src" path="/mordred-library"/>
- <classpathentry combineaccessrules="false" kind="src" path="/user-library"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/user-library"/>
</dependencies>
</GenerateEclipseProject>
</target>
Propchange: james/server/trunk/build-tools/imap-post-john-sieve.mpt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -0,0 +1 @@
+/james/server/sandbox/active/pure_spring_deployment/build-tools/imap-post-john-sieve.mpt:893986-896410
Propchange: james/server/trunk/build-tools/imap-prep-john-sieve.mpt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -0,0 +1 @@
+/james/server/sandbox/active/pure_spring_deployment/build-tools/imap-prep-john-sieve.mpt:893986-896410
Propchange: james/server/trunk/build-tools/imap-sieve.mpt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -0,0 +1 @@
+/james/server/sandbox/active/pure_spring_deployment/build-tools/imap-sieve.mpt:893986-896410
Propchange: james/server/trunk/build-tools/john.smith.sieve
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -0,0 +1 @@
+/james/server/sandbox/active/pure_spring_deployment/build-tools/john.smith.sieve:893986-896410
Propchange: james/server/trunk/build-tools/pop3-after-smtp.mpt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -0,0 +1 @@
+/james/server/sandbox/active/pure_spring_deployment/build-tools/pop3-after-smtp.mpt:893986-896410
Propchange: james/server/trunk/build-tools/sieve-smtp.mpt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -0,0 +1 @@
+/james/server/sandbox/active/pure_spring_deployment/build-tools/sieve-smtp.mpt:893986-896410
Propchange: james/server/trunk/build-tools/sieve.xsl
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -0,0 +1 @@
+/james/server/sandbox/active/pure_spring_deployment/build-tools/sieve.xsl:893986-896410
Propchange: james/server/trunk/build-tools/vut-pop3.mpt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -0,0 +1 @@
+/james/server/sandbox/active/pure_spring_deployment/build-tools/vut-pop3.mpt:893986-896410
Propchange: james/server/trunk/build-tools/vut-smtp.mpt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -0,0 +1 @@
+/james/server/sandbox/active/pure_spring_deployment/build-tools/vut-smtp.mpt:893986-896410
Propchange: james/server/trunk/build-tools/vut.xsl
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -0,0 +1 @@
+/james/server/sandbox/active/pure_spring_deployment/build-tools/vut.xsl:893986-896410
Propchange: james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -0,0 +1 @@
+/james/server/sandbox/active/pure_spring_deployment/core-api/src/main/java/org/apache/james/api/kernel:893986-896410
Modified: james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/LoaderService.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/LoaderService.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/LoaderService.java (original)
+++ james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/LoaderService.java Wed Jan 6 12:10:36 2010
@@ -19,19 +19,35 @@
package org.apache.james.api.kernel;
+import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.commons.logging.Log;
+
/**
* Loads instances of given types.
*/
public interface LoaderService {
-
+
/**
* Loads an instance of the given class.
* The load may elect to return a new instance
- * or reuse an existing one, as appropriate for the type.
+ * and use the logger and config for the lifecycle.
+ * Instances should - where appropriate - have dependencies injected.
+ * @param <T>
+ * @param type may be interface or concrete, not null
+ * @return an instance of the type
+ */
+
+ public <T>T load(Class<T> type, Log logger, HierarchicalConfiguration config);
+
+
+ /**
+ * Loads an instance of the given class.
+ * The load return a new instance
* Instances should - where appropriate - have dependencies injected.
* @param <T>
* @param type may be interface or concrete, not null
* @return an instance of the type
*/
+
public <T>T load(Class<T> type);
}
Modified: james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Configurable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Configurable.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Configurable.java (original)
+++ james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Configurable.java Wed Jan 6 12:10:36 2010
@@ -20,8 +20,8 @@
package org.apache.james.lifecycle;
-import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.HierarchicalConfiguration;
/**
* Classes which needs to access the configuration should implement this
@@ -30,11 +30,12 @@
public interface Configurable {
/**
- * Configure
+ * Configure the object. Be aware that no services are injected when this is called. If you need
+ * to access injected stuff do it in a method annotated with @PostConstruct
*
* @param config
* @throws ConfigurationException
*/
- public void configure(Configuration config) throws ConfigurationException;
+ public void configure(HierarchicalConfiguration config) throws ConfigurationException;
}
Modified: james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java (original)
+++ james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java Wed Jan 6 12:10:36 2010
@@ -19,17 +19,13 @@
package org.apache.james.api.kernel.mock;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Resource;
-
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.james.api.kernel.LoaderService;
+import org.apache.james.api.kernel.AbstractJSR250LoaderService;
-public class FakeLoader implements LoaderService, org.apache.avalon.framework.service.ServiceManager{
+public class FakeLoader extends AbstractJSR250LoaderService implements org.apache.avalon.framework.service.ServiceManager{
private final Map<String, Object> servicesByName;
private final Map<String, String> mappings = new HashMap<String, String>();
@@ -49,7 +45,8 @@
mappings.put("scheduler", "org.apache.avalon.cornerstone.services.scheduler.TimeScheduler");
mappings.put("database-connections", "org.apache.avalon.cornerstone.services.datasources.DataSourceSelector");
mappings.put("defaultvirtualusertable", "org.apache.james.api.vut.VirtualUserTable");
-
+ mappings.put("virtualusertablemanagement", "org.apache.james.api.vut.management.VirtualUserTableManagement");
+
mappings.put("spoolmanager", "org.apache.james.services.SpoolManager");
mappings.put("matcherpackages", "org.apache.james.transport.MatcherLoader");
mappings.put("mailetpackages", "org.apache.james.transport.MailetLoader");
@@ -59,16 +56,15 @@
mappings.put("spoolmanagement", "org.apache.james.management.SpoolManagementService");
mappings.put("bayesiananalyzermanagement", "org.apache.james.management.BayesianAnalyzerManagementService");
mappings.put("processormanagement", "org.apache.james.management.ProcessorManagementService");
- mappings.put("virtualusertablemanagement", "org.apache.james.api.vut.management.VirtualUserTableManagementService");
+ mappings.put("virtualusertablemanagementservice", "org.apache.james.api.vut.management.VirtualUserTableManagementService");
mappings.put("domainlistmanagement", "org.apache.james.management.DomainListManagementService");
mappings.put("nntp-repository", "org.apache.james.nntpserver.repository.NNTPRepository");
}
-
+
public Object get(String name) {
Object service = servicesByName.get(mapName(name));
- System.out.println("KEYS="+servicesByName.keySet().toString());
return service;
}
@@ -77,63 +73,41 @@
if(newName == null) {
newName = name;
}
- System.out.println("NEW=" + newName);
return newName;
}
- private void injectResources(Object resource) {
- final Method[] methods = resource.getClass().getMethods();
- for (Method method : methods) {
- final Resource resourceAnnotation = method.getAnnotation(Resource.class);
- if (resourceAnnotation != null) {
- final String name = resourceAnnotation.name();
- if (name == null) {
- // Unsupported
- } else {
- // Name indicates a service
- final Object service = get(name);
-
- System.out.println("SERVICE=" + service);
- if (service == null) {
- } else {
- try {
- Object[] args = {service};
- method.invoke(resource, args);
- } catch (IllegalAccessException e) {
- throw new RuntimeException("Injection failed", e);
- } catch (IllegalArgumentException e) {
- throw new RuntimeException("Injection failed", e);
- } catch (InvocationTargetException e) {
- throw new RuntimeException("Injection failed", e);
- }
- }
- }
- }
- }
- }
-
- public <T> T load(Class<T> type) {
- try {
- final T newInstance = type.newInstance();
- injectResources(newInstance);
- return newInstance;
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.avalon.framework.service.ServiceManager#hasService(java.lang.String)
+ */
public boolean hasService(String name) {
return servicesByName.containsKey(name);
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.avalon.framework.service.ServiceManager#lookup(java.lang.String)
+ */
public Object lookup(String name) throws ServiceException {
return servicesByName.get(name);
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.avalon.framework.service.ServiceManager#release(java.lang.Object)
+ */
public void release(Object service) {
}
public void put(String role, Object service) {
servicesByName.put(role, service);
}
+
+
+ @Override
+ protected Object getObjectForName(String name) {
+ return get(name);
+ }
}
Modified: james/server/trunk/core-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/pom.xml?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/core-function/pom.xml (original)
+++ james/server/trunk/core-function/pom.xml Wed Jan 6 12:10:36 2010
@@ -98,23 +98,7 @@
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-management-library</artifactId>
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java Wed Jan 6 12:10:36 2010
@@ -26,6 +26,8 @@
import org.apache.commons.logging.Log;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.dnsservice.TemporaryResolutionException;
+import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.LogEnabled;
import org.apache.mailet.HostAddress;
import org.xbill.DNS.ARecord;
import org.xbill.DNS.Cache;
@@ -62,7 +64,7 @@
* Provides DNS client functionality to services running
* inside James
*/
-public class DNSServer implements DNSService, DNSServerMBean {
+public class DNSServer implements DNSService, DNSServerMBean, LogEnabled, Configurable {
/**
* A resolver instance used to retrieve DNS records. This
@@ -125,19 +127,11 @@
private Log logger;
- @Resource(name="org.apache.commons.logging.Log")
- public void setLogger(Log logger) {
+ public void setLog(Log logger) {
this.logger = logger;
}
- @Resource(name="org.apache.commons.configuration.Configuration")
- public void setConfiguration(HierarchicalConfiguration configuration) {
- this.configuration = configuration;
- }
-
- @SuppressWarnings("unchecked")
- public void configure()
- throws ConfigurationException {
+ public void configure(HierarchicalConfiguration configuration) throws ConfigurationException{
final boolean autodiscover =
configuration.getBoolean( "autodiscover", true );
@@ -204,14 +198,12 @@
}
+
@PostConstruct
public void init()
throws Exception {
- logger.debug("DNSService init...");
-
- configure();
-
+ logger.debug("DNSService init...");
// If no DNS servers were configured, default to local host
if (dnsServers.isEmpty()) {
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java Wed Jan 6 12:10:36 2010
@@ -33,11 +33,12 @@
import org.apache.commons.logging.Log;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.domainlist.ManageableDomainList;
+import org.apache.james.lifecycle.LogEnabled;
/**
* All implementations of the DomainList interface should extends this abstract class
*/
-public abstract class AbstractDomainList implements ManageableDomainList {
+public abstract class AbstractDomainList implements ManageableDomainList, LogEnabled {
private DNSService dns;
private boolean autoDetect = true;
private boolean autoDetectIP = true;
@@ -49,8 +50,7 @@
}
- @Resource(name="org.apache.commons.logging.Log")
- public void setLogger(Log logger) {
+ public void setLog(Log logger) {
this.logger = logger;
}
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java Wed Jan 6 12:10:36 2010
@@ -37,6 +37,7 @@
import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.services.FileSystem;
@@ -69,9 +70,8 @@
private HierarchicalConfiguration configuration;
- @Resource(name="org.apache.commons.configuration.Configuration")
- public void setConfiguration(HierarchicalConfiguration configuration) {
- this.configuration = configuration;
+ public void configure(Configuration configuration) throws ConfigurationException{
+ this.configuration = (HierarchicalConfiguration)configuration;
}
public void setDataSourceComponent(DataSourceComponent dataSourceComponent) {
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java Wed Jan 6 12:10:36 2010
@@ -30,39 +30,32 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.james.lifecycle.Configurable;
/**
* Mimic the old behavoir of JAMES
*/
-public class XMLDomainList extends AbstractDomainList {
+public class XMLDomainList extends AbstractDomainList implements Configurable{
private List<String> domainNames = null;
private boolean managementDisabled = false;
-
- private HierarchicalConfiguration configuration;
-
- @Resource(name="org.apache.commons.configuration.Configuration")
- public void setConfiguration(HierarchicalConfiguration configuration) {
- this.configuration = configuration;
- }
-
- @PostConstruct
- public void init() throws Exception {
- configure();
- }
-
- @SuppressWarnings("unchecked")
- protected void configure() throws ConfigurationException {
- List<String> serverNameConfs = configuration.getList( "domainnames.domainname" );
- for ( int i = 0; i < serverNameConfs.size(); i++ ) {
- addDomainInternal( serverNameConfs.get(i));
- }
- setAutoDetect(configuration.getBoolean("autodetect", true));
- setAutoDetectIP(configuration.getBoolean("autodetectIP", true));
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
+ */
+ public void configure(HierarchicalConfiguration config) throws ConfigurationException {
+ List<String> serverNameConfs = config.getList( "domainnames.domainname" );
+ for ( int i = 0; i < serverNameConfs.size(); i++ ) {
+ addDomainInternal( serverNameConfs.get(i));
+ }
+ setAutoDetect(config.getBoolean("autodetect", true));
+ setAutoDetectIP(config.getBoolean("autodetectIP", true));
}
+
+
/**
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java Wed Jan 6 12:10:36 2010
@@ -25,6 +25,8 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
+import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.MailRepository;
import org.apache.james.util.Lock;
import org.apache.mailet.Mail;
@@ -40,7 +42,7 @@
/**
* This class represent an AbstractMailRepository. All MailRepositories should extend this class.
*/
-public abstract class AbstractMailRepository implements MailRepository {
+public abstract class AbstractMailRepository implements MailRepository, LogEnabled, Configurable {
/**
* Whether 'deep debugging' is turned on.
@@ -57,10 +59,8 @@
private Log logger;
- private HierarchicalConfiguration configuration;
- @Resource(name="org.apache.commons.logging.Log")
- public void setLogger(Log logger) {
+ public void setLog(Log logger) {
this.logger = logger;
}
@@ -68,9 +68,8 @@
return logger;
}
- @Resource(name="org.apache.commons.configuration.Configuration")
- public void setConfiguration(HierarchicalConfiguration configuration) {
- this.configuration = configuration;
+ public void configure(HierarchicalConfiguration configuration) throws ConfigurationException{
+ doConfigure(configuration);
}
/**
@@ -172,10 +171,6 @@
}
}
- @PostConstruct
- public void init() throws Exception {
- doConfigure(configuration);
- }
/**
* @see #store(Mail)
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/FileMailRepository.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/FileMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/FileMailRepository.java Wed Jan 6 12:10:36 2010
@@ -92,7 +92,6 @@
@PostConstruct
public void init()
throws Exception {
- super.init();
try {
objectRepository = (ObjectRepository) selectRepository(store, "OBJECT");
streamRepository = (StreamRepository) selectRepository(store, "STREAM");
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java Wed Jan 6 12:10:36 2010
@@ -139,6 +139,10 @@
private FileSystem fileSystem;
+ private String filestore;
+
+ private String destination;
+
@Resource(name="database-connections")
public void setDatasources(DataSourceSelector datasources) {
this.datasources = datasources;
@@ -155,7 +159,7 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug(this.getClass().getName() + ".configure()");
}
- String destination = configuration.getString("[@destinationURL]");
+ destination = configuration.getString("[@destinationURL]");
// normalize the destination, to simplify processing.
if ( ! destination.endsWith("/") ) {
@@ -216,8 +220,30 @@
inMemorySizeLimit = configuration.getInt("inMemorySizeLimit", 409600000);
- String filestore = configuration.getString("filestore", null);
+ filestore = configuration.getString("filestore", null);
sqlFileName = configuration.getString("sqlFile");
+
+
+ }
+
+
+ /**
+ * Initialises the JDBC repository.
+ * 1) Tests the connection to the database.
+ * 2) Loads SQL strings from the SQL definition file,
+ * choosing the appropriate SQL for this connection,
+ * and performing paramter substitution,
+ * 3) Initialises the database with the required tables, if necessary.
+ *
+ * @throws Exception if an error occurs
+ */
+ @PostConstruct
+ public void init() throws Exception {
+ StringBuffer logBuffer = null;
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug(this.getClass().getName() + ".initialize()");
+ }
+
try {
if (filestore != null) {
@@ -236,40 +262,18 @@
}
if (getLogger().isDebugEnabled()) {
- StringBuffer logBuffer =
+ StringBuffer logBuf =
new StringBuffer(128)
.append(this.getClass().getName())
.append(" created according to ")
.append(destination);
- getLogger().debug(logBuffer.toString());
+ getLogger().debug(logBuf.toString());
}
} catch (Exception e) {
final String message = "Failed to retrieve Store component:" + e.getMessage();
getLogger().error(message, e);
throw new ConfigurationException(message, e);
}
-
- }
-
-
- /**
- * Initialises the JDBC repository.
- * 1) Tests the connection to the database.
- * 2) Loads SQL strings from the SQL definition file,
- * choosing the appropriate SQL for this connection,
- * and performing paramter substitution,
- * 3) Initialises the database with the required tables, if necessary.
- *
- * @throws Exception if an error occurs
- */
- @PostConstruct
- public void init() throws Exception {
- super.init();
-
- StringBuffer logBuffer = null;
- if (getLogger().isDebugEnabled()) {
- getLogger().debug(this.getClass().getName() + ".initialize()");
- }
theJDBCUtil =
new JDBCUtil() {
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCSpoolRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCSpoolRepository.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCSpoolRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCSpoolRepository.java Wed Jan 6 12:10:36 2010
@@ -32,8 +32,6 @@
import java.sql.SQLException;
import java.util.LinkedList;
-import javax.annotation.PostConstruct;
-
/**
* Implementation of a SpoolRepository on a database.
*
@@ -119,12 +117,6 @@
super.doConfigure(conf);
maxPendingMessages = conf.getInt("config.maxcache",1000);
}
-
- @PostConstruct
- public void init() throws Exception {
- super.init();
- }
-
/**
* @see org.apache.james.services.SpoolRepository#accept()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org