directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r122735 - in incubator/directory/ldap/trunk: . clients common common/src/test/org/apache/ldap/common/util snacc-provider snickers-provider
Date Sun, 19 Dec 2004 02:53:18 GMT
Author: brett
Date: Sat Dec 18 18:53:17 2004
New Revision: 122735

URL: http://svn.apache.org/viewcvs?view=rev&rev=122735
Log:
project cleanup
Removed:
   incubator/directory/ldap/trunk/clients/build.xml
   incubator/directory/ldap/trunk/clients/default.properties
   incubator/directory/ldap/trunk/clients/maven.xml
   incubator/directory/ldap/trunk/common/build.xml
   incubator/directory/ldap/trunk/common/sample.build.properties
   incubator/directory/ldap/trunk/snacc-provider/build.xml
   incubator/directory/ldap/trunk/snacc-provider/default.properties
   incubator/directory/ldap/trunk/snacc-provider/maven.xml
   incubator/directory/ldap/trunk/snickers-provider/maven.xml
Modified:
   incubator/directory/ldap/trunk/clients/project.properties
   incubator/directory/ldap/trunk/clients/project.xml
   incubator/directory/ldap/trunk/common/maven.xml
   incubator/directory/ldap/trunk/common/project.properties
   incubator/directory/ldap/trunk/common/project.xml
   incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/util/DateUtilsTest.java
   incubator/directory/ldap/trunk/maven.xml
   incubator/directory/ldap/trunk/project.properties
   incubator/directory/ldap/trunk/project.xml
   incubator/directory/ldap/trunk/snacc-provider/project.properties
   incubator/directory/ldap/trunk/snacc-provider/project.xml
   incubator/directory/ldap/trunk/snickers-provider/project.properties
   incubator/directory/ldap/trunk/snickers-provider/project.xml

Deleted: /incubator/directory/ldap/trunk/clients/build.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/clients/build.xml?view=auto&rev=122734
==============================================================================

Deleted: /incubator/directory/ldap/trunk/clients/default.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/clients/default.properties?view=auto&rev=122734
==============================================================================

Deleted: /incubator/directory/ldap/trunk/clients/maven.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/clients/maven.xml?view=auto&rev=122734
==============================================================================

Modified: incubator/directory/ldap/trunk/clients/project.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/clients/project.properties?view=diff&rev=122735&p1=incubator/directory/ldap/trunk/clients/project.properties&r1=122734&p2=incubator/directory/ldap/trunk/clients/project.properties&r2=122735
==============================================================================
--- incubator/directory/ldap/trunk/clients/project.properties	(original)
+++ incubator/directory/ldap/trunk/clients/project.properties	Sat Dec 18 18:53:17 2004
@@ -1,20 +1 @@
-maven.ui.banner.background=#fff
-maven.ui.source.background=#fff
-maven.ui.section.background=#6a82b6
-maven.xdoc.date=left
-maven.xdoc.version=0.7.1
-maven.xdoc.developmentProcessUrl=http://ldapd.sourceforge.net/devprocess.html
-
-# Override the Modules path in build.properties
-# This defines the directory under which all of
-# the module site content will be stored.
-
-#site.path=<directoryname>/ The default is blank.  Override this property
-#in the build.properties.  Remember to include the final forward slash.
-module.name=ldap-client
-
-
-# eclipse configuration
-#maven.eclipse.workspace=c:/cygwin/home/Administrator/projects/ldapd/HEAD
-
-maven.repo.remote=http://www.ibiblio.org/maven/,http://ldapd.sourceforge.net/maven/repository/
+module.path=clients

Modified: incubator/directory/ldap/trunk/clients/project.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/clients/project.xml?view=diff&rev=122735&p1=incubator/directory/ldap/trunk/clients/project.xml&r1=122734&p2=incubator/directory/ldap/trunk/clients/project.xml&r2=122735
==============================================================================
--- incubator/directory/ldap/trunk/clients/project.xml	(original)
+++ incubator/directory/ldap/trunk/clients/project.xml	Sat Dec 18 18:53:17 2004
@@ -1,108 +1,84 @@
 <?xml version="1.0"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:noNamespaceSchemaLocation="maven-project.xsd">
-  <pomVersion>3</pomVersion>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+  xsi:noNamespaceSchemaLocation="maven-project.xsd">
+  <extend>../project.xml</extend>
   <artifactId>ldap-clients</artifactId>
-  <groupId>incubator-directory</groupId>
-  <name>ldap-clients</name>
-  <currentVersion>0.8.0</currentVersion>
+  <name>ldap-clients</name>
+  <currentVersion>0.8-SNAPSHOT</currentVersion>
 
-  <organization>
-    <name>The Apache Incubator</name>
-    <url>http://incubator.apache.org</url>
-    <logo>/images/apache-incubator-logo.png</logo>
-  </organization>
-  
   <inceptionYear>2003</inceptionYear>
-  <package>org.apache.directory.sitedocs</package>
-  <logo>/images/apache-directory-logo.png</logo>
-  <url>http://incubator.apache.org/directory</url>
-  
+  <package>org.apache.directory.clients</package>
+  
   <description> 
-    An LDAP Client libarary used for testing and building LDAP JNDI 
+    An LDAP Client libarary used for testing and building LDAP JNDI 
     providers. 
-  </description>
+  </description>
   
   <shortDescription> 
     Pure java LDAP clients. These clients are designed to bundle with the Eve 
     LDAP server, but will work with any RFC 2251 compliant LDAP server. 
   </shortDescription>
-  
-  <dependencies>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>2.1</version>
-      <url>http://jakarta.apache.org/commons/collections.html</url>
-    </dependency>
-    <dependency>
-      <groupId>regexp</groupId>
-      <artifactId>regexp</artifactId>
-      <version>1.2</version>
-      <url>http://jakarta.apache.org/regexp/index.html</url>
-    </dependency>
-    <dependency>
-      <groupId>avalon-framework</groupId>
-      <artifactId>avalon-framework-api</artifactId>
-      <version>4.1.5</version>
-      <url>http://avalon.apache.org/framework/</url>
-    </dependency>
-    <dependency>
-      <groupId>avalon-framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-      <version>4.1.5</version>
-      <url>http://avalon.apache.org/framework/</url>
-    </dependency>
-    <dependency>
-      <groupId>excalibur-cli</groupId>
-      <artifactId>excalibur-cli</artifactId>
-      <version>1.0</version>
-      <url>http://avalon.apache.org/excalibur/</url>
-    </dependency>
-    <dependency>
-      <groupId>logkit</groupId>
-      <artifactId>logkit</artifactId>
-      <version>1.2</version>
-      <url>http://avalon.apache.org/logkit/</url>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xerces</artifactId>
-      <version>2.4.0</version>
-      <url>http://www.ibiblio.org/maven</url>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
-      <version>2.2.1</version>
-      <url>http://www.ibiblio.org/maven</url>
-    </dependency>
-    <dependency>
-      <groupId>directory</groupId>
-      <artifactId>ldap-common</artifactId>
-      <version>0.8-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
+  
+  <dependencies>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>2.1</version>
+      <url>http://jakarta.apache.org/commons/collections.html</url>
+    </dependency>
+    <dependency>
+      <groupId>regexp</groupId>
+      <artifactId>regexp</artifactId>
+      <version>1.2</version>
+      <url>http://jakarta.apache.org/regexp/index.html</url>
+    </dependency>
+    <dependency>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+      <version>4.1.5</version>
+      <url>http://avalon.apache.org/framework/</url>
+    </dependency>
+    <dependency>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
+      <version>4.1.5</version>
+      <url>http://avalon.apache.org/framework/</url>
+    </dependency>
+    <dependency>
+      <groupId>excalibur-cli</groupId>
+      <artifactId>excalibur-cli</artifactId>
+      <version>1.0</version>
+      <url>http://avalon.apache.org/excalibur/</url>
+    </dependency>
+    <dependency>
+      <groupId>logkit</groupId>
+      <artifactId>logkit</artifactId>
+      <version>1.2</version>
+      <url>http://avalon.apache.org/logkit/</url>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xerces</artifactId>
+      <version>2.4.0</version>
+      <url>http://www.ibiblio.org/maven</url>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xmlParserAPIs</artifactId>
+      <version>2.2.1</version>
+      <url>http://www.ibiblio.org/maven</url>
+    </dependency>
+    <dependency>
+      <groupId>incubator-directory</groupId>
+      <artifactId>ldap-common</artifactId>
+      <version>0.8-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 
-  <build>
-    <nagEmailAddress>directory-dev@incubator.apache.org</nagEmailAddress>
-    <sourceDirectory>${basedir}/src/java</sourceDirectory>
-    <sourceModifications/>
-    <unitTestSourceDirectory/>
-    <integrationUnitTestSourceDirectory/>
-    <aspectSourceDirectory/>
-    <unitTest/>
-    
-    <resources>
-      <directory>${basedir}/src/java/org/apache/ldap/clients</directory>
-      <targetPath>org/apache/ldap/clients</targetPath>
-    </resources>
-  </build>
-  
-  <reports>
-    <report>maven-changelog-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-javadoc-plugin</report>
-  </reports>
+  <reports>
+    <report>maven-changelog-plugin</report>
+    <report>maven-developer-activity-plugin</report>
+    <report>maven-file-activity-plugin</report>
+    <report>maven-javadoc-plugin</report>
+  </reports>
 </project>

Deleted: /incubator/directory/ldap/trunk/common/build.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/common/build.xml?view=auto&rev=122734
==============================================================================

Modified: incubator/directory/ldap/trunk/common/maven.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/common/maven.xml?view=diff&rev=122735&p1=incubator/directory/ldap/trunk/common/maven.xml&r1=122734&p2=incubator/directory/ldap/trunk/common/maven.xml&r2=122735
==============================================================================
--- incubator/directory/ldap/trunk/common/maven.xml	(original)
+++ incubator/directory/ldap/trunk/common/maven.xml	Sat Dec 18 18:53:17 2004
@@ -4,58 +4,39 @@
   xmlns:ant="jelly:ant"
   xmlns:deploy="deploy">
 
-  <preGoal name="site">
-    <attainGoal name="docbook:transform"/>
-  </preGoal>
-
-  <postGoal name="site">
-    <attainGoal name="server:copy-images"/>
-  </postGoal>
-
-  <goal name="server:copy-images">
-    <copy toDir="target/docs/images">
-      <fileSet dir="${basedir}/src/images">
-        <include name="*.gif"/>
-      </fileSet>
-    </copy>
-  </goal>
+  <!-- TODO: replace with eve plugin/antlr plugin? -->
+  <preGoal name="java:compile">
+    <!-- Produces 
+    target/antlr/org/apache/common/name/antlrValueTokenTypes.txt 
+    -->
+    <copy file="${basedir}/src/antlr/DnCommonTokenTypes.txt" toDir="."/>
+    <j:set var="maven.antlr.grammars" value="valuelexer.g"/>
+    <attainGoal name="antlr:generate" />
     
-  <!-- ===========================================================
-           A N T L R   P R E P A R A T I O N S
-  ============================================================ -->
-
-	<preGoal name="java:compile">
-		<!-- Produces 
-		target/antlr/org/apache/common/name/antlrValueTokenTypes.txt 
-		-->
-		<copy file="${basedir}/src/antlr/DnCommonTokenTypes.txt" toDir="."/>
-		<j:set var="maven.antlr.grammars" value="valuelexer.g"/>
-		<attainGoal name="antlr:generate" />
-		
-		<j:set var="maven.antlr.grammars" value="valueparser.g"/>
-		<attainGoal name="antlr:generate" />
-		
-		<j:set var="maven.antlr.grammars" value="typelexer.g"/>
-		<attainGoal name="antlr:generate" />
-
-		<j:set var="maven.antlr.grammars" value="dnparser.g"/>
-		<attainGoal name="antlr:generate" />
-
-		<j:set var="maven.antlr.grammars" value="filter-value-lexer.g"/>
-		<attainGoal name="antlr:generate" />
-
-		<j:set var="maven.antlr.grammars" value="filter-lexer.g"/>
-		<attainGoal name="antlr:generate" />
-
-		<j:set var="maven.antlr.grammars" value="filter-value-parser.g"/>
-		<attainGoal name="antlr:generate" />
-
-		<j:set var="maven.antlr.grammars" value="filter-parser.g"/>
-		<attainGoal name="antlr:generate" />
-
-		<delete file="./DnCommonTokenTypes.txt"/>
-		<delete file="./antlrValueTokenTypes.txt"/>
-	</preGoal>        
+    <j:set var="maven.antlr.grammars" value="valueparser.g"/>
+    <attainGoal name="antlr:generate" />
+    
+    <j:set var="maven.antlr.grammars" value="typelexer.g"/>
+    <attainGoal name="antlr:generate" />
+
+    <j:set var="maven.antlr.grammars" value="dnparser.g"/>
+    <attainGoal name="antlr:generate" />
+
+    <j:set var="maven.antlr.grammars" value="filter-value-lexer.g"/>
+    <attainGoal name="antlr:generate" />
+
+    <j:set var="maven.antlr.grammars" value="filter-lexer.g"/>
+    <attainGoal name="antlr:generate" />
+
+    <j:set var="maven.antlr.grammars" value="filter-value-parser.g"/>
+    <attainGoal name="antlr:generate" />
+
+    <j:set var="maven.antlr.grammars" value="filter-parser.g"/>
+    <attainGoal name="antlr:generate" />
+
+    <delete file="./DnCommonTokenTypes.txt"/>
+    <delete file="./antlrValueTokenTypes.txt"/>
+  </preGoal>        
     
   <preGoal name="jar:jar">
     <copy

Modified: incubator/directory/ldap/trunk/common/project.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/common/project.properties?view=diff&rev=122735&p1=incubator/directory/ldap/trunk/common/project.properties&r1=122734&p2=incubator/directory/ldap/trunk/common/project.properties&r2=122735
==============================================================================
--- incubator/directory/ldap/trunk/common/project.properties	(original)
+++ incubator/directory/ldap/trunk/common/project.properties	Sat Dec 18 18:53:17 2004
@@ -1,30 +1,5 @@
-maven.ui.banner.background=#fff
-maven.ui.source.background=#fff
-maven.ui.section.background=#6a82b6
-maven.xdoc.date=left
-maven.xdoc.version=0.7.5
-maven.xdoc.developmentProcessUrl=http://incubator.apache.org/directory
-
-# Override the Modules path in build.properties
-# This defines the directory under which all of
-# the module site content will be stored.
-
-#site.path=<directoryname>/ The default is blank.  Override this property
-#in the build.properties.  Remember to include the final forward slash.
-module.name=ldap-common
+module.path=common
 
 # antlr configuration
 maven.antlr.grammars=
 maven.antlr.src.dir=${basedir}/src/antlr
-
-#
-# remote repository properties
-#
-
-maven.repo.remote=http://cvs.apache.org/repository, http://ibiblio.org/maven
-
-maven.repo.list=apachecvs
-maven.repo.apachecvs=scp://cvs.apache.org
-maven.repo.apachecvs.directory=/www/cvs.apache.org/repository
-maven.repo.apachecvs.group=apcvs
-

Modified: incubator/directory/ldap/trunk/common/project.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/common/project.xml?view=diff&rev=122735&p1=incubator/directory/ldap/trunk/common/project.xml&r1=122734&p2=incubator/directory/ldap/trunk/common/project.xml&r2=122735
==============================================================================
--- incubator/directory/ldap/trunk/common/project.xml	(original)
+++ incubator/directory/ldap/trunk/common/project.xml	Sat Dec 18 18:53:17 2004
@@ -1,34 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
-    <pomVersion>3</pomVersion>
-    <groupId>incubator-directory</groupId>	
-    <id>ldap-common</id>
-    <name>Common LDAP API</name>
-    <currentVersion>0.8-SNAPSHOT</currentVersion>
+  <extend>../project.xml</extend>
+  <groupId>incubator-directory</groupId>	
+  <artifactId>ldap-common</artifactId>
+  <name>Common LDAP API</name>
+  <currentVersion>0.8-SNAPSHOT</currentVersion>
     
-    <organization>
-      <name>The Apache Incubator</name>
-      <url>http://incubator.apache.org</url>
-      <logo>/images/apache-incubator-logo.png</logo>
-    </organization>
-
-    <inceptionYear>2003</inceptionYear>
-    <package>org.apache.ldap.common</package>
-    <logo>/images/apache-directory-logo.png</logo>
-    <url>http://incubator.apache.org/directory</url>
-
-    <description>
-      Common LDAP packages used for protocol compliant parsing of distinguished
-      names, LDIFs, filters, and urls.  Also contains the Common Message API 
-      which enables a plugable interface for ASN.1 BER Message codec providers.
-    </description>
-
-    <shortDescription>
-      Common LDAP packages used by clients and servers.
-    </shortDescription>
+  <package>org.apache.ldap.common</package>
+
+  <description>
+    Common LDAP packages used for protocol compliant parsing of distinguished
+    names, LDIFs, filters, and urls.  Also contains the Common Message API 
+    which enables a plugable interface for ASN.1 BER Message codec providers.
+  </description>
+
+  <shortDescription>
+    Common LDAP packages used by clients and servers.
+  </shortDescription>
     
-    <dependencies>
+  <dependencies>
 
     <dependency>
       <groupId>regexp</groupId>
@@ -63,91 +54,21 @@
       <artifactId>snickers-codec</artifactId>
       <version>0.2-SNAPSHOT</version>
     </dependency>
-
-    </dependencies>
-    
-    <build>
-      <nagEmailAddress>directory-dev@incubator.apache.org</nagEmailAddress>
-      <sourceDirectory>${basedir}/src/java</sourceDirectory>
-      <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-      <integrationUnitTestSourceDirectory/>
-      <aspectSourceDirectory/>
-                                                                                
-      <unitTest>
-        <includes>
-          <include>**/*Test*</include>
-          <include>**/*TestCase*</include>
-        </includes>
-                                                                                
-        <excludes>
-          <exclude>**/testutils/*</exclude>
-        </excludes>
-
-        <resources>
-          <resource>
-            <directory>${basedir}/src/test</directory>
-            <includes>
-              <include>**/*.dtd</include>
-              <include>**/*.ldif</include>
-              <include>**/*.properties</include>
-              <include>**/*.x*</include>
-              <include>**/*.mf</include>
-              <include>**/*.jar</include>
-            </includes>
-          </resource>
-                                                                                
-          <resource>
-            <directory>${basedir}/src/java</directory>
-            <includes>
-              <include>**/*.dtd</include>
-              <include>**/*.ldif</include>
-              <include>**/*.properties</include>
-              <include>**/*.x*</include>
-              <include>**/*.mf</include>
-              <include>**/*.jar</include>
-            </includes>
-          </resource>
-        </resources>
-      </unitTest>
-                                                                                
-      <resources>
-        <resource>
-          <directory>${basedir}/src/java</directory>
-          <includes>
-            <include>**/*.dtd</include>
-            <include>**/*.properties</include>
-            <include>**/*.x*</include>
-          </includes>
-        </resource>
-                                                                                
-        <resource>
-          <directory>${basedir}/src/java/org/apache/ldap/common/name</directory>
-          <targetPath>org/apache/ldap/common/name</targetPath>
-          <includes>
-            <include>antlrNameParserTokenTypes.txt</include>
-            <include>antlrTypeTokenTypes.txt</include>
-            <include>antlrValueParserTokenTypes.txt</include>
-            <include>antlrValueTokenTypes.txt</include>
-          </includes>
-        </resource>
-      </resources>
-
-      <jars></jars>
-    </build>
+  </dependencies>
     
-    <reports>
-      <report>maven-changelog-plugin</report>
-      <report>maven-developer-activity-plugin</report>
-      <report>maven-file-activity-plugin</report>
-      <report>maven-javadoc-plugin</report>
-      <report>maven-changes-plugin</report>
-      <report>maven-checkstyle-plugin</report>
-      <report>maven-file-activity-plugin</report>
-      <report>maven-javadoc-plugin</report>
-      <report>maven-jdepend-plugin</report>
-      <report>maven-jxr-plugin</report>
-      <report>maven-license-plugin</report>
-      <report>maven-tasklist-plugin</report>
-    </reports>
+  <reports>
+    <report>maven-changelog-plugin</report>
+    <report>maven-developer-activity-plugin</report>
+    <report>maven-file-activity-plugin</report>
+    <report>maven-javadoc-plugin</report>
+    <report>maven-changes-plugin</report>
+    <report>maven-checkstyle-plugin</report>
+    <report>maven-file-activity-plugin</report>
+    <report>maven-javadoc-plugin</report>
+    <report>maven-jdepend-plugin</report>
+    <report>maven-jxr-plugin</report>
+    <report>maven-license-plugin</report>
+    <report>maven-tasklist-plugin</report>
+  </reports>
     
 </project>

Deleted: /incubator/directory/ldap/trunk/common/sample.build.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/common/sample.build.properties?view=auto&rev=122734
==============================================================================

Modified: incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/util/DateUtilsTest.java
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/util/DateUtilsTest.java?view=diff&rev=122735&p1=incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/util/DateUtilsTest.java&r1=122734&p2=incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/util/DateUtilsTest.java&r2=122735
==============================================================================
--- incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/util/DateUtilsTest.java
(original)
+++ incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/util/DateUtilsTest.java
Sat Dec 18 18:53:17 2004
@@ -54,6 +54,9 @@
         cal.set( Calendar.MINUTE, 32 );
         cal.set( Calendar.SECOND, 07 );
 
+        // TODO: BUG! Does not run in different timezones. Is it intended that the calendar
inside DateUtils
+        //  should be UTC? No TimeZone is set for it.
+
         time = DateUtils.getGeneralizedTime( cal.getTimeInMillis() );
         assertEquals( "Expected the example date of 10:32 AM, " +
                 "December 16, 1994 UTC", "19941216053207-0500", time );

Modified: incubator/directory/ldap/trunk/maven.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/maven.xml?view=diff&rev=122735&p1=incubator/directory/ldap/trunk/maven.xml&r1=122734&p2=incubator/directory/ldap/trunk/maven.xml&r2=122735
==============================================================================
--- incubator/directory/ldap/trunk/maven.xml	(original)
+++ incubator/directory/ldap/trunk/maven.xml	Sat Dec 18 18:53:17 2004
@@ -2,6 +2,7 @@
   xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" xmlns:m="maven" 
   xmlns:deploy="deploy">
   
+  <!-- TODO: needed? -->
   <preGoal name="site">
     <attainGoal name="docbook:transform"/>
   </preGoal>
@@ -10,6 +11,7 @@
     <attainGoal name="server:copy-images"/>
   </postGoal>
 
+  <!-- TODO: should be able to remove -->
   <goal name="server:copy-images">
     <copy toDir="target/docs/images">
       <fileSet dir="${basedir}/src/images">
@@ -18,39 +20,9 @@
     </copy>
   </goal>
   
+  <!-- TODO: why is home not under target? -->
   <goal name="cleanall">
     <attainGoal name="clean"/>
     <delete dir="home"/>
-  </goal>
-  
-  <goal name="java:compile" description="Build All Jar Files And Intall">
-    <maven:reactor basedir="${basedir}" postProcessing="true" 
-      includes="**/project.xml" excludes="./project.xml" goals="jar:install" 
-      banner="Building All" ignoreFailures="false"/>
-  </goal>
-  
-  <goal name="sitedocs" description="Builds the entire site documentation">
-    <maven:reactor basedir="${basedir}" postProcessing="true" 
-      includes="**/project.xml" excludes="./project.xml" goals="site" 
-      banner="site" ignoreFailures="false"/>
-  </goal>
-  
-  <goal name="clean-all" description="Clean all sandbox projects">
-    <maven:reactor basedir="${basedir}" postProcessing="true" 
-      includes="*/project.xml" goals="clean" banner="Clean All" 
-      ignoreFailures="true"/>
-  </goal>
-  
-  <goal name="eclipse-all" 
-    description="Generate eclipse descriptors for all projects">
-    <maven:reactor basedir="${basedir}" postProcessing="true" 
-      includes="*/project.xml" goals="clean" banner="Clean All" 
-      ignoreFailures="true"/>
-  </goal>
-  
-  <goal name="eclipse-all" description="Create all eclipse projects">
-    <maven:reactor basedir="${basedir}" postProcessing="true" 
-      includes="*/project.xml" goals="eclipse" banner="Eclipse Project" 
-      ignoreFailures="true"/>
   </goal>
 </project>

Modified: incubator/directory/ldap/trunk/project.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/project.properties?view=diff&rev=122735&p1=incubator/directory/ldap/trunk/project.properties&r1=122734&p2=incubator/directory/ldap/trunk/project.properties&r2=122735
==============================================================================
--- incubator/directory/ldap/trunk/project.properties	(original)
+++ incubator/directory/ldap/trunk/project.properties	Sat Dec 18 18:53:17 2004
@@ -1,6 +1,6 @@
 maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
-maven.license.licenseFile=../../LICENSE.txt
-maven.xdoc.date=left
+maven.license.licenseFile=${basedir}/../../LICENSE.txt
+maven.incubator.disclaimerFile=${basedir}/../../INCUBATOR-DISCLAIMER.txt
 maven.xdoc.poweredby.image=
 maven.xdoc.includeProjectDocumentation=no
 
@@ -8,8 +8,14 @@
 # remote repository properties
 #
 
+# TODO: can we get rid of the ldapd repository?
 maven.repo.remote=http://cvs.apache.org/repository, http://ibiblio.org/maven, http://ldapd.sourceforge.net/maven/repository
-maven.repo.central=minotaur.apache.org
-maven.repo.central.directory=/www/cvs.apache.org/repository
-maven.remote.group=apcvs
 
+maven.repo.list=maven.repo.apachecvs
+maven.repo.apachecvs=scp://cvs.apache.org
+maven.repo.apachecvs.directory=/www/cvs.apache.org/repository
+maven.repo.apachecvs.group=apcvs
+
+# User must specify:
+# maven.repo.apachecvs.username=
+# maven.repo.apachecvs.identity=

Modified: incubator/directory/ldap/trunk/project.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/project.xml?view=diff&rev=122735&p1=incubator/directory/ldap/trunk/project.xml&r1=122734&p2=incubator/directory/ldap/trunk/project.xml&r2=122735
==============================================================================
--- incubator/directory/ldap/trunk/project.xml	(original)
+++ incubator/directory/ldap/trunk/project.xml	Sat Dec 18 18:53:17 2004
@@ -2,7 +2,7 @@
 <project>
   <pomVersion>3</pomVersion>
   <groupId>directory</groupId>
-  <id>directory-ldap</id>
+  <artifactId>directory-ldap-parent</artifactId>
   <name>The Apache Directory Project</name>
   
   <organization>
@@ -15,21 +15,37 @@
   <inceptionYear>2003</inceptionYear>
   <package>org.apache.directory.sitedocs</package>
   <logo>http://incubator.apache.org/directory/images/apache-directory-logo.png</logo>
-  <url>http://incubator.apache.org/directory/subprojects/directory-ldap/</url>
+  <url>http://incubator.apache.org/directory/subprojects/directory-ldap/${module.path}</url>
 
   <issueTrackingUrl>
-    http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10400
+    http://issues.apache.org/jira/browse/DIRLDAP
   </issueTrackingUrl>
-  <siteAddress>cvs.apache.org</siteAddress>
+  <siteAddress>www.apache.org</siteAddress>
   <siteDirectory>/home/akarasulu/public_html/directory</siteDirectory>
   <distributionDirectory>
       /home/akarasulu/public_html/directory/dist
   </distributionDirectory>
   
+  <gumpRepositoryId>apache-incubator-svn</gumpRepositoryId>
+
+  <repository>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/incubator:directory/ldap/trunk/${module.path}
+    </connection>
+
+    <url>
+      http://svn.apache.org/viewcvs.cgi/incubator/directory/ldap/trunk/${module.path}/?root=Apache-SVN
+    </url>
+    
+    <developerConnection>
+      https://svn.apache.org/repos/asf/incubator/directory/ldap/trunk/${module.path}
+    </developerConnection>
+  </repository>
+  
   <shortDescription>Apache Directory Project</shortDescription>
   
   <description>
-    Long Directory Project description from inside POM.
+    Apache Directory Project.
   </description>
   
   <mailingLists>
@@ -47,18 +63,85 @@
     </mailingList>
   </mailingLists>
   
-  <developers/>
-  
   <licenses>
     <license>
-      <name>Apache 1.1 License</name>
-      <url>
-http://cvs.apache.org/viewcvs.cgi/incubator/directory/LICENSE.txt?rev=1369&amp;root=Apache-SVN&amp;view=markup
-        </url>
+      <name>Apache 2.0 License</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
-  <dependencies/>
+
+  <build>
+    <nagEmailAddress>directory-dev@incubator.apache.org</nagEmailAddress>
+    <sourceDirectory>${basedir}/src/java</sourceDirectory>
+    <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+                                                                              
+    <unitTest>
+      <!-- TODO: needed? -->
+      <includes>
+        <include>**/*Test*</include>
+        <include>**/*TestCase*</include>
+      </includes>
+                                                                              
+      <!-- TODO: needed? -->
+      <excludes>
+        <exclude>**/testutils/*</exclude>
+      </excludes>
+
+      <!-- TODO: needed? -->
+      <resources>
+        <resource>
+          <directory>${basedir}/src/test</directory>
+          <includes>
+            <include>**/*.dtd</include>
+            <include>**/*.ldif</include>
+            <include>**/*.properties</include>
+            <include>**/*.x*</include>
+            <include>**/*.mf</include>
+            <include>**/*.jar</include>
+          </includes>
+        </resource>
+                                                                              
+      <!-- TODO: needed? -->
+        <resource>
+          <directory>${basedir}/src/java</directory>
+          <includes>
+            <include>**/*.dtd</include>
+            <include>**/*.ldif</include>
+            <include>**/*.properties</include>
+            <include>**/*.x*</include>
+            <include>**/*.mf</include>
+            <include>**/*.jar</include>
+          </includes>
+        </resource>
+      </resources>
+    </unitTest>
+                                                                              
+      <!-- TODO: needed? -->
+    <resources>
+      <resource>
+        <directory>${basedir}/src/java</directory>
+        <includes>
+          <include>**/*.dtd</include>
+          <include>**/*.properties</include>
+          <include>**/*.x*</include>
+        </includes>
+      </resource>
+                                                                              
+      <!-- TODO: needed? -->
+      <resource>
+        <directory>${basedir}/src/java/org/apache/ldap/common/name</directory>
+        <targetPath>org/apache/ldap/common/name</targetPath>
+        <includes>
+          <include>antlrNameParserTokenTypes.txt</include>
+          <include>antlrTypeTokenTypes.txt</include>
+          <include>antlrValueParserTokenTypes.txt</include>
+          <include>antlrValueTokenTypes.txt</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+
   <reports>
     <report>maven-license-plugin</report>
   </reports>

Deleted: /incubator/directory/ldap/trunk/snacc-provider/build.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/snacc-provider/build.xml?view=auto&rev=122734
==============================================================================

Deleted: /incubator/directory/ldap/trunk/snacc-provider/default.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/snacc-provider/default.properties?view=auto&rev=122734
==============================================================================

Deleted: /incubator/directory/ldap/trunk/snacc-provider/maven.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/snacc-provider/maven.xml?view=auto&rev=122734
==============================================================================

Modified: incubator/directory/ldap/trunk/snacc-provider/project.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/snacc-provider/project.properties?view=diff&rev=122735&p1=incubator/directory/ldap/trunk/snacc-provider/project.properties&r1=122734&p2=incubator/directory/ldap/trunk/snacc-provider/project.properties&r2=122735
==============================================================================
--- incubator/directory/ldap/trunk/snacc-provider/project.properties	(original)
+++ incubator/directory/ldap/trunk/snacc-provider/project.properties	Sat Dec 18 18:53:17 2004
@@ -1,22 +1,2 @@
-maven.ui.banner.background=#fff
-maven.ui.source.background=#fff
-maven.ui.section.background=#6a82b6
-maven.xdoc.date=left
-maven.xdoc.version=0.7.1
-maven.xdoc.developmentProcessUrl=http://ldapd.sourceforge.net/devprocess.html
-
-# Override the Modules path in build.properties
-# This defines the directory under which all of
-# the module site content will be stored.
-
-#site.path=<directoryname>/ The default is blank.  Override this property
-#in the build.properties.  Remember to include the final forward slash.
-module.name=ldap-snacc-provider
-maven.repo.remote=http://cvs.apache.org/repository, http://www.ibiblio.org/maven/, http://ldapd.sourceforge.net/maven/repository/
-
-
-maven.repo.list=apachecvs
-maven.repo.apachecvs=scp://cvs.apache.org
-maven.repo.apachecvs.directory=/www/cvs.apache.org/repository
-maven.repo.apachecvs.group=apcvs
+module.path=snacc-provider
 

Modified: incubator/directory/ldap/trunk/snacc-provider/project.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/snacc-provider/project.xml?view=diff&rev=122735&p1=incubator/directory/ldap/trunk/snacc-provider/project.xml&r1=122734&p2=incubator/directory/ldap/trunk/snacc-provider/project.xml&r2=122735
==============================================================================
--- incubator/directory/ldap/trunk/snacc-provider/project.xml	(original)
+++ incubator/directory/ldap/trunk/snacc-provider/project.xml	Sat Dec 18 18:53:17 2004
@@ -2,34 +2,19 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:noNamespaceSchemaLocation="maven-project.xsd">
 	
-    <pomVersion>3</pomVersion>
-    <groupId>incubator-directory</groupId>
-    <id>ldap-snacc-provider</id>
-    <name>ldap-snacc-provider</name>
-    <currentVersion>0.8-SNAPSHOT</currentVersion>
-    
-    <organization>
-      <name>The Apache Incubator</name>
-      <url>http://incubator.apache.org</url>
-      <logo>/images/apache-incubator-logo.png</logo>
-    </organization>
-
-    <inceptionYear>2003</inceptionYear>
-    <package>org.apache.ldap.common.berlib</package>
-    
-    <logo>/images/apache-directory-logo.png</logo>
-    <url>http://incubator.apache.org/directory</url>
-
-    <description>
-      Snacc based LDAP message codec provider.
-    </description>
-
-    <shortDescription>
-      Snacc based LDAP message codec provider.
-    </shortDescription>
-    
-    <dependencies>
-
+  <extend>../project.xml</extend>
+  <groupId>incubator-directory</groupId>
+  <artifactId>ldap-snacc-provider</artifactId>
+  <name>ldap-snacc-provider</name>
+  <currentVersion>0.8-SNAPSHOT</currentVersion>
+  
+  <package>org.apache.ldap.common.berlib</package>
+  
+  <shortDescription>
+    Snacc based LDAP message codec provider.
+  </shortDescription>
+  
+  <dependencies>
     <dependency>
       <groupId>incubator-directory</groupId>
       <artifactId>ldap-common</artifactId>
@@ -62,32 +47,22 @@
       <version>2.0</version>
       <url>http://jakarta.apache.org/commons/lang</url>
     </dependency>
-
   </dependencies>
     
-    <build>
-      <nagEmailAddress>ldapd-devel@sourceforge.net</nagEmailAddress>
-      <sourceDirectory>${basedir}/src/java</sourceDirectory>
-      <sourceModifications/>
-      <unitTestSourceDirectory/>
-      <integrationUnitTestSourceDirectory/>
-      <aspectSourceDirectory/>
-      <unitTest/>
-    </build>
-    
-    <reports>
-      <report>maven-changelog-plugin</report>
-      <report>maven-developer-activity-plugin</report>
-      <report>maven-file-activity-plugin</report>
-      <report>maven-javadoc-plugin</report>
-      <report>maven-changes-plugin</report>
-      <report>maven-checkstyle-plugin</report>
-      <report>maven-file-activity-plugin</report>
-      <report>maven-javadoc-plugin</report>
-      <report>maven-jdepend-plugin</report>
-      <report>maven-jxr-plugin</report>
-      <report>maven-license-plugin</report>
-      <report>maven-tasklist-plugin</report>
-    </reports>
+  <reports>
+    <report>maven-changelog-plugin</report>
+    <report>maven-developer-activity-plugin</report>
+    <report>maven-file-activity-plugin</report>
+    <report>maven-javadoc-plugin</report>
+    <report>maven-changes-plugin</report>
+    <report>maven-checkstyle-plugin</report>
+    <report>maven-file-activity-plugin</report>
+    <report>maven-javadoc-plugin</report>
+    <report>maven-jdepend-plugin</report>
+    <report>maven-jxr-plugin</report>
+    <report>maven-license-plugin</report>
+    <report>maven-tasklist-plugin</report>
+  </reports>
     
 </project>
+

Deleted: /incubator/directory/ldap/trunk/snickers-provider/maven.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/snickers-provider/maven.xml?view=auto&rev=122734
==============================================================================

Modified: incubator/directory/ldap/trunk/snickers-provider/project.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/snickers-provider/project.properties?view=diff&rev=122735&p1=incubator/directory/ldap/trunk/snickers-provider/project.properties&r1=122734&p2=incubator/directory/ldap/trunk/snickers-provider/project.properties&r2=122735
==============================================================================
--- incubator/directory/ldap/trunk/snickers-provider/project.properties	(original)
+++ incubator/directory/ldap/trunk/snickers-provider/project.properties	Sat Dec 18 18:53:17
2004
@@ -1,18 +1,3 @@
 maven.javadoc.private=true
-
-maven.license.licenseFile=../../../LICENSE.txt
-#maven.junit.fork=true
-maven.xdoc.includeProjectDocumentation=yes
-
-#
-# remote repository properties
-#
-
-maven.repo.remote=http://cvs.apache.org/repository, http://ibiblio.org/maven, http://ldapd.sourceforge.net/maven/repository
-
-maven.repo.list=apachecvs
-maven.repo.apachecvs=scp://cvs.apache.org
-maven.repo.apachecvs.directory=/www/cvs.apache.org/repository
-maven.repo.apachecvs.group=apcvs
-
+module.path=snickers-provider
 

Modified: incubator/directory/ldap/trunk/snickers-provider/project.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/snickers-provider/project.xml?view=diff&rev=122735&p1=incubator/directory/ldap/trunk/snickers-provider/project.xml&r1=122734&p2=incubator/directory/ldap/trunk/snickers-provider/project.xml&r2=122735
==============================================================================
--- incubator/directory/ldap/trunk/snickers-provider/project.xml	(original)
+++ incubator/directory/ldap/trunk/snickers-provider/project.xml	Sat Dec 18 18:53:17 2004
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project>
+  <extend>../project.xml</extend>
   <groupId>incubator-directory</groupId>
-  <id>ldap-snickers-provider</id>
+  <artifactId>ldap-snickers-provider</artifactId>
   
   <name>Snickers based LDAP BER Message Provider</name>
   <package>org.apache.ldap.common.berlib.snickers</package>
@@ -107,64 +108,5 @@
       <url>http://junit.org</url>
     </dependency>
   </dependencies>
-
-  <build>
-    <nagEmailAddress>directory-dev@incubator.apache.org</nagEmailAddress>
-    <sourceDirectory>${basedir}/src/java</sourceDirectory>
-    <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-    <integrationUnitTestSourceDirectory/>
-    <aspectSourceDirectory/>
-
-    <unitTest>
-      <includes>
-        <include>**/*Test*</include>
-        <include>**/*TestCase*</include>
-      </includes>
-
-      <excludes>
-        <exclude>**/testutils/*</exclude>
-        <exclude>**/Abstract*</exclude>
-      </excludes>
-
-      <resources>
-        <resource>
-          <directory>${basedir}/src/test</directory>
-          <includes>
-            <include>**/*.dtd</include>
-            <include>**/*.ldif</include>
-            <include>**/*.properties</include>
-            <include>**/*.x*</include>
-            <include>**/*.mf</include>
-            <include>**/*.jar</include>
-          </includes>
-        </resource>
-
-        <resource>
-          <directory>${basedir}/src/test</directory>
-          <includes>
-            <include>**/*.dtd</include>
-            <include>**/*.ldif</include>
-            <include>**/*.properties</include>
-            <include>**/*.x*</include>
-            <include>**/*.mf</include>
-            <include>**/*.jar</include>
-          </includes>
-        </resource>
-      </resources>
-    </unitTest>
-
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <includes>
-          <include>**/*.dtd</include>
-          <include>**/*.properties</include>
-          <include>**/*.x*</include>
-        </includes>
-      </resource>
-    </resources>
-    <jars></jars>
-  </build>
-
 </project>
 

Mime
View raw message