You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2006/01/26 07:46:53 UTC
svn commit: r372462 - in /directory/trunks/apacheds: protocols/ldap/pom.xml
protocols/ldap/src/main/java/org/apache/ldap/server/protocol/LdapProtocolProvider.java
src/site/site.xml standalone/daemon/pom.xml
Author: ersiner
Date: Wed Jan 25 22:46:42 2006
New Revision: 372462
URL: http://svn.apache.org/viewcvs?rev=372462&view=rev
Log:
Attempt to fix build errors due to renaming and other issues.
Build in trunks still fail because of asn1 related issues.
Modified:
directory/trunks/apacheds/protocols/ldap/pom.xml
directory/trunks/apacheds/protocols/ldap/src/main/java/org/apache/ldap/server/protocol/LdapProtocolProvider.java
directory/trunks/apacheds/src/site/site.xml
directory/trunks/apacheds/standalone/daemon/pom.xml
Modified: directory/trunks/apacheds/protocols/ldap/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/ldap/pom.xml?rev=372462&r1=372461&r2=372462&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/ldap/pom.xml (original)
+++ directory/trunks/apacheds/protocols/ldap/pom.xml Wed Jan 25 22:46:42 2006
@@ -19,12 +19,12 @@
</dependency>
<dependency>
<groupId>org.apache.directory.mina</groupId>
- <artifactId>org.apache.mina.asn1</artifactId>
+ <artifactId>mina-filter-codec-asn1</artifactId>
<version>0.9.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.mina</groupId>
- <artifactId>org.apache.mina.filter.ssl</artifactId>
+ <artifactId>mina-filter-ssl</artifactId>
<version>0.9.1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: directory/trunks/apacheds/protocols/ldap/src/main/java/org/apache/ldap/server/protocol/LdapProtocolProvider.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/ldap/src/main/java/org/apache/ldap/server/protocol/LdapProtocolProvider.java?rev=372462&r1=372461&r2=372462&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/ldap/src/main/java/org/apache/ldap/server/protocol/LdapProtocolProvider.java (original)
+++ directory/trunks/apacheds/protocols/ldap/src/main/java/org/apache/ldap/server/protocol/LdapProtocolProvider.java Wed Jan 25 22:46:42 2006
@@ -27,8 +27,8 @@
import javax.naming.Context;
-import org.apache.asn1.codec.mina.Asn1CodecDecoder;
-import org.apache.asn1.codec.mina.Asn1CodecEncoder;
+import org.apache.mina.filter.codec.asn1.Asn1CodecDecoder;
+import org.apache.mina.filter.codec.asn1.Asn1CodecEncoder;
import org.apache.ldap.common.exception.LdapNamingException;
import org.apache.ldap.common.message.AbandonRequest;
import org.apache.ldap.common.message.AbandonRequestImpl;
Modified: directory/trunks/apacheds/src/site/site.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/src/site/site.xml?rev=372462&r1=372461&r2=372462&view=diff
==============================================================================
--- directory/trunks/apacheds/src/site/site.xml (original)
+++ directory/trunks/apacheds/src/site/site.xml Wed Jan 25 22:46:42 2006
@@ -10,7 +10,7 @@
<links>
</links>
- <menu name="Apache Directory Server" inherited="top">
+ <menu name="Apache Directory Server" inherit="top">
<item name="Overview" href="/index.html"/>
<item name="Features" href="/features.html"/>
<item name="Roadmap" href="/roadmap.html"/>
@@ -47,15 +47,15 @@
<item name="Mailing Lists" href="/mailing-lists.html"/>
<item name="License" href="/license.html"/>
<item name="Notices" href="/notices.html"/>
- </menu>
-
+ </menu>
+
<!-- Commented out, still useful as a placeholder for the next event
<menu name="ApacheCon US 2005">
<item name="ApacheCon US 2005" href="http://www.apachecon.com/"
img="http://apache.org/images/ac2005us_blue_125x125.jpg" />
- </menu>
- -->
-
+ </menu>
+ -->
+ ${modules}
</body>
</project>
Modified: directory/trunks/apacheds/standalone/daemon/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/daemon/pom.xml?rev=372462&r1=372461&r2=372462&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/daemon/pom.xml (original)
+++ directory/trunks/apacheds/standalone/daemon/pom.xml Wed Jan 25 22:46:42 2006
@@ -2,9 +2,10 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.directory</groupId>
+ <groupId>org.apache.directory.server</groupId>
<artifactId>build</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>0.9.4-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<version>0.9.4-SNAPSHOT</version>
<artifactId>org.apache.directory.server.standalone.daemon</artifactId>