You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2006/02/05 15:48:24 UTC

svn commit: r375037 - in /directory/trunks/apacheds: ./ core/ core/src/main/java/org/apache/ldap/server/partition/ core/src/main/java/org/apache/ldap/server/prefs/ core/src/main/java/org/apache/ldap/server/schema/ core/src/main/java/org/apache/ldap/ser...

Author: ersiner
Date: Sun Feb  5 06:48:22 2006
New Revision: 375037

URL: http://svn.apache.org/viewcvs?rev=375037&view=rev
Log:
Commeting out most of the site distribution information from poms. Will try to make maven do some automagic.
Added new generated subprojects index.xml.

Modified:
    directory/trunks/apacheds/core/pom.xml
    directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/package.html
    directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/prefs/package.html
    directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/SchemaChecker.java
    directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/package.html
    directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/package.html
    directory/trunks/apacheds/plugin/pom.xml
    directory/trunks/apacheds/pom.xml
    directory/trunks/apacheds/shared/pom.xml
    directory/trunks/apacheds/simple/installers/pom.xml
    directory/trunks/apacheds/simple/pom.xml
    directory/trunks/apacheds/src/site/site.xml
    directory/trunks/apacheds/src/site/xdoc/projects/index.xml

Modified: directory/trunks/apacheds/core/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/pom.xml?rev=375037&r1=375036&r2=375037&view=diff
==============================================================================
--- directory/trunks/apacheds/core/pom.xml (original)
+++ directory/trunks/apacheds/core/pom.xml Sun Feb  5 06:48:22 2006
@@ -15,12 +15,12 @@
      JNDI provider, interceptor framework, interceptor services, the schema 
      subsystem and the database subsystem. Hence the core is the heart of the server.
   </description>
-  <distributionManagement>
+  <!-- <distributionManagement>
     <site>
       <id>apache.websites</id>
       <url>scp://minotaur.apache.org/www/directory.apache.org/newsite/subprojects/apacheds/projects/apacheds-core/</url>
     </site>
-  </distributionManagement> 
+  </distributionManagement> -->
   <dependencies>
     <dependency>
       <groupId>commons-io</groupId>

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/package.html
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/package.html?rev=375037&r1=375036&r2=375037&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/package.html (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/package.html Sun Feb  5 06:48:22 2006
@@ -1,5 +1,4 @@
-
+<body>
 <p>
 </p>
-
-
+</body>

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/prefs/package.html
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/prefs/package.html?rev=375037&r1=375036&r2=375037&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/prefs/package.html (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/prefs/package.html Sun Feb  5 06:48:22 2006
@@ -1,3 +1,4 @@
+<body>
 Platform independent server side Preferences implementation based on ApacheDS.
 The data is backed by the directory using a specific LDAP schema to map
 preferences to the LDAP/X.500 namespace.  To make sure you're preferences are
@@ -5,6 +6,4 @@
 following property is set to our implementation:
 
 java.util.prefs.PreferencesFactory=org.apache.ldap.server.prefs.ServerPreferencesFactory
-
-
-
+</body>

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/SchemaChecker.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/SchemaChecker.java?rev=375037&r1=375036&r2=375037&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/SchemaChecker.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/SchemaChecker.java Sun Feb  5 06:48:22 2006
@@ -39,7 +39,7 @@
 /**
  * Performs schema checks on behalf of the SchemaService.
  *
- * @todo we really need to refactor this code since there's much duplication
+ * TODO: we really need to refactor this code since there's much duplication
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/package.html
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/package.html?rev=375037&r1=375036&r2=375037&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/package.html (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/bootstrap/package.html Sun Feb  5 06:48:22 2006
@@ -1,3 +1,4 @@
+<body>
 <p>
 Contains interfaces and classes used for bootstrap schema object loading and
 configuration.
@@ -103,4 +104,4 @@
     schema objects can be brought into memory from disk.
   </li>
 </ul>
-
+</body>

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/package.html
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/package.html?rev=375037&r1=375036&r2=375037&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/package.html (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/schema/package.html Sun Feb  5 06:48:22 2006
@@ -1,3 +1,4 @@
+<body>
 <p>
     Contains interfaces for schema object registry services and simple POJO
     implementations of these services.  Other helper interfaces and classes are
@@ -26,4 +27,5 @@
        <li>don't worry who or what does the populating</li>
        <li>don't worry about where the information comes from</li>
     </ul>
-</p>
\ No newline at end of file
+</p>
+</body>

Modified: directory/trunks/apacheds/plugin/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/plugin/pom.xml?rev=375037&r1=375036&r2=375037&view=diff
==============================================================================
--- directory/trunks/apacheds/plugin/pom.xml (original)
+++ directory/trunks/apacheds/plugin/pom.xml Sun Feb  5 06:48:22 2006
@@ -13,12 +13,12 @@
     A collection of tools as plugins to manage various tasks associated with 
     the directory server.
   </description>
-  <distributionManagement>
+  <!-- <distributionManagement>
     <site>
       <id>apache.websites</id>
       <url>scp://minotaur.apache.org/www/directory.apache.org/newsite/subprojects/apacheds/projects/maven-directory-plugin/</url>
     </site>
-  </distributionManagement> 
+  </distributionManagement> -->
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>

Modified: directory/trunks/apacheds/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/pom.xml?rev=375037&r1=375036&r2=375037&view=diff
==============================================================================
--- directory/trunks/apacheds/pom.xml (original)
+++ directory/trunks/apacheds/pom.xml Sun Feb  5 06:48:22 2006
@@ -15,7 +15,7 @@
   <distributionManagement>
     <site>
       <id>apache.websites</id>
-      <url>scp://minotaur.apache.org/www/directory.apache.org/newsite/subprojects/apacheds/</url>
+      <url>scp://minotaur.apache.org/www/directory.apache.org/newsite/projects/apacheds/</url>
     </site>
   </distributionManagement>
 
@@ -151,7 +151,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
-        <version>2.0-beta-4</version>
+        <version>2.0-SNAPSHOT</version>
       </plugin>
       <!-- The following plugin can be enabled for recursive site generations -->
       <!-- <plugin>
@@ -162,28 +162,26 @@
             <phase>site</phase>
             <configuration>
               <tasks>
-                <copy file="src/site/site.xml" todir="protocols/kerberos-common/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="protocols/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="protocols/dhcp/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="protocols/changepw/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="protocols/ntp/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="protocols/ldap/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="protocols/kerberos/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="protocols/dns/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="core/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="core-unit/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="plugin/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="standalone/simple/jndi/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="standalone/simple/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="standalone/simple/unit/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="standalone/simple/main/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="standalone/simple/ssl/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="standalone/daemon/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="standalone/installers/plugin/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="standalone/installers/test/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="protocol-common/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="shared/src/site" overwrite="true"/>
-                <copy file="src/site/site.xml" todir="tools/src/site" overwrite="true"/>
+                <copy file="src/site/site.xml" todir="protocols/kerberos-common/src/site"/>
+                <copy file="src/site/site.xml" todir="protocols/src/site"/>
+                <copy file="src/site/site.xml" todir="protocols/dhcp/src/site"/>
+                <copy file="src/site/site.xml" todir="protocols/changepw/src/site"/>
+                <copy file="src/site/site.xml" todir="protocols/ntp/src/site"/>
+                <copy file="src/site/site.xml" todir="protocols/ldap/src/site"/>
+                <copy file="src/site/site.xml" todir="protocols/kerberos/src/site"/>
+                <copy file="src/site/site.xml" todir="protocols/dns/src/site"/>
+                <copy file="src/site/site.xml" todir="simple/jndi/src/site"/>
+                <copy file="src/site/site.xml" todir="simple/src/site"/>
+                <copy file="src/site/site.xml" todir="simple/unit/src/site"/>
+                <copy file="src/site/site.xml" todir="simple/main/src/site"/>
+                <copy file="src/site/site.xml" todir="simple/ssl/src/site"/>
+                <copy file="src/site/site.xml" todir="simple/installers/src/site"/>
+                <copy file="src/site/site.xml" todir="core/src/site"/>
+                <copy file="src/site/site.xml" todir="core-unit/src/site"/>
+                <copy file="src/site/site.xml" todir="plugin/src/site"/>
+                <copy file="src/site/site.xml" todir="protocol-common/src/site"/>
+                <copy file="src/site/site.xml" todir="shared/src/site"/>
+                <copy file="src/site/site.xml" todir="tools/src/site"/>
               </tasks>
             </configuration>
             <goals>
@@ -205,14 +203,18 @@
           <reportSet>
             <reports>
               <report>project-team</report>
-              <report>mailing-list</report>
+              <!-- <report>mailing-list</report>
               <report>issue-tracking</report>
               <report>license</report>
-              <report>scm</report>
+              <report>scm</report> -->
             </reports>
           </reportSet>
         </reportSets>
       </plugin>
+      <!-- <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin> -->
     </plugins>
   </reporting>
 

Modified: directory/trunks/apacheds/shared/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/shared/pom.xml?rev=375037&r1=375036&r2=375037&view=diff
==============================================================================
--- directory/trunks/apacheds/shared/pom.xml (original)
+++ directory/trunks/apacheds/shared/pom.xml Sun Feb  5 06:48:22 2006
@@ -14,11 +14,11 @@
      and the maven plugin. Any code shared across modules in general 
      can go here so long as it does not depend on other modules. 
   </description>
-  <distributionManagement>
+  <!-- <distributionManagement>
     <site>
       <id>apache.websites</id>
       <url>scp://minotaur.apache.org/www/directory.apache.org/newsite/subprojects/apacheds/projects/apacheds-shared/</url>
     </site>
-  </distributionManagement>
+  </distributionManagement> -->
 </project>
 

Modified: directory/trunks/apacheds/simple/installers/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/simple/installers/pom.xml?rev=375037&r1=375036&r2=375037&view=diff
==============================================================================
--- directory/trunks/apacheds/simple/installers/pom.xml (original)
+++ directory/trunks/apacheds/simple/installers/pom.xml Sun Feb  5 06:48:22 2006
@@ -75,12 +75,12 @@
       <version>1.2.1</version>
     </dependency>
   </dependencies>
-  <distributionManagement>
+  <!-- <distributionManagement>
     <site>
       <id>apache.websites</id>
       <url>scp://minotaur.apache.org/www/directory.apache.org/newsite/subprojects/apacheds/</url>
     </site>
-  </distributionManagement>
+  </distributionManagement> -->
   <build>
     <plugins>
       <plugin>

Modified: directory/trunks/apacheds/simple/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/simple/pom.xml?rev=375037&r1=375036&r2=375037&view=diff
==============================================================================
--- directory/trunks/apacheds/simple/pom.xml (original)
+++ directory/trunks/apacheds/simple/pom.xml Sun Feb  5 06:48:22 2006
@@ -15,12 +15,12 @@
     A single executable server jar containing all dependencies. This jar 
     can be used as the JNDI provider or to fire up the standalone directory server.
   </description>
-  <distributionManagement>
+  <!-- <distributionManagement>
     <site>
       <id>apache.websites</id>
       <url>scp://minotaur.apache.org/www/directory.apache.org/newsite/subprojects/apacheds/projects/apacheds-standalone/</url>
     </site>
-  </distributionManagement>
+  </distributionManagement> -->
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: directory/trunks/apacheds/src/site/site.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/src/site/site.xml?rev=375037&r1=375036&r2=375037&view=diff
==============================================================================
--- directory/trunks/apacheds/src/site/site.xml (original)
+++ directory/trunks/apacheds/src/site/site.xml Sun Feb  5 06:48:22 2006
@@ -56,7 +56,7 @@
             img="http://apache.org/images/ac2005us_blue_125x125.jpg" />
     </menu>
      -->
-    ${reports}     
+    ${reports}
  </body>
 
 </project>

Modified: directory/trunks/apacheds/src/site/xdoc/projects/index.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/src/site/xdoc/projects/index.xml?rev=375037&r1=375036&r2=375037&view=diff
==============================================================================
--- directory/trunks/apacheds/src/site/xdoc/projects/index.xml (original)
+++ directory/trunks/apacheds/src/site/xdoc/projects/index.xml Sun Feb  5 06:48:22 2006
@@ -1,169 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>ApacheDS - Projects</title> 
-  </properties>
-  
-  <body>
-    <section name="Server Projects">
-      <p>
-        The server is composed of several sub-projects.  Here is the list of
-        server sub-projects with brief descriptions:
-      </p>
-      
-      <table>
-        <tr>
-          <th>Project</th>
-          <th>Description</th>
-        </tr>
-        
-        <tr>
-          <td>
-            core
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            shared
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            tools
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            standalone/simple/jndi
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            standalone/simple/main
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            standalone/simple/ssl
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            standalone/daemon
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            protocol-common
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            protocols/dhcp
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            protocols/changepw
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            protocols/ntp
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            protocols/ldap
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            protocols/dns
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            protocols/kerberos
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            protocols/kerberos-common
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            core-unit
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <tr>
-          <td>
-            standalone/simple/unit
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr>
-        <!-- <tr>
-          <td>
-            site
-          </td>
-          <td>
-            To be described...
-          </td>
-        </tr> -->
-      </table>
-
-    </section>
-  </body>
+ <properties>
+  <title>Apache Directory Server - Subprojects</title>
+ </properties>
+ <body>
+  <section name="Apache Directory Server Subprojects">
+   <p>Apache Directory Server is composed of several subprojects. Here is the list of them with brief descriptions:</p>
+   <table>
+    <tr><td>Project</td><td>Description</td></tr>
+     <tr><td>kerberos-common</td><td>To be described...</td></tr>
+     <tr><td>protocols-build</td><td>To be described...</td></tr>
+     <tr><td>dhcp-protocol</td><td>To be described...</td></tr>
+     <tr><td>changepw-protocol</td><td>To be described...</td></tr>
+     <tr><td>ntp-protocol</td><td>To be described...</td></tr>
+     <tr><td>ldap-protocol</td><td>To be described...</td></tr>
+     <tr><td>kerberos-protocol</td><td>To be described...</td></tr>
+     <tr><td>dns-protocol</td><td>To be described...</td></tr>
+     <tr><td>standalone-simple-jndi</td><td>To be described...</td></tr>
+     <tr><td>simple-build</td><td> A single executable server jar containing all dependencies. This jar can be used as the JNDI provider or to fire up the standalone directory server. </td></tr>
+     <tr><td>Apache Directory Server Sar for JBoss 3.x</td><td>To be described...</td></tr>
+     <tr><td>standalone-simple-unit</td><td>To be described...</td></tr>
+     <tr><td>standalone-simple-main</td><td>To be described...</td></tr>
+     <tr><td>standalone-simple-ssl</td><td>To be described...</td></tr>
+     <tr><td>Apache Directory Server Installers</td><td>To be described...</td></tr>
+     <tr><td>apacheds-core</td><td> Server's core contains all backend subsystems. It depends on protocol and uses it with seda to service LDAP requests. The core contains the JNDI provider, interceptor framework, interceptor services, the schema subsystem and the database subsystem. Hence the core is the heart of the server. </td></tr>
+     <tr><td>apacheds-core-unit</td><td>To be described...</td></tr>
+     <tr><td>apacheds-plugin</td><td> A collection of tools as plugins to manage various tasks associated with the directory server. </td></tr>
+     <tr><td>protocol-common</td><td>To be described...</td></tr>
+     <tr><td>apacheds-shared</td><td> Created to eliminate cyclic project dependencies between the core and the maven plugin. Any code shared across modules in general can go here so long as it does not depend on other modules. </td></tr>
+     <tr><td>Apache Directory Server Tools</td><td> Contained within this executable jar are various commandline utilities for apacheds. </td></tr>
+   </table>
+  </section>
+ </body>
 </document>