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 2005/12/31 09:37:14 UTC

svn commit: r360261 - in /directory/trunk: ./ apacheds-build/ apacheds-core-unit/ apacheds-server-main/ apacheds-server-unit/ apacheds-server/ apacheds-shared/ changepw-protocol/ dhcp-protocol/ dns-protocol/ kerberos-common/ ldap-common/ mina-asn1/ min...

Author: akarasulu
Date: Sat Dec 31 00:37:06 2005
New Revision: 360261

URL: http://svn.apache.org/viewcvs?rev=360261&view=rev
Log:
changes ...

 o ignoring idea IDE project, workspace and module files
 o added minimal pom to server-main
 o added apacheds-server-main module to apacheds-build 

Added:
    directory/trunk/apacheds-server-main/pom.xml
Modified:
    directory/trunk/   (props changed)
    directory/trunk/apacheds-build/   (props changed)
    directory/trunk/apacheds-build/pom.xml
    directory/trunk/apacheds-core-unit/   (props changed)
    directory/trunk/apacheds-server/   (props changed)
    directory/trunk/apacheds-server-main/   (props changed)
    directory/trunk/apacheds-server-main/project.xml
    directory/trunk/apacheds-server-unit/   (props changed)
    directory/trunk/apacheds-shared/   (props changed)
    directory/trunk/changepw-protocol/   (props changed)
    directory/trunk/dhcp-protocol/   (props changed)
    directory/trunk/dns-protocol/   (props changed)
    directory/trunk/kerberos-common/   (props changed)
    directory/trunk/ldap-common/   (props changed)
    directory/trunk/mina/   (props changed)
    directory/trunk/mina-asn1/   (props changed)
    directory/trunk/mina-build/   (props changed)
    directory/trunk/mina-examples/   (props changed)
    directory/trunk/mina-spring/   (props changed)
    directory/trunk/mina-ssl/   (props changed)
    directory/trunk/protocol-common/   (props changed)

Propchange: directory/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,3 +1,6 @@
+*.ipr
+*.iws
+*.iml
 server-work
 *.log
 target

Propchange: directory/trunk/apacheds-build/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -0,0 +1,3 @@
+*.ipr
+*.iws
+*.iml

Modified: directory/trunk/apacheds-build/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds-build/pom.xml?rev=360261&r1=360260&r2=360261&view=diff
==============================================================================
--- directory/trunk/apacheds-build/pom.xml (original)
+++ directory/trunk/apacheds-build/pom.xml Sat Dec 31 00:37:06 2005
@@ -27,5 +27,6 @@
     <module>../apacheds-core-unit</module>
     <module>../apacheds-server</module>
     <module>../apacheds-server-unit</module>
+    <module>../apacheds-server-main</module>
   </modules>
 </project>

Propchange: directory/trunk/apacheds-core-unit/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,4 +1,6 @@
 *.iml
+*.ipr
+*.iws
 .wtpmodules
 .settings
 .deployables

Propchange: directory/trunk/apacheds-server/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,4 +1,7 @@
 target
+*.ipr
+*.iws
+*.iml
 .wtpmodules
 .settings
 .deployables

Propchange: directory/trunk/apacheds-server-main/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,4 +1,7 @@
 server-work
+.wtpmodules
+.settings
+.deployables
 apache.org
 logs
 *.project

Added: directory/trunk/apacheds-server-main/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds-server-main/pom.xml?rev=360261&view=auto
==============================================================================
--- directory/trunk/apacheds-server-main/pom.xml (added)
+++ directory/trunk/apacheds-server-main/pom.xml Sat Dec 31 00:37:06 2005
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.ldap.server</groupId>
+    <artifactId>build</artifactId>
+    <version>0.9.4-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.apache.ldap.server.main</artifactId>
+  <name>apacheds-server-main</name>
+  <packaging>jar</packaging>  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.ldap.server</groupId>
+      <artifactId>org.apache.ldap.server</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
+    </dependency>  
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>1.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>1.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>1.2.1</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/trunk/apacheds-server-main/project.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds-server-main/project.xml?rev=360261&r1=360260&r2=360261&view=diff
==============================================================================
--- directory/trunk/apacheds-server-main/project.xml (original)
+++ directory/trunk/apacheds-server-main/project.xml Sat Dec 31 00:37:06 2005
@@ -27,141 +27,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>regexp</groupId>
-      <artifactId>regexp</artifactId>
-      <version>1.2</version>
-      <url>http://jakarta.apache.org/regexp/index.html</url>
-      <properties>
-        <gump.project>jakarta-regexp</gump.project>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>oro</groupId>
-      <artifactId>oro</artifactId>
-      <version>2.0.7</version>
-      <url>http://jakarta.apache.org/oro</url>
-      <properties>
-        <gump.project>jakarta-oro</gump.project>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.0</version>
-      <url>http://jakarta.apache.org/commons/lang/api</url>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.0</version>
-      <url>http://jakarta.apache.org/commons/collections</url>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>1.0</version>
-      <url>http://jakarta.apache.org/commons/io</url>
-    </dependency>
-    <dependency>
-      <groupId>commons-primitives</groupId>
-      <artifactId>commons-primitives</artifactId>
-      <version>20041207.202534</version>
-      <url>http://jakarta.apache.org/commons/primitives</url>
-    </dependency>
-    <dependency>
-      <groupId>antlr</groupId>
-      <artifactId>antlr</artifactId>
-      <version>2.7.2</version>
-      <url>http://antlr.org/</url>
-    </dependency>
-    <dependency>
-      <groupId>jdbm</groupId>
-      <artifactId>jdbm</artifactId>
-      <version>1.0</version>
-      <url>http://jdbm.sourceforge.net</url>
-    </dependency>
-    <dependency>
-      <groupId>directory-shared</groupId>
-      <artifactId>kerberos-common</artifactId>
-      <version>0.7-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>apacheds-shared</artifactId>
-      <version>${pom.currentVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>directory-protocols</groupId>
-      <artifactId>kerberos-protocol</artifactId>
-      <version>0.7-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>directory-protocols</groupId>
-      <artifactId>ldap-protocol</artifactId>
-      <version>0.9.4-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>directory-protocols</groupId>
-      <artifactId>kerberos-protocol</artifactId>
-      <version>0.7-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>directory-protocols</groupId>
-      <artifactId>changepw-protocol</artifactId>
-      <version>0.7-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>directory-protocols</groupId>
-      <artifactId>ntp-protocol</artifactId>
-      <version>0.5-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>directory-asn1</groupId>
-      <artifactId>asn1-codec</artifactId>
-      <version>0.3.4-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>directory-shared</groupId>
-      <artifactId>apache-ldapber-provider</artifactId>
-      <version>0.9.4-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>directory-shared</groupId>
-      <artifactId>protocol-common</artifactId>
-      <version>0.7-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>directory-asn1</groupId>
-      <artifactId>asn1-ber</artifactId>
-      <version>0.3.4-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>directory-asn1</groupId>
-      <artifactId>asn1-der</artifactId>
-      <version>0.3.4-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>directory-network</groupId>
-      <artifactId>mina</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>apacheds-core</artifactId>
-      <version>${pom.currentVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>apacheds-server</artifactId>
-      <version>${pom.currentVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>maven-plugins</groupId>
-      <artifactId>maven-javaapp-plugin</artifactId>
-      <version>1.3</version>
-      <type>plugin</type>
-    </dependency>
-    <dependency>
       <groupId>springframework</groupId>
       <artifactId>spring-core</artifactId>
       <version>1.2.1</version>
@@ -174,16 +39,6 @@
       <url>http://www.springframework.com/</url>
     </dependency>
     <dependency>
-      <groupId>bouncycastle</groupId>
-      <artifactId>bcprov-jdk14</artifactId>
-      <version>124</version>
-      <properties>
-        <gump.project>bcprov</gump.project>
-      </properties>
-    </dependency>
-
-    <!-- Still needed for Spring -->
-    <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.4</version>
@@ -196,17 +51,4 @@
       <url>http://www.springframework.com/</url>
     </dependency>
   </dependencies>
-
-  <reports>
-    <report>maven-changes-plugin</report>
-    <report>maven-tasklist-plugin</report>
-    <report>maven-junit-report-plugin</report>
-    <report>maven-jdepend-plugin</report>
-    <report>maven-simian-plugin</report>
-    <report>maven-javadoc-plugin</report>
-    <report>maven-jxr-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-multiproject-plugin</report>
-  </reports>
-
 </project>

Propchange: directory/trunk/apacheds-server-unit/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,3 +1,6 @@
+*.ipr
+*.iws
+*.iml
 target
 .wtpmodules
 .deployables

Propchange: directory/trunk/apacheds-shared/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,4 +1,7 @@
 target
+*.ipr
+*.iws
+*.iml
 .deployables
 .wtpmodules
 .settings

Propchange: directory/trunk/changepw-protocol/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,3 +1,6 @@
+*.ipr
+*.iws
+*.iml
 target
 .wtpmodules
 .settings

Propchange: directory/trunk/dhcp-protocol/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,4 +1,6 @@
 target
+*.ipr
+*.iws
 .wtpmodules
 .settings
 .deployables

Propchange: directory/trunk/dns-protocol/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,4 +1,5 @@
 target
+*.iml
 .wtpmodules
 .settings
 .deployables

Propchange: directory/trunk/kerberos-common/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,4 +1,6 @@
 .wtpmodules
+*.ipr
+*.iws
 .settings
 .deployables
 bin

Propchange: directory/trunk/ldap-common/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,4 +1,5 @@
 *.ipr
+*.iml
 .deployables
 *.iws
 .wtpmodules

Propchange: directory/trunk/mina/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,4 +1,5 @@
 .settings
+*.iws
 .deployables
 .wtpmodules
 target

Propchange: directory/trunk/mina-asn1/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,3 +1,6 @@
+*.ipr
+*.iws
+*.iml
 .wtpmodules
 .deployables
 .settings

Propchange: directory/trunk/mina-build/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -0,0 +1,4 @@
+*.ipr
+*.iws
+*.iml
+

Propchange: directory/trunk/mina-examples/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,3 +1,6 @@
+*.ipr
+*.iws
+*.iml
 .wtpmodules
 .settings
 target

Propchange: directory/trunk/mina-spring/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,3 +1,6 @@
+*.ipr
+*.iws
+*.iml
 .wtpmodules
 .settings
 .deployables

Propchange: directory/trunk/mina-ssl/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,3 +1,6 @@
+*.ipr
+*.iws
+*.iml
 .wtpmodules
 .settings
 .classpath

Propchange: directory/trunk/protocol-common/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 00:37:06 2005
@@ -1,3 +1,6 @@
+*.ipr
+*.iws
+*.iml
 bin
 *.log
 .wtpmodules