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 ba...@apache.org on 2008/08/10 14:14:12 UTC

svn commit: r684482 - in /james/server/trunk: avalon-user-function/src/main/resources/org/apache/james/vut/ phoenix-deployment/src/conf/ spring-deployment/src/main/config/james/ spring-deployment/src/main/test/org/apache/james/container/spring/beanfact...

Author: bago
Date: Sun Aug 10 05:14:12 2008
New Revision: 684482

URL: http://svn.apache.org/viewvc?rev=684482&view=rev
Log:
Repackaging for the user api/library code, in progress.
Moved VirtuserTableManagement interface to user-api.api.vut.management.

Added:
    james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java   (contents, props changed)
      - copied, changed from r684466, james/server/trunk/user-library/src/main/java/org/apache/james/services/VirtualUserTableManagement.java
Removed:
    james/server/trunk/user-library/src/main/java/org/apache/james/services/VirtualUserTableManagement.java
Modified:
    james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/vut/JDBCVirtualUserTable.xinfo
    james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
    james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
    james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
    james/server/trunk/user-library/src/main/java/org/apache/james/core/DefaultVirtualUserTable.java
    james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java
    james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java
    james/server/trunk/user-library/src/main/resources/org/apache/james/core/DefaultVirtualUserTable.xinfo
    james/server/trunk/user-library/src/main/resources/org/apache/james/management/VirtualUserTableManagement.xinfo
    james/server/trunk/user-library/src/main/resources/org/apache/james/vut/XMLVirtualUserTable.xinfo
    james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java

Modified: james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/vut/JDBCVirtualUserTable.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/vut/JDBCVirtualUserTable.xinfo?rev=684482&r1=684481&r2=684482&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/vut/JDBCVirtualUserTable.xinfo (original)
+++ james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/vut/JDBCVirtualUserTable.xinfo Sun Aug 10 05:14:12 2008
@@ -26,7 +26,7 @@
   </block>
 
   <services>
-    <service name="org.apache.james.services.VirtualUserTableManagement" version="1.0" />
+    <service name="org.apache.james.api.vut.management.VirtualUserTableManagement" version="1.0" />
     <service name="org.apache.james.api.vut.VirtualUserTable" version="1.0" />
     <service name="org.apache.james.services.DomainList" version="1.0"/>
   </services>

Modified: james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml?rev=684482&r1=684481&r2=684482&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml Sun Aug 10 05:14:12 2008
@@ -254,7 +254,7 @@
   <!-- The VirtualUserTable Management block  -->
   <block name="virtualusertablemanagement" class="org.apache.james.management.VirtualUserTableManagement" >
     <provide name="virtualusertable-store" role="org.apache.james.api.vut.VirtualUserTableStore"/>
-    <provide name="defaultvirtualusertable" role="org.apache.james.services.VirtualUserTableManagement" />
+    <provide name="defaultvirtualusertable" role="org.apache.james.api.vut.management.VirtualUserTableManagement" />
   </block>
   
   <!-- VirtualUserTable Store -->

Modified: james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml?rev=684482&r1=684481&r2=684482&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml Sun Aug 10 05:14:12 2008
@@ -254,7 +254,7 @@
   <!-- The VirtualUserTable Management block  -->
   <block name="virtualusertablemanagement" class="org.apache.james.management.VirtualUserTableManagement" >
     <provide name="virtualusertable-store" role="org.apache.james.api.vut.VirtualUserTableStore"/>
-    <provide name="defaultvirtualusertable" role="org.apache.james.services.VirtualUserTableManagement" />
+    <provide name="defaultvirtualusertable" role="org.apache.james.api.vut.management.VirtualUserTableManagement" />
   </block>
   
   <!-- VirtualUserTable Store -->

Modified: james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml?rev=684482&r1=684481&r2=684482&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml (original)
+++ james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml Sun Aug 10 05:14:12 2008
@@ -264,7 +264,7 @@
   <!-- The VirtualUserTable Management block  -->
   <block name="virtualusertablemanagement" class="org.apache.james.management.VirtualUserTableManagement" >
     <provide name="virtualusertable-store" role="org.apache.james.api.vut.VirtualUserTableStore"/>
-    <provide name="defaultvirtualusertable" role="org.apache.james.services.VirtualUserTableManagement" />
+    <provide name="defaultvirtualusertable" role="org.apache.james.api.vut.management.VirtualUserTableManagement" />
   </block>
   
   <!-- VirtualUserTable Store -->

Copied: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java (from r684466, james/server/trunk/user-library/src/main/java/org/apache/james/services/VirtualUserTableManagement.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/services/VirtualUserTableManagement.java&r1=684466&r2=684482&rev=684482&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/services/VirtualUserTableManagement.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java Sun Aug 10 05:14:12 2008
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.services;
+package org.apache.james.api.vut.management;
 
 import java.util.Collection;
 import java.util.Map;

Propchange: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: james/server/trunk/user-library/src/main/java/org/apache/james/core/DefaultVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/core/DefaultVirtualUserTable.java?rev=684482&r1=684481&r2=684482&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/core/DefaultVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/core/DefaultVirtualUserTable.java Sun Aug 10 05:14:12 2008
@@ -31,7 +31,7 @@
 import org.apache.james.api.user.ErrorMappingException;
 import org.apache.james.api.user.InvalidMappingException;
 import org.apache.james.api.vut.VirtualUserTableStore;
-import org.apache.james.services.VirtualUserTableManagement;
+import org.apache.james.api.vut.management.VirtualUserTableManagement;
 
 /**
  * Default VirtualUserTable
@@ -60,49 +60,49 @@
     }
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#addAddressMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#addAddressMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public boolean addAddressMapping(String user, String domain, String address) throws InvalidMappingException {
         return vut.addAddressMapping(user, domain, address);
     }
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#addErrorMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#addErrorMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public boolean addErrorMapping(String user, String domain, String error) throws InvalidMappingException {
         return vut.addErrorMapping(user, domain, error);
     }
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#addRegexMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#addRegexMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public boolean addRegexMapping(String user, String domain, String regex) throws InvalidMappingException {
         return vut.addRegexMapping(user, domain, regex);
     }
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#getUserDomainMappings(java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#getUserDomainMappings(java.lang.String, java.lang.String)
      */
     public Collection getUserDomainMappings(String user, String domain) throws InvalidMappingException {
         return vut.getUserDomainMappings(user, domain);
     }
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#removeAddressMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#removeAddressMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public boolean removeAddressMapping(String user, String domain, String address) throws InvalidMappingException {
         return vut.removeAddressMapping(user, domain, address);
     }
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#removeErrorMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#removeErrorMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public boolean removeErrorMapping(String user, String domain, String error) throws InvalidMappingException {
         return vut.removeErrorMapping(user, domain, error);
     }
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#removeRegexMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#removeRegexMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public boolean removeRegexMapping(String user, String domain, String regex) throws InvalidMappingException {
         return vut.removeRegexMapping(user, domain, regex);
@@ -116,35 +116,35 @@
     }
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#addMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#addMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public boolean addMapping(String user, String domain, String mapping) throws InvalidMappingException {
         return vut.addMapping(user, domain, mapping);
     }
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#removeMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#removeMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public boolean removeMapping(String user, String domain, String mapping) throws InvalidMappingException {
         return vut.removeMapping(user, domain, mapping);
     }
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#getAllMappings()
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#getAllMappings()
      */
     public Map getAllMappings() {
         return vut.getAllMappings();
     }
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#addAliasDomainMapping(String, String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#addAliasDomainMapping(String, String)
      */
     public boolean addAliasDomainMapping(String aliasDomain, String realDomain) throws InvalidMappingException {
         return vut.addAliasDomainMapping(aliasDomain, realDomain);
     }
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#removeAliasDomainMapping(String, String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#removeAliasDomainMapping(String, String)
      */
     public boolean removeAliasDomainMapping(String aliasDomain, String realDomain) throws InvalidMappingException {
         return vut.removeAliasDomainMapping(aliasDomain, realDomain);

Modified: james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java?rev=684482&r1=684481&r2=684482&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java Sun Aug 10 05:14:12 2008
@@ -43,21 +43,21 @@
 public class VirtualUserTableManagement implements Serviceable, VirtualUserTableManagementService, VirtualUserTableManagementMBean {
 
     VirtualUserTableStore store;
-    org.apache.james.services.VirtualUserTableManagement defaultVUT;    
+    org.apache.james.api.vut.management.VirtualUserTableManagement defaultVUT;    
 
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager arg0) throws ServiceException {
         setVirtualUserTableStore((VirtualUserTableStore) arg0.lookup(VirtualUserTableStore.ROLE));
-        setDefaultVirtualUserTable((org.apache.james.services.VirtualUserTableManagement) arg0.lookup(DefaultVirtualUserTable.ROLE));
+        setDefaultVirtualUserTable((org.apache.james.api.vut.management.VirtualUserTableManagement) arg0.lookup(DefaultVirtualUserTable.ROLE));
     }
 
     public void setVirtualUserTableStore(VirtualUserTableStore store) {
         this.store = store;
     }
     
-    public void setDefaultVirtualUserTable(org.apache.james.services.VirtualUserTableManagement defaultVUT) {
+    public void setDefaultVirtualUserTable(org.apache.james.api.vut.management.VirtualUserTableManagement defaultVUT) {
         this.defaultVUT = defaultVUT;
     }
     
@@ -68,7 +68,7 @@
      * @return VirtualUserTableManagement object
      * @throws VirtualUserTableManagementException if no VirtualUserTable with the given name exists
      */
-    private org.apache.james.services.VirtualUserTableManagement getTable(String tableName) throws VirtualUserTableManagementException {     
+    private org.apache.james.api.vut.management.VirtualUserTableManagement getTable(String tableName) throws VirtualUserTableManagementException {     
         // if the tableName was null return the DefaultVirtualUserTable
         if (tableName == null) {
             return defaultVUT;
@@ -78,11 +78,11 @@
             // Check if a table with the given name exists, if not throw an Exception
             if (vut == null) {
                 throw new VirtualUserTableManagementException("No VirtualUserTable with such name: " + tableName);
-            } else if (!(vut instanceof org.apache.james.services.VirtualUserTableManagement)){
+            } else if (!(vut instanceof org.apache.james.api.vut.management.VirtualUserTableManagement)){
                 // Used VUT not support management, throw an Exception
                 throw new VirtualUserTableManagementException("Used VirtualUserTable implementation not support management");
             } else {
-                return (org.apache.james.services.VirtualUserTableManagement) vut;
+                return (org.apache.james.api.vut.management.VirtualUserTableManagement) vut;
             }
         }
     }

Modified: james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java?rev=684482&r1=684481&r2=684482&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java Sun Aug 10 05:14:12 2008
@@ -41,9 +41,9 @@
 import org.apache.james.api.user.ErrorMappingException;
 import org.apache.james.api.user.InvalidMappingException;
 import org.apache.james.api.vut.VirtualUserTable;
+import org.apache.james.api.vut.management.VirtualUserTableManagement;
 import org.apache.james.services.DNSServer;
 import org.apache.james.services.DomainList;
-import org.apache.james.services.VirtualUserTableManagement;
 import org.apache.james.util.DomainListUtil;
 import org.apache.mailet.MailAddress;
 import org.apache.oro.text.regex.MalformedPatternException;
@@ -198,7 +198,7 @@
     }
     
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#addRegexMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#addRegexMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public synchronized boolean addRegexMapping(String user, String domain, String regex) throws InvalidMappingException {     
         try {
@@ -217,7 +217,7 @@
 
     
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#removeRegexMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#removeRegexMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public synchronized boolean removeRegexMapping(String user, String domain, String regex) throws InvalidMappingException {
         getLogger().info("Remove regex mapping => " + regex + " for user: " + user + " domain: " + domain);
@@ -225,7 +225,7 @@
     }
     
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#addAddressMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#addAddressMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public synchronized boolean addAddressMapping(String user, String domain, String address) throws InvalidMappingException {
         if (address.indexOf('@') < 0) {
@@ -245,7 +245,7 @@
     }
     
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#removeAddressMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#removeAddressMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public synchronized boolean removeAddressMapping(String user, String domain, String address) throws InvalidMappingException {
         if (address.indexOf('@') < 0) {
@@ -256,7 +256,7 @@
     }
     
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#addErrorMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#addErrorMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public synchronized boolean addErrorMapping(String user, String domain, String error) throws InvalidMappingException {   
         if (checkMapping(user,domain,error) == true) {          
@@ -268,7 +268,7 @@
     }
     
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#removeErrorMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#removeErrorMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public synchronized boolean removeErrorMapping(String user, String domain, String error) throws InvalidMappingException {
         getLogger().info("Remove error mapping => " + error + " for user: " + user + " domain: " + domain);     
@@ -277,7 +277,7 @@
 
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#addMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#addMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public synchronized boolean addMapping(String user, String domain, String mapping) throws InvalidMappingException {
         String map = mapping.toLowerCase();
@@ -295,7 +295,7 @@
     }
     
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#removeMapping(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#removeMapping(java.lang.String, java.lang.String, java.lang.String)
      */
     public synchronized boolean removeMapping(String user, String domain, String mapping) throws InvalidMappingException {
         String map = mapping.toLowerCase();
@@ -313,7 +313,7 @@
     }
     
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#getAllMappings()
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#getAllMappings()
      */
     public Map getAllMappings() {
         int count = 0;
@@ -380,7 +380,7 @@
     }
     
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#getUserDomainMappings(java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#getUserDomainMappings(java.lang.String, java.lang.String)
      */
     public Collection getUserDomainMappings(String user, String domain) {
         return getUserDomainMappingsInternal(user, domain);
@@ -403,7 +403,7 @@
     }
 
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#addAliasDomainMapping(java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#addAliasDomainMapping(java.lang.String, java.lang.String)
      */
     public synchronized boolean addAliasDomainMapping(String aliasDomain, String realDomain) throws InvalidMappingException {
         getLogger().info("Add domain mapping: " + aliasDomain  + " => " + realDomain);
@@ -411,7 +411,7 @@
     }
     
     /**
-     * @see org.apache.james.services.VirtualUserTableManagement#removeAliasDomainMapping(java.lang.String, java.lang.String)
+     * @see org.apache.james.api.vut.management.VirtualUserTableManagement#removeAliasDomainMapping(java.lang.String, java.lang.String)
      */
     public synchronized boolean removeAliasDomainMapping(String aliasDomain, String realDomain) throws InvalidMappingException {
         getLogger().info("Remove domain mapping: " + aliasDomain  + " => " + realDomain);

Modified: james/server/trunk/user-library/src/main/resources/org/apache/james/core/DefaultVirtualUserTable.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/resources/org/apache/james/core/DefaultVirtualUserTable.xinfo?rev=684482&r1=684481&r2=684482&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/resources/org/apache/james/core/DefaultVirtualUserTable.xinfo (original)
+++ james/server/trunk/user-library/src/main/resources/org/apache/james/core/DefaultVirtualUserTable.xinfo Sun Aug 10 05:14:12 2008
@@ -28,7 +28,7 @@
   <!-- services that are offered by this block -->
   <services>
     <service name="org.apache.james.api.vut.VirtualUserTable" version="1.0" />
-    <service name="org.apache.james.services.VirtualUserTableManagement" version="1.0" />
+    <service name="org.apache.james.api.vut.management.VirtualUserTableManagement" version="1.0" />
   </services>
 
   <dependencies>

Modified: james/server/trunk/user-library/src/main/resources/org/apache/james/management/VirtualUserTableManagement.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/resources/org/apache/james/management/VirtualUserTableManagement.xinfo?rev=684482&r1=684481&r2=684482&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/resources/org/apache/james/management/VirtualUserTableManagement.xinfo (original)
+++ james/server/trunk/user-library/src/main/resources/org/apache/james/management/VirtualUserTableManagement.xinfo Sun Aug 10 05:14:12 2008
@@ -39,7 +39,7 @@
       <service name="org.apache.james.api.vut.VirtualUserTableStore" version="1.0"/>
     </dependency>
     <dependency>
-      <service name="org.apache.james.services.VirtualUserTableManagement" version="1.0"/>
+      <service name="org.apache.james.api.vut.management.VirtualUserTableManagement" version="1.0"/>
     </dependency>
   </dependencies>
 </blockinfo>

Modified: james/server/trunk/user-library/src/main/resources/org/apache/james/vut/XMLVirtualUserTable.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/resources/org/apache/james/vut/XMLVirtualUserTable.xinfo?rev=684482&r1=684481&r2=684482&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/resources/org/apache/james/vut/XMLVirtualUserTable.xinfo (original)
+++ james/server/trunk/user-library/src/main/resources/org/apache/james/vut/XMLVirtualUserTable.xinfo Sun Aug 10 05:14:12 2008
@@ -26,7 +26,7 @@
   </block>
 
   <services>
-    <service name="org.apache.james.services.VirtualUserTableManagement" version="1.0" />
+    <service name="org.apache.james.api.vut.management.VirtualUserTableManagement" version="1.0" />
     <service name="org.apache.james.api.vut.VirtualUserTable" version="1.0" />
     <service name="org.apache.james.services.DomainList" version="1.0"/>
   </services>

Modified: james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java?rev=684482&r1=684481&r2=684482&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java Sun Aug 10 05:14:12 2008
@@ -27,7 +27,7 @@
 import org.apache.james.api.user.ErrorMappingException;
 import org.apache.james.api.user.InvalidMappingException;
 import org.apache.james.api.vut.VirtualUserTable;
-import org.apache.james.services.VirtualUserTableManagement;
+import org.apache.james.api.vut.management.VirtualUserTableManagement;
 import org.apache.james.vut.VirtualUserTableUtil;
 
 public class MockVirtualUserTableManagementImpl implements VirtualUserTableManagement {



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