directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r894423 - in /directory/apacheds/branches/apacheds-schema: server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java
Date Tue, 29 Dec 2009 15:33:54 GMT
Author: elecharny
Date: Tue Dec 29 15:33:53 2009
New Revision: 894423

URL: http://svn.apache.org/viewvc?rev=894423&view=rev
Log:
Used the defined @ in testSuiteServer

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/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java

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=894423&r1=894422&r2=894423&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:33:53 2009
@@ -44,7 +44,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DefaultDirectoryService;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.annotations.DSBuilder;
+import org.apache.directory.server.core.annotations.CreateDS;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
 import org.apache.directory.server.core.jndi.CoreContextFactory;
@@ -82,7 +82,7 @@
  */
 @LdapServerBuilder( name="test" )
 @CreateTransport( protocol="LDAP")
-@DSBuilder( factory = DefaultDirectoryServiceFactory.class, name="DSTest" )
+@CreateDS( factory = DefaultDirectoryServiceFactory.class, name="DSTest" )
 public abstract class AbstractServerTest
 {
     private static final Logger LOG = LoggerFactory.getLogger( AbstractServerTest.class );

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=894423&r1=894422&r2=894423&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:33:53 2009
@@ -19,7 +19,7 @@
 package org.apache.directory.server.core.integ;
 
 import org.apache.directory.server.annotations.LdapServerBuilder;
-import org.apache.directory.server.annotations.Transport;
+import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.annotations.CreateDS;
 import org.junit.runner.RunWith;
@@ -28,8 +28,13 @@
 @RunWith( FrameworkSuite.class )
 @Suite.SuiteClasses( { TestClassA.class, TestClassB.class, TestClassC.class } )
 @CreateDS( name = "SuiteDS" )
-@Transport( protocol="LDAP" )
-@LdapServerBuilder( name="test" )
+@LdapServerBuilder( 
+    name = "test",
+    transports = 
+        {
+            @CreateTransport( protocol = "LDAP" ), 
+            @CreateTransport( protocol = "LDAPS" ) 
+        })
 @ApplyLdifs(
     {
         "dn: cn=testSuite,ou=system\n" + 



Mime
View raw message