directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r894424 - in /directory/apacheds/branches/apacheds-schema: server-annotations/src/main/java/org/apache/directory/server/annotations/ server-unit/src/main/java/org/apache/directory/server/unit/ test-framework/src/main/java/org/apache/directo...
Date Tue, 29 Dec 2009 15:39:42 GMT
Author: elecharny
Date: Tue Dec 29 15:39:41 2009
New Revision: 894424

URL: http://svn.apache.org/viewvc?rev=894424&view=rev
Log:
Reenamed the LdapServerBuilder @

Added:
    directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java
      - copied, changed from r894422, directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/LdapServerBuilder.java
Removed:
    directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/LdapServerBuilder.java
Modified:
    directory/apacheds/branches/apacheds-schema/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
    directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
    directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkSuite.java
    directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java

Copied: directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java
(from r894422, directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/LdapServerBuilder.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java?p2=directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java&p1=directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/LdapServerBuilder.java&r1=894422&r2=894424&rev=894424&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/LdapServerBuilder.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java
Tue Dec 29 15:39:41 2009
@@ -46,7 +46,7 @@
 @Inherited
 @Retention ( RetentionPolicy.RUNTIME )
 @Target ( { ElementType.METHOD, ElementType.TYPE } )
-public @interface LdapServerBuilder
+public @interface CreateLdapServer
 {
     /** The instance name */
     String name();

Modified: directory/apacheds/branches/apacheds-schema/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java?rev=894424&r1=894423&r2=894424&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
Tue Dec 29 15:39:41 2009
@@ -38,7 +38,7 @@
 import junit.framework.AssertionFailedError;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.annotations.LdapServerBuilder;
+import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.CoreSession;
@@ -80,7 +80,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@LdapServerBuilder( name="test" )
+@CreateLdapServer( name="test" )
 @CreateTransport( protocol="LDAP")
 @CreateDS( factory = DefaultDirectoryServiceFactory.class, name="DSTest" )
 public abstract class AbstractServerTest

Modified: directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java?rev=894424&r1=894423&r2=894424&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
(original)
+++ directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
Tue Dec 29 15:39:41 2009
@@ -24,7 +24,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.DefaultLdapServerFactory;
-import org.apache.directory.server.annotations.LdapServerBuilder;
+import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.factory.DSBuilderAnnotationProcessor;
 import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
@@ -61,7 +61,7 @@
     private FrameworkSuite suite;
 
     /** The LdapServerBuilder for this class, if any */
-    private LdapServerBuilder classLdapServerBuilder;
+    private CreateLdapServer classLdapServerBuilder;
 
     /** The DirectoryService for this class, if any */
     private DirectoryService classDS;
@@ -84,7 +84,7 @@
     {
         // Before running any test, check to see if we must create a class DS
         // Get the LdapServerBuilder, if any
-        classLdapServerBuilder = getDescription().getAnnotation( LdapServerBuilder.class
);
+        classLdapServerBuilder = getDescription().getAnnotation( CreateLdapServer.class );
 
         try
         {
@@ -267,7 +267,7 @@
             // Last not least, see if we have to start a server
             if ( ( suite != null ) && ( suite.getSuiteLdapServerBuilder() != null
) )
             {
-                LdapServerBuilder ldapServerBuilder = suite.getSuiteLdapServerBuilder();
+                CreateLdapServer ldapServerBuilder = suite.getSuiteLdapServerBuilder();
                 
                 DefaultLdapServerFactory ldapServerFactory = (DefaultLdapServerFactory)ldapServerBuilder.factory().newInstance();
                 ldapServerFactory.setDirectoryService( directoryService );

Modified: directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkSuite.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkSuite.java?rev=894424&r1=894423&r2=894424&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkSuite.java
(original)
+++ directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkSuite.java
Tue Dec 29 15:39:41 2009
@@ -20,7 +20,7 @@
 
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.annotations.LdapServerBuilder;
+import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.factory.DSBuilderAnnotationProcessor;
@@ -54,7 +54,7 @@
     private DirectoryService directoryService;
     
     /** The LdapServerBuilder for this class, if any */
-    private LdapServerBuilder ldapServerBuilder;
+    private CreateLdapServer ldapServerBuilder;
 
     /** The LdapServer for this class, if any */
     private LdapServer ldapServer;
@@ -162,7 +162,7 @@
     
     private void startLdapServer( Description description )
     {
-        ldapServerBuilder = description.getAnnotation( LdapServerBuilder.class );
+        ldapServerBuilder = description.getAnnotation( CreateLdapServer.class );
 
         if ( ldapServerBuilder != null )
         {
@@ -263,7 +263,7 @@
     /**
      * @return the suiteLdapServerBuilder
      */
-    public LdapServerBuilder getSuiteLdapServerBuilder()
+    public CreateLdapServer getSuiteLdapServerBuilder()
     {
         return ldapServerBuilder;
     }

Modified: directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java?rev=894424&r1=894423&r2=894424&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java
(original)
+++ directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java
Tue Dec 29 15:39:41 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.directory.server.core.integ;
 
-import org.apache.directory.server.annotations.LdapServerBuilder;
+import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.annotations.CreateDS;
@@ -28,7 +28,7 @@
 @RunWith( FrameworkSuite.class )
 @Suite.SuiteClasses( { TestClassA.class, TestClassB.class, TestClassC.class } )
 @CreateDS( name = "SuiteDS" )
-@LdapServerBuilder( 
+@CreateLdapServer( 
     name = "test",
     transports = 
         {



Mime
View raw message