directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r542039 - in /directory/apacheds/trunk: ./ benchmarks/ bootstrap-extract/ bootstrap-partition/ bootstrap-plugin/ btree-base/ constants/ core-plugin/ core-shared/ core-unit/ core/ jdbm-store/ kerberos-shared/ mitosis/ protocol-changepw/ prot...
Date Sun, 27 May 2007 21:36:14 GMT
Author: elecharny
Date: Sun May 27 14:36:12 2007
New Revision: 542039

URL: http://svn.apache.org/viewvc?view=rev&rev=542039
Log:
Moved all the plugin/jar versions to the apacheds/pom.xml file. Added some newlines

Modified:
    directory/apacheds/trunk/benchmarks/pom.xml
    directory/apacheds/trunk/bootstrap-extract/pom.xml
    directory/apacheds/trunk/bootstrap-partition/pom.xml
    directory/apacheds/trunk/bootstrap-plugin/pom.xml
    directory/apacheds/trunk/btree-base/pom.xml
    directory/apacheds/trunk/constants/pom.xml
    directory/apacheds/trunk/core-plugin/pom.xml
    directory/apacheds/trunk/core-shared/pom.xml
    directory/apacheds/trunk/core-unit/pom.xml
    directory/apacheds/trunk/core/pom.xml
    directory/apacheds/trunk/jdbm-store/pom.xml
    directory/apacheds/trunk/kerberos-shared/pom.xml
    directory/apacheds/trunk/mitosis/pom.xml
    directory/apacheds/trunk/pom.xml
    directory/apacheds/trunk/protocol-changepw/pom.xml
    directory/apacheds/trunk/protocol-dhcp/pom.xml
    directory/apacheds/trunk/protocol-dns/pom.xml
    directory/apacheds/trunk/protocol-kerberos/pom.xml
    directory/apacheds/trunk/protocol-ldap/pom.xml
    directory/apacheds/trunk/protocol-ntp/pom.xml
    directory/apacheds/trunk/protocol-shared/pom.xml
    directory/apacheds/trunk/sar-plugin/pom.xml
    directory/apacheds/trunk/schema-bootstrap/pom.xml
    directory/apacheds/trunk/schema-extras/pom.xml
    directory/apacheds/trunk/schema-registries/pom.xml
    directory/apacheds/trunk/server-installers/pom.xml
    directory/apacheds/trunk/server-jndi/pom.xml
    directory/apacheds/trunk/server-main/pom.xml
    directory/apacheds/trunk/server-sar/pom.xml
    directory/apacheds/trunk/server-tools/pom.xml
    directory/apacheds/trunk/server-unit/pom.xml
    directory/apacheds/trunk/utils/pom.xml

Modified: directory/apacheds/trunk/benchmarks/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/benchmarks/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/benchmarks/pom.xml (original)
+++ directory/apacheds/trunk/benchmarks/pom.xml Sun May 27 14:36:12 2007
@@ -8,15 +8,17 @@
   </parent>
   <artifactId>apacheds-benchmarks</artifactId>
   <name>ApacheDS Benchmarks</name>
+  
   <description>
     Set of programs to run to benchmark the performance of the server.
   </description>
+
   <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
-      <version>1.2.25</version>
     </dependency>
   </dependencies>
 </project>

Modified: directory/apacheds/trunk/bootstrap-extract/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-extract/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/bootstrap-extract/pom.xml (original)
+++ directory/apacheds/trunk/bootstrap-extract/pom.xml Sun May 27 14:36:12 2007
@@ -9,27 +9,32 @@
   <artifactId>apacheds-bootstrap-extract</artifactId>
   <name>ApacheDS Bootstrap Partition File Extractor</name>
   <packaging>jar</packaging>
+
   <description>
     This artifact contains the classes needed to extract db files into the proper position
       for the schema partition.
   </description>
+
   <dependencies>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-store</artifactId>
       <version>${pom.version}</version>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>

Modified: directory/apacheds/trunk/bootstrap-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-partition/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/bootstrap-partition/pom.xml (original)
+++ directory/apacheds/trunk/bootstrap-partition/pom.xml Sun May 27 14:36:12 2007
@@ -9,6 +9,7 @@
   <artifactId>apacheds-bootstrap-partition</artifactId>
   <name>ApacheDS Bootstrap Partition</name>
   <packaging>jar</packaging>
+
   <description>
     A special jar file that contains a pre-loaded partition with schema 
     information.  This schema partition will mount off of the ou=schema 
@@ -16,33 +17,39 @@
     It must be used with the apacheds-bootstrap-extract jar which contains
     the classes to install these files.
   </description>
+
   <dependencies>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-store</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-bootstrap-extract</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-schema-extras</artifactId>
       <version>${pom.version}</version>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -61,40 +68,41 @@
           </systemProperties>
         </configuration>
       </plugin>
-  	  <plugin>
-	    <groupId>org.apache.directory.server</groupId>
-  	    <artifactId>apacheds-bootstrap-plugin</artifactId>
-            <configuration>
-              <disabledSchemas>
-                <disabledSchema>nis</disabledSchema>
-                <disabledSchema>krb5kdc</disabledSchema>
-                <disabledSchema>samba</disabledSchema>
-                <disabledSchema>autofs</disabledSchema>
-                <disabledSchema>apachedns</disabledSchema>
-                <disabledSchema>corba</disabledSchema>
-                <disabledSchema>dhcp</disabledSchema>
-                <disabledSchema>mozilla</disabledSchema>
-              </disabledSchemas>
-              <indexedAttributes>
-                <indexedAttribute>objectClass</indexedAttribute>
-                <indexedAttribute>ou</indexedAttribute>
-                <indexedAttribute>cn</indexedAttribute>
-                <indexedAttribute>m-oid</indexedAttribute>
-                <indexedAttribute>m-disabled</indexedAttribute>
-              </indexedAttributes>
-              <bootstrapSchemaClasses>
-          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.ApachednsSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.AutofsSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.CollectiveSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.CorbaSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.CosineSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.DhcpSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.InetorgpersonSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.JavaSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.Krb5kdcSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.MozillaSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.NisSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.SambaSchema</bootstrapSchemaClass>
+
+      <plugin>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-bootstrap-plugin</artifactId>
+        <configuration>
+          <disabledSchemas>
+            <disabledSchema>nis</disabledSchema>
+            <disabledSchema>krb5kdc</disabledSchema>
+            <disabledSchema>samba</disabledSchema>
+            <disabledSchema>autofs</disabledSchema>
+            <disabledSchema>apachedns</disabledSchema>
+            <disabledSchema>corba</disabledSchema>
+            <disabledSchema>dhcp</disabledSchema>
+            <disabledSchema>mozilla</disabledSchema>
+          </disabledSchemas>
+          <indexedAttributes>
+            <indexedAttribute>objectClass</indexedAttribute>
+            <indexedAttribute>ou</indexedAttribute>
+            <indexedAttribute>cn</indexedAttribute>
+            <indexedAttribute>m-oid</indexedAttribute>
+            <indexedAttribute>m-disabled</indexedAttribute>
+          </indexedAttributes>
+          <bootstrapSchemaClasses>
+            <bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.ApachednsSchema</bootstrapSchemaClass>
+            <bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.AutofsSchema</bootstrapSchemaClass>
+            <bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.CollectiveSchema</bootstrapSchemaClass>
+            <bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.CorbaSchema</bootstrapSchemaClass>
+            <bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.CosineSchema</bootstrapSchemaClass>
+            <bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.DhcpSchema</bootstrapSchemaClass>
+            <bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.InetorgpersonSchema</bootstrapSchemaClass>
+            <bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.JavaSchema</bootstrapSchemaClass>
+            <bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.Krb5kdcSchema</bootstrapSchemaClass>
+            <bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.MozillaSchema</bootstrapSchemaClass>
+            <bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.NisSchema</bootstrapSchemaClass>
+            <bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.SambaSchema</bootstrapSchemaClass>
           </bootstrapSchemaClasses>
         </configuration>
         <executions>

Modified: directory/apacheds/trunk/bootstrap-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/bootstrap-plugin/pom.xml (original)
+++ directory/apacheds/trunk/bootstrap-plugin/pom.xml Sun May 27 14:36:12 2007
@@ -9,52 +9,53 @@
   <artifactId>apacheds-bootstrap-plugin</artifactId>
   <name>ApacheDS Bootstrap Plugin</name>
   <packaging>maven-plugin</packaging>
+
   <description>
     This plugin pre-loads a set of schema objects into a special fixed schema 
     partition within the server.  It uses the bootstrap schema objects to do
     this at build time.  The schema partition files created are then packaged 
     using the jar plugin to become what is known as the bootstrap partition jar.
   </description>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.0</version>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-store</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-constants</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-schema-bootstrap</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-utils</artifactId>
       <version>${pom.version}</version>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>org.apache.directory.server</groupId>-->
-      <!--<artifactId>apacheds-schema-extras</artifactId>-->
-      <!--<version>${pom.version}</version>-->
-    <!--</dependency>-->
   </dependencies>
 
   <build>
@@ -62,10 +63,6 @@
       <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>

Modified: directory/apacheds/trunk/btree-base/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/btree-base/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/btree-base/pom.xml (original)
+++ directory/apacheds/trunk/btree-base/pom.xml Sun May 27 14:36:12 2007
@@ -9,16 +9,19 @@
   <artifactId>apacheds-btree-base</artifactId>
   <name>ApacheDS BTree Base</name>
   <packaging>jar</packaging>
+
   <description>
     Base BTree interfaces used by the BTreePartition and JdbmPartitions as well
     as by the JdbmStore.  Used to break cyclic dependencies.
   </description>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-schema-registries</artifactId>

Modified: directory/apacheds/trunk/constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/constants/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/constants/pom.xml (original)
+++ directory/apacheds/trunk/constants/pom.xml Sun May 27 14:36:12 2007
@@ -9,6 +9,7 @@
   <artifactId>apacheds-constants</artifactId>
   <name>ApacheDS Constants</name>
   <packaging>jar</packaging>
+
   <description>
     Contains classes that store interfaces with various constants in ApacheDS.
   </description>

Modified: directory/apacheds/trunk/core-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-plugin/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/core-plugin/pom.xml (original)
+++ directory/apacheds/trunk/core-plugin/pom.xml Sun May 27 14:36:12 2007
@@ -9,36 +9,40 @@
   <artifactId>apacheds-core-plugin</artifactId>
   <name>ApacheDS Core Plugin (Maven 2)</name>
   <packaging>maven-plugin</packaging>
+
   <description>
     A collection of tools as plugins to manage various tasks associated with 
     the directory server.
   </description>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.0</version>
     </dependency>
+
     <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-shared</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>velocity</groupId>
       <artifactId>velocity-dep</artifactId>
-      <version>1.4</version>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>

Modified: directory/apacheds/trunk/core-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/core-shared/pom.xml (original)
+++ directory/apacheds/trunk/core-shared/pom.xml Sun May 27 14:36:12 2007
@@ -8,10 +8,12 @@
   </parent>
   <artifactId>apacheds-core-shared</artifactId>
   <name>ApacheDS Core Shared</name>
+
   <description>
     Shared classes between the core plugin and the core to prevent cyclic
     dependencies since the core uses the core plugin.
   </description>
+
   <packaging>jar</packaging>
 </project>
 

Modified: directory/apacheds/trunk/core-unit/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-unit/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/core-unit/pom.xml (original)
+++ directory/apacheds/trunk/core-unit/pom.xml Sun May 27 14:36:12 2007
@@ -9,6 +9,7 @@
   <artifactId>apacheds-core-unit</artifactId>
   <name>ApacheDS Core Unit</name>
   <packaging>jar</packaging>  
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -59,6 +60,7 @@
             <argLine>-Xmx1024m</argLine>
           </configuration>
         </plugin>
+
         <plugin>
           <artifactId>maven-antrun-plugin</artifactId>
             <executions>
@@ -84,29 +86,31 @@
               </execution>
             </executions>
           </plugin>
-   	    </plugins>
+        </plugins>
       </build>
     </profile>
+    
     <profile>
       <id>integration</id>
       <activation>
         <property><name>integration</name></property>
       </activation>
-    <build>
-      <plugins>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <forkMode>pertest</forkMode>
-            <!-- <argLine>-agentlib:yjpagent</argLine> -->
-            <excludes>
-              <exclude>**/*PTest.java</exclude>
-            </excludes>
-            <argLine>-Xmx1024m</argLine>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-antrun-plugin</artifactId>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <forkMode>pertest</forkMode>
+              <!-- <argLine>-agentlib:yjpagent</argLine> -->
+              <excludes>
+                <exclude>**/*PTest.java</exclude>
+              </excludes>
+              <argLine>-Xmx1024m</argLine>
+            </configuration>
+          </plugin>
+
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
                 <phase>validate</phase>
@@ -129,33 +133,35 @@
               </execution>
             </executions>
           </plugin>
-   	    </plugins>
+        </plugins>
       </build>
     </profile>
+
     <profile>
       <id>performance</id>
       <activation>
         <property><name>performance</name></property>
       </activation>
-    <build>
-      <plugins>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <systemProperties>
-              <property>
-                <name>outputDirectory</name>
-                <value>${basedir}/target</value>
-              </property>
-            </systemProperties>
-            <excludes>
-              <exclude>**/*ITest.java</exclude>
-            </excludes>
-            <argLine>-Xmx1024m</argLine>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-antrun-plugin</artifactId>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <systemProperties>
+                <property>
+                  <name>outputDirectory</name>
+                  <value>${basedir}/target</value>
+                </property>
+              </systemProperties>
+              <excludes>
+                <exclude>**/*ITest.java</exclude>
+              </excludes>
+              <argLine>-Xmx1024m</argLine>
+            </configuration>
+          </plugin>
+
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
                 <phase>validate</phase>
@@ -178,7 +184,7 @@
               </execution>
             </executions>
           </plugin>
-   	    </plugins>
+        </plugins>
       </build>
     </profile>
   </profiles>

Modified: directory/apacheds/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/core/pom.xml (original)
+++ directory/apacheds/trunk/core/pom.xml Sun May 27 14:36:12 2007
@@ -9,63 +9,75 @@
   <artifactId>apacheds-core</artifactId>
   <name>ApacheDS Core</name>
   <packaging>jar</packaging>
+
   <description>
      Server's core contains the JNDI provider, interceptors, schema, and
      database subsystems.  The core is the heart of the server without protocols
      enabled.
   </description>
+
   <dependencies>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-schema-bootstrap</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-schema-registries</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-shared</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-utils</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-store</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-constants</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-btree-base</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-bootstrap-partition</artifactId>
       <version>${pom.version}</version>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -81,6 +93,7 @@
         </configuration>
       </plugin>
     </plugins>
+
     <resources>
       <resource>
         <directory>src/main/resources</directory>

Modified: directory/apacheds/trunk/jdbm-store/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/jdbm-store/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-store/pom.xml Sun May 27 14:36:12 2007
@@ -9,6 +9,7 @@
   <artifactId>apacheds-jdbm-store</artifactId>
   <name>ApacheDS JDBM Store</name>
   <packaging>jar</packaging>
+
   <description>
     A JDBM entry store which does not have any dependency on core interfaces.
     The JDBM partition will use this store and build on it to adapt this to 
@@ -18,31 +19,37 @@
     important for use within the bootstrap plugin which needs to build the
     schema partition used for bootstrapping the server.
   </description>
+
   <dependencies>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>jdbm</groupId>
       <artifactId>jdbm</artifactId>
     </dependency>
+
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-constants</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-btree-base</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-schema-registries</artifactId>

Modified: directory/apacheds/trunk/kerberos-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/pom.xml (original)
+++ directory/apacheds/trunk/kerberos-shared/pom.xml Sun May 27 14:36:12 2007
@@ -8,15 +8,19 @@
   </parent>
   <artifactId>apacheds-kerberos-shared</artifactId>
   <name>ApacheDS Protocol Kerberos Shared</name>
+
   <description>
     The Kerberos protocol provider for ApacheDS
   </description>
+
   <packaging>jar</packaging>  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>

Modified: directory/apacheds/trunk/mitosis/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/mitosis/pom.xml (original)
+++ directory/apacheds/trunk/mitosis/pom.xml Sun May 27 14:36:12 2007
@@ -9,6 +9,7 @@
   <artifactId>mitosis</artifactId>
   <name>ApacheDS replication</name>
   <packaging>jar</packaging>
+
   <description>
      Mitosis is the multi-master replications service included into Apache
      Directory Server
@@ -64,17 +65,18 @@
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
+      <version>${pom.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-shared</artifactId>
+      <version>${pom.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
-      <!--scope>test</scope-->
     </dependency>
 
     <dependency>
@@ -106,6 +108,7 @@
             <argLine>-Xmx1024m</argLine>
           </configuration>
         </plugin>
+
         <plugin>
           <artifactId>maven-antrun-plugin</artifactId>
             <executions>
@@ -131,28 +134,30 @@
               </execution>
             </executions>
           </plugin>
-            </plugins>
+        </plugins>
       </build>
     </profile>
+
     <profile>
       <id>integration</id>
       <activation>
         <property><name>integration</name></property>
       </activation>
-    <build>
-      <plugins>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <forkMode>pertest</forkMode>
-            <excludes>
-              <exclude>**/*PTest.java</exclude>
-            </excludes>
-            <argLine>-Xmx1024m</argLine>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-antrun-plugin</artifactId>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <forkMode>pertest</forkMode>
+              <excludes>
+                <exclude>**/*PTest.java</exclude>
+              </excludes>
+              <argLine>-Xmx1024m</argLine>
+            </configuration>
+          </plugin>
+
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
                 <phase>validate</phase>
@@ -175,33 +180,35 @@
               </execution>
             </executions>
           </plugin>
-            </plugins>
+        </plugins>
       </build>
     </profile>
+ 
     <profile>
       <id>performance</id>
       <activation>
         <property><name>performance</name></property>
       </activation>
-    <build>
-      <plugins>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <systemProperties>
-              <property>
-                <name>outputDirectory</name>
-                <value>${basedir}/target</value>
-              </property>
-            </systemProperties>
-            <excludes>
-              <exclude>**/*ITest.java</exclude>
-            </excludes>
-            <argLine>-Xmx1024m</argLine>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-antrun-plugin</artifactId>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <systemProperties>
+                <property>
+                  <name>outputDirectory</name>
+                  <value>${basedir}/target</value>
+                </property>
+              </systemProperties>
+              <excludes>
+                <exclude>**/*ITest.java</exclude>
+              </excludes>
+              <argLine>-Xmx1024m</argLine>
+            </configuration>
+          </plugin>
+
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
                 <phase>validate</phase>
@@ -224,7 +231,7 @@
               </execution>
             </executions>
           </plugin>
-            </plugins>
+        </plugins>
       </build>
     </profile>
   </profiles>

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Sun May 27 14:36:12 2007
@@ -80,6 +80,7 @@
         <artifactId>mina-core</artifactId>
         <version>1.0.2</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.mina</groupId>
         <artifactId>mina-filter-ssl</artifactId>
@@ -89,93 +90,151 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>1.2</version>
+        <version>1.3.1</version>
       </dependency>
+
       <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
         <version>3.2</version>
       </dependency>
+
       <dependency>
         <groupId>commons-daemon</groupId>
         <artifactId>commons-daemon</artifactId>
         <version>1.0.1</version>
       </dependency>
+
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
-        <version>2.1</version>
+        <version>2.3</version>
       </dependency>
+
       <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
         <version>1.0</version>
       </dependency>
+
       <dependency>
         <groupId>commons-dbcp</groupId>
         <artifactId>commons-dbcp</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
       </dependency>
+
       <dependency>
         <groupId>commons-pool</groupId>
         <artifactId>commons-pool</artifactId>
         <version>1.3</version>
       </dependency>
+
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
-        <version>1.0.4</version>
+        <version>1.1</version>
       </dependency>
+
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>nlog4j</artifactId>
         <version>1.2.25</version>
       </dependency>
+
       <dependency>
         <groupId>jdbm</groupId>
         <artifactId>jdbm</artifactId>
         <version>1.0</version>
       </dependency>
+
+      <dependency>
+        <groupId>velocity</groupId>
+        <artifactId>velocity-dep</artifactId>
+        <version>1.4</version>
+      </dependency>
+
       <dependency>
         <groupId>antlr</groupId>
         <artifactId>antlr</artifactId>
-        <version>2.7.6</version>
+        <version>2.7.7</version>
       </dependency>
+
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
       </dependency>
+
       <dependency>
         <groupId>quartz</groupId>
         <artifactId>quartz</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.1</version>
       </dependency>
+
       <dependency>
         <groupId>jug</groupId>
         <artifactId>jug-asl</artifactId>
-        <version>2.0rc6</version>
+        <version>2.0.0</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.derby</groupId>
         <artifactId>derby</artifactId>
-        <version>10.1.3.1</version>
+        <version>10.2.2.0</version>
       </dependency>
 
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
       </dependency>
+
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
       </dependency>
+
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-api</artifactId>
+        <version>2.0.6</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-project</artifactId>
+        <version>2.0.6</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-archiver</artifactId>
+        <version>2.0.5</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <version>1.4.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact</artifactId>
+        <version>2.0.6</version>
+      </dependency>
+
+      <dependency>
+        <groupId>ldapsdk</groupId>
+        <artifactId>ldapsdk</artifactId>
+        <version>4.1</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -239,7 +298,7 @@
         <module>server-tools</module>
 
         <!-- breaks the build on first try
-	<module>sar-plugin</module>
+        <module>sar-plugin</module>
         <module>server-sar</module>
         -->
 
@@ -271,6 +330,9 @@
       <id>brett</id>
     </developer>
     <developer>
+      <id>ckoppelt</id>
+    </developer>
+    <developer>
       <id>elecharny</id>
       <url>http://directory.apache.org/community/who/elecharny.html</url>
     </developer>
@@ -343,36 +405,78 @@
   </organization>
 
   <build>
-  <pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <argLine>-Xmx1024m</argLine>
-        </configuration>
-      </plugin>
-    </plugins>
-  </pluginManagement>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.3</version>
+          <configuration>
+            <argLine>-Xmx1024m</argLine>
+          </configuration>
+        </plugin>
+        
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.0.2</version>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+            <optimize>true</optimize>
+            <showDeprecations>true</showDeprecations>
+            <encoding>ISO-8859-1</encoding>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-eclipse-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antlr-plugin</artifactId>
+          <version>2.0-beta-1</version>
+          <executions>
+             <execution>
+                <goals>
+                   <goal>generate</goal>
+                </goals>
+             </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.1</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
 
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
- 
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
       </plugin>
      
       <plugin>
@@ -400,7 +504,6 @@
           </execution>
         </executions>
       </plugin>
-
     </plugins>
   </build>
 

Modified: directory/apacheds/trunk/protocol-changepw/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-changepw/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/protocol-changepw/pom.xml (original)
+++ directory/apacheds/trunk/protocol-changepw/pom.xml Sun May 27 14:36:12 2007
@@ -8,16 +8,20 @@
   </parent>
   <artifactId>apacheds-protocol-changepw</artifactId>
   <name>ApacheDS Protocol Change Password</name>
+
   <description>
     The Change Password protocol provider for ApacheDS
   </description>
+
   <packaging>jar</packaging>  
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>

Modified: directory/apacheds/trunk/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dhcp/pom.xml Sun May 27 14:36:12 2007
@@ -8,25 +8,31 @@
   </parent>
   <artifactId>apacheds-protocol-dhcp</artifactId>
   <name>ApacheDS Protocol Dhcp</name>
+
   <description>
     The DHCP protocol provider for ApacheDS
   </description>
+
   <packaging>jar</packaging>  
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>

Modified: directory/apacheds/trunk/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/protocol-dns/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dns/pom.xml Sun May 27 14:36:12 2007
@@ -8,20 +8,25 @@
   </parent>
   <artifactId>apacheds-protocol-dns</artifactId>
   <name>ApacheDS Protocol Dns</name>
+
   <description>
     The DNS protocol provider for ApacheDS
   </description>
+
   <packaging>jar</packaging>  
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>

Modified: directory/apacheds/trunk/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/pom.xml (original)
+++ directory/apacheds/trunk/protocol-kerberos/pom.xml Sun May 27 14:36:12 2007
@@ -8,16 +8,20 @@
   </parent>
   <artifactId>apacheds-protocol-kerberos</artifactId>
   <name>ApacheDS Protocol Kerberos</name>
+
   <description>
     The Kerberos Protocol Provider for ApacheDS
   </description>
+
   <packaging>jar</packaging>  
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>

Modified: directory/apacheds/trunk/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ldap/pom.xml Sun May 27 14:36:12 2007
@@ -7,26 +7,32 @@
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-ldap</artifactId>
+
   <description>
     The LDAPv3 protocol provider for ApacheDS
   </description>
+
   <name>ApacheDS Protocol Ldap</name>
   <packaging>jar</packaging>  
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-asn1-codec</artifactId>
       <version>0.9.6-SNAPSHOT</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-filter-ssl</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>

Modified: directory/apacheds/trunk/protocol-ntp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ntp/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/protocol-ntp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ntp/pom.xml Sun May 27 14:36:12 2007
@@ -8,20 +8,25 @@
   </parent>
   <artifactId>apacheds-protocol-ntp</artifactId>
   <name>ApacheDS Protocol Ntp</name>
+
   <description>
     The NTP protocol provider for ApacheDS
   </description>
+
   <packaging>jar</packaging>  
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>

Modified: directory/apacheds/trunk/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/protocol-shared/pom.xml (original)
+++ directory/apacheds/trunk/protocol-shared/pom.xml Sun May 27 14:36:12 2007
@@ -8,11 +8,14 @@
   </parent>
   <groupId>org.apache.directory.server</groupId>
   <artifactId>apacheds-protocol-shared</artifactId>
+
   <description>
     Shared library that is used by all protocol providers in ApacheDS
   </description>
+
   <name>ApacheDS Protocol Shared</name>
   <packaging>jar</packaging>  
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: directory/apacheds/trunk/sar-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/sar-plugin/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/sar-plugin/pom.xml (original)
+++ directory/apacheds/trunk/sar-plugin/pom.xml Sun May 27 14:36:12 2007
@@ -8,26 +8,26 @@
   <artifactId>apacheds-sar-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>ApacheDS Server Sar Maven Plugin</name>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0.1</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-archiver</artifactId>
-      <version>2.0.1</version>
     </dependency>
+
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.0.5</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>2.0</version>
     </dependency>
   </dependencies>
 </project>

Modified: directory/apacheds/trunk/schema-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/pom.xml (original)
+++ directory/apacheds/trunk/schema-bootstrap/pom.xml Sun May 27 14:36:12 2007
@@ -8,42 +8,51 @@
   </parent>
   <artifactId>apacheds-schema-bootstrap</artifactId>
   <name>ApacheDS Bootstrap Schemas</name>
+
   <description>
     The minimal set of schemas needed to bootstrap the server's special schema
     partition which is used to store all the schemas for the server.
   </description>
+
   <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-schema-registries</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-shared</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-constants</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>jdbm</groupId>
       <artifactId>jdbm</artifactId>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-core-plugin</artifactId>
+        <version>${pom.version}</version>
         <configuration>
           <schemaSourcesDir>src/main/schema</schemaSourcesDir>
           <schemas>

Modified: directory/apacheds/trunk/schema-extras/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-extras/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/schema-extras/pom.xml (original)
+++ directory/apacheds/trunk/schema-extras/pom.xml Sun May 27 14:36:12 2007
@@ -9,31 +9,37 @@
   <artifactId>apacheds-schema-extras</artifactId>
   <name>ApacheDS Extra Schemas</name>
   <packaging>jar</packaging>
+
   <description>
-  </description>
     A set of additional bootstrap schemas beyond the essential set.
+  </description>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-schema-registries</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-schema-bootstrap</artifactId>
       <version>${pom.version}</version>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-core-plugin</artifactId>
+        <version>${pom.version}</version>
         <configuration>
           <schemaSourcesDir>src/main/schema</schemaSourcesDir>
           <schemas>

Modified: directory/apacheds/trunk/schema-registries/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-registries/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/schema-registries/pom.xml (original)
+++ directory/apacheds/trunk/schema-registries/pom.xml Sun May 27 14:36:12 2007
@@ -8,16 +8,20 @@
   </parent>
   <artifactId>apacheds-schema-registries</artifactId>
   <name>ApacheDS Schema Registries</name>
+
   <description>
     Interfaces for schema entity registries are contained here.
   </description>
+
   <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-core-shared</artifactId>

Modified: directory/apacheds/trunk/server-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/server-installers/pom.xml (original)
+++ directory/apacheds/trunk/server-installers/pom.xml Sun May 27 14:36:12 2007
@@ -9,73 +9,89 @@
   <artifactId>apacheds-server-installers</artifactId>
   <name>ApacheDS Server Installers</name>
   <packaging>jar</packaging>
+
   <description>
     Installer generating project for ApacheDS
   </description>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>mitosis</artifactId>
       <version>${pom.version}</version>
     </dependency>  
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-main</artifactId>
       <version>${pom.version}</version>
     </dependency>  
+
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>
       <scope>provided</scope>
     </dependency>  
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-tools</artifactId>
       <version>${pom.version}</version>
     </dependency>  
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-schema-extras</artifactId>
       <version>${pom.version}</version>
     </dependency>  
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
     </dependency>
+
     <dependency>
       <groupId>commons-daemon</groupId>
       <artifactId>commons-daemon</artifactId>
     </dependency>
+
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
+
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
     </dependency>
+
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.directory.daemon</groupId>
         <artifactId>daemon-plugin</artifactId>
+        <version>1.1.1-SNAPSHOT</version>
         <configuration>
           <excludes>
 
@@ -102,6 +118,7 @@
             <exclude>asm:asm-util</exclude>
             <exclude>jasperreports:jasperreports</exclude>
           </excludes>
+
           <application>
             <name>apacheds</name>
             <version>${pom.version}</version>
@@ -124,6 +141,7 @@
               <author>trustin@apache.org</author>
             </authors>
           </application>
+
           <packagedFiles>
             <packagedFile>
               <source>org.apache.directory.server:apacheds-server-tools</source>
@@ -142,6 +160,7 @@
           <applicationClass>
             org.apache.ldap.server.Service
           </applicationClass>
+
           <rpmTargets>
             <rpmTarget>
               <packagedFiles>
@@ -164,6 +183,7 @@
               <daemonFramework>jsvc</daemonFramework>
             </rpmTarget>
           </rpmTargets>
+
           <innoTargets>
             <innoTarget>
               <id>windows-xp-procrun</id>
@@ -178,6 +198,7 @@
               <daemonFramework>procrun</daemonFramework>
             </innoTarget>
           </innoTargets>
+
           <izPackTargets>
             <izPackTarget>
               <packagedFiles>
@@ -199,6 +220,7 @@
               <osArch>i386</osArch>
               <daemonFramework>jsvc</daemonFramework>
             </izPackTarget>
+
             <izPackTarget>
               <packagedFiles>
                 <packagedFile>
@@ -240,6 +262,7 @@
               <osArch>sparc</osArch>
               <daemonFramework>jsvc</daemonFramework>
             </izPackTarget>
+
             <izPackTarget>
               <packagedFiles>
                 <packagedFile>
@@ -260,6 +283,7 @@
               <osArch>i386</osArch>
               <daemonFramework>jsvc</daemonFramework>
             </izPackTarget>
+
             <izPackTarget>
               <packagedFiles>
                 <packagedFile>

Modified: directory/apacheds/trunk/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/server-jndi/pom.xml (original)
+++ directory/apacheds/trunk/server-jndi/pom.xml Sun May 27 14:36:12 2007
@@ -8,49 +8,59 @@
   </parent>
   <artifactId>apacheds-server-jndi</artifactId>
   <name>ApacheDS Server JNDI</name>
+
   <description>
     The JNDI provider which launches the core and associated network 
     services: Changepw, Kerberos, LDAP, and NTP if all are configured.
     By default only LDAP is configured to startup.
   </description>
+
   <packaging>jar</packaging>  
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>  
-    <dependency>
+
+    <!--dependency>
       <groupId>backport-util-concurrent</groupId>
       <artifactId>backport-util-concurrent</artifactId>
       <version>2.2</version>
       <scope>compile</scope>
-    </dependency>
+    </dependency-->
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-changepw</artifactId>
       <version>${pom.version}</version>
     </dependency>  
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-ntp</artifactId>
       <version>${pom.version}</version>
     </dependency>  
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-kerberos</artifactId>
       <version>${pom.version}</version>
     </dependency>  
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-ldap</artifactId>
       <version>${pom.version}</version>
     </dependency>  
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-dns</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>

Modified: directory/apacheds/trunk/server-main/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-main/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/server-main/pom.xml (original)
+++ directory/apacheds/trunk/server-main/pom.xml Sun May 27 14:36:12 2007
@@ -9,65 +9,73 @@
   <artifactId>apacheds-server-main</artifactId>
   <name>ApacheDS Server Main</name>
   <packaging>jar</packaging>  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-jndi</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>
       <version>1.1.1-SNAPSHOT</version>
     </dependency>  
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
     </dependency>
+
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-      	<artifactId>maven-jar-plugin</artifactId>
-      	<configuration>
-      	  <archive>
-      	    <manifest>
-      	      <mainClass>org.apache.directory.server.UberjarMain</mainClass>
-      	    </manifest>
-      	  </archive>
-      	</configuration>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>org.apache.directory.server.UberjarMain</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-      	<artifactId>maven-assembly-plugin</artifactId>
-      	<version>2.1</version>
-      	<configuration>
-      	  <archive>
-      	    <manifest>
-      	      <mainClass>org.apache.directory.server.UberjarMain</mainClass>
-      	    </manifest> 
-      	  </archive>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>org.apache.directory.server.UberjarMain</mainClass>
+            </manifest> 
+          </archive>
           <descriptor>src/main/assembly/apacheds-main.xml</descriptor>
           <classifier>app</classifier>
           <appendAssemblyId>false</appendAssemblyId>
-      	</configuration>
+        </configuration>
       </plugin>
     </plugins>
   </build>

Modified: directory/apacheds/trunk/server-sar/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-sar/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/server-sar/pom.xml (original)
+++ directory/apacheds/trunk/server-sar/pom.xml Sun May 27 14:36:12 2007
@@ -8,46 +8,57 @@
   </parent>
   <artifactId>apacheds-server-sar</artifactId>
   <name>ApacheDS Server Sar (JBoss 3.x)</name>
+
   <description>
     A server archive file for ApacheDS to run within a JBoss 3.x instance
   </description>
+
   <packaging>sar</packaging>  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-ssl</artifactId>
       <version>${pom.version}</version>
     </dependency>  
+
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>
     </dependency>
+
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-system</artifactId>
       <version>3.2.3</version>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
     </dependency>
+
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
     </dependency>
   </dependencies>
+
   <repositories>
     <repository>
       <id>mojo.snapshots</id>
@@ -55,12 +66,13 @@
       <url>http://snapshots.maven.codehaus.org/maven2</url>
     </repository>
   </repositories>
+
   <build>
     <plugins>
       <plugin>
         <extensions>true</extensions>
         <groupId>org.apache.directory.server</groupId>
-      	<artifactId>apacheds-sar-plugin</artifactId>
+        <artifactId>apacheds-sar-plugin</artifactId>
         <configuration>
           <excludes>
             <exclude>

Modified: directory/apacheds/trunk/server-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/server-tools/pom.xml (original)
+++ directory/apacheds/trunk/server-tools/pom.xml Sun May 27 14:36:12 2007
@@ -8,30 +8,37 @@
   </parent>
   <artifactId>apacheds-server-tools</artifactId>
   <name>ApacheDS Server Tools</name>
+
   <description>
     Contained within this executable jar are various commandline utilities
     for apacheds.
   </description>
+
   <packaging>jar</packaging>  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-main</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>
     </dependency>
+
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
     </dependency>
+
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>

Modified: directory/apacheds/trunk/server-unit/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-unit/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/server-unit/pom.xml (original)
+++ directory/apacheds/trunk/server-unit/pom.xml Sun May 27 14:36:12 2007
@@ -9,31 +9,36 @@
   <artifactId>apacheds-server-unit</artifactId>
   <name>ApacheDS Server Unit</name>
   <packaging>jar</packaging>  
+
   <description>
     Unit testing framework for ApacheDS Server JNDI Provider
   </description>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>provided</scope>
     </dependency>  
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>  
+
     <dependency>
       <groupId>ldapsdk</groupId>
       <artifactId>ldapsdk</artifactId>
-      <version>4.1</version>
       <scope>test</scope>
     </dependency>  
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-jndi</artifactId>
       <version>${pom.version}</version>
     </dependency>  
+
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-unit</artifactId>
@@ -79,6 +84,7 @@
                 <argLine>-Xmx1024m</argLine>
               </configuration>
             </plugin>
+
             <plugin>
               <artifactId>maven-antrun-plugin</artifactId>
               <executions>
@@ -106,6 +112,7 @@
          </plugins>
        </build>
     </profile>
+
     <profile>
       <id>integration</id>
       <activation>

Modified: directory/apacheds/trunk/utils/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/utils/pom.xml?view=diff&rev=542039&r1=542038&r2=542039
==============================================================================
--- directory/apacheds/trunk/utils/pom.xml (original)
+++ directory/apacheds/trunk/utils/pom.xml Sun May 27 14:36:12 2007
@@ -9,15 +9,18 @@
   <artifactId>apacheds-utils</artifactId>
   <name>ApacheDS Utils</name>
   <packaging>jar</packaging>
+
   <description>
     Contains utility classes for ApacheDS.
   </description>
+
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-constants</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-core-shared</artifactId>



Mime
View raw message