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 2009/10/28 16:02:45 UTC
svn commit: r830567 - in /james/server/trunk:
avalon-socket-library/src/main/java/org/apache/james/socket/
avalon-user-function/src/main/java/org/apache/james/core/
avalon-user-function/src/main/java/org/apache/james/userrepository/
avalon-user-functio...
Author: norman
Date: Wed Oct 28 15:02:41 2009
New Revision: 830567
URL: http://svn.apache.org/viewvc?rev=830567&view=rev
Log:
More guice work
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.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/userrepository/AbstractJdbcUsersRepository.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/ListUsersJdbcRepositoryTest.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationAdapter.java
james/server/trunk/core-function/pom.xml
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/mailrepository/AvalonMailStore.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/GuiceMailStore.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/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/mailrepository/filepair/AbstractFileRepository.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java
james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java
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=830567&r1=830566&r2=830567&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 Oct 28 15:02:41 2009
@@ -499,7 +499,6 @@
public final void initialize() throws Exception {
if (!isEnabled()) {
getLogger().info(protocolHandlerFactory.getServiceType() + " Disabled");
- System.out.println(protocolHandlerFactory.getServiceType() + " Disabled");
return;
}
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AbstractGuiceStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AbstractGuiceStore.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AbstractGuiceStore.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AbstractGuiceStore.java Wed Oct 28 15:02:41 2009
@@ -77,8 +77,8 @@
for ( int i = 0; i < repConfs.size(); i++ )
{
final HierarchicalConfiguration repConf = repConfs.get(i);
- String repName = repConf.getString("/ @name");
- String repClass = repConf.getString("/ @class");
+ String repName = repConf.getString("[@name]");
+ String repClass = repConf.getString("[@class]");
if (getLogger().isDebugEnabled()) {
getLogger().debug("Starting " + repClass);
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=830567&r1=830566&r2=830567&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 Oct 28 15:02:41 2009
@@ -376,7 +376,7 @@
* <br>
*
* <pre>
- * <repository name="LocalUsers"
+ * <repository name="so even "
* class="org.apache.james.userrepository.JamesUsersJdbcRepository">
* <!-- Name of the datasource to use -->
* <data-source>MailDb</data-source>
@@ -401,9 +401,9 @@
// Parse the DestinationURL for the name of the datasource,
// the table to use, and the (optional) repository Key.
- String destUrl = configuration.getString("/ @destinationURL", null);
+ String destUrl = configuration.getString("[@destinationURL]", null);
// throw an exception if the attribute is missing
- if (destUrl == null) throw new ConfigurationException("destinatURL attribute is missing from Configuration");
+ if (destUrl == null) throw new ConfigurationException("destinationURL attribute is missing from Configuration");
// normalise the destination, to simplify processing.
if (!destUrl.endsWith("/")) {
@@ -450,7 +450,7 @@
Iterator<String> paramIt = configuration.getKeys("sqlParameters");
while(paramIt.hasNext()) {
String rawName = paramIt.next();
- String paramName = paramIt.next().substring("sqlParameters/ @".length(), rawName.length());
+ String paramName = paramIt.next().substring("sqlParameters.[@".length(), rawName.length() -1);
String paramValue = configuration.getString(rawName);
m_sqlParameters.put(paramName, paramValue);
}
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=830567&r1=830566&r2=830567&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 Oct 28 15:02:41 2009
@@ -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;
@@ -101,9 +101,9 @@
final DefaultConfigurationBuilder objectConfiguration
= new DefaultConfigurationBuilder();
- objectConfiguration.addProperty( "/ @destinationURL", destination );
- objectConfiguration.addProperty( "/ @type", "OBJECT" );
- objectConfiguration.addProperty( "/ @model", "SYNCHRONOUS" );
+ objectConfiguration.addProperty( "[@destinationURL]", destination );
+ objectConfiguration.addProperty( "[@type]", "OBJECT" );
+ objectConfiguration.addProperty( "[@model]", "SYNCHRONOUS" );
objectRepository = (ObjectRepository)store.select( objectConfiguration );
if (getLogger().isDebugEnabled()) {
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=830567&r1=830566&r2=830567&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 Oct 28 15:02:41 2009
@@ -78,7 +78,7 @@
public void doConfigure(HierarchicalConfiguration arg0) throws ConfigurationException {
- String destination = arg0.getString("/ @destinationURL",null);
+ String destination = arg0.getString("[@destinationURL]",null);
if (destination == null) {
throw new ConfigurationException("destinationURL must configured");
@@ -107,7 +107,7 @@
new StringBuffer(256)
.append("Malformed destinationURL - Must be of the format '")
.append("db://<data-source>'. Was passed ")
- .append(arg0.getString("/ @repositoryPath"));
+ .append(arg0.getString("[@destinationURL]"));
throw new ConfigurationException(exceptionBuffer.toString());
}
if (urlParams.size() >= 1) {
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=830567&r1=830566&r2=830567&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 Oct 28 15:02:41 2009
@@ -22,6 +22,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.commons.configuration.ConfigurationUtils;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.test.mock.james.MockFileSystem;
@@ -73,6 +74,7 @@
configuration.addChild(new AttrValConfiguration("sqlFile","file://conf/sqlResources.xml"));
res.setLogger(new SimpleLog("MockLog"));
res.setConfiguration(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=830567&r1=830566&r2=830567&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 Oct 28 15:02:41 2009
@@ -73,14 +73,14 @@
file_Persistent_Object_Repository.setFileSystem(fs);
file_Persistent_Object_Repository.setLogger(new SimpleLog("MockLog"));
DefaultConfigurationBuilder defaultConfiguration22 = new DefaultConfigurationBuilder();
- defaultConfiguration22.addProperty("/ @destinationURL", "file://target/var/users");
+ defaultConfiguration22.addProperty("[@destinationURL]", "file://target/var/users");
file_Persistent_Object_Repository.setConfiguration(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");
+ configuration.addProperty("destination/[@URL]", "file://target/var/users");
res.setLogger(new SimpleLog("MockLog"));
res.setConfiguration(configuration);
res.init();
Modified: james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationAdapter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationAdapter.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationAdapter.java (original)
+++ james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationAdapter.java Wed Oct 28 15:02:41 2009
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.configuration.ConfigurationUtil;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
/**
* Bridges commons configuration to Avalon.
@@ -36,7 +35,5 @@
public ConfigurationAdapter(org.apache.avalon.framework.configuration.Configuration avalonConfig) throws ConfigurationException {
String config = ConfigurationUtil.toString(avalonConfig);
load(new ByteArrayInputStream(config.getBytes()));
-
- setExpressionEngine(new XPathExpressionEngine());
}
}
Modified: james/server/trunk/core-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/pom.xml?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/core-function/pom.xml (original)
+++ james/server/trunk/core-function/pom.xml Wed Oct 28 15:02:41 2009
@@ -98,7 +98,23 @@
<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/domain/JDBCDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java?rev=830567&r1=830566&r2=830567&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 Oct 28 15:02:41 2009
@@ -120,7 +120,7 @@
new StringBuffer(256)
.append("Malformed destinationURL - Must be of the format '")
.append("db://<data-source>/<table>'. Was passed ")
- .append(configuration.getString("/ @repositoryPath"));
+ .append(configuration.getString("repositoryPath"));
throw new ConfigurationException(exceptionBuffer.toString());
}
dataSourceName = (String)urlParams.get(0);
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java Wed Oct 28 15:02:41 2009
@@ -80,7 +80,7 @@
}
public Object select(Object arg0) throws ServiceException {
- return select(arg0);
+ return store.select(arg0);
}
public boolean isSelectable(Object arg0) {
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=830567&r1=830566&r2=830567&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 Oct 28 15:02:41 2009
@@ -70,11 +70,11 @@
protected void doConfigure(HierarchicalConfiguration config)
throws org.apache.commons.configuration.ConfigurationException {
super.doConfigure(config);
- destination = config.getString("/ @destinationURL");
+ destination = config.getString("[@destinationURL]");
if (getLogger().isDebugEnabled()) {
getLogger().debug("AvalonMailRepository.destinationURL: " + destination);
}
- String checkType = config.getString("/ @type");
+ String checkType = config.getString("[@type]");
if (! (checkType.equals("MAIL") || checkType.equals("SPOOL")) ) {
String exceptionString = "Attempt to configure AvalonMailRepository as " +
checkType;
@@ -83,15 +83,12 @@
}
throw new ConfigurationException(exceptionString);
}
- fifo = config.getBoolean("/ @FIFO", false);
- cacheKeys = config.getBoolean("/@ CACHEKEYS", true);
+ fifo = config.getBoolean("[@FIFO]", false);
+ cacheKeys = config.getBoolean("[@CACHEKEYS]", true);
// ignore model
}
- /**
- * @see org.apache.avalon.framework.activity.Initializable#initialize()
- */
@PostConstruct
public void init()
throws Exception {
@@ -153,9 +150,9 @@
DefaultConfigurationBuilder objectConfiguration
= new DefaultConfigurationBuilder();
- objectConfiguration.addProperty("/ @destinationURL", destination);
- objectConfiguration.addProperty("/ @type", type);
- objectConfiguration.addProperty("/ @model", "SYNCHRONOUS");
+ objectConfiguration.addProperty("[@destinationURL]", destination);
+ objectConfiguration.addProperty("[@type]", type);
+ objectConfiguration.addProperty("[@model]", "SYNCHRONOUS");
return store.select(objectConfiguration);
}
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java Wed Oct 28 15:02:41 2009
@@ -121,7 +121,7 @@
classes = new HashMap<String,String>();
defaultConfigs = new HashMap<String, HierarchicalConfiguration>();
List<HierarchicalConfiguration> registeredClasses
- = configuration.configurationsAt("repositories/repository");
+ = configuration.configurationsAt("repositories.repository");
for ( int i = 0; i < registeredClasses.size(); i++ )
{
registerRepository(registeredClasses.get(i));
@@ -145,17 +145,20 @@
@SuppressWarnings("unchecked")
public synchronized void registerRepository(HierarchicalConfiguration repConf)
throws ConfigurationException {
- String className = repConf.getString("/ @class");
+ String className = repConf.getString("[@class]");
boolean infoEnabled = getLogger().isInfoEnabled();
- List<String> protocols = repConf.getList("protocols/protocol");
- List<String >types = repConf.getList("types/type");
+ List<String> protocols = repConf.getList("protocols.protocol");
+ List<String >types = repConf.getList("types.type");
for ( int i = 0; i < protocols.size(); i++ )
{
String protocol = protocols.get(i);
- // Get the default configuration for these protocol/type combinations.
- HierarchicalConfiguration defConf = repConf.configurationAt("config");
+ HierarchicalConfiguration defConf = null;
+ if (repConf.containsKey("config")) {
+ // Get the default configuration for these protocol/type combinations.
+ defConf = repConf.configurationAt("config");
+ }
for ( int j = 0; j < types.size(); j++ )
{
@@ -169,7 +172,9 @@
.append(" to handle ")
.append(protocol)
.append(" protocol requests for repositories of type ")
- .append(type);
+ .append(type)
+ .append(" with key ")
+ .append(key);
getLogger().info(infoBuffer.toString());
}
if (classes.get(key) != null) {
@@ -211,97 +216,114 @@
throw new ServiceException("",
"hint is of the wrong type. Must be a Configuration", cce);
}
+
String destination = null;
String protocol = null;
- destination = repConf.getString("/ @destinationURL");
- int idx = destination.indexOf(':');
- if ( idx == -1 )
- throw new ServiceException("",
- "destination is malformed. Must be a valid URL: "
- + destination);
- protocol = destination.substring(0,idx);
+ destination = repConf.getString("[@destinationURL]");
+ int idx = destination.indexOf(':');
+ if ( idx == -1 )
+ throw new ServiceException("",
+ "destination is malformed. Must be a valid URL: "
+ + destination);
+ protocol = destination.substring(0,idx);
- String type = repConf.getString("/ @type");
- String repID = destination + type;
- Object reply = repositories.get(repID);
- StringBuffer logBuffer = null;
- if (reply != null) {
- if (getLogger().isDebugEnabled()) {
- logBuffer =
- new StringBuffer(128)
- .append("obtained repository: ")
- .append(repID)
- .append(",")
- .append(reply.getClass());
- getLogger().debug(logBuffer.toString());
- }
- return reply;
- } else {
- String key = protocol + type;
- String repClass = (String) classes.get( key );
-
- if (getLogger().isDebugEnabled()) {
- logBuffer =
- new StringBuffer(128)
- .append("obtained repository: ")
- .append(repClass)
- .append(" to handle: ")
- .append(protocol)
- .append(",")
- .append(type);
- getLogger().debug( logBuffer.toString() );
- }
+ String type = repConf.getString("[@type]");
+ String repID = destination + type;
+ Object reply = repositories.get(repID);
+ StringBuffer logBuffer = null;
+ if (reply != null) {
+ if (getLogger().isDebugEnabled()) {
+ logBuffer =
+ new StringBuffer(128)
+ .append("obtained repository: ")
+ .append(repID)
+ .append(",")
+ .append(reply.getClass());
+ getLogger().debug(logBuffer.toString());
+ }
+ return reply;
+ } else {
+ String key = protocol + type;
+ String repClass = (String) classes.get( key );
+ if (getLogger().isDebugEnabled()) {
+ logBuffer =
+ new StringBuffer(128)
+ .append("obtained repository: ")
+ .append(repClass)
+ .append(" to handle: ")
+ .append(protocol)
+ .append(",")
+ .append(type)
+ .append(" with key ")
+ .append(key);
+ getLogger().debug( logBuffer.toString() );
+ }
- // If default values have been set, create a new repository
- // configuration element using the default values
- // and the values in the selector.
- // If no default values, just use the selector.
- final CombinedConfiguration config = new CombinedConfiguration();
- HierarchicalConfiguration defConf = defaultConfigs.get(key);
- if ( defConf == null) {
- config.addConfiguration(repConf);
- }
- else {
- config.addConfiguration(repConf);
- config.addConfiguration(defConf);
- }
+ // If default values have been set, create a new repository
+ // configuration element using the default values
+ // and the values in the selector.
+ // If no default values, just use the selector.
+ final CombinedConfiguration config = new CombinedConfiguration();
+ HierarchicalConfiguration defConf = defaultConfigs.get(key);
+ if ( defConf == null) {
+ config.addConfiguration(repConf);
+ }
+ else {
+ config.addConfiguration(repConf);
+ config.addConfiguration(defConf);
+ }
- try {
- Class<?> objectClass = Thread.currentThread().getContextClassLoader().loadClass(repClass);
- reply = Guice.createInjector(new Jsr250Module(), new AbstractModule() {
+ try {
+ Class<?> objectClass = Thread.currentThread().getContextClassLoader().loadClass(repClass);
+ reply = Guice.createInjector(new Jsr250Module(), new AbstractModule() {
- @Override
- protected void configure() {
- bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
- bind(HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(config);
- bind(FileSystem.class).annotatedWith(Names.named("org.apache.james.services.FileSystem")).toInstance(fs);
- bind(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(datasources);
- }
- }).getInstance(objectClass);
-
- repositories.put(repID, reply);
- if (getLogger().isInfoEnabled()) {
- logBuffer =
- new StringBuffer(128)
- .append("added repository: ")
- .append(repID)
- .append("->")
- .append(repClass);
- getLogger().info(logBuffer.toString());
+ @Override
+ protected void configure() {
+ bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
+ bind(HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(config);
+ bind(FileSystem.class).annotatedWith(Names.named("org.apache.james.services.FileSystem")).toInstance(fs);
+ bind(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(datasources);
+ bind(Store.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.store.Store")).toInstance(new Store() {
+
+ public Object select(Object arg0) throws ServiceException {
+ return GuiceMailStore.this.select(arg0);
+ }
+
+ public boolean isSelectable(Object arg0) {
+ return GuiceMailStore.this.isSelectable(arg0);
+ }
+
+ public void release(Object arg0) {
+ GuiceMailStore.this.release(arg0);
+ }
+
+ });
}
- return reply;
- } catch (Exception e) {
- if (getLogger().isWarnEnabled()) {
- getLogger().warn( "Exception while creating repository:" +
- e.getMessage(), e );
- }
- throw new
- ServiceException("", "Cannot find or init repository",
- e);
+ }).getInstance(objectClass);
+
+ repositories.put(repID, reply);
+ if (getLogger().isInfoEnabled()) {
+ logBuffer =
+ new StringBuffer(128)
+ .append("added repository: ")
+ .append(repID)
+ .append("->")
+ .append(repClass);
+ getLogger().info(logBuffer.toString());
}
+ return reply;
+ } catch (Exception e) {
+ if (getLogger().isWarnEnabled()) {
+ getLogger().warn( "Exception while creating repository:" +
+ e.getMessage(), e );
+ }
+ throw new
+ ServiceException("", "Cannot find or init repository",
+ e);
}
+ }
}
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=830567&r1=830566&r2=830567&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 Oct 28 15:02:41 2009
@@ -24,8 +24,9 @@
import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
import org.apache.avalon.cornerstone.services.store.StreamRepository;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.ConfigurationUtils;
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
@@ -155,8 +156,8 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug(this.getClass().getName() + ".configure()");
}
+ String destination = configuration.getString("[@destinationURL]");
- String destination = configuration.getString("/ @destinationURL");
// normalize the destination, to simplify processing.
if ( ! destination.endsWith("/") ) {
destination += "/";
@@ -183,7 +184,7 @@
new StringBuffer(256)
.append("Malformed destinationURL - Must be of the format '")
.append("db://<data-source>[/<table>[/<repositoryName>]]'. Was passed ")
- .append(configuration.getString("/ @destinationURL"));
+ .append(configuration.getString("[@destinationURL]"));
throw new ConfigurationException(exceptionBuffer.toString());
}
if (urlParams.size() >= 1) {
@@ -200,7 +201,8 @@
}
repositoryName += (String)urlParams.get(i);
}
- }
+ }
+
if (getLogger().isDebugEnabled()) {
StringBuffer logBuffer =
@@ -215,20 +217,18 @@
inMemorySizeLimit = configuration.getInt("inMemorySizeLimit", 409600000);
- String filestore = configuration.getString("filestore", null);
- sqlFileName = configuration.getString("sqlFile");
+ String filestore = configuration.getString("config.filestore", null);
+ sqlFileName = configuration.getString("config.sqlFile");
try {
if (filestore != null) {
- //TODO Remove me ???
//prepare Configurations for stream repositories
- DefaultConfiguration streamConfiguration
- = new DefaultConfiguration( "repository",
- "generated:JDBCMailRepository.configure()" );
-
- streamConfiguration.setAttribute( "destinationURL", filestore );
- streamConfiguration.setAttribute( "type", "STREAM" );
- streamConfiguration.setAttribute( "model", "SYNCHRONOUS" );
+ DefaultConfigurationBuilder streamConfiguration
+ = new DefaultConfigurationBuilder();
+
+ streamConfiguration.addProperty( "[@destinationURL]", filestore );
+ streamConfiguration.addProperty( "[@type]", "STREAM" );
+ streamConfiguration.addProperty( "[@model]", "SYNCHRONOUS" );
sr = (StreamRepository) store.select(streamConfiguration);
if (getLogger().isDebugEnabled()) {
@@ -248,7 +248,7 @@
final String message = "Failed to retrieve Store component:" + e.getMessage();
getLogger().error(message, e);
throw new ConfigurationException(message, e);
- }
+ }
}
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=830567&r1=830566&r2=830567&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 Oct 28 15:02:41 2009
@@ -117,7 +117,7 @@
*/
protected void doConfigure(HierarchicalConfiguration conf) throws ConfigurationException {
super.doConfigure(conf);
- maxPendingMessages = conf.getInt("maxcache",1000);
+ maxPendingMessages = conf.getInt("config.maxcache",1000);
}
@PostConstruct
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java Wed Oct 28 15:02:41 2009
@@ -805,9 +805,9 @@
protected void configure(HierarchicalConfiguration conf) throws ConfigurationException {
String destination;
this.mList = null;
- BUFFERING = conf.getBoolean("/ @BUFFERING", true);
- fifo = conf.getBoolean("/ @FIFO", false);
- destination = conf.getString("/ @destinationURL");
+ BUFFERING = conf.getBoolean("[@BUFFERING]", true);
+ fifo = conf.getBoolean("[@FIFO]", false);
+ destination = conf.getString("[@destinationURL]");
if (destination.charAt(destination.length() - 1) == '/') {
// Remove the trailing / as well as the protocol marker
mboxFile = destination.substring("mbox://".length(), destination.lastIndexOf("/"));
@@ -819,7 +819,7 @@
getLogger().debug("MBoxMailRepository.destinationURL: " + destination);
}
- String checkType = conf.getString("/ @type");
+ String checkType = conf.getString("[@type]");
if (!(checkType.equals("MAIL") || checkType.equals("SPOOL"))) {
String exceptionString = "Attempt to configure MboxMailRepository as " + checkType;
if (getLogger().isWarnEnabled()) {
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java Wed Oct 28 15:02:41 2009
@@ -22,7 +22,6 @@
package org.apache.james.mailrepository;
import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
import org.apache.james.services.SpoolRepository;
@@ -86,24 +85,15 @@
return logger;
}
- /**
- * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
- */
- protected void configure(HierarchicalConfiguration conf) throws ConfigurationException {
- }
-
- /**
- * @see org.apache.avalon.framework.activity.Initializable#initialize()
- */
@PostConstruct
- public void initialize() throws Exception {
- configure(configuration);
+ public void init() throws Exception {
try {
spoolRep = (SpoolRepository) mailStore.select(configuration);
} catch (Exception e) {
getLogger().error("Cannot open private SpoolRepository");
throw e;
}
+
if (getLogger().isInfoEnabled()) {
getLogger().info("SpoolRepository opened: "
+ spoolRep.hashCode());
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java Wed Oct 28 15:02:41 2009
@@ -136,12 +136,12 @@
*/
protected void doConfigure(HierarchicalConfiguration conf) throws ConfigurationException {
log.debug("JavamailStoreMailRepository configure");
- destination = conf.getString("/ @destinationURL");
+ destination = conf.getString("[@destinationURL]");
log.debug("JavamailStoreMailRepository.destinationURL: " + destination);
if (!destination.endsWith("/")) {
destination += "/";
}
- String postfix = conf.getString("/ @postfix", "");
+ String postfix = conf.getString("[@postfix]", "");
if (postfix.length() > 0) {
if (postfix.startsWith("/")) {
postfix = postfix.substring(1);
@@ -195,7 +195,7 @@
+ destination, e);
}
- String checkType = conf.getString("/ @type");
+ String checkType = conf.getString("@type");
if (!checkType.equals(TYPE)) {
String exceptionString = "Attempt to configure JavaMailStoreMailRepository as "
+ checkType;
Modified: james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java Wed Oct 28 15:02:41 2009
@@ -47,7 +47,7 @@
file_Persistent_Stream_Repository.setLogger(new SimpleLog("MockLog"));
DefaultConfigurationBuilder defaultConfiguration2 = new DefaultConfigurationBuilder();
- defaultConfiguration2.addProperty("/ @destinationURL", "file://target/var/mr");
+ defaultConfiguration2.addProperty( "[@destinationURL]", "file://target/var/mr");
file_Persistent_Stream_Repository.setConfiguration(defaultConfiguration2);
file_Persistent_Stream_Repository.init();
@@ -56,7 +56,7 @@
file_Persistent_Object_Repository.setFileSystem(fs);
file_Persistent_Object_Repository.setLogger(new SimpleLog("MockLog"));
DefaultConfigurationBuilder defaultConfiguration22 = new DefaultConfigurationBuilder();
- defaultConfiguration22.addProperty("/ @destinationURL", "file://target/var/mr");
+ defaultConfiguration22.addProperty( "[@destinationURL]", "file://target/var/mr");
file_Persistent_Object_Repository.setConfiguration(defaultConfiguration22);
file_Persistent_Object_Repository.init();
mockStore.add("OBJECT.mr", file_Persistent_Object_Repository);
@@ -64,8 +64,8 @@
mr.setLogger(new SimpleLog("MockLog"));
DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder();
- defaultConfiguration.addProperty("/ @destinationURL","file://target/var/mr");
- defaultConfiguration.addProperty("/ @type","MAIL");
+ defaultConfiguration.addProperty( "[@destinationURL]","file://target/var/mr");
+ defaultConfiguration.addProperty( "[@type]","MAIL");
mr.setConfiguration(defaultConfiguration);
mr.init();
return mr;
Modified: james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java Wed Oct 28 15:02:41 2009
@@ -48,15 +48,15 @@
file_Persistent_Stream_Repository.setFileSystem(fs);
file_Persistent_Stream_Repository.setLogger(new SimpleLog("MockLog"));
DefaultConfigurationBuilder defaultConfiguration2 = new DefaultConfigurationBuilder();
- defaultConfiguration2.addProperty("/ @destinationURL", "file://target/var/mr/testrepo");
+ defaultConfiguration2.addProperty("[@destinationURL]", "file://target/var/mr/testrepo");
file_Persistent_Stream_Repository.setConfiguration(defaultConfiguration2);
file_Persistent_Stream_Repository.init();
mockStore.add("STREAM.mr", file_Persistent_Stream_Repository);
DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder();
- defaultConfiguration.addProperty("/ @destinationURL","db://maildb/mr/testrepo");
- defaultConfiguration.addProperty("sqlFile","file://conf/sqlResources.xml");
- defaultConfiguration.addProperty("/ @type","MAIL");
+ defaultConfiguration.addProperty("[@destinationURL]","db://maildb/mr/testrepo");
+ defaultConfiguration.addProperty("config.sqlFile","file://conf/sqlResources.xml");
+ defaultConfiguration.addProperty("[@type]","MAIL");
mr.setFileSystem(fs);
mr.setStore(mockStore);
mr.setDatasources(selector);
Modified: james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java Wed Oct 28 15:02:41 2009
@@ -48,8 +48,8 @@
File fInbox = new MockFileSystem().getFile("file://conf/org/apache/james/mailrepository/testdata/Inbox");
String mboxPath = "mbox://"+fInbox.toURI().toString().substring(new File("").toURI().toString().length());
- defaultConfiguration.addProperty("/ @destinationURL",mboxPath);
- defaultConfiguration.addProperty("/ @type","MAIL");
+ defaultConfiguration.addProperty("[@destinationURL]",mboxPath);
+ defaultConfiguration.addProperty("[@type]","MAIL");
mr.setConfiguration(defaultConfiguration);
mr.setLogger(new SimpleLog("MockLog"));;
mr.init();
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java Wed Oct 28 15:02:41 2009
@@ -104,7 +104,7 @@
{
if( null == m_destination )
{
- final String destination = configuration.getString( "/ @destinationURL" );
+ final String destination = configuration.getString( "[@destinationURL]" );
setDestination( destination );
}
}
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java Wed Oct 28 15:02:41 2009
@@ -24,6 +24,7 @@
import org.apache.avalon.cornerstone.services.store.Store;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationUtils;
import java.util.HashMap;
import java.util.Map;
@@ -50,15 +51,15 @@
private Object extractKeyObject(Object object) {
if (object instanceof Configuration) {
Configuration repConf = (Configuration) object;
+ System.out.println(ConfigurationUtils.toString(repConf));
- String type = repConf.getString("/ @type");
+ String type = repConf.getString("[@type]");
String prefix = "";
if (!"MAIL".equals(type) && !"SPOOL".equals(type)) {
prefix = type + ".";
}
- String attribute = repConf.getString("/ @destinationURL");
+ String attribute = repConf.getString("[@destinationURL]");
String[] strings = attribute.split("/");
- System.out.println(prefix);
if (strings.length > 0) {
return prefix + strings[strings.length - 1];
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java Wed Oct 28 15:02:41 2009
@@ -361,8 +361,8 @@
Store mailstore = (Store) compMgr.lookup(Store.ROLE);
DefaultConfigurationBuilder spoolConf = new DefaultConfigurationBuilder();
- spoolConf.addProperty("/ @destinationURL", workRepositoryPath);
- spoolConf.addProperty("/ @type", "SPOOL");
+ spoolConf.addProperty("[@destinationURL]", workRepositoryPath);
+ spoolConf.addProperty("[@type]", "SPOOL");
workRepository = (SpoolRepository) mailstore.select(spoolConf);
} catch (ServiceException cnfe) {
log("Failed to retrieve Store component:" + cnfe.getMessage());
Modified: james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java (original)
+++ james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java Wed Oct 28 15:02:41 2009
@@ -477,8 +477,8 @@
throws SpoolManagementException {
// Setup all needed data
DefaultConfigurationBuilder spoolConf = new DefaultConfigurationBuilder();
- spoolConf.addProperty("/ @destinationURL", url);
- spoolConf.addProperty("/ @type", "SPOOL");
+ spoolConf.addProperty("[@destinationURL]", url);
+ spoolConf.addProperty("[@type]", "SPOOL");
try {
return (SpoolRepository) mailStore.select(spoolConf);
Modified: james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java (original)
+++ james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java Wed Oct 28 15:02:41 2009
@@ -242,7 +242,7 @@
Configuration handlerConfiguration = ((HierarchicalConfiguration)configuration).configurationAt("handler");
- enabled = configuration.getBoolean("/ @enabled", true);
+ enabled = configuration.getBoolean("[@enabled]", true);
final Log logger = getLogger();
if (!enabled) {
@@ -342,14 +342,14 @@
}
- useStartTLS = configuration.getBoolean("startTLS/ @enable", false);
+ useStartTLS = configuration.getBoolean("startTLS.[@enable]", false);
if (useStartTLS) {
- keystore = configuration.getString("startTLS/keystore", null);
+ keystore = configuration.getString("startTLS.keystore", null);
if (keystore == null) {
throw new ConfigurationException("keystore needs to get configured");
}
- secret = configuration.getString("startTLS/secret","");
+ secret = configuration.getString("startTLS.secret","");
}
}
@@ -376,7 +376,7 @@
.append(hostName);
getLogger().info(infoBuffer.toString());
- boolean autodetect = handlerConfiguration.getBoolean(HELLO_NAME + "/ @autodetect", true);
+ boolean autodetect = handlerConfiguration.getBoolean(HELLO_NAME + "/[@autodetect]", true);
if (autodetect) {
helloName = hostName;
} else {
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java Wed Oct 28 15:02:41 2009
@@ -132,8 +132,8 @@
//read from the XML configuration and create and configure each of the handlers
ConfigurationAdapter jamesConfiguration = new ConfigurationAdapter(handlerConfiguration.getChild("handlerchain"));
- if (jamesConfiguration.getString("@coreHandlersPackage") == null)
- jamesConfiguration.addProperty("/ @coreHandlersPackage", CoreCmdHandlerLoader.class.getName());
+ if (jamesConfiguration.getString("[@coreHandlersPackage]") == null)
+ jamesConfiguration.addProperty("[@coreHandlersPackage]", CoreCmdHandlerLoader.class.getName());
handlerChain.configure(jamesConfiguration);
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java Wed Oct 28 15:02:41 2009
@@ -155,8 +155,8 @@
//read from the XML configuration and create and configure each of the handlers
ConfigurationAdapter jamesConfiguration = new ConfigurationAdapter(handlerConfiguration.getChild("handlerchain"));
- if (jamesConfiguration.getString("@coreHandlersPackage") == null)
- jamesConfiguration.addProperty("/ @coreHandlersPackage", CoreCmdHandlerLoader.class.getName());
+ if (jamesConfiguration.getString("[@coreHandlersPackage]") == null)
+ jamesConfiguration.addProperty("[@coreHandlersPackage]", CoreCmdHandlerLoader.class.getName());
handlerChain.configure(jamesConfiguration);
}
Modified: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java (original)
+++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java Wed Oct 28 15:02:41 2009
@@ -30,6 +30,7 @@
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.ConfigurationUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.api.protocol.Configurable;
@@ -92,7 +93,7 @@
boolean validConfig = false;
ArrayList<String> rblserverCollection = new ArrayList<String>();
- List<String> whiteList = handlerConfiguration.getList("rblservers/whitelist");
+ List<String> whiteList = handlerConfiguration.getList("rblservers.whitelist");
if ( whiteList != null ) {
for ( int i = 0 ; i < whiteList.size() ; i++ ) {
String rblServerName = whiteList.get(i);
@@ -107,7 +108,7 @@
validConfig = true;
}
}
- List<String> blackList = handlerConfiguration.getList("rblservers/blacklist");
+ List<String> blackList = handlerConfiguration.getList("rblservers.blacklist");
if ( blackList != null ) {
for ( int i = 0 ; i < blackList.size() ; i++ ) {
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java Wed Oct 28 15:02:41 2009
@@ -244,8 +244,8 @@
//read from the XML configuration and create and configure each of the handlers
ConfigurationAdapter jamesConfiguration = new ConfigurationAdapter(handlerConfiguration.getChild("handlerchain"));
- if (jamesConfiguration.getString("@coreHandlersPackage") == null)
- jamesConfiguration.addProperty("/ @coreHandlersPackage", CoreCmdHandlerLoader.class.getName());
+ if (jamesConfiguration.getString("[@coreHandlersPackage]") == null)
+ jamesConfiguration.addProperty("[@coreHandlersPackage]", CoreCmdHandlerLoader.class.getName());
handlerChain.configure(jamesConfiguration);
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java Wed Oct 28 15:02:41 2009
@@ -270,8 +270,8 @@
//read from the XML configuration and create and configure each of the handlers
ConfigurationAdapter jamesConfiguration = new ConfigurationAdapter(handlerConfiguration.getChild("handlerchain"));
- if (jamesConfiguration.getString("@coreHandlersPackage") == null)
- jamesConfiguration.addProperty("/ @coreHandlersPackage", CoreCmdHandlerLoader.class.getName());
+ if (jamesConfiguration.getString("[@coreHandlersPackage]") == null)
+ jamesConfiguration.addProperty("[@coreHandlersPackage]", CoreCmdHandlerLoader.class.getName());
handlerChain.configure(jamesConfiguration);
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java Wed Oct 28 15:02:41 2009
@@ -203,8 +203,8 @@
//read from the XML configuration and create and configure each of the handlers
HierarchicalConfiguration handlerchainConfig = handlerConfiguration.configurationAt("handlerchain");
- if (handlerchainConfig.getString("@coreHandlersPackage") == null)
- handlerchainConfig.addProperty("/ @coreHandlersPackage", CoreCmdHandlerLoader.class.getName());
+ if (handlerchainConfig.getString("[@coreHandlersPackage]") == null)
+ handlerchainConfig.addProperty("[@coreHandlersPackage]", CoreCmdHandlerLoader.class.getName());
handlerChain.configure(handlerchainConfig);
}
Modified: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java?rev=830567&r1=830566&r2=830567&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java Wed Oct 28 15:02:41 2009
@@ -206,7 +206,7 @@
List<org.apache.commons.configuration.Configuration> children = ((HierarchicalConfiguration) commonsConf).configurationsAt("handler");
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- String coreCmdName = commonsConf.getString("@coreHandlersPackage");
+ String coreCmdName = commonsConf.getString("[@coreHandlersPackage]");
// load the core handlers
loadClass(classLoader, coreCmdName,
addHandler(coreCmdName));
@@ -216,7 +216,7 @@
for (int i = 0; i < children.size(); i++) {
org.apache.commons.configuration.Configuration hConf = children.get(i);
- String className = hConf.getString("@class");
+ String className = hConf.getString("[@class]");
if (className != null) {
// ignore base handlers.
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org