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 ie...@apache.org on 2013/03/01 00:31:42 UTC
svn commit: r1451435 [1/9] - in /james/server/trunk: ./ app/
app/src/assemble/ app/src/reporting-site/
cli/src/main/java/org/apache/james/cli/
cli/src/main/java/org/apache/james/cli/probe/impl/
core/src/main/java/org/apache/james/core/ data/data-api/sr...
Author: ieugen
Date: Thu Feb 28 23:31:36 2013
New Revision: 1451435
URL: http://svn.apache.org/r1451435
Log:
Code analisys improvements (Intellij Idea) part of JAMES-1220
* redundant code removal
* for-each transforamations
* 'final' attribute added
* fixed some Thread locking issues - avoid locking on non-final objects and also on method objects
* added a lot of @Override's
Added:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/Patterns.java
Modified:
james/server/trunk/.gitignore
james/server/trunk/app/pom.xml
james/server/trunk/app/src/assemble/app.xml
james/server/trunk/app/src/reporting-site/site.xml
james/server/trunk/cli/src/main/java/org/apache/james/cli/ServerCmd.java
james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java
james/server/trunk/core/src/main/java/org/apache/james/core/MailImpl.java
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java
james/server/trunk/data/data-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java
james/server/trunk/data/data-file/pom.xml
james/server/trunk/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java
james/server/trunk/data/data-file/src/main/java/org/apache/james/rrt/file/XMLRecipientRewriteTable.java
james/server/trunk/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
james/server/trunk/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
james/server/trunk/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
james/server/trunk/data/data-hbase/pom.xml
james/server/trunk/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
james/server/trunk/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java
james/server/trunk/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java
james/server/trunk/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
james/server/trunk/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java
james/server/trunk/data/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java
james/server/trunk/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
james/server/trunk/data/data-jcr/pom.xml
james/server/trunk/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
james/server/trunk/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
james/server/trunk/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
james/server/trunk/data/data-jcr/src/test/java/org/apache/james/user/jcr/JcrUserRepositoryTest.java
james/server/trunk/data/data-jdbc/pom.xml
james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
james/server/trunk/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
james/server/trunk/data/data-jpa/pom.xml
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
james/server/trunk/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
james/server/trunk/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java
james/server/trunk/data/data-ldap/pom.xml
james/server/trunk/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPGroupRestriction.java
james/server/trunk/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUser.java
james/server/trunk/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
james/server/trunk/data/data-library/pom.xml
james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/util/DigestUtil.java
james/server/trunk/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java
james/server/trunk/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
james/server/trunk/data/data-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java
james/server/trunk/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
james/server/trunk/data/data-library/src/test/java/org/apache/james/rrt/lib/mock/MockRecipientRewriteTableManagementImpl.java
james/server/trunk/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
james/server/trunk/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java
james/server/trunk/data/data-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java
james/server/trunk/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java
james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml
james/server/trunk/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java
james/server/trunk/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java
james/server/trunk/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java
james/server/trunk/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet4Network.java
james/server/trunk/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java
james/server/trunk/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/netmatcher/NetMatcher.java
james/server/trunk/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
james/server/trunk/filesystem-api/src/main/java/org/apache/james/filesystem/api/SieveFileRepository.java
james/server/trunk/filesystem-api/src/test/java/org/apache/james/filesystem/api/SieveFileRepositoryTestCase.java
james/server/trunk/karaf/distribution/src/main/assembly/unix.xml
james/server/trunk/karaf/integration/pom.xml
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerLiveTest.java
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirStoreUtil.java
james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java
james/server/trunk/mailetcontainer-camel/pom.xml
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherMailetPair.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessorTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractNotify.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTableMailet.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDeliverySocketFactory.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java
james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
james/server/trunk/pom.xml
james/server/trunk/protocols/protocols-imap4/pom.xml
james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java
james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java
james/server/trunk/protocols/protocols-library/pom.xml
james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/POP3BeforeSMTPHelper.java
james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java
james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java
james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java
james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java
james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/ConnectionCountHandler.java
james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java
james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
james/server/trunk/protocols/protocols-lmtp/pom.xml
james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java
james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
james/server/trunk/protocols/protocols-pop3/pom.xml
james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java
james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java
james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java
james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
james/server/trunk/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
james/server/trunk/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
james/server/trunk/protocols/protocols-smtp/pom.xml
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMatcherConfig.java
james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java
james/server/trunk/queue/queue-activemq/pom.xml
james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java
james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java
james/server/trunk/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
james/server/trunk/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
james/server/trunk/queue/queue-file/pom.xml
james/server/trunk/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
james/server/trunk/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java
james/server/trunk/queue/queue-jms/pom.xml
james/server/trunk/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
james/server/trunk/queue/queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java
james/server/trunk/queue/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/AbstractLoaderBeanFactory.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ConfigurationBeanFactoryPostProcessor.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagement.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/resource/AbstractJamesResourceLoader.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
james/server/trunk/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java
james/server/trunk/util/src/main/java/org/apache/james/util/TimeConverter.java
james/server/trunk/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
james/server/trunk/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java
james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java
james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/NamedThreadFactory.java
james/server/trunk/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java
james/server/trunk/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java
james/server/trunk/util/src/main/java/org/apache/james/util/retry/api/ExceptionRetryingProxy.java
james/server/trunk/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java
james/server/trunk/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java
james/server/trunk/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
james/server/trunk/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java
james/server/trunk/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
james/server/trunk/util/src/main/java/org/apache/james/util/sql/SqlResources.java
james/server/trunk/util/src/test/java/org/apache/james/util/retry/DoublingRetryScheduleTest.java
james/server/trunk/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
james/server/trunk/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
Modified: james/server/trunk/.gitignore
URL: http://svn.apache.org/viewvc/james/server/trunk/.gitignore?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/.gitignore (original)
+++ james/server/trunk/.gitignore Thu Feb 28 23:31:36 2013
@@ -3,3 +3,4 @@ target
*.iml
*.log
var/
+log/
Modified: james/server/trunk/app/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/app/pom.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/app/pom.xml (original)
+++ james/server/trunk/app/pom.xml Thu Feb 28 23:31:36 2013
@@ -1009,186 +1009,6 @@
</dependency>
</dependencies>
</profile>
-
- <profile>
- <id>make-deb</id>
- <build>
- <!-- copy resources and filter properties -->
- <resources>
- <resource>
- <directory>src/debian/control</directory>
- <filtering>true</filtering>
- <includes>
- <include>*</include>
- </includes>
- <targetPath>${project.build.directory}/debian/control</targetPath>
- </resource>
- <resource>
- <directory>src/main/app</directory>
- <targetPath>${project.build.directory}/${project.artifactId}</targetPath>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <targetPath>${project.build.directory}/${project.artifactId}/conf</targetPath>
- <includes>
- <include>**/*.*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>jdeb</artifactId>
- <groupId>org.vafer</groupId>
- <version>0.9</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>jdeb</goal>
- </goals>
- <configuration>
- <deb>${project.build.directory}/${project.artifactId}_${project.version}_all.deb
- </deb>
-
- <dataSet>
- <!-- all files and dirs -->
- <data>
- <src>${project.build.directory}/${project.artifactId}</src>
- <type>directory</type>
- <includes>**/*</includes>
- <mapper>
- <type>directory</type>
- <prefix>/usr/share/${project.artifactId}</prefix>
- </mapper>
- <mapper>
- <type>perm</type>
- <prefix>/usr/share/${project.artifactId}</prefix>
- <filemode>755</filemode>
- </mapper>
- </data>
- <!-- add the generated jsw daemon and binaries -->
- <data>
- <src>${project.build.directory}/appassembler/bin</src>
- <type>directory</type>
- <includes>**/*</includes>
- <mapper>
- <type>directory</type>
- <prefix>/usr/share/${project.artifactId}/bin</prefix>
- </mapper>
- <mapper>
- <type>perm</type>
- <prefix>/usr/share/${project.artifactId}/bin</prefix>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>${project.build.directory}/appassembler/jsw/james/bin</src>
- <type>directory</type>
- <includes>**/*</includes>
- <mapper>
- <type>directory</type>
- <prefix>/usr/share/${project.artifactId}/bin</prefix>
- </mapper>
- <mapper>
- <type>perm</type>
- <prefix>/usr/share/${project.artifactId}/bin</prefix>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>${project.build.directory}/appassembler/jsw/james/lib</src>
- <type>directory</type>
- <includes>**/*</includes>
- <excludes>libwrapper*</excludes>
- <mapper>
- <type>directory</type>
- <prefix>/usr/share/${project.artifactId}/lib</prefix>
- </mapper>
- <mapper>
- <type>perm</type>
- <prefix>/usr/share/${project.artifactId}/lib</prefix>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>${project.build.directory}/appassembler/jsw/james/lib</src>
- <type>directory</type>
- <includes>libwrapper*</includes>
- <mapper>
- <type>directory</type>
- <prefix>/usr/share/${project.artifactId}/bin</prefix>
- </mapper>
- <mapper>
- <type>perm</type>
- <prefix>/usr/share/${project.artifactId}/bin</prefix>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>${project.build.directory}/appassembler/jsw/james/conf</src>
- <type>directory</type>
- <includes>**/*</includes>
- <mapper>
- <type>directory</type>
- <prefix>/usr/share/${project.artifactId}/conf</prefix>
- </mapper>
- <mapper>
- <type>perm</type>
- <prefix>/usr/share/${project.artifactId}/conf</prefix>
- <filemode>755</filemode>
- </mapper>
- </data>
- <!-- package documentation files (realease info, install, no javadoc) -->
- <data>
- <src>${project.basedir}</src>
- <type>directory</type>
- <includes>README.txt,README.crypto,NOTICE</includes>
- <mapper>
- <type>directory</type>
- <prefix>/usr/share/doc/${project.artifactId}</prefix>
- </mapper>
- <mapper>
- <type>perm</type>
- <prefix>/usr/share/doc/${project.artifactId}</prefix>
- <filemode>644</filemode>
- </mapper>
- </data>
- <data>
- <src>${project.build.directory}/debian/control/copyright</src>
- <type>file</type>
- <mapper>
- <type>file</type>
- <prefix>/</prefix>
- </mapper>
- <mapper>
- <type>perm</type>
- <prefix>/usr/share/doc/${project.artifactId}</prefix>
- <filemode>644</filemode>
- </mapper>
- </data>
- <!-- libs -->
- <data>
- <src>${project.build.directory}/appassembler/lib</src>
- <type>directory</type>
- <mapper>
- <type>directory</type>
- <prefix>/usr/share/${project.artifactId}/lib</prefix>
- </mapper>
- <mapper>
- <type>perm</type>
- <prefix>/usr/share/${project.artifactId}/lib</prefix>
- <filemode>644</filemode>
- </mapper>
- </data>
- </dataSet>
- <controlDir>${project.build.directory}/debian/control</controlDir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Modified: james/server/trunk/app/src/assemble/app.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/app/src/assemble/app.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/app/src/assemble/app.xml (original)
+++ james/server/trunk/app/src/assemble/app.xml Thu Feb 28 23:31:36 2013
@@ -1,171 +1,174 @@
-<assembly>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied.
-
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
- <id>app</id>
-
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
-
- <fileSets>
- <!-- include txt files -->
- <fileSet>
- <directory>.</directory>
- <directoryMode>0755</directoryMode>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>README*</include>
- </includes>
- </fileSet>
- <!-- include configs -->
- <fileSet>
- <directory>src/main/resources</directory>
- <directoryMode>0755</directoryMode>
- <outputDirectory>conf</outputDirectory>
- <!-- set some sane security defaults for config files -->
- <fileMode>0600</fileMode>
- </fileSet>
-
- <!-- create empty folders by copy a .dummy file -->
- <fileSet>
- <directory>.</directory>
- <directoryMode>0755</directoryMode>
- <outputDirectory>log</outputDirectory>
- <includes>
- <include>.dummy</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/app/var</directory>
- <outputDirectory>var</outputDirectory>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>src/main/app/sieve</directory>
- <outputDirectory>var</outputDirectory>
- <directoryMode>0755</directoryMode>
- </fileSet>
-
- <fileSet>
- <directory>src/main/app/lib</directory>
- <outputDirectory>lib</outputDirectory>
- <directoryMode>0755</directoryMode>
- </fileSet>
-
- <!-- include stuff from appassembler -->
- <fileSet>
- <directory>target/appassembler/lib</directory>
- <outputDirectory>lib</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0600</fileMode>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/appassembler/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <lineEnding>dos</lineEnding>
- <includes>
- <include>*.bat</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/appassembler/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- <lineEnding>unix</lineEnding>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>src/main/app/bin/</directory>
- <outputDirectory>bin</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <lineEnding>dos</lineEnding>
- <includes>
- <include>*.bat</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/app/bin/</directory>
- <outputDirectory>bin</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- <lineEnding>unix</lineEnding>
- <includes>
- <include>setenv.sh</include>
- </includes>
- </fileSet>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>app</id>
+
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+
+ <fileSets>
+ <!-- include txt files -->
+ <fileSet>
+ <directory>.</directory>
+ <directoryMode>0755</directoryMode>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README*</include>
+ </includes>
+ </fileSet>
+ <!-- include configs -->
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <directoryMode>0755</directoryMode>
+ <outputDirectory>conf</outputDirectory>
+ <!-- set some sane security defaults for config files -->
+ <fileMode>0600</fileMode>
+ </fileSet>
+
+ <!-- create empty folders by copy a .dummy file -->
+ <fileSet>
+ <directory>.</directory>
+ <directoryMode>0755</directoryMode>
+ <outputDirectory>log</outputDirectory>
+ <includes>
+ <include>.dummy</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/app/var</directory>
+ <outputDirectory>var</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/app/sieve</directory>
+ <outputDirectory>var</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+
+ <fileSet>
+ <directory>src/main/app/lib</directory>
+ <outputDirectory>lib</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+
+ <!-- include stuff from appassembler -->
+ <fileSet>
+ <directory>target/appassembler/lib</directory>
+ <outputDirectory>lib</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0600</fileMode>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/appassembler/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ <includes>
+ <include>*.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/appassembler/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>src/main/app/bin/</directory>
+ <outputDirectory>bin</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ <includes>
+ <include>*.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/app/bin/</directory>
+ <outputDirectory>bin</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ <includes>
+ <include>setenv.sh</include>
+ </includes>
+ </fileSet>
+
<!-- include stuff from appassembler daemons-->
- <fileSet>
- <directory>target/appassembler/jsw/james/lib</directory>
- <outputDirectory>lib</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>target/appassembler/jsw/james/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <directoryMode>0755</directoryMode>
- <!-- set some sane security defaults for config files -->
- <fileMode>0600</fileMode>
- </fileSet>
- <fileSet>
- <directory>target/appassembler/jsw/james/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- <includes>
- <include>*.bat</include>
- <include>*.exe</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/appassembler/jsw/james/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- </fileSet>
- </fileSets>
- <files>
- <file>
- <source>src/main/licensing/app/notice-for-binary.txt</source>
- <outputDirectory>/</outputDirectory>
- <fileMode>0644</fileMode>
- <destName>NOTICE</destName>
- <lineEnding>crlf</lineEnding>
- </file>
- <file>
- <source>src/main/licensing/app/license-for-binary.txt</source>
- <outputDirectory>/</outputDirectory>
- <fileMode>0644</fileMode>
- <destName>LICENSE</destName>
- <lineEnding>crlf</lineEnding>
- </file>
- </files>
+ <fileSet>
+ <directory>target/appassembler/jsw/james/lib</directory>
+ <outputDirectory>lib</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/appassembler/jsw/james/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <!-- set some sane security defaults for config files -->
+ <fileMode>0600</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/appassembler/jsw/james/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ <includes>
+ <include>*.bat</include>
+ <include>*.exe</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/appassembler/jsw/james/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>src/main/licensing/app/notice-for-binary.txt</source>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>0644</fileMode>
+ <destName>NOTICE</destName>
+ <lineEnding>crlf</lineEnding>
+ </file>
+ <file>
+ <source>src/main/licensing/app/license-for-binary.txt</source>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>0644</fileMode>
+ <destName>LICENSE</destName>
+ <lineEnding>crlf</lineEnding>
+ </file>
+ </files>
</assembly>
Modified: james/server/trunk/app/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/app/src/reporting-site/site.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/app/src/reporting-site/site.xml (original)
+++ james/server/trunk/app/src/reporting-site/site.xml Thu Feb 28 23:31:36 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Modified: james/server/trunk/cli/src/main/java/org/apache/james/cli/ServerCmd.java
URL: http://svn.apache.org/viewvc/james/server/trunk/cli/src/main/java/org/apache/james/cli/ServerCmd.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/cli/src/main/java/org/apache/james/cli/ServerCmd.java (original)
+++ james/server/trunk/cli/src/main/java/org/apache/james/cli/ServerCmd.java Thu Feb 28 23:31:36 2013
@@ -45,10 +45,9 @@ public class ServerCmd {
private static final String PORT_OPT_LONG = "port";
private static final String PORT_OPT_SHORT = "p";
private static final int defaultPort = 9999;
- private static Options options = null;
+ private static final Options options = new Options();
static {
- options = new Options();
Option optHost = new Option(HOST_OPT_SHORT, HOST_OPT_LONG, true, "node hostname or ip address");
optHost.setRequired(true);
options.addOption(optHost);
Modified: james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java
URL: http://svn.apache.org/viewvc/james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java (original)
+++ james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java Thu Feb 28 23:31:36 2013
@@ -61,7 +61,7 @@ public class JmxServerProbe implements S
* @param port TCP port of the remote JMX agent
* @throws IOException on connection failures
*/
- public JmxServerProbe(String host, int port) throws IOException, InterruptedException {
+ public JmxServerProbe(String host, int port) throws IOException {
this.host = host;
this.port = port;
connect();
@@ -73,7 +73,7 @@ public class JmxServerProbe implements S
* @param host hostname or IP address of the JMX agent
* @throws IOException on connection failures
*/
- public JmxServerProbe(String host) throws IOException, InterruptedException {
+ public JmxServerProbe(String host) throws IOException {
this.host = host;
this.port = defaultPort;
connect();
Modified: james/server/trunk/core/src/main/java/org/apache/james/core/MailImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/main/java/org/apache/james/core/MailImpl.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/core/src/main/java/org/apache/james/core/MailImpl.java (original)
+++ james/server/trunk/core/src/main/java/org/apache/james/core/MailImpl.java Thu Feb 28 23:31:36 2013
@@ -27,7 +27,6 @@ import org.apache.mailet.MailAddress;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.ParseException;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -42,6 +41,7 @@ import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import java.util.UUID;
/**
@@ -108,26 +108,23 @@ public class MailImpl implements Disposa
/**
* Attributes added to this MailImpl instance
*/
- private HashMap attributes;
+ private Map<String, Object> attributes;
/**
* A constructor that creates a new, uninitialized MailImpl
*/
public MailImpl() {
setState(Mail.DEFAULT);
- attributes = new HashMap();
+ attributes = new HashMap<String, Object>();
}
/**
* A constructor that creates a MailImpl with the specified name, sender,
* and recipients.
- *
- * @param name
- * the name of the MailImpl
- * @param sender
- * the sender for this MailImpl
- * @param recipients
- * the collection of recipients of this MailImpl
+ *
+ * @param name the name of the MailImpl
+ * @param sender the sender for this MailImpl
+ * @param recipients the collection of recipients of this MailImpl
*/
public MailImpl(String name, MailAddress sender, Collection recipients) {
this();
@@ -137,21 +134,16 @@ public class MailImpl implements Disposa
// Copy the recipient list
if (recipients != null) {
- Iterator theIterator = recipients.iterator();
this.recipients = new ArrayList();
- while (theIterator.hasNext()) {
- this.recipients.add(theIterator.next());
- }
+ this.recipients.addAll(recipients);
}
}
/**
* Create a copy of the input mail and assign it a new name
- *
- * @param mail
- * original mail
- * @throws MessagingException
- * when the message is not clonable
+ *
+ * @param mail original mail
+ * @throws MessagingException when the message is not clonable
*/
public MailImpl(Mail mail) throws MessagingException {
this(mail, newName(mail));
@@ -171,8 +163,8 @@ public class MailImpl implements Disposa
if (mail instanceof MailImpl) {
setAttributesRaw((HashMap) cloneSerializableObject(((MailImpl) mail).getAttributesRaw()));
} else {
- HashMap attribs = new HashMap();
- for (Iterator i = mail.getAttributeNames(); i.hasNext();) {
+ HashMap<String, Object> attribs = new HashMap<String, Object>();
+ for (Iterator i = mail.getAttributeNames(); i.hasNext(); ) {
String hashKey = (String) i.next();
attribs.put(hashKey, cloneSerializableObject(mail.getAttribute(hashKey)));
}
@@ -180,25 +172,21 @@ public class MailImpl implements Disposa
}
} catch (IOException e) {
// should never happen for in memory streams
- setAttributesRaw(new HashMap());
+ setAttributesRaw(new HashMap<String, Object>());
} catch (ClassNotFoundException e) {
// should never happen as we just serialized it
- setAttributesRaw(new HashMap());
+ setAttributesRaw(new HashMap<String, Object>());
}
}
/**
* A constructor that creates a MailImpl with the specified name, sender,
* recipients, and message data.
- *
- * @param name
- * the name of the MailImpl
- * @param sender
- * the sender for this MailImpl
- * @param recipients
- * the collection of recipients of this MailImpl
- * @param messageIn
- * a stream containing the message source
+ *
+ * @param name the name of the MailImpl
+ * @param sender the sender for this MailImpl
+ * @param recipients the collection of recipients of this MailImpl
+ * @param messageIn a stream containing the message source
*/
public MailImpl(String name, MailAddress sender, Collection recipients, InputStream messageIn) throws MessagingException {
this(name, sender, recipients);
@@ -216,24 +204,20 @@ public class MailImpl implements Disposa
/**
* A constructor that creates a MailImpl with the specified name, sender,
* recipients, and MimeMessage.
- *
- * @param name
- * the name of the MailImpl
- * @param sender
- * the sender for this MailImpl
- * @param recipients
- * the collection of recipients of this MailImpl
- * @param message
- * the MimeMessage associated with this MailImpl
+ *
+ * @param name the name of the MailImpl
+ * @param sender the sender for this MailImpl
+ * @param recipients the collection of recipients of this MailImpl
+ * @param message the MimeMessage associated with this MailImpl
*/
- public MailImpl(String name, MailAddress sender, Collection recipients, MimeMessage message) throws MessagingException {
+ public MailImpl(String name, MailAddress sender, Collection recipients, MimeMessage message) {
this(name, sender, recipients);
this.setMessage(new MimeMessageCopyOnWriteProxy(message));
}
/**
* Duplicate the MailImpl.
- *
+ *
* @return a MailImpl that is a duplicate of this one
*/
public Mail duplicate() {
@@ -243,10 +227,8 @@ public class MailImpl implements Disposa
/**
* Duplicate the MailImpl, replacing the mail name with the one passed in as
* an argument.
- *
- * @param newName
- * the name for the duplicated mail
- *
+ *
+ * @param newName the name for the duplicated mail
* @return a MailImpl that is a duplicate of this one with a different name
*/
public Mail duplicate(String newName) {
@@ -260,7 +242,7 @@ public class MailImpl implements Disposa
/**
* Get the error message associated with this MailImpl.
- *
+ *
* @return the error message associated with this MailImpl
*/
@Override
@@ -270,82 +252,90 @@ public class MailImpl implements Disposa
/**
* Get the MimeMessage associated with this MailImpl.
- *
+ *
* @return the MimeMessage associated with this MailImpl
*/
+ @Override
public MimeMessage getMessage() throws MessagingException {
return message;
}
/**
* Set the name of this MailImpl.
- *
- * @param name
- * the name of this MailImpl
+ *
+ * @param name the name of this MailImpl
*/
+ @Override
public void setName(String name) {
this.name = name;
}
/**
* Get the name of this MailImpl.
- *
+ *
* @return the name of this MailImpl
*/
+ @Override
public String getName() {
return name;
}
/**
* Get the recipients of this MailImpl.
- *
+ *
* @return the recipients of this MailImpl
*/
+ @Override
public Collection getRecipients() {
return recipients;
}
/**
* Get the sender of this MailImpl.
- *
+ *
* @return the sender of this MailImpl
*/
+ @Override
public MailAddress getSender() {
return sender;
}
/**
* Get the state of this MailImpl.
- *
+ *
* @return the state of this MailImpl
*/
+ @Override
public String getState() {
return state;
}
/**
* Get the remote host associated with this MailImpl.
- *
+ *
* @return the remote host associated with this MailImpl
*/
+ @Override
public String getRemoteHost() {
return remoteHost;
}
/**
* Get the remote address associated with this MailImpl.
- *
+ *
* @return the remote address associated with this MailImpl
*/
+ @Override
public String getRemoteAddr() {
return remoteAddr;
}
/**
* Get the last updated time for this MailImpl.
- *
+ *
* @return the last updated time for this MailImpl
*/
+ @Override
public Date getLastUpdated() {
return lastUpdated;
}
@@ -355,37 +345,36 @@ public class MailImpl implements Disposa
* Return the size of the message including its headers.
* MimeMessage.getSize() method only returns the size of the message body.
* </p>
- *
+ * <p/>
* <p>
* Note: this size is not guaranteed to be accurate - see Sun's
* documentation of MimeMessage.getSize().
* </p>
- *
+ *
* @return approximate size of full message including headers.
- *
- * @throws MessagingException
- * if a problem occurs while computing the message size
+ * @throws MessagingException if a problem occurs while computing the message size
*/
+ @Override
public long getMessageSize() throws MessagingException {
return MimeMessageUtil.getMessageSize(message);
}
/**
* Set the error message associated with this MailImpl.
- *
- * @param msg
- * the new error message associated with this MailImpl
+ *
+ * @param msg the new error message associated with this MailImpl
*/
+ @Override
public void setErrorMessage(String msg) {
this.errorMessage = msg;
}
/**
* Set the MimeMessage associated with this MailImpl.
- *
- * @param message
- * the new MimeMessage associated with this MailImpl
+ *
+ * @param message the new MimeMessage associated with this MailImpl
*/
+ @Override
public void setMessage(MimeMessage message) {
// TODO: We should use the MimeMessageCopyOnWriteProxy
@@ -405,19 +394,18 @@ public class MailImpl implements Disposa
/**
* Set the recipients for this MailImpl.
- *
- * @param recipients
- * the recipients for this MailImpl
+ *
+ * @param recipients the recipients for this MailImpl
*/
+ @Override
public void setRecipients(Collection recipients) {
this.recipients = recipients;
}
/**
* Set the sender of this MailImpl.
- *
- * @param sender
- * the sender of this MailImpl
+ *
+ * @param sender the sender of this MailImpl
*/
public void setSender(MailAddress sender) {
this.sender = sender;
@@ -425,9 +413,8 @@ public class MailImpl implements Disposa
/**
* Set the state of this MailImpl.
- *
- * @param state
- * the state of this MailImpl
+ *
+ * @param state the state of this MailImpl
*/
public void setState(String state) {
this.state = state;
@@ -435,9 +422,8 @@ public class MailImpl implements Disposa
/**
* Set the remote address associated with this MailImpl.
- *
- * @param remoteHost
- * the new remote host associated with this MailImpl
+ *
+ * @param remoteHost the new remote host associated with this MailImpl
*/
public void setRemoteHost(String remoteHost) {
this.remoteHost = remoteHost;
@@ -445,9 +431,8 @@ public class MailImpl implements Disposa
/**
* Set the remote address associated with this MailImpl.
- *
- * @param remoteAddr
- * the new remote address associated with this MailImpl
+ *
+ * @param remoteAddr the new remote address associated with this MailImpl
*/
public void setRemoteAddr(String remoteAddr) {
this.remoteAddr = remoteAddr;
@@ -455,9 +440,8 @@ public class MailImpl implements Disposa
/**
* Set the date this mail was last updated.
- *
- * @param lastUpdated
- * the date the mail was last updated
+ *
+ * @param lastUpdated the date the mail was last updated
*/
public void setLastUpdated(Date lastUpdated) {
// Make a defensive copy to ensure that the date
@@ -470,14 +454,10 @@ public class MailImpl implements Disposa
/**
* Writes the message out to an OutputStream.
- *
- * @param out
- * the OutputStream to which to write the content
- *
- * @throws MessagingException
- * if the MimeMessage is not set for this MailImpl
- * @throws IOException
- * if an error occurs while reading or writing from the stream
+ *
+ * @param out the OutputStream to which to write the content
+ * @throws MessagingException if the MimeMessage is not set for this MailImpl
+ * @throws IOException if an error occurs while reading or writing from the stream
*/
public void writeMessageTo(OutputStream out) throws IOException, MessagingException {
if (message != null) {
@@ -490,18 +470,14 @@ public class MailImpl implements Disposa
// Serializable Methods
// TODO: These need some work. Currently very tightly coupled to
// the internal representation.
+
/**
* Read the MailImpl from an <code>ObjectInputStream</code>.
- *
- * @param in
- * the ObjectInputStream from which the object is read
- *
- * @throws IOException
- * if an error occurs while reading from the stream
- * @throws ClassNotFoundException
- * ?
- * @throws ClassCastException
- * if the serialized objects are not of the appropriate type
+ *
+ * @param in the ObjectInputStream from which the object is read
+ * @throws IOException if an error occurs while reading from the stream
+ * @throws ClassNotFoundException ?
+ * @throws ClassCastException if the serialized objects are not of the appropriate type
*/
private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
try {
@@ -529,7 +505,7 @@ public class MailImpl implements Disposa
attributes = (HashMap) in.readObject();
} catch (OptionalDataException ode) {
if (ode.eof) {
- attributes = new HashMap();
+ attributes = new HashMap<String, Object>();
} else {
throw ode;
}
@@ -538,12 +514,9 @@ public class MailImpl implements Disposa
/**
* Write the MailImpl to an <code>ObjectOutputStream</code>.
- *
- * @param out
- * the ObjectOutputStream to which the object is written
- *
- * @throws IOException
- * if an error occurs while writing to the stream
+ *
+ * @param out the ObjectOutputStream to which the object is written
+ * @throws IOException if an error occurs while writing to the stream
*/
private void writeObject(java.io.ObjectOutputStream out) throws IOException {
out.writeObject(sender);
@@ -557,9 +530,7 @@ public class MailImpl implements Disposa
out.writeObject(attributes);
}
- /**
- * @see org.apache.james.lifecycle.api.Disposable#dispose()
- */
+ @Override
public void dispose() {
LifecycleUtil.dispose(message);
message = null;
@@ -574,11 +545,11 @@ public class MailImpl implements Disposa
* <strong>Note</strong>: This method is not exposed in the Mail interface,
* it is for internal use by James only.
* </p>
- *
+ *
* @return Serializable of the entire attributes collection
* @since 2.2.0
- **/
- public HashMap getAttributesRaw() {
+ */
+ public Map<String, Object> getAttributesRaw() {
return attributes;
}
@@ -591,59 +562,39 @@ public class MailImpl implements Disposa
* <strong>Note</strong>: This method is not exposed in the Mail interface,
* it is for internal use by James only.
* </p>
- *
- * @param attr
- * Serializable of the entire attributes collection
+ *
+ * @param attr Serializable of the entire attributes collection
* @since 2.2.0
- **/
- public void setAttributesRaw(HashMap attr) {
- this.attributes = (attr == null) ? new HashMap() : attr;
+ */
+ public void setAttributesRaw(HashMap<String, Object> attr) {
+ this.attributes = (attr == null) ? new HashMap<String, Object>() : attr;
}
- /**
- * @see org.apache.mailet.Mail#getAttribute(String)
- * @since 2.2.0
- */
+ @Override
public Serializable getAttribute(String key) {
return (Serializable) attributes.get(key);
}
- /**
- * @see org.apache.mailet.Mail#setAttribute(String,Serializable)
- * @since 2.2.0
- */
+ @Override
public Serializable setAttribute(String key, Serializable object) {
return (Serializable) attributes.put(key, object);
}
- /**
- * @see org.apache.mailet.Mail#removeAttribute(String)
- * @since 2.2.0
- */
+ @Override
public Serializable removeAttribute(String key) {
return (Serializable) attributes.remove(key);
}
- /**
- * @see org.apache.mailet.Mail#removeAllAttributes()
- * @since 2.2.0
- */
+ @Override
public void removeAllAttributes() {
attributes.clear();
}
- /**
- * @see org.apache.mailet.Mail#getAttributeNames()
- * @since 2.2.0
- */
+ @Override
public Iterator getAttributeNames() {
return attributes.keySet().iterator();
}
- /**
- * @see org.apache.mailet.Mail#hasAttributes()
- * @since 2.2.0
- */
@Override
public boolean hasAttributes() {
return !attributes.isEmpty();
@@ -652,9 +603,8 @@ public class MailImpl implements Disposa
/**
* This methods provide cloning for serializable objects. Mail Attributes
* are Serializable but not Clonable so we need a deep copy
- *
- * @param o
- * Object to be cloned
+ *
+ * @param o Object to be cloned
* @return the cloned Object
* @throws IOException
* @throws ClassNotFoundException
@@ -671,17 +621,16 @@ public class MailImpl implements Disposa
}
private static final java.util.Random random = new java.util.Random(); // Used
- // to
- // generate
- // new
- // mail
- // names
+ // to
+ // generate
+ // new
+ // mail
+ // names
/**
* Create a unique new primary key name for the given MailObject.
- *
- * @param mail
- * the mail to use as the basis for the new mail name
+ *
+ * @param mail the mail to use as the basis for the new mail name
* @return a new name
*/
public static String newName(Mail mail) throws MessagingException {
@@ -711,7 +660,7 @@ public class MailImpl implements Disposa
/**
* Generate a new identifier/name for a mail being processed by this server.
- *
+ *
* @return the new identifier
*/
public static String getId() {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org