Return-Path: 
 <commits-return-7596-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 55010 invoked from network); 4 Jan 2006 03:20:01 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 4 Jan 2006 03:20:01 -0000
Received: (qmail 51506 invoked by uid 500); 4 Jan 2006 03:20:01 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 51440 invoked by uid 500); 4 Jan 2006 03:20:00 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 51429 invoked by uid 99); 4 Jan 2006 03:20:00 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jan 2006 19:20:00 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 03 Jan 2006 19:19:59 -0800
Received: (qmail 54909 invoked by uid 65534); 4 Jan 2006 03:19:39 -0000
Message-ID: <20060104031939.54906.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r365808 - in /directory/trunk: apacheds-server-main/
 apacheds-server-main/src/main/assembly/ kerberos-common/ ldap-common/
 ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/psearch/
 ldap-common/src/main/java/org/apache/lda...
Date: Wed, 04 Jan 2006 03:19:37 -0000
To: commits@directory.apache.org
From: akarasulu@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: akarasulu
Date: Tue Jan  3 19:19:29 2006
New Revision: 365808

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

 o removing unused directories in codec
 o switched from JCE based signed jar that breaks to use lightcrypto 
 o fixed pom on main to use special assembly for apacheds


Added:
    directory/trunk/apacheds-server-main/src/main/assembly/
    directory/trunk/apacheds-server-main/src/main/assembly/apacheds-main.xml   (with props)
Removed:
    directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/psearch/
    directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/psearch/
Modified:
    directory/trunk/apacheds-server-main/   (props changed)
    directory/trunk/apacheds-server-main/pom.xml
    directory/trunk/apacheds-server-main/server.xml
    directory/trunk/kerberos-common/pom.xml
    directory/trunk/ldap-common/todo.txt

Propchange: directory/trunk/apacheds-server-main/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jan  3 19:19:29 2006
@@ -1,4 +1,5 @@
 server-work
+example.com
 .wtpmodules
 .settings
 .deployables

Modified: directory/trunk/apacheds-server-main/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds-server-main/pom.xml?rev=365808&r1=365807&r2=365808&view=diff
==============================================================================
--- directory/trunk/apacheds-server-main/pom.xml (original)
+++ directory/trunk/apacheds-server-main/pom.xml Tue Jan  3 19:19:29 2006
@@ -57,9 +57,9 @@
       	  <archive>
       	    <manifest>
       	      <mainClass>org.apache.ldap.server.ServerMain</mainClass>
-      	    </manifest>
+      	    </manifest> 
       	  </archive>
-          <descriptorId>jar-with-dependencies</descriptorId>
+          <descriptor>src/main/assembly/apacheds-main.xml</descriptor>
           <classifier>app</classifier>
           <appendAssemblyId>false</appendAssemblyId>
       	</configuration>

Modified: directory/trunk/apacheds-server-main/server.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds-server-main/server.xml?rev=365808&r1=365807&r2=365808&view=diff
==============================================================================
--- directory/trunk/apacheds-server-main/server.xml (original)
+++ directory/trunk/apacheds-server-main/server.xml Tue Jan  3 19:19:29 2006
@@ -7,8 +7,7 @@
   <bean id="environment" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
     <property name="properties">
       <props>
-        <prop key="asn.1.berlib.provider">org.apache.ldap.common.berlib.asn1.SnickersProvider</prop>
-        <!--prop key="asn.1.berlib.provider">org.apache.ldap.common.TwixProvider</prop-->
+        <prop key="asn.1.berlib.provider">org.apache.ldap.common.asn1.TwixProvider</prop>
         <prop key="java.naming.security.authentication">simple</prop>
         <prop key="java.naming.security.principal">uid=admin,ou=system</prop>
         <prop key="java.naming.security.credentials">secret</prop>

Added: directory/trunk/apacheds-server-main/src/main/assembly/apacheds-main.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds-server-main/src/main/assembly/apacheds-main.xml?rev=365808&view=auto
==============================================================================
--- directory/trunk/apacheds-server-main/src/main/assembly/apacheds-main.xml (added)
+++ directory/trunk/apacheds-server-main/src/main/assembly/apacheds-main.xml Tue Jan  3 19:19:29 2006
@@ -0,0 +1,38 @@
+<assembly>
+  <id>apacheds-main</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <unpack>true</unpack>
+      <scope>runtime</scope>
+      <excludes>
+        <exclude>aopalliance:aopalliance:jar:1.0</exclude>
+        <exclude>jasperreports:jasperreports:jar:0.6.6</exclude>
+        <exclude>freemarker:freemarker:jar:2.3.2</exclude>
+        <exclude>asm:asm-util:jar:1.3.4</exclude>
+        <exclude>asm:asm:jar:1.5.3</exclude>
+        <exclude>com.jamonapi:jamon:jar:1.0</exclude>
+        <exclude>xerces:xerces:jar:2.0.2</exclude>
+        <exclude>commons-pool:commons-pool:jar:1.2</exclude>
+        <exclude>com.sun:tools:jar:1.4.2</exclude>
+        <exclude>xml-apis:xml-apis:jar:1.0.b2</exclude>
+        <exclude>aspectwerkz:aspectwerkz-core:jar:0.8.1</exclude>
+        <exclude>velocity:velocity:jar:1.4</exclude>
+        <exclude>org.springframework:spring-aop:jar:1.2.1</exclude>
+        <exclude>qdox:qdox:jar:1.5</exclude>
+        <exclude>commons-attributes:commons-attributes-compiler:jar:2.1</exclude>
+        <exclude>cglib:cglib:jar:2.1</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Propchange: directory/trunk/apacheds-server-main/src/main/assembly/apacheds-main.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: directory/trunk/kerberos-common/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/kerberos-common/pom.xml?rev=365808&r1=365807&r2=365808&view=diff
==============================================================================
--- directory/trunk/kerberos-common/pom.xml (original)
+++ directory/trunk/kerberos-common/pom.xml Tue Jan  3 19:19:29 2006
@@ -19,8 +19,8 @@
     </dependency>
     <dependency>
       <groupId>bouncycastle</groupId>
-      <artifactId>bcprov-jdk14</artifactId>
-      <version>124</version>
+      <artifactId>lcrypto-jdk14</artifactId>
+      <version>131</version>
     </dependency>
   </dependencies>
   <build>

Modified: directory/trunk/ldap-common/todo.txt
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/todo.txt?rev=365808&r1=365807&r2=365808&view=diff
==============================================================================
--- directory/trunk/ldap-common/todo.txt (original)
+++ directory/trunk/ldap-common/todo.txt Tue Jan  3 19:19:29 2006
@@ -1,10 +1,17 @@
  o cleanup all the noise from tests
  o figure out a way to export DnCommonTokenTypes.txt so we don't need antrun
- o figure out what needs to be done with stuff in old directory
  o place xdocs in the right place to properly build the site
  o cleanup dependencies
  o reduce footprint
  o remove old provider architecture structures since we now have only one 
    asn1 provider library
- o change packages for asn1new to common.ber or something like that
  o make sure logging properties files are being picked up for tests
+ o reorg package structure for codec
+   - blow away all this grammar, and pojo stuff 
+   - create codec.<operation> based packages like codec.add and codec.search
+   - put controls under operation the request or reponse control is for
+   - remove this asn1 pkg component to have org.apache.ldap.common.codec base
+ o delete unneeded tag transitions that don't have actions
+ o remove Assert.assertXXX lines in test cases
+ o move out GrammarAction for LdapControlGrammar into its own class and setup
+   an extension point where we can plugin different control codec extensions