james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r905200 - in /james/server/trunk: ./ spring-deployment/ user-function/ user-function/src/ user-function/src/main/ user-function/src/main/config/ user-function/src/main/config/org/ user-function/src/main/config/org/apache/ user-function/src/...
Date Mon, 01 Feb 2010 07:38:57 GMT
Author: norman
Date: Mon Feb  1 07:38:55 2010
New Revision: 905200

URL: http://svn.apache.org/viewvc?rev=905200&view=rev
Log:
complete merge 

Added:
    james/server/trunk/user-function/   (props changed)
      - copied from r905116, james/server/trunk/avalon-user-function/
    james/server/trunk/user-function/LICENSE.txt
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/LICENSE.txt
    james/server/trunk/user-function/NOTICE.txt
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/NOTICE.txt
    james/server/trunk/user-function/pom.xml
      - copied, changed from r905116, james/server/trunk/avalon-user-function/pom.xml
    james/server/trunk/user-function/src/
      - copied from r905116, james/server/trunk/avalon-user-function/src/
    james/server/trunk/user-function/src/main/
      - copied from r905116, james/server/trunk/avalon-user-function/src/main/
    james/server/trunk/user-function/src/main/config/
      - copied from r905116, james/server/trunk/avalon-user-function/src/main/config/
    james/server/trunk/user-function/src/main/config/org/
      - copied from r905116, james/server/trunk/avalon-user-function/src/main/config/org/
    james/server/trunk/user-function/src/main/config/org/apache/
      - copied from r905116, james/server/trunk/avalon-user-function/src/main/config/org/apache/
    james/server/trunk/user-function/src/main/config/org/apache/james/
      - copied from r905116, james/server/trunk/avalon-user-function/src/main/config/org/apache/james/
    james/server/trunk/user-function/src/main/java/
      - copied from r905116, james/server/trunk/avalon-user-function/src/main/java/
    james/server/trunk/user-function/src/main/java/org/
      - copied from r905116, james/server/trunk/avalon-user-function/src/main/java/org/
    james/server/trunk/user-function/src/main/java/org/apache/
      - copied from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/
    james/server/trunk/user-function/src/main/java/org/apache/james/
      - copied from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/
    james/server/trunk/user-function/src/main/java/org/apache/james/core/
      - copied from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/
    james/server/trunk/user-function/src/main/java/org/apache/james/core/AbstractStore.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AbstractStore.java
    james/server/trunk/user-function/src/main/java/org/apache/james/core/UsersStoreImpl.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/UsersStoreImpl.java
    james/server/trunk/user-function/src/main/java/org/apache/james/core/VirtualUserTableStoreImpl.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/VirtualUserTableStoreImpl.java
    james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/
      - copied from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/
    james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
    james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java
    james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
    james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
    james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/ReadOnlyLDAPGroupRestriction.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ReadOnlyLDAPGroupRestriction.java
    james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/ReadOnlyLDAPUser.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ReadOnlyLDAPUser.java
    james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/ReadOnlyUsersLDAPRepository.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ReadOnlyUsersLDAPRepository.java
    james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/SimpleLDAPConnection.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/SimpleLDAPConnection.java
    james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
    james/server/trunk/user-function/src/main/java/org/apache/james/vut/
      - copied from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/
    james/server/trunk/user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
    james/server/trunk/user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
      - copied unchanged from r905116, james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
    james/server/trunk/user-function/src/main/resources/
      - copied from r905116, james/server/trunk/avalon-user-function/src/main/resources/
    james/server/trunk/user-function/src/test/
      - copied from r905116, james/server/trunk/avalon-user-function/src/test/
    james/server/trunk/user-function/src/test/config/
      - copied from r905116, james/server/trunk/avalon-user-function/src/test/config/
    james/server/trunk/user-function/src/test/java/
      - copied from r905116, james/server/trunk/avalon-user-function/src/test/java/
    james/server/trunk/user-function/src/test/java/org/
      - copied from r905116, james/server/trunk/avalon-user-function/src/test/java/org/
    james/server/trunk/user-function/src/test/java/org/apache/
      - copied from r905116, james/server/trunk/avalon-user-function/src/test/java/org/apache/
    james/server/trunk/user-function/src/test/java/org/apache/james/
      - copied from r905116, james/server/trunk/avalon-user-function/src/test/java/org/apache/james/
    james/server/trunk/user-function/src/test/java/org/apache/james/management/
      - copied from r905116, james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/
    james/server/trunk/user-function/src/test/java/org/apache/james/management/UserManagementTest.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java
    james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/
      - copied from r905116, james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/
    james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
    james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
    james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
    james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
    james/server/trunk/user-function/src/test/java/org/apache/james/vut/
      - copied from r905116, james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/
    james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
    james/server/trunk/user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
      - copied unchanged from r905116, james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
    james/server/trunk/user-function/src/test/resources/
      - copied from r905116, james/server/trunk/avalon-user-function/src/test/resources/
    james/server/trunk/user-function/src/test/resources/sqlResources.xml
      - copied unchanged from r905116, james/server/trunk/avalon-user-function/src/test/resources/sqlResources.xml
Modified:
    james/server/trunk/pom.xml
    james/server/trunk/spring-deployment/pom.xml

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=905200&r1=905199&r2=905200&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Mon Feb  1 07:38:55 2010
@@ -140,7 +140,6 @@
     </plugins>
   </build>
   
-  
   <reporting>
     <plugins>
     <!--
@@ -419,6 +418,7 @@
       <artifactId>james-server-user-function</artifactId>
       <version>3.0-M1</version>
     </dependency>
+  
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-smtpserver-function</artifactId>

Modified: james/server/trunk/spring-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=905200&r1=905199&r2=905200&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Mon Feb  1 07:38:55 2010
@@ -282,7 +282,7 @@
       <artifactId>james-server-smtp-protocol-library</artifactId>
       <scope>runtime</scope>
     </dependency>
-
+   
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-user-function</artifactId>

Propchange: james/server/trunk/user-function/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb  1 07:38:55 2010
@@ -0,0 +1,4 @@
+.*
+target
+*.log
+stage

Copied: james/server/trunk/user-function/pom.xml (from r905116, james/server/trunk/avalon-user-function/pom.xml)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/pom.xml?p2=james/server/trunk/user-function/pom.xml&p1=james/server/trunk/avalon-user-function/pom.xml&r1=905116&r2=905200&rev=905200&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/pom.xml (original)
+++ james/server/trunk/user-function/pom.xml Mon Feb  1 07:38:55 2010
@@ -25,8 +25,8 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
-  <artifactId>james-server-avalon-user-function</artifactId>
-  <name>Apache JAMES Server Avalon User function</name>
+  <artifactId>james-server-user-function</artifactId>
+  <name>Apache JAMES Server User function</name>
   <dependencies>
     <dependency>
       <groupId>${javax.mail.groupId}</groupId>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message