directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r894075 - in /directory/apacheds/branches/apacheds-schema: server-annotations/ server-annotations/src/main/java/org/apache/directory/server/annotations/ test-framework/ test-framework/src/main/java/org/apache/directory/server/core/integ/ann...
Date Sun, 27 Dec 2009 16:21:53 GMT
Author: elecharny
Date: Sun Dec 27 16:21:52 2009
New Revision: 894075

URL: http://svn.apache.org/viewvc?rev=894075&view=rev
Log:
o Fixed the dependencies
o Moved annotations to server-annotations
o Fixed imports

Added:
    directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/LdapServer.java
      - copied, changed from r894017, directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/LdapServer.java
    directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java
      - copied, changed from r894064, directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/Sasl.java
    directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/Transport.java
      - copied, changed from r894002, directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/Transport.java
    directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/TransportType.java
      - copied, changed from r894002, directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/TransportType.java
Removed:
    directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/
Modified:
    directory/apacheds/branches/apacheds-schema/server-annotations/pom.xml
    directory/apacheds/branches/apacheds-schema/test-framework/pom.xml
    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-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-annotations/pom.xml?rev=894075&r1=894074&r2=894075&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-annotations/pom.xml (original)
+++ directory/apacheds/branches/apacheds-schema/server-annotations/pom.xml Sun Dec 27 16:21:52
2009
@@ -52,5 +52,11 @@
       <artifactId>apacheds-core-builder</artifactId>
       <version>${pom.version}</version>
     </dependency>  
+    
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <version>${pom.version}</version>
+    </dependency>  
   </dependencies>
 </project>

Copied: directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/LdapServer.java
(from r894017, directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/LdapServer.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/LdapServer.java?p2=directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/LdapServer.java&p1=directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/LdapServer.java&r1=894017&r2=894075&rev=894075&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/LdapServer.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/LdapServer.java
Sun Dec 27 16:21:52 2009
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.core.integ.annotations;
+package org.apache.directory.server.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Copied: directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java
(from r894064, directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/Sasl.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java?p2=directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java&p1=directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/Sasl.java&r1=894064&r2=894075&rev=894075&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/Sasl.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java
Sun Dec 27 16:21:52 2009
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.core.integ.annotations;
+package org.apache.directory.server.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Copied: directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/Transport.java
(from r894002, directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/Transport.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/Transport.java?p2=directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/Transport.java&p1=directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/Transport.java&r1=894002&r2=894075&rev=894075&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/Transport.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/Transport.java
Sun Dec 27 16:21:52 2009
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.core.integ.annotations;
+package org.apache.directory.server.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Copied: directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/TransportType.java
(from r894002, directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/TransportType.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/TransportType.java?p2=directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/TransportType.java&p1=directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/TransportType.java&r1=894002&r2=894075&rev=894075&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/TransportType.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-annotations/src/main/java/org/apache/directory/server/annotations/TransportType.java
Sun Dec 27 16:21:52 2009
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.directory.server.core.integ.annotations;
+package org.apache.directory.server.annotations;
 
 /**
  * The two different type of Transport

Modified: directory/apacheds/branches/apacheds-schema/test-framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/test-framework/pom.xml?rev=894075&r1=894074&r2=894075&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/pom.xml (original)
+++ directory/apacheds/branches/apacheds-schema/test-framework/pom.xml Sun Dec 27 16:21:52
2009
@@ -32,13 +32,13 @@
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-ldap</artifactId>
+      <artifactId>apacheds-core-annotations</artifactId>
       <version>${pom.version}</version>
     </dependency>  
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-annotations</artifactId>
+      <artifactId>apacheds-server-annotations</artifactId>
       <version>${pom.version}</version>
     </dependency>  
 

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=894075&r1=894074&r2=894075&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
Sun Dec 27 16:21:52 2009
@@ -18,10 +18,10 @@
  */
 package org.apache.directory.server.core.integ;
 
+import org.apache.directory.server.annotations.LdapServer;
+import org.apache.directory.server.annotations.Transport;
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.annotations.DSBuilder;
-import org.apache.directory.server.core.integ.annotations.LdapServer;
-import org.apache.directory.server.core.integ.annotations.Transport;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 



Mime
View raw message