You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/01/06 13:10:49 UTC
svn commit: r896414 [4/4] - in /james/server/trunk: ./
avalon-guice-bridge-api/ avalon-socket-library/
avalon-socket-library/src/main/java/org/apache/james/socket/
avalon-socket-library/src/main/resources/org/ avalon-spring-bridge-library/
avalon-user-...
Modified: james/server/trunk/spring-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Wed Jan 6 12:10:36 2010
@@ -28,6 +28,7 @@
<artifactId>james-server-spring-deployment</artifactId>
<name>Apache JAMES Server Spring Deployment</name>
<build>
+
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -37,24 +38,338 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>appassembler-maven-plugin</artifactId>
+ <version>1.0</version>
+ <configuration>
+ <!-- Include etc/ in the beginning of the classpath declaration in the bin scripts -->
+ <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
+ <configurationDirectory>conf</configurationDirectory>
+ <target>${project.build.directory}/appassembler</target>
+ <repositoryLayout>flat</repositoryLayout>
+ <repositoryName>lib</repositoryName>
+ <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
+ <!-- Generate bin scripts for windows and unix per default -->
+ <platforms>
+ <platform>windows</platform>
+ <platform>unix</platform>
+ </platforms>
+ <programs>
+ <program>
+ <mainClass>org.apache.james.container.spring.Main</mainClass>
+ <!-- call it only run because appassemble will add .bat by default on windows -->
+ <name>run</name>
+ <!-- Only generate windows bat script for this application -->
+ <platforms>
+ <platform>windows</platform>
+ </platforms>
+ </program>
+ <program>
+ <mainClass>org.apache.james.container.spring.Main</mainClass>
+ <name>run.sh</name>
+ <!-- Only generate unix shell script for this application -->
+ <platforms>
+ <platform>unix</platform>
+ </platforms>
+ </program>
+ </programs>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-appassemble</id>
+ <phase>package</phase>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+
+ <tasks>
+ <!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path
+ from the lib dir to make windows happy again -->
+ <replace file="${project.build.directory}/appassembler/bin/run.bat" token="%BASEDIR%\lib" value="..\lib"/>
+ </tasks>
+
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-spring-bridge-library</artifactId>
- </dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-mina-socket-library</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-socket-shared-library</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-javamail-util</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-common-util</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-socket-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-domain-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-library</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-management-library</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-avalon-socket-library</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-smtp-protocol-library</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-avalon-user-function</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-basic-user-function</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-smtpserver-function</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-imapserver-function</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-function</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-pop3server-function</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-nntpserver-function</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-fetchmail-function</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-spoolmanager-function</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailets-function</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-remotemanager-function</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-experimental-activemq-function</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-jcr-store</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.avalon.cornerstone.datasources</groupId>
+ <artifactId>cornerstone-datasources-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.cornerstone.threads</groupId>
+ <artifactId>cornerstone-threads-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.cornerstone.threads</groupId>
+ <artifactId>cornerstone-threads-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+ <artifactId>cornerstone-sockets-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+ <artifactId>cornerstone-sockets-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
+ <artifactId>cornerstone-scheduler-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-smtpserver-function</artifactId>
+ <version>3.0-M1</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-config.xml?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/james-config.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/james-config.xml Wed Jan 6 12:10:36 2010
@@ -1140,7 +1140,7 @@
value="org.apache.derby.jdbc.EmbeddedDriver"/>
<property
name="torque.dsfactory.mailboxmanager.connection.url"
- value="jdbc:derby:../apps/james/var/mailboxmanager-derbydb;create=true"/>
+ value="jdbc:derby:../var/mailboxmanager-derbydb;create=true"/>
<property
name="torque.dsfactory.mailboxmanager.connection.user"
value="app"/>
@@ -1499,7 +1499,7 @@
<!-- -->
<data-source name="maildb" class="org.apache.james.util.dbcp.JdbcDataSource">
<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
- <dburl>jdbc:derby:../apps/james/var/derbydb;create=true</dburl>
+ <dburl>jdbc:derby:../var/derbydb;create=true</dburl>
<user></user>
<password></password>
<poolPreparedStatements>true</poolPreparedStatements>
Modified: james/server/trunk/spring-deployment/src/main/config/james/log4j.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/log4j.properties?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/log4j.properties (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/log4j.properties Wed Jan 6 12:10:36 2010
@@ -27,9 +27,137 @@
log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.FILE.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+log4j.appender.MAILBOXMANAGER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.MAILBOXMANAGER.File=../log/mailboxmanager.log
+log4j.appender.MAILBOXMANAGER.DatePattern='.'yyyy-MM-dd
+log4j.appender.MAILBOXMANAGER.layout=org.apache.log4j.PatternLayout
+log4j.appender.MAILBOXMANAGER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+
+log4j.appender.IMAPSERVER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.IMAPSERVER.File=../log/imapserver.log
+log4j.appender.IMAPSERVER.DatePattern='.'yyyy-MM-dd
+log4j.appender.IMAPSERVER.layout=org.apache.log4j.PatternLayout
+log4j.appender.IMAPSERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+log4j.appender.JAMES=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.JAMES.File=../log/james.log
+log4j.appender.JAMES.DatePattern='.'yyyy-MM-dd
+log4j.appender.JAMES.layout=org.apache.log4j.PatternLayout
+log4j.appender.JAMES.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+
+log4j.appender.SPOOLMANAGER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.SPOOLMANAGER.File=../log/spoolmanager.log
+log4j.appender.SPOOLMANAGER.DatePattern='.'yyyy-MM-dd
+log4j.appender.SPOOLMANAGER.layout=org.apache.log4j.PatternLayout
+log4j.appender.SPOOLMANAGER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+
+log4j.appender.DNSSERVER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.DNSSERVER.File=../log/dnsserver.log
+log4j.appender.DNSSERVER.DatePattern='.'yyyy-MM-dd
+log4j.appender.DNSSERVER.layout=org.apache.log4j.PatternLayout
+log4j.appender.DNSSERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+log4j.appender.REMOTEMANAGER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.REMOTEMANAGER.File=../log/remotemanager.log
+log4j.appender.REMOTEMANAGER.DatePattern='.'yyyy-MM-dd
+log4j.appender.REMOTEMANAGER.layout=org.apache.log4j.PatternLayout
+log4j.appender.REMOTEMANAGER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+log4j.appender.POP3SERVER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.POP3SERVER.File=../log/pop3server.log
+log4j.appender.POP3SERVER.DatePattern='.'yyyy-MM-dd
+log4j.appender.POP3SERVER.layout=org.apache.log4j.PatternLayout
+log4j.appender.POP3SERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+log4j.appender.SMTPSERVER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.SMTPSERVER.File=../log/smtpserver.log
+log4j.appender.SMTPSERVER.DatePattern='.'yyyy-MM-dd
+log4j.appender.SMTPSERVER.layout=org.apache.log4j.PatternLayout
+log4j.appender.SMTPSERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+log4j.appender.NNTPSERVER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.NNTPSERVER.File=../log/nntpserver.log
+log4j.appender.NNTPSERVER.DatePattern='.'yyyy-MM-dd
+log4j.appender.NNTPSERVER.layout=org.apache.log4j.PatternLayout
+log4j.appender.NNTPSERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+log4j.appender.NNTP-REPOSITORY=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.NNTP-REPOSITORY.File=../log/nntp-store.log
+log4j.appender.NNTP-REPOSITORY.DatePattern='.'yyyy-MM-dd
+log4j.appender.NNTP-REPOSITORY.layout=org.apache.log4j.PatternLayout
+log4j.appender.NNTP-REPOSITORY.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+log4j.appender.MAILSTORE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.MAILSTORE.File=../log/mailstore.log
+log4j.appender.MAILSTORE.DatePattern='.'yyyy-MM-dd
+log4j.appender.MAILSTORE.layout=org.apache.log4j.PatternLayout
+log4j.appender.MAILSTORE.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+
+log4j.appender.USERS-STORE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.USERS-STORE.File=../log/usersstore.log
+log4j.appender.USERS-STORE.DatePattern='.'yyyy-MM-dd
+log4j.appender.USERS-STORE.layout=org.apache.log4j.PatternLayout
+log4j.appender.USERS-STORE.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+log4j.appender.OBJECTSTORAGE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.OBJECTSTORAGE.File=../log/objectstore.log
+log4j.appender.OBJECTSTORAGE.DatePattern='.'yyyy-MM-dd
+log4j.appender.OBJECTSTORAGE.layout=org.apache.log4j.PatternLayout
+log4j.appender.OBJECTSTORAGE.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+log4j.appender.CONNECTIONS=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.CONNECTIONS.File=../log/connections.log
+log4j.appender.CONNECTIONS.DatePattern='.'yyyy-MM-dd
+log4j.appender.CONNECTIONS.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONNECTIONS.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+log4j.appender.SOCKETS=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.SOCKETS.File=../log/sockets.log
+log4j.appender.SOCKETS.DatePattern='.'yyyy-MM-dd
+log4j.appender.SOCKETS.layout=org.apache.log4j.PatternLayout
+log4j.appender.SOCKETS.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+log4j.appender.SCHEDULER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.SCHEDULER.File=../log/scheduler.log
+log4j.appender.SCHEDULER.DatePattern='.'yyyy-MM-dd
+log4j.appender.SCHEDULER.layout=org.apache.log4j.PatternLayout
+log4j.appender.SCHEDULER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+log4j.appender.FETCHMAIL=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.FETCHMAIL.File=../log/fetchmail.log
+log4j.appender.FETCHMAIL.DatePattern='.'yyyy-MM-dd
+log4j.appender.FETCHMAIL.layout=org.apache.log4j.PatternLayout
+log4j.appender.FETCHMAIL.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+
+
+
log4j.logger.org.springframework=WARN, CONS, FILE
log4j.logger.org.apache.james=DEBUG, CONS, FILE
#log4j.logger.james: set from default value WARN to INFO or even DEBUG to see (even) more logging
log4j.logger.james=WARN, CONS, FILE
log4j.logger=DEBUG, CONS, FILE
+log4j.logger.james.mailboxmanager=INFO, MAILBOXMANAGER
+log4j.logger.james.imapserver=INFO, IMAPSERVER
+log4j.logger.james.James=INFO, JAMES
+log4j.logger.james.spoolmanager=INFO, SPOOLMANAGER
+log4j.logger.james.dnsserver=INFO, DNSSERVER
+log4j.logger.james.remotemanager=INFO, REMOTEMANAGER
+log4j.logger.james.pop3server=INFO, POP3SERVER
+log4j.logger.james.smtpserver=INFO, SMTPSERVER
+log4j.logger.james.nntpserver=INFO, NNTPSERVER
+log4j.logger.james.nntp-repository=INFO, NNTP-REPOSITORY
+log4j.logger.james.mailstore=INFO, MAILSTORE
+log4j.logger.james.users-store=INFO, USERS-STORE
+log4j.logger.james.objectstorage=INFO, OBJECTSTORAGE
+log4j.logger.james.connections=INFO, CONNECTIONS
+log4j.logger.james.sockets=INFO, SOCKETS
+log4j.logger.james.scheduler=INFO, SCHEDULER
+log4j.logger.james.fetchmail=INFO, FETCHMAIL
+
+
+
Modified: james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml Wed Jan 6 12:10:36 2010
@@ -1,164 +1,342 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
-<!--
- ! 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. !
- -->
+ <!--
+ ! 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. !
+ -->
<beans>
- <!--
- beans which replace Avalon specific container logic
- -->
- <bean id="fileSystemOverride" class="org.apache.james.container.spring.adaptor.FileSystemBridge" />
-
- <bean id="serviceManager" class="org.apache.james.container.spring.adaptor.DefaultServiceManagerFactory" >
- <property name="replacements">
- <!-- replacement map.
- key must point to an avalon service from james-assembly.xml
- value must point to a bean
- -->
- <map>
- <entry key="filesystem" value="fileSystemOverride" />
- </map>
- </property>
- </bean>
-
- <!--
- Logging to log4j
- -->
- <bean id="logger" class="org.apache.james.container.spring.logging.log4j.LoggerToComponentMapper" init-method="init">
- <property name="configurationResource" value="log4j.properties"/>
- </bean>
-
- <!--
- Logging to System.out
- -->
- <!--
- <bean name="logWorker" class="org.apache.james.container.spring.logging.SystemConsoleLogWorker" />
-
- <bean name="logger, loggerMap" class="org.apache.james.container.spring.adaptor.LoggingBridge" >
- <property name="logWorker" ref="logWorker" />
- </bean>
- -->
-
- <!--
- maps the default standard ports for SMTP, POP3, IMAP, NNTP to non-privileged ports in the
- 9000's range (must be activated in "configurationProvider"-bean)
- -->
- <bean id="privilegedPortsConfigurationInterceptor" class="org.apache.james.container.spring.examples.configuration.UnprivilegedPortConfigurationInterceptor" />
-
- <!--
- replaces strings in configuration values
- -->
- <bean id="stringRemapperConfigurationInterceptor" class="org.apache.james.container.spring.examples.configuration.StringRemapperConfigurationInterceptor">
- <property name="mappings">
- <map>
- <!-- avoid having folders be generated outside the working directory -->
- <entry key="../apps/" value="../var/"/>
- </map>
- </property>
- </bean>
-
-
- <bean id="configurationProvider" class="org.apache.james.container.spring.adaptor.AvalonConfigurationFileProvider" >
- <property name="configurationResource" value="classpath:james-config.xml" />
- <property name="configurationInterceptors">
- <list>
- <ref bean="stringRemapperConfigurationInterceptor" />
- <!--<ref bean="privilegedPortsConfigurationInterceptor" />-->
- </list>
- </property>
- </bean>
-
- <bean id="avalonContext" class="org.apache.james.container.spring.adaptor.AvalonContext" >
- <property name="applicationHome" value="data" />
- <property name="applicationName" value="Apache JAMES Server" />
- </bean>
-
- <!--
- ** JMX part **
-
- to enable exposure of JMX, activate the following beans
-
- NOTE: if you are running JDK < 1.5, you'd have to make a MBeanServer implementation available on the
- classpath, for example mx4j
- -->
-
- <!--
- <bean id="exporter" class="org.springframework.jmx.export.MBeanExporter" lazy-init="false" >
- <property name="autodetect" value="true" />
- <property name="namingStrategy" ref="namingStrategy" />
- </bean>
-
- <bean id="namingStrategy" class="org.springframework.jmx.export.naming.KeyNamingStrategy" >
- <property name="mappings" ><props>
- <prop key="fetchmail" >bean:name=fetchmail</prop>
- <prop key="smtpserver" >bean:name=smtpserver</prop>
- <prop key="James" >bean:name=James</prop>
- <prop key="dnsserver" >bean:name=dnsserver</prop>
- <prop key="remotemanager" >bean:name=remotemanager</prop>
- <prop key="pop3server" >bean:name=pop3server</prop>
- <prop key="nntpserver" >bean:name=nntpserver</prop>
- <prop key="virtualusertablemanagement" >bean:name=virtualusertablemanagement</prop>
- <prop key="spoolmanagement" >bean:name=spoolmanagement</prop>
- <prop key="domainlistmanagement" >bean:name=domainlistmanagement</prop>
- <prop key="processormanagement" >bean:name=processormanagement</prop>
- <prop key="bayesiananalyzermanagement" >bean:name=bayesiananalyzermanagement</prop>
- <prop key="usermanagement" >bean:name=usermanagement</prop>
-
- <prop key="serverConnector" >bean:name=serverConnector</prop>
- </props></property>
- </bean>
-
-
- <bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean" />
-
- <bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean">
- <property name="port" value="1099" />
- </bean>
-
- <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry">
- <property name="objectName" value="connector:name=rmi" />
- <property name="serviceUrl" value="service:jmx:rmi://localhost/jndi/rmi://localhost:1099/jamesmailserver" />
- </bean>
- -->
-
- <!--
- beans managing bootstrapping and component lifecycle
- -->
- <bean id="loggerPropagator" class="org.apache.james.container.spring.lifecycle.LoggerPropagator" >
- <property name="loggerFactory" ref="logger"/>
- </bean>
-
- <bean id="contextPropagator" class="org.apache.james.container.spring.lifecycle.ContextPropagator" >
- <property name="context" ref="avalonContext"/>
- </bean>
-
- <bean id="servicePropagator" class="org.apache.james.container.spring.lifecycle.ServicePropagator" >
- <property name="serviceManagerFactory" ref="serviceManager"/>
- </bean>
-
- <bean id="configurationManager" class="org.apache.james.container.spring.lifecycle.ConfigurationPropagator" >
- <property name="configurationProvider" ref="configurationProvider"/>
- </bean>
+ <!--
+ ** JMX part ** to enable exposure of JMX, activate the following beans
- <bean id="initializationManager" class="org.apache.james.container.spring.lifecycle.InitializationPropagator" />
+ NOTE: if you are running JDK < 1.5, you'd have to make a MBeanServer
+ implementation available on the classpath, for example mx4j
+ -->
+
+ <!--
+ <bean id="exporter" class="org.springframework.jmx.export.MBeanExporter" lazy-init="false">
+ <property name="autodetect" value="true" />
+ <property name="namingStrategy" ref="namingStrategy" />
+ </bean>
+ <bean id="namingStrategy" class="org.springframework.jmx.export.naming.KeyNamingStrategy" >
+ <property name="mappings" >
+ <props>
+ <prop key="fetchmail"> bean:name=fetchmail</prop>
+ <prop key="smtpserver">bean:name=smtpserver</prop>
+ <prop key="James" >bean:name=James</prop>
+ <prop key="dnsserver" >bean:name=dnsserver</prop>
+ <prop key="remotemanager" >bean:name=remotemanager</prop>
+ <prop key="pop3server" >bean:name=pop3server</prop>
+ <prop key="nntpserver">bean:name=nntpserver</prop>
+ <prop key="virtualusertablemanagement">bean:name=virtualusertablemanagement</prop>
+ <prop key="spoolmanagement" >bean:name=spoolmanagement</prop>
+ <prop key="domainlistmanagement" >bean:name=domainlistmanagement</prop>
+ <prop key="processormanagement" >bean:name=processormanagement</prop>
+ <prop key="bayesiananalyzermanagement">bean:name=bayesiananalyzermanagement</prop>
+ <prop key="usermanagement" >bean:name=usermanagement</prop>
+ <prop key="serverConnector" >bean:name=serverConnector</prop>
+ </props>
+ </property>
+ </bean>
+
+ <bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean" />
+
+ <bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean">
+ <property name="port" value="1099" />
+ </bean>
+
+ <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry">
+ <property name="objectName" value="connector:name=rmi" />
+ <property name="serviceUrl" value="service:jmx:rmi://localhost/jndi/rmi://localhost:1099/jamesmailserver" />
+ </bean>
+ -->
+
+ <bean
+ class="org.apache.james.container.spring.lifecycle.AvalonServiceableBeanPostProcessor">
+ <property name="order" value="2" />
+ <property name="beanRoleMap">
+ <map>
+ <entry
+ key="org.apache.avalon.cornerstone.services.threads.ThreadManager"
+ value="thread-manager" />
+ </map>
+ </property>
+ </bean>
+
+ <bean
+ class="org.apache.james.container.spring.lifecycle.AvalonInitializableBeanPostProcessor">
+ <property name="order" value="4" />
+ </bean>
+
+ <bean
+ class="org.apache.james.container.spring.lifecycle.AvalonConfigurableBeanPostProcessor">
+ <property name="configurationProvider" ref="configurationProvider" />
+ <property name="order" value="1" />
+ </bean>
+
+ <bean
+ class="org.apache.james.container.spring.lifecycle.CommonsConfigurableBeanPostProcessor">
+ <property name="configurationProvider" ref="configurationProvider" />
+ <property name="order" value="1" />
+ <property name="mappings">
+ <map>
+ <entry key="pop3server.protocolserver" value="pop3server" />
+ <entry key="pop3server.protocolhandlerfactory" value="pop3server" />
+ <entry key="smtpserver.protocolserver" value="smtpserver" />
+ <entry key="smtpserver.protocolhandlerfactory" value="smtpserver" />
+ <entry key="nntpserver.protocolserver" value="nntpserver" />
+ <entry key="nntpserver.protocolhandlerfactory" value="nntpserver" />
+ <entry key="imapserver.protocolserver" value="imapserver" />
+ <entry key="imapserver.protocolhandlerfactory" value="imapserver" />
+ <entry key="remotemanager.protocolserver" value="remotemanager" />
+ <entry key="remotemanager.protocolhandlerfactory" value="remotemanager" />
+ </map>
+ </property>
+ </bean>
+
+ <bean id="configurationProvider"
+ class="org.apache.james.container.spring.lifecycle.SpringConfigurationProvider">
+ <property name="configurationResource" value="classpath:james-config.xml" />
+ </bean>
+
+ <bean
+ class="org.apache.james.container.spring.lifecycle.LogEnabledBeanPostProcessor">
+ <property name="logProvider" ref="logProvider" />
+ <property name="order" value="0" />
+ <property name="mappings">
+ <map>
+ <entry key="pop3server.protocolserver" value="pop3server" />
+ <entry key="pop3server.protocolhandlerfactory" value="pop3server" />
+ <entry key="smtpserver.protocolserver" value="smtpserver" />
+ <entry key="smtpserver.protocolhandlerfactory" value="smtpserver" />
+ <entry key="nntpserver.protocolserver" value="nntpserver" />
+ <entry key="nntpserver.protocolhandlerfactory" value="nntpserver" />
+ <entry key="imapserver.protocolserver" value="imapserver" />
+ <entry key="imapserver.protocolhandlerfactory" value="imapserver" />
+ <entry key="remotemanager.protocolserver" value="remotemanager" />
+ <entry key="remotemanager.protocolhandlerfactory" value="remotemanager" />
+ </map>
+ </property>
+ </bean>
+
+ <bean
+ class="org.apache.james.container.spring.lifecycle.AvalonLogEnabledBeanPostProcessor">
+ <property name="logProvider" ref="logProvider" />
+ <property name="order" value="0" />
+ </bean>
+
+ <bean id="logProvider"
+ class="org.apache.james.container.spring.lifecycle.SpringLogProvider" />
+
+
+ <bean id="org.apache.james.LoaderService" class="org.apache.james.container.spring.lifecycle.JSR250LoaderService">
+ <property name="order" value="3" />
+ </bean>
+
+ <bean id="James" class="org.apache.james.James" />
+
+ <!-- The James Spool Manager block -->
+ <bean id="spoolmanager" class="org.apache.james.transport.JamesSpoolManager" />
+
+ <bean id="matcherpackages" class="org.apache.james.transport.JamesMatcherLoader" />
+
+ <bean id="mailetpackages" class="org.apache.james.transport.JamesMailetLoader" />
+
+ <bean id="dnsserver" class="org.apache.james.dnsserver.DNSServer" />
+
+ <!-- The Spool Management block -->
+ <bean id="spoolmanagement" class="org.apache.james.management.impl.SpoolManagement" />
+
+ <bean id="processormanagement" class="org.apache.james.management.impl.ProcessorManagement" />
+
+ <bean id="bayesiananalyzermanagement"
+ class="org.apache.james.management.impl.BayesianAnalyzerManagement" />
+
+ <!-- RemoteManager Beans-->
+ <bean id="remotemanager.protocolhandlerfactory"
+ class="org.apache.james.remotemanager.RemoteManagerProtocolHandlerFactory" />
+
+ <bean id="remotemanager.protocolserver" class="org.apache.james.socket.AvalonProtocolServer">
+ <property name="protocolHandlerFactory" ref="remotemanager.protocolhandlerfactory" />
+ </bean>
+
+ <bean id="remotemanager" class="org.apache.james.remotemanager.RemoteManagerMBeanImpl">
+ <property name="protocolServer" ref="remotemanager.protocolserver" />
+ </bean>
+
+ <!-- The User Management block -->
+ <bean id="usermanagement" class="org.apache.james.impl.user.UserManagement" />
+
+ <!-- POP3 Server Beans-->
+ <bean id="pop3server.protocolhandlerfactory"
+ class="org.apache.james.pop3server.POP3ServerProtocolServerHandlerFactory" />
+
+ <bean id="pop3server.protocolserver" class="org.apache.james.socket.AvalonProtocolServer">
+ <property name="protocolHandlerFactory" ref="pop3server.protocolhandlerfactory" />
+ </bean>
+
+ <bean id="pop3server" class="org.apache.james.pop3server.POP3ServerMBeanImpl">
+ <property name="protocolServer" ref="pop3server.protocolserver" />
+ </bean>
+
+ <!-- SMTP Server Beans-->
+ <bean id="smtpserver.protocolhandlerfactory"
+ class="org.apache.james.smtpserver.SMTPServerProtocolHandlerFactory" />
+
+ <bean id="smtpserver.protocolserver" class="org.apache.james.socket.AvalonProtocolServer">
+ <property name="protocolHandlerFactory" ref="smtpserver.protocolhandlerfactory" />
+ </bean>
+
+ <bean id="smtpserver" class="org.apache.james.smtpserver.SMTPServerMBeanImpl">
+ <property name="protocolServer" ref="smtpserver.protocolserver" />
+ </bean>
+
+ <!-- Async SMTP Server -->
+ <!-- enable this to use the MINA based SMTP Server which uses NIO -->
+ <!--
+ <bean id="smtpserver"
+ class="org.apache.james.smtpserver.mina.AsyncSMTPServer" />
+ -->
+
+ <bean id="org.apache.james.smtpserver.protocol.DNSService"
+ class="org.apache.james.smtpserver.integration.SMTPServerDNSServiceAdapter" />
+
+ <!-- NNTP Server Beans-->
+ <bean id="nntpserver.protocolhandlerfactory"
+ class="org.apache.james.nntpserver.NNTPServerProtocolHandlerFactory" />
+
+ <bean id="nntpserver.protocolserver" class="org.apache.james.socket.AvalonProtocolServer">
+ <property name="protocolHandlerFactory" ref="nntpserver.protocolhandlerfactory" />
+ </bean>
+
+ <bean id="nntpserver" class="org.apache.james.nntpserver.NNTPServerMBeanImpl">
+ <property name="protocolServer" ref="nntpserver.protocolserver" />
+ </bean>
+
+ <!-- NNTP Repository -->
+ <bean id="nntp-repository"
+ class="org.apache.james.nntpserver.repository.NNTPRepositoryImpl" />
+
+
+ <!-- FetchMail Service -->
+ <bean id="fetchmail" class="org.apache.james.fetchmail.FetchScheduler" />
+
+ <!-- The High Level Storage block -->
+ <bean id="mailstore" class="org.apache.james.mailrepository.MailStore" />
+
+ <!-- The main SpoolRepository -->
+ <bean id="spoolrepository"
+ class="org.apache.james.mailrepository.MailStoreSpoolRepository" />
+
+ <!-- The User Storage block -->
+ <bean id="users-store" class="org.apache.james.core.UsersStoreImpl" />
+
+ <!--
+ This is needed to link the smtpserver to the local user repository
+ -->
+ <!--
+ LocalJamesUsersRepository is used for backward compatibility with
+ James 2.3.0
+ -->
+ <!-- This is needed to support <usernames> configuraion inside James -->
+ <!--
+ If backward compatibility is not need the LocalUsersRepository
+ implementaion
+ -->
+ <!-- could be safely used -->
+ <bean id="localusersrepository"
+ class="org.apache.james.impl.jamesuser.LocalJamesUsersRepository" />
+
+
+ <!-- The context FileSystem implementation -->
+ <bean id="filesystem"
+ class="org.apache.james.container.spring.adaptor.FileSystemBridge" />
+
+ <!-- The VirtualUserTable Management block -->
+ <bean id="virtualusertablemanagementservice"
+ class="org.apache.james.impl.vut.VirtualUserTableManagement" />
+
+ <!-- VirtualUserTable Store -->
+ <bean id="virtualusertable-store" class="org.apache.james.core.VirtualUserTableStoreImpl" />
+
+
+ <bean id="defaultvirtualusertable" name="virtualusertablemanagement"
+ class="org.apache.james.impl.vut.DefaultVirtualUserTable" />
+
+ <!--
+ ########################################################################
+ -->
+ <!-- The context domainlist implementation -->
+ <bean id="domainlist" class="org.apache.james.domain.XMLDomainList" />
+
+ <!-- JDBC implementation of the domainlist service-->
+ <!--
+ <bean id="domainlist" class="org.apache.james.domain.JDBCDomainList"
+ />
+ -->
+
+ <!-- JDBC VirtualUserTable implementation of the domainlist service -->
+ <!--
+ <bean id="domainlist"
+ class="org.apache.james.vut.JDBCVirtualUserTable" />
+ -->
+
+ <!-- XML VirtualUserTable implementation of the domainlist service -->
+ <!--
+ <bean id="domainlist" class="org.apache.james.vut.XMLVirtualUserTable"
+ />
+ -->
+
+ <!-- IMAP server Beans -->
+ <bean id="imapserver.protocolhandlerfactory" name="org.apache.jsieve.mailet.Poster"
+ class="org.apache.james.imapserver.ImapServerProtocolHandlerFactory" />
+
+ <bean id="imapserver.protocolserver" class="org.apache.james.socket.AvalonProtocolServer">
+ <property name="protocolHandlerFactory" ref="imapserver.protocolhandlerfactory" />
+ </bean>
+
+ <!--
+ ####################################################################
+ -->
+
+ <bean id="domainlistmanagement" class="org.apache.james.management.impl.DomainListManagement" />
+
+
+ <!--
+ Configuration for Cornerstone Blocks only after here NOTHING BELOW
+ THIS SHOULD NEED CHANGING, (unless you want secure sockets (TLS))
+ -->
+
+ <!-- The Connection Manager block -->
+ <bean id="connections" class="org.apache.james.socket.SimpleConnectionManager" />
+
+ <!-- The Socket Manager block -->
+ <bean id="sockets"
+ class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager" />
+
+ <!-- The Time Scheduler block -->
+ <bean id="scheduler"
+ class="org.apache.avalon.cornerstone.blocks.scheduler.DefaultTimeScheduler" destroy-method="dispose" />
+
+ <!-- The DataSourceSelector block -->
+ <bean id="database-connections"
+ class="org.apache.avalon.cornerstone.blocks.datasources.DefaultDataSourceSelector" destroy-method="dispose" />
+
+ <!-- The ThreadManager block -->
+ <bean id="thread-manager"
+ class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager" destroy-method="dispose" />
</beans>
\ No newline at end of file
Modified: james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/Main.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/Main.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/Main.java (original)
+++ james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/Main.java Wed Jan 6 12:10:36 2010
@@ -18,15 +18,17 @@
****************************************************************/
package org.apache.james.container.spring;
-import org.apache.james.container.spring.beanfactory.JamesApplicationContext;
/**
* Bootstraps James using a Spring container
*/
public class Main {
- public static void main(String[] args) {
- JamesApplicationContext.newJamesApplicationContext();
+ public static void main(String[] args) {
+ JamesServerApplicationContext context = new JamesServerApplicationContext(
+ new String[] {"spring-beans.xml"});
+ context.registerShutdownHook();
+
}
}
Modified: james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java (original)
+++ james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java Wed Jan 6 12:10:36 2010
@@ -30,7 +30,7 @@
public class FileSystemBridge implements FileSystem, ResourceLoaderAware {
public File getBasedir() throws FileNotFoundException {
- return new File(".");
+ return new File("./../");
}
private ResourceLoader resourceLoader = null;
Added: james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-1.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-1.pom?rev=896414&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-1.pom (added)
+++ james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-1.pom Wed Jan 6 12:10:36 2010
@@ -0,0 +1,215 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>3</version>
+ </parent>
+ <groupId>org.apache.excalibur</groupId>
+ <artifactId>excalibur</artifactId>
+ <version>1</version>
+ <name>Excalibur</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>containerkit</module>
+ <module>framework</module>
+ <module>components</module>
+ <module>fortress</module>
+ <module>deprecated</module>
+ <module>cornerstone</module>
+ </modules>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</developerConnection>
+ <url>https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</url>
+ </scm>
+ <distributionManagement>
+ <repository>
+ <id>apache-maven</id>
+ <name>repository</name>
+ <!-- need to point to a staging repo here -->
+ <url>file:///Users/jheymans/tmp/stagingrepo</url>
+ <!--url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository/</url-->
+ </repository>
+ <!--snapshotRepository>
+ <id>apache-maven-snapshot</id>
+ <name>repository</name>
+ <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository-->
+ </distributionManagement>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <passphrase>yourgpgpassphrasehere</passphrase>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.3</source>
+ <target>1.3</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.directory}/classes/META-INF" failonerror="false" verbose="false">
+ <fileset dir="${basedir}">
+ <include name="LICENSE.txt" />
+ <include name="NOTICE.txt" />
+ </fileset>
+ </copy>
+ <copy todir="${project.build.directory}/classes" failonerror="false" verbose="false">
+ <fileset dir="${basedir}/src/java">
+ <include name="**/*.xtest" />
+ <include name="**/*.roles" />
+ <include name="**/*.xconf" />
+ <include name="**/*.xlog" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>copy-test-resources</id>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.directory}/test-classes" failonerror="false" verbose="false">
+ <fileset dir="${basedir}/src/test">
+ <include name="**/*.xtest" />
+ <include name="**/*.roles" />
+ <include name="**/*.xconf" />
+ <include name="**/*.xlog" />
+ <include name="**/*.properties" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <!--
+ This will avoid Maven and Eclipse sharing each-others generated classes
+ since they use different compilers.
+ Make sure to ignore eclipse-classes for SCM checkin/diff in Eclipse:
+ Window->Preferences->Team->Ignored Resources
+ -->
+ <buildOutputDirectory>${basedir}/eclipse-classes</buildOutputDirectory>
+ <wtpversion>1.0</wtpversion>
+ <useProjectReferences>false</useProjectReferences>
+ <downloadSources>true</downloadSources>
+ <buildcommands>
+ <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+ </buildcommands>
+ <!--
+ <projectnatures>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </projectnatures>
+ -->
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <!-- can't use 1.3: most of the libs are compiled with 1.4 -->
+ <jdkName>1.4</jdkName>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-4</version>
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/excalibur/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-2.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-2.pom?rev=896414&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-2.pom (added)
+++ james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-2.pom Wed Jan 6 12:10:36 2010
@@ -0,0 +1,216 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>3</version>
+ </parent>
+ <groupId>org.apache.excalibur</groupId>
+ <artifactId>excalibur</artifactId>
+ <version>2</version>
+ <name>Excalibur</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>containerkit</module>
+ <module>framework</module>
+ <module>components</module>
+ <module>fortress</module>
+ <module>deprecated</module>
+ <module>cornerstone</module>
+ </modules>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</developerConnection>
+ <url>https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</url>
+ </scm>
+ <distributionManagement>
+ <repository>
+ <id>apache-maven</id>
+ <name>repository</name>
+ <!-- need to point to a staging repo here -->
+ <url>file:///Users/jheymans/tmp/stagingrepo</url>
+ <!--url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository/</url-->
+ </repository>
+ <!--snapshotRepository>
+ <id>apache-maven-snapshot</id>
+ <name>repository</name>
+ <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository-->
+ </distributionManagement>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.3</source>
+ <target>1.3</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.directory}/classes/META-INF" failonerror="false" verbose="false">
+ <fileset dir="${basedir}">
+ <include name="LICENSE.txt" />
+ <include name="NOTICE.txt" />
+ </fileset>
+ </copy>
+ <copy todir="${project.build.directory}/classes" failonerror="false" verbose="false">
+ <fileset dir="${basedir}/src/java">
+ <include name="**/*.xtest" />
+ <include name="**/*.roles" />
+ <include name="**/*.xconf" />
+ <include name="**/*.xlog" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>copy-test-resources</id>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.directory}/test-classes" failonerror="false" verbose="false">
+ <fileset dir="${basedir}/src/test">
+ <include name="**/*.xtest" />
+ <include name="**/*.roles" />
+ <include name="**/*.xconf" />
+ <include name="**/*.xlog" />
+ <include name="**/*.properties" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <!--
+ This will avoid Maven and Eclipse sharing each-others generated classes
+ since they use different compilers.
+ Make sure to ignore eclipse-classes for SCM checkin/diff in Eclipse:
+ Window->Preferences->Team->Ignored Resources
+ -->
+ <buildOutputDirectory>${basedir}/eclipse-classes</buildOutputDirectory>
+ <wtpversion>1.0</wtpversion>
+ <useProjectReferences>false</useProjectReferences>
+ <downloadSources>true</downloadSources>
+ <buildcommands>
+ <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+ </buildcommands>
+ <!--
+ <projectnatures>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </projectnatures>
+ -->
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <!-- can't use 1.3: most of the libs are compiled with 1.4 -->
+ <jdkName>1.4</jdkName>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-4</version>
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/excalibur/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Added: james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-3.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-3.pom?rev=896414&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-3.pom (added)
+++ james/server/trunk/stage/org.apache.excalibur.components/org.apache.excalibur/poms/excalibur-3.pom Wed Jan 6 12:10:36 2010
@@ -0,0 +1,241 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>3</version>
+
+ </parent>
+ <groupId>org.apache.excalibur</groupId>
+ <artifactId>excalibur</artifactId>
+ <version>3</version>
+ <name>Excalibur</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>containerkit</module>
+ <module>framework</module>
+ <module>components</module>
+ <module>fortress</module>
+ <module>deprecated</module>
+
+ <module>cornerstone</module>
+ </modules>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/excalibur/tags/excalibur-3</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/excalibur/tags/excalibur-3</developerConnection>
+ <url>https://svn.apache.org/repos/asf/excalibur/tags/excalibur-3</url>
+ </scm>
+
+ <distributionManagement>
+ <repository>
+ <id>apache-maven</id>
+ <name>repository</name>
+ <!-- need to point to a staging repo here -->
+ <url>file:///Users/jheymans/tmp/stagingrepo</url>
+ <!--url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository/</url-->
+
+ </repository>
+ <!--snapshotRepository>
+ <id>apache-maven-snapshot</id>
+ <name>repository</name>
+ <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository-->
+ </distributionManagement>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <plugins>
+ <plugin>
+
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.3</source>
+ <target>1.3</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>process-resources</phase>
+
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.directory}/classes/META-INF" failonerror="false" verbose="false">
+ <fileset dir="${basedir}">
+ <include name="LICENSE.txt" />
+ <include name="NOTICE.txt" />
+ </fileset>
+ </copy>
+ <copy todir="${project.build.directory}/classes" failonerror="false" verbose="false">
+
+ <fileset dir="${basedir}/src/java">
+ <include name="**/*.xtest" />
+ <include name="**/*.roles" />
+ <include name="**/*.xconf" />
+ <include name="**/*.xlog" />
+ <include name="**/*.xinfo" />
+ </fileset>
+ </copy>
+ </tasks>
+
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>copy-test-resources</id>
+ <phase>process-test-resources</phase>
+
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.directory}/test-classes" failonerror="false" verbose="false">
+ <fileset dir="${basedir}/src/test">
+ <include name="**/*.xtest" />
+ <include name="**/*.roles" />
+ <include name="**/*.xconf" />
+ <include name="**/*.xlog" />
+ <include name="**/*.properties" />
+
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <!--
+ This will avoid Maven and Eclipse sharing each-others generated classes
+ since they use different compilers.
+ Make sure to ignore eclipse-classes for SCM checkin/diff in Eclipse:
+ Window->Preferences->Team->Ignored Resources
+ -->
+ <buildOutputDirectory>${basedir}/eclipse-classes</buildOutputDirectory>
+
+ <wtpversion>1.0</wtpversion>
+ <useProjectReferences>false</useProjectReferences>
+ <downloadSources>true</downloadSources>
+ <buildcommands>
+ <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+ </buildcommands>
+ <!--
+ <projectnatures>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </projectnatures>
+ -->
+
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <!-- can't use 1.3: most of the libs are compiled with 1.4 -->
+
+ <jdkName>1.4</jdkName>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-4</version>
+
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/excalibur/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Propchange: james/server/trunk/stage/org.slf4j/jars/slf4j-log4j12-1.3.0.LICENSE
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 12:10:36 2010
@@ -0,0 +1 @@
+/james/server/sandbox/active/pure_spring_deployment/stage/org.slf4j/jars/slf4j-log4j12-1.3.0.LICENSE:893986-896410
Modified: james/server/trunk/stage/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/pom.xml?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/stage/pom.xml (original)
+++ james/server/trunk/stage/pom.xml Wed Jan 6 12:10:36 2010
@@ -286,10 +286,12 @@
<groupId>mstor</groupId>
<artifactId>mstor</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
+ -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
@@ -300,6 +302,11 @@
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.db.torque</groupId>
<artifactId>runtime</artifactId>
</dependency>
@@ -324,20 +331,18 @@
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
+
<dependency>
- <groupId>avalon-phoenix</groupId>
- <artifactId>avalon-phoenix-client</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
</dependency>
-
- <!-- phoenix-runtime -->
<dependency>
- <groupId>spice</groupId>
- <artifactId>spice-configkit</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -390,20 +395,7 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</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>
+
</dependencies>
<build>
Modified: james/server/trunk/user-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/pom.xml?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/user-library/pom.xml (original)
+++ james/server/trunk/user-library/pom.xml Wed Jan 6 12:10:36 2010
@@ -31,6 +31,10 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
<dependency>
@@ -50,23 +54,6 @@
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</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>oro</groupId>
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java Wed Jan 6 12:10:36 2010
@@ -28,6 +28,8 @@
import org.apache.james.api.user.User;
import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.impl.user.DefaultUser;
+import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.LogEnabled;
import java.util.ArrayList;
import java.util.Collection;
@@ -41,7 +43,7 @@
* implementations, and makes it easier to create new User repositories.</p>
*
*/
-public abstract class AbstractUsersRepository implements JamesUsersRepository {
+public abstract class AbstractUsersRepository implements JamesUsersRepository, LogEnabled, Configurable {
/**
* Ignore case in usernames
@@ -58,26 +60,14 @@
*/
protected boolean enableForwarding;
- private HierarchicalConfiguration configuration;
private Log logger;
- @Resource(name="org.apache.commons.logging.Log")
- public void setLogger(Log logger) {
+ public void setLog(Log logger) {
this.logger = logger;
}
- @Resource(name="org.apache.commons.configuration.Configuration")
- public void setConfiguration(HierarchicalConfiguration configuration) {
- this.configuration = configuration;
- }
-
- @PostConstruct
- public void init() throws Exception{
- configure();
- }
-
- private void configure() throws ConfigurationException {
+ public void configure(HierarchicalConfiguration configuration) throws ConfigurationException{
setIgnoreCase(configuration.getBoolean("usernames", false));
setEnableAliases(configuration.getBoolean("enableAliases", false));
setEnableForwarding(configuration.getBoolean("enableForwarding", false));
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java Wed Jan 6 12:10:36 2010
@@ -24,8 +24,6 @@
import java.util.Collection;
-import javax.annotation.PostConstruct;
-
/**
* This is a wrapper that provide access to the "LocalUsers" repository
* but expect to find a JamesUsersRepository and return an object implementing
@@ -35,12 +33,6 @@
- // REMOVE ME!!!
- @Override
- @PostConstruct
- public void init() throws Exception {
- super.init();
- }
/**
* @see org.apache.james.impl.jamesuser.JamesUsersRepository#setEnableAliases(boolean)
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java Wed Jan 6 12:10:36 2010
@@ -43,6 +43,8 @@
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.api.vut.management.VirtualUserTableManagement;
+import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.LogEnabled;
import org.apache.mailet.MailAddress;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.Perl5Compiler;
@@ -50,7 +52,7 @@
/**
*
*/
-public abstract class AbstractVirtualUserTable implements VirtualUserTable, VirtualUserTableManagement, DomainList {
+public abstract class AbstractVirtualUserTable implements VirtualUserTable, VirtualUserTableManagement, DomainList, LogEnabled, Configurable {
private boolean autoDetect = true;
private boolean autoDetectIP = true;
@@ -69,18 +71,8 @@
this.dns = dns;
}
- @Resource(name="org.apache.commons.configuration.Configuration")
- public void setConfiguration(HierarchicalConfiguration config) {
- this.config = config;
- }
-
- @Resource(name="org.apache.commons.logging.Log")
- public void setLogger(Log logger) {
- this.logger = logger;
- }
-
- private void configure() throws ConfigurationException {
- setRecursiveMapping(config.getBoolean("recursiveMapping", true));
+ public void configure(HierarchicalConfiguration config) throws ConfigurationException {
+ setRecursiveMapping(config.getBoolean("recursiveMapping", true));
try {
setMappingLimit(config.getInt("mappingLimit",10));
} catch (IllegalArgumentException e) {
@@ -88,6 +80,11 @@
}
doConfigure(config);
}
+
+ public void setLog(Log logger) {
+ this.logger = logger;
+ }
+
protected void doConfigure(HierarchicalConfiguration conf) throws ConfigurationException {
@@ -97,10 +94,6 @@
this.recursive = recursive;
}
- @PostConstruct
- public void init() throws Exception {
- configure();
- }
/**
* Set the mappingLimit
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java?rev=896414&r1=896413&r2=896414&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java Wed Jan 6 12:10:36 2010
@@ -49,9 +49,8 @@
*/
protected UsersRepository getUsersRepository() throws Exception {
MockUsersRepository repos = new MockUsersRepository();
- repos.setLogger(new SimpleLog("MockLog"));
- repos.setConfiguration(new DefaultConfigurationBuilder());
- repos.init();
+ repos.setLog(new SimpleLog("MockLog"));
+ repos.configure(new DefaultConfigurationBuilder());
return repos;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org