directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r368603 - in /directory/trunks: apacheds-build/ apacheds-server-ssl/ apacheds-server-ssl/src/ apacheds-server-ssl/src/main/ apacheds-server-ssl/src/main/java/ apacheds-server-ssl/src/main/java/org/ apacheds-server-ssl/src/main/java/org/apac...
Date Fri, 13 Jan 2006 05:32:50 GMT
Author: trustin
Date: Thu Jan 12 21:31:37 2006
New Revision: 368603

URL: http://svn.apache.org/viewcvs?rev=368603&view=rev
Log:
Fixed the subtle issues introduced after applying LDAPS patch:
* LDAPS test messages are not logged
* Some compilation issues


Added:
    directory/trunks/apacheds-server-ssl/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/
    directory/trunks/apacheds-server-ssl/pom.xml
      - copied unchanged from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/pom.xml
    directory/trunks/apacheds-server-ssl/src/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/
    directory/trunks/apacheds-server-ssl/src/main/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/main/
    directory/trunks/apacheds-server-ssl/src/main/java/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/main/java/
    directory/trunks/apacheds-server-ssl/src/main/java/org/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/main/java/org/
    directory/trunks/apacheds-server-ssl/src/main/java/org/apache/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/main/java/org/apache/
    directory/trunks/apacheds-server-ssl/src/main/java/org/apache/ldap/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/main/java/org/apache/ldap/
    directory/trunks/apacheds-server-ssl/src/main/java/org/apache/ldap/server/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/main/java/org/apache/ldap/server/
    directory/trunks/apacheds-server-ssl/src/main/java/org/apache/ldap/server/jndi/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/main/java/org/apache/ldap/server/jndi/
    directory/trunks/apacheds-server-ssl/src/main/java/org/apache/ldap/server/jndi/ssl/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/main/java/org/apache/ldap/server/jndi/ssl/
    directory/trunks/apacheds-server-ssl/src/main/java/org/apache/ldap/server/jndi/ssl/LdapsInitializer.java
      - copied unchanged from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/main/java/org/apache/ldap/server/jndi/ssl/LdapsInitializer.java
    directory/trunks/apacheds-server-ssl/src/main/java/org/apache/ldap/server/jndi/ssl/support/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/main/java/org/apache/ldap/server/jndi/ssl/support/
    directory/trunks/apacheds-server-ssl/src/main/java/org/apache/ldap/server/jndi/ssl/support/ServerX509TrustManager.java
      - copied unchanged from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/main/java/org/apache/ldap/server/jndi/ssl/support/ServerX509TrustManager.java
    directory/trunks/apacheds-server-ssl/src/test/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/
    directory/trunks/apacheds-server-ssl/src/test/java/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/
    directory/trunks/apacheds-server-ssl/src/test/java/org/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/
    directory/trunks/apacheds-server-ssl/src/test/java/org/apache/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/apache/
    directory/trunks/apacheds-server-ssl/src/test/java/org/apache/ldap/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/apache/ldap/
    directory/trunks/apacheds-server-ssl/src/test/java/org/apache/ldap/server/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/apache/ldap/server/
    directory/trunks/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/
    directory/trunks/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/
    directory/trunks/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/LdapsTest.java
      - copied, changed from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/LdapsTest.java
    directory/trunks/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/support/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/support/
    directory/trunks/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/support/BogusSSLContextFactory.java
      - copied unchanged from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/support/BogusSSLContextFactory.java
    directory/trunks/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/support/BogusTrustManagerFactory.java
      - copied unchanged from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/support/BogusTrustManagerFactory.java
    directory/trunks/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/support/SSLSocketFactory.java
      - copied unchanged from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/support/SSLSocketFactory.java
    directory/trunks/apacheds-server-ssl/src/test/resources/
      - copied from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/resources/
    directory/trunks/apacheds-server-ssl/src/test/resources/bogus.cert
      - copied unchanged from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/resources/bogus.cert
    directory/trunks/apacheds-server-ssl/src/test/resources/log4j.properties
Modified:
    directory/trunks/apacheds-build/pom.xml

Modified: directory/trunks/apacheds-build/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds-build/pom.xml?rev=368603&r1=368602&r2=368603&view=diff
==============================================================================
--- directory/trunks/apacheds-build/pom.xml (original)
+++ directory/trunks/apacheds-build/pom.xml Thu Jan 12 21:31:37 2006
@@ -19,14 +19,70 @@
       <version>0.9.4-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  
-  <modules>
-    <module>../apacheds</module>
-    <module>../apacheds-shared</module>
-    <module>../apacheds-plugin</module>
-    <module>../apacheds-core-unit</module>
-    <module>../apacheds-server</module>
-    <module>../apacheds-server-unit</module>
-    <module>../apacheds-server-main</module>
-  </modules>
+
+  <profiles>
+    <profile>
+      <id>jdk1.5</id>
+      <activation>
+        <jdk>1.5</jdk>
+      </activation>
+      <modules>
+        <module>../apacheds</module>
+        <module>../apacheds-shared</module>
+        <module>../apacheds-plugin</module>
+        <module>../apacheds-core-unit</module>
+        <module>../apacheds-server</module>
+        <module>../apacheds-server-ssl</module>
+        <module>../apacheds-server-unit</module>
+        <module>../apacheds-server-main</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>jdk1.4</id>
+      <activation>
+        <jdk>1.4</jdk>
+      </activation>
+      <modules>
+        <module>../apacheds</module>
+        <module>../apacheds-shared</module>
+        <module>../apacheds-plugin</module>
+        <module>../apacheds-core-unit</module>
+        <module>../apacheds-server</module>
+        <module>../apacheds-server-unit</module>
+        <module>../apacheds-server-main</module>
+      </modules>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>validate</phase>
+                <configuration>
+                  <tasks>
+                    <echo>
+====================================================================
+                       W A R N I N G
+                       -------------
+
+Build with 1.4 jvm will not include modules:
+ 
+ o apacheds-server-ssl
+
+Use JDK 1.5 to make sure these modules build.
+====================================================================
+                    </echo>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>

Copied: directory/trunks/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/LdapsTest.java
(from r368591, directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/LdapsTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/LdapsTest.java?p2=directory/trunks/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/LdapsTest.java&p1=directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/LdapsTest.java&r1=368591&r2=368603&rev=368603&view=diff
==============================================================================
--- directory/sandbox/trustin/ldaps/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/LdapsTest.java
(original)
+++ directory/trunks/apacheds-server-ssl/src/test/java/org/apache/ldap/server/jndi/ssl/LdapsTest.java
Thu Jan 12 21:31:37 2006
@@ -64,7 +64,6 @@
         InputStream in = getClass().getResourceAsStream( "/bogus.cert" );
         configuration.getLdapsCertificateFile().getParentFile().mkdirs();
 
-        System.out.println( configuration.getLdapsCertificateFile().getAbsolutePath() );
         FileOutputStream out = new FileOutputStream(
                 configuration.getLdapsCertificateFile() );
 
@@ -72,8 +71,8 @@
         {
             int c = in.read();
             if( c < 0 )
-                break;
             {
+                break;
             }
             out.write( c );
         }

Added: directory/trunks/apacheds-server-ssl/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds-server-ssl/src/test/resources/log4j.properties?rev=368603&view=auto
==============================================================================
--- directory/trunks/apacheds-server-ssl/src/test/resources/log4j.properties (added)
+++ directory/trunks/apacheds-server-ssl/src/test/resources/log4j.properties Thu Jan 12 21:31:37
2006
@@ -0,0 +1,5 @@
+log4j.rootCategory=ERROR, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n



Mime
View raw message