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/13 22:41:51 UTC
svn commit: r368866 - in /directory/trunks/apacheds: ./ protocol-common/
protocols/ protocols/changepw/ protocols/dhcp/ protocols/dns/
protocols/kerberos-common/ protocols/kerberos-common/src/
protocols/kerberos-core/ protocols/kerberos/ protocols/ntp/
Author: akarasulu
Date: Fri Jan 13 13:41:44 2006
New Revision: 368866
URL: http://svn.apache.org/viewcvs?rev=368866&view=rev
Log:
including all protocols now
Added:
directory/trunks/apacheds/protocols/kerberos-common/
- copied from r368850, directory/trunks/apacheds/protocols/kerberos-core/
directory/trunks/apacheds/protocols/kerberos-common-readme.txt
directory/trunks/apacheds/protocols/kerberos-common/pom.xml
- copied, changed from r368865, directory/trunks/apacheds/protocols/kerberos-core/pom.xml
directory/trunks/apacheds/protocols/kerberos-common/src/
- copied from r368865, directory/trunks/apacheds/protocols/kerberos-core/src/
Removed:
directory/trunks/apacheds/protocols/kerberos-core/
Modified:
directory/trunks/apacheds/pom.xml
directory/trunks/apacheds/protocol-common/pom.xml
directory/trunks/apacheds/protocols/changepw/pom.xml
directory/trunks/apacheds/protocols/dhcp/pom.xml
directory/trunks/apacheds/protocols/dns/pom.xml
directory/trunks/apacheds/protocols/kerberos/pom.xml
directory/trunks/apacheds/protocols/ntp/pom.xml
directory/trunks/apacheds/protocols/pom.xml
Modified: directory/trunks/apacheds/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/pom.xml?rev=368866&r1=368865&r2=368866&view=diff
==============================================================================
--- directory/trunks/apacheds/pom.xml (original)
+++ directory/trunks/apacheds/pom.xml Fri Jan 13 13:41:44 2006
@@ -37,6 +37,7 @@
<module>server-unit</module>
<module>server-main</module>
-->
+ <module>protocol-common</module>
<module>protocols</module>
</modules>
</profile>
Modified: directory/trunks/apacheds/protocol-common/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-common/pom.xml?rev=368866&r1=368865&r2=368866&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-common/pom.xml (original)
+++ directory/trunks/apacheds/protocol-common/pom.xml Fri Jan 13 13:41:44 2006
@@ -6,7 +6,7 @@
<artifactId>build</artifactId>
<version>0.9.4-SNAPSHOT</version>
</parent>
- <groupId>org.apache.directory.server.protocols</groupId>
+ <groupId>org.apache.directory.server</groupId>
<version>0.7.1-SNAPSHOT</version>
<artifactId>org.apache.directory.protocol.common</artifactId>
<name>protocol-common</name>
Modified: directory/trunks/apacheds/protocols/changepw/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/changepw/pom.xml?rev=368866&r1=368865&r2=368866&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/changepw/pom.xml (original)
+++ directory/trunks/apacheds/protocols/changepw/pom.xml Fri Jan 13 13:41:44 2006
@@ -2,9 +2,9 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>org.apache.directory.server.protocols</groupId>
<artifactId>build</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<groupId>org.apache.directory.server.protocols</groupId>
<version>0.7-SNAPSHOT</version>
@@ -19,27 +19,10 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.mina</groupId>
- <artifactId>org.apache.mina</artifactId>
- <version>0.9.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory</groupId>
+ <groupId>org.apache.directory.server.protocols</groupId>
<artifactId>org.apache.directory.kerberos.common</artifactId>
<version>0.7-SNAPSHOT</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: directory/trunks/apacheds/protocols/dhcp/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/dhcp/pom.xml?rev=368866&r1=368865&r2=368866&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/dhcp/pom.xml (original)
+++ directory/trunks/apacheds/protocols/dhcp/pom.xml Fri Jan 13 13:41:44 2006
@@ -2,38 +2,22 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.directory</groupId>
- <artifactId>protocols-build</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.directory.server.protocols</groupId>
+ <artifactId>build</artifactId>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
- <groupId>org.apache.directory</groupId>
+ <groupId>org.apache.directory.server.protocols</groupId>
<version>0.1-SNAPSHOT</version>
<artifactId>org.apache.directory.protocol.dhcp</artifactId>
<name>dhcp-protocol</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>org.apache.directory.mina</groupId>
- <artifactId>org.apache.mina</artifactId>
- <version>0.9.1-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: directory/trunks/apacheds/protocols/dns/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/dns/pom.xml?rev=368866&r1=368865&r2=368866&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/dns/pom.xml (original)
+++ directory/trunks/apacheds/protocols/dns/pom.xml Fri Jan 13 13:41:44 2006
@@ -2,9 +2,9 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.directory</groupId>
- <artifactId>protocols-build</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.directory.server.protocols</groupId>
+ <artifactId>build</artifactId>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<version>0.3-SNAPSHOT</version>
<artifactId>org.apache.directory.protocol.dns</artifactId>
@@ -17,28 +17,6 @@
<version>1.2.17</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.directory</groupId>
- <artifactId>org.apache.directory.protocol.common</artifactId>
- <version>0.7.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.mina</groupId>
- <artifactId>org.apache.mina</artifactId>
- <version>0.9.1-SNAPSHOT</version>
- </dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Added: directory/trunks/apacheds/protocols/kerberos-common-readme.txt
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/kerberos-common-readme.txt?rev=368866&view=auto
==============================================================================
--- directory/trunks/apacheds/protocols/kerberos-common-readme.txt (added)
+++ directory/trunks/apacheds/protocols/kerberos-common-readme.txt Fri Jan 13 13:41:44 2006
@@ -0,0 +1,7 @@
+The dependency on protocol-common is keeping this module here. This dep should
+be removed somehow and kerberos-common should be moved to directory/common.
+
+One reason for this out of place module in the dependency tree can be due to
+the fact that we are trying to share classes between the pp for kerberos and
+changepw. In this case we can separate these common class from common classes
+meant for a client and a server to share.
Copied: directory/trunks/apacheds/protocols/kerberos-common/pom.xml (from r368865, directory/trunks/apacheds/protocols/kerberos-core/pom.xml)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/kerberos-common/pom.xml?p2=directory/trunks/apacheds/protocols/kerberos-common/pom.xml&p1=directory/trunks/apacheds/protocols/kerberos-core/pom.xml&r1=368865&r2=368866&rev=368866&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/kerberos-core/pom.xml (original)
+++ directory/trunks/apacheds/protocols/kerberos-common/pom.xml Fri Jan 13 13:41:44 2006
@@ -2,38 +2,21 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.directory</groupId>
+ <groupId>org.apache.directory.server.protocols</groupId>
<artifactId>build</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
- <groupId>org.apache.directory</groupId>
+ <groupId>org.apache.directory.server.protocols</groupId>
<version>0.7-SNAPSHOT</version>
<artifactId>org.apache.directory.kerberos.common</artifactId>
<name>kerberos-common</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>org.apache.directory</groupId>
- <artifactId>org.apache.directory.protocol.common</artifactId>
- <version>0.7.1-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>bouncycastle</groupId>
<artifactId>lcrypto-jdk14</artifactId>
<version>131</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: directory/trunks/apacheds/protocols/kerberos/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/kerberos/pom.xml?rev=368866&r1=368865&r2=368866&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/kerberos/pom.xml (original)
+++ directory/trunks/apacheds/protocols/kerberos/pom.xml Fri Jan 13 13:41:44 2006
@@ -2,11 +2,11 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.directory</groupId>
- <artifactId>protocols-build</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.directory.server.protocols</groupId>
+ <artifactId>build</artifactId>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
- <groupId>org.apache.directory</groupId>
+ <groupId>org.apache.directory.server.protocols</groupId>
<version>0.7-SNAPSHOT</version>
<artifactId>org.apache.directory.protocol.kerberos</artifactId>
<name>kerberos-protocol</name>
@@ -19,27 +19,10 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.mina</groupId>
- <artifactId>org.apache.mina</artifactId>
- <version>0.9.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory</groupId>
+ <groupId>org.apache.directory.server.protocols</groupId>
<artifactId>org.apache.directory.kerberos.common</artifactId>
<version>0.7-SNAPSHOT</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: directory/trunks/apacheds/protocols/ntp/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/ntp/pom.xml?rev=368866&r1=368865&r2=368866&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/ntp/pom.xml (original)
+++ directory/trunks/apacheds/protocols/ntp/pom.xml Fri Jan 13 13:41:44 2006
@@ -2,9 +2,9 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.directory</groupId>
- <artifactId>protocols-build</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.directory.server.protocols</groupId>
+ <artifactId>build</artifactId>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<groupId>org.apache.directory</groupId>
<version>0.5-SNAPSHOT</version>
@@ -18,28 +18,6 @@
<version>1.2.17</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.directory.mina</groupId>
- <artifactId>org.apache.mina</artifactId>
- <version>0.9.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory</groupId>
- <artifactId>org.apache.directory.protocol.common</artifactId>
- <version>0.7.1-SNAPSHOT</version>
- </dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: directory/trunks/apacheds/protocols/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/pom.xml?rev=368866&r1=368865&r2=368866&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/pom.xml (original)
+++ directory/trunks/apacheds/protocols/pom.xml Fri Jan 13 13:41:44 2006
@@ -13,13 +13,27 @@
<packaging>pom</packaging>
<modules>
- <!--
<module>ntp</module>
- <module>dns</module>
<module>dhcp</module>
- <module>ldap</module>
+ <module>dns</module>
+ <module>kerberos-core</module>
<module>kerberos</module>
<module>changepw</module>
+ <!--
+ <module>ldap</module>
-->
</modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.directory.mina</groupId>
+ <artifactId>org.apache.mina</artifactId>
+ <version>0.9.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>org.apache.directory.protocol.common</artifactId>
+ <version>0.7.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>