You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/01/17 03:02:32 UTC
svn commit: r369628 - in /directory/trunks/apacheds: pom.xml
protocols/ldap/src/main/java/org/apache/ldap/server/protocol/support/SearchResponseIterator.java
standalone/simple/pom.xml
Author: akarasulu
Date: Mon Jan 16 18:02:26 2006
New Revision: 369628
URL: http://svn.apache.org/viewcvs?rev=369628&view=rev
Log:
fixing 1.4 build so it does not include the standalone ssl module
Modified:
directory/trunks/apacheds/pom.xml
directory/trunks/apacheds/protocols/ldap/src/main/java/org/apache/ldap/server/protocol/support/SearchResponseIterator.java
directory/trunks/apacheds/standalone/simple/pom.xml
Modified: directory/trunks/apacheds/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/pom.xml?rev=369628&r1=369627&r2=369628&view=diff
==============================================================================
--- directory/trunks/apacheds/pom.xml (original)
+++ directory/trunks/apacheds/pom.xml Mon Jan 16 18:02:26 2006
@@ -20,68 +20,13 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk1.5</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <modules>
- <module>core</module>
- <module>shared</module>
- <module>plugin</module>
- <module>core-unit</module>
- <module>protocol-common</module>
- <module>protocols</module>
- <module>standalone/simple</module>
- </modules>
- </profile>
-
- <profile>
- <id>jdk1.4</id>
- <activation>
- <jdk>1.4</jdk>
- </activation>
- <modules>
- <module>core</module>
- <module>shared</module>
- <module>plugin</module>
- <module>core-unit</module>
- <module>protocol-common</module>
- <module>protocols</module>
- <module>standalone/simple</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>
+ <modules>
+ <module>core</module>
+ <module>shared</module>
+ <module>plugin</module>
+ <module>core-unit</module>
+ <module>protocol-common</module>
+ <module>protocols</module>
+ <module>standalone/simple</module>
+ </modules>
</project>
Modified: directory/trunks/apacheds/protocols/ldap/src/main/java/org/apache/ldap/server/protocol/support/SearchResponseIterator.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/ldap/src/main/java/org/apache/ldap/server/protocol/support/SearchResponseIterator.java?rev=369628&r1=369627&r2=369628&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/ldap/src/main/java/org/apache/ldap/server/protocol/support/SearchResponseIterator.java (original)
+++ directory/trunks/apacheds/protocols/ldap/src/main/java/org/apache/ldap/server/protocol/support/SearchResponseIterator.java Mon Jan 16 18:02:26 2006
@@ -25,6 +25,7 @@
import javax.naming.directory.SearchResult;
import org.apache.ldap.common.exception.LdapException;
+import org.apache.ldap.common.message.ManageDsaITControl;
import org.apache.ldap.common.message.ReferralImpl;
import org.apache.ldap.common.message.ResultCodeEnum;
import org.apache.ldap.common.message.SearchRequest;
@@ -79,8 +80,7 @@
* local variable for the following call to next()
*/
Attribute ref = result.getAttributes().get( "ref" );
-
- if( ref == null || ref.size() > 0 )
+ if( ref == null || ref.size() == 0 || req.getControls().containsKey( ManageDsaITControl.CONTROL_OID ) )
{
SearchResponseEntry respEntry;
respEntry = new SearchResponseEntryImpl( req.getMessageId() );
Modified: directory/trunks/apacheds/standalone/simple/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/simple/pom.xml?rev=369628&r1=369627&r2=369628&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/simple/pom.xml (original)
+++ directory/trunks/apacheds/standalone/simple/pom.xml Mon Jan 16 18:02:26 2006
@@ -10,14 +10,6 @@
<groupId>org.apache.directory.server.standalone.simple</groupId>
<name>simple-build</name>
<packaging>pom</packaging>
- <modules>
- <module>jndi</module>
- <module>main</module>
- <module>ssl</module>
- <module>unit</module>
- <!--
- -->
- </modules>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
@@ -51,5 +43,64 @@
<version>0.9.4-SNAPSHOT</version>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jdk1.5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <modules>
+ <module>jndi</module>
+ <module>main</module>
+ <module>ssl</module>
+ <module>unit</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>jdk1.4</id>
+ <activation>
+ <jdk>1.4</jdk>
+ </activation>
+ <modules>
+ <module>jndi</module>
+ <module>main</module>
+ <module>unit</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 standalone-simple-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>