directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r154063 [1/3] - in incubator/directory/asn1/branches/ber-decoder/modules: ber/ ber/xdocs/ codec/ codec/src/docbook/ codec/src/images/ compiler/ der/ runtime/ runtime/src/java/org/apache/snickers/encoding/ runtime/src/java/org/apache/snickers/encoding/ber/ runtime/src/java/org/apache/snickers/runtime/ runtime/src/test/com/acme/spnego/ runtime/src/test/com/acme/spnego/ber/ runtime/src/test/org/apache/snickers/encoding/ber/
Date Wed, 16 Feb 2005 18:57:33 GMT
Author: adc
Date: Wed Feb 16 10:57:26 2005
New Revision: 154063

URL: http://svn.apache.org/viewcvs?view=rev&rev=154063
Log: (empty)


Added:
    incubator/directory/asn1/branches/ber-decoder/modules/ber/LICENSE.txt
    incubator/directory/asn1/branches/ber-decoder/modules/codec/LICENSE.txt
    incubator/directory/asn1/branches/ber-decoder/modules/der/LICENSE.txt
    incubator/directory/asn1/branches/ber-decoder/modules/der/maven.xml
    incubator/directory/asn1/branches/ber-decoder/modules/der/project.properties
Removed:
    incubator/directory/asn1/branches/ber-decoder/modules/ber/xdocs/
    incubator/directory/asn1/branches/ber-decoder/modules/codec/src/docbook/
    incubator/directory/asn1/branches/ber-decoder/modules/codec/src/images/
Modified:
    incubator/directory/asn1/branches/ber-decoder/modules/ber/maven.xml
    incubator/directory/asn1/branches/ber-decoder/modules/ber/project.properties
    incubator/directory/asn1/branches/ber-decoder/modules/ber/project.xml
    incubator/directory/asn1/branches/ber-decoder/modules/codec/maven.xml
    incubator/directory/asn1/branches/ber-decoder/modules/codec/project.xml
    incubator/directory/asn1/branches/ber-decoder/modules/compiler/project.xml
    incubator/directory/asn1/branches/ber-decoder/modules/der/project.xml
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/project.xml
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/Decoder.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/ASN1ObjectIdentifierEncoder.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/ASN1OctetStringEncoder.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BERDecoder.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BERInputStream.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BEROutputStream.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/runtime/ASN1BitString.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/runtime/ASN1OctetString.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ContextFlags.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/MechType.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/MechTypeList.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegTokenInit.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegTokenTarg.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegotiationToken.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ber/ContextFlagsDecoder.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ber/ContextFlagsEncoder.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ber/MechTypeDecoder.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ber/MechTypeEncoder.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ber/MechTypeListDecoder.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ber/NegTokenInitDecoder.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ber/NegotiationTokenDecoder.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ber/NegotiationTokenEncoder.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/org/apache/snickers/encoding/ber/AbstractDecoderTestCase.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/org/apache/snickers/encoding/ber/BenchmarkTest.java
    incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/org/apache/snickers/encoding/ber/TupleTest.java

Added: incubator/directory/asn1/branches/ber-decoder/modules/ber/LICENSE.txt
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/ber/LICENSE.txt?view=auto&rev=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/ber/LICENSE.txt (added)
+++ incubator/directory/asn1/branches/ber-decoder/modules/ber/LICENSE.txt Wed Feb 16 10:57:26 2005
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Modified: incubator/directory/asn1/branches/ber-decoder/modules/ber/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/ber/maven.xml?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/ber/maven.xml (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/ber/maven.xml Wed Feb 16 10:57:26 2005
@@ -1,7 +1,31 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> 
-  
-<project 
-  default="jar:install" 
-  >
-  
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  
+
+<!-- $Revision: 1.3 $ $Date: 2004/03/10 09:59:25 $ -->
+
+<project default="default"
+    xmlns:j="jelly:core"
+    xmlns:ant="jelly:ant"
+    xmlns:maven="jelly:maven">
+
+    <preGoal name="xdoc:jelly-transform">
+        <attainGoal name="html2xdoc"/>
+    </preGoal>
+
+</project>

Modified: incubator/directory/asn1/branches/ber-decoder/modules/ber/project.properties
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/ber/project.properties?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/ber/project.properties (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/ber/project.properties Wed Feb 16 10:57:26 2005
@@ -1,20 +1,20 @@
-maven.javadoc.private=true
-maven.javadoc.customtags=tag1 tag2
-
-tag1.name=todo
-tag1.description=To Do:
-tag1.enabled=true
-tag1.scope=all
-
-tag2.name=task
-tag2.description=Task:
-tag2.enabled=false
-tag2.scope=all
-
-maven.license.licenseFile=../../../LICENSE.txt
-#maven.clover.instrument.tests=true
-#maven.junit.fork=true
-maven.xdoc.includeProjectDocumentation=yes
-
-maven.repo.remote=http://cvs.apache.org/repository, http://ibiblio.org/maven, http://ldapd.sourceforge.net/maven/repository
+##
+##
+##   Copyright 2004 The Apache Software Foundation
+##
+##   Licensed under the Apache License, Version 2.0 (the "License");
+##   you may not use this file except in compliance with the License.
+##   You may obtain a copy of the License at
+##
+##       http://www.apache.org/licenses/LICENSE-2.0
+##
+##   Unless required by applicable law or agreed to in writing, software
+##   distributed under the License is distributed on an "AS IS" BASIS,
+##   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##   See the License for the specific language governing permissions and
+##   limitations under the License.
+##
 
+##
+## $Revision: 1.6 $ $Date: 2004/07/13 02:19:38 $
+##

Modified: incubator/directory/asn1/branches/ber-decoder/modules/ber/project.xml
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/ber/project.xml?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/ber/project.xml (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/ber/project.xml Wed Feb 16 10:57:26 2005
@@ -1,21 +1,51 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-  <extend>${basedir}/../project.xml</extend>
-  <groupId>incubator-directory</groupId>
-  <id>asn1-ber</id>
+<!--
+
+    Copyright 2004-2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
   
-  <name>ASN.1 BER Runtime</name>
-  <package>org.apache.asn1.ber</package>
-  <inceptionYear>2004</inceptionYear>
-      
-  <shortDescription>ASN.1 BER Runtime</shortDescription>
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  
+
+<!-- $Revision: 1.21 $ $Date: 2004/07/11 21:48:46 $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>${basedir}/../../etc/project.xml</extend>
 
-  <description>
+    <!-- ===================== -->
+    <!-- Module Identification -->
+    <!-- ===================== -->
+
+    <name>ASN.1 BER Runtime</name>
+    <inceptionYear>2004</inceptionYear>
+    <id>asn1-ber</id>
+    <shortDescription>ASN.1 BER Runtime</shortDescription>
+    <description>
     API containing functionality used for encoding and decoding BER 
     streams both in blocking and non-blocking modes.
-  </description>
-      
-  <dependencies>
+    </description>
+    <url>http://incubator.apache.org/directory/subprojects/asn1/</url>
+    <siteDirectory>/www/incubator.apache.org/projects/directory/subprojects/asn1</siteDirectory>
+    <distributionDirectory>/www/incubator.apache.org/projects/directory/subprojects/asn1</distributionDirectory>
+
+    <package>org.apache.asn1.ber</package>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
@@ -72,6 +102,13 @@
         http://incubator.apache.org/directory/subprojects/ldap/snacc-provider
       </url>
     </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <url>http://junit.org</url>
+    </dependency>
 
     <dependency>
       <groupId>snacc4j</groupId>
@@ -90,6 +127,21 @@
       </properties>
     </dependency>
 
-  </dependencies>
-</project>
+    </dependencies>
+
 
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <unitTest>
+            <includes>
+                <include>**/*Test.java</include>
+            </includes>
+            <excludes>
+                <exclude>**/Abstract*.java</exclude>
+            </excludes>
+        </unitTest>
+    </build>
+</project>

Added: incubator/directory/asn1/branches/ber-decoder/modules/codec/LICENSE.txt
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/codec/LICENSE.txt?view=auto&rev=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/codec/LICENSE.txt (added)
+++ incubator/directory/asn1/branches/ber-decoder/modules/codec/LICENSE.txt Wed Feb 16 10:57:26 2005
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Modified: incubator/directory/asn1/branches/ber-decoder/modules/codec/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/codec/maven.xml?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/codec/maven.xml (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/codec/maven.xml Wed Feb 16 10:57:26 2005
@@ -1,7 +1,31 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> 
-  
-<project 
-  default="jar:install" 
-  >
-  
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  
+
+<!-- $Revision: 1.3 $ $Date: 2004/03/10 09:59:25 $ -->
+
+<project default="default"
+    xmlns:j="jelly:core"
+    xmlns:ant="jelly:ant"
+    xmlns:maven="jelly:maven">
+
+    <preGoal name="xdoc:jelly-transform">
+        <attainGoal name="html2xdoc"/>
+    </preGoal>
+
+</project>

Modified: incubator/directory/asn1/branches/ber-decoder/modules/codec/project.xml
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/codec/project.xml?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/codec/project.xml (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/codec/project.xml Wed Feb 16 10:57:26 2005
@@ -1,16 +1,37 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-  <extend>${basedir}/../project.xml</extend>
-  <groupId>incubator-directory</groupId>
-  <id>asn1-codec</id>
+<!--
+
+    Copyright 2004-2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
   
-  <name>Stateful chunking codec API for ASN.1 runtime</name>
-  <package>org.apache.asn1.codecs</package>
-  <inceptionYear>2004</inceptionYear>
-      
-  <shortDescription>API for stateful chunking encoder/decoder pairs</shortDescription>
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  
+
+<!-- $Revision: 1.21 $ $Date: 2004/07/11 21:48:46 $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>${basedir}/../../etc/project.xml</extend>
 
-  <description>
+    <!-- ===================== -->
+    <!-- Module Identification -->
+    <!-- ===================== -->
+
+    <name>Stateful chunking codec API for ASN.1 runtime</name>
+    <inceptionYear>2004</inceptionYear>
+    <id>asn1-codec</id>
+    <shortDescription>API for stateful chunking encoder/decoder pairs</shortDescription>
+    <description>
     API for stackable stateful encoders and decoders.  Such codec interfaces
     allow for the efficient processing of data as it is made available while
     maintaining small actively processing footprints.  Of course these aspects
@@ -19,15 +40,39 @@
     Until this API is added to the commons-codec project several interfaces
     and classes here are duplicated to minimize the number of dependencies:
     namely a dependency on commons-codec will be avoided.
-  </description>
-      
-  <dependencies>
+    </description>
+    <url>http://incubator.apache.org/directory/subprojects/asn1/</url>
+    <siteDirectory>/www/incubator.apache.org/projects/directory/subprojects/asn1</siteDirectory>
+    <distributionDirectory>/www/incubator.apache.org/projects/directory/subprojects/asn1</distributionDirectory>
+
+    <package>org.apache.asn1.codecs</package>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <url>http://junit.org</url>
     </dependency>
-  </dependencies>
-</project>
+    </dependencies>
+
 
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <unitTest>
+            <includes>
+                <include>**/*Test.java</include>
+            </includes>
+            <excludes>
+                <exclude>**/Abstract*.java</exclude>
+            </excludes>
+        </unitTest>
+    </build>
+</project>

Modified: incubator/directory/asn1/branches/ber-decoder/modules/compiler/project.xml
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/compiler/project.xml?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/compiler/project.xml (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/compiler/project.xml Wed Feb 16 10:57:26 2005
@@ -28,7 +28,7 @@
     <!-- ===================== -->
 
     <name>Snickers :: Compiler</name>
-    <id>snickers-compiler</id>
+    <id>asn1-compiler</id>
     <shortDescription>Snickers Compiler</shortDescription>
     <description>Snickers Compiler</description>
     <url>http://incubator.apache.org/directory/subprojects/snickers/</url>

Added: incubator/directory/asn1/branches/ber-decoder/modules/der/LICENSE.txt
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/der/LICENSE.txt?view=auto&rev=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/der/LICENSE.txt (added)
+++ incubator/directory/asn1/branches/ber-decoder/modules/der/LICENSE.txt Wed Feb 16 10:57:26 2005
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Added: incubator/directory/asn1/branches/ber-decoder/modules/der/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/der/maven.xml?view=auto&rev=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/der/maven.xml (added)
+++ incubator/directory/asn1/branches/ber-decoder/modules/der/maven.xml Wed Feb 16 10:57:26 2005
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  
+
+<!-- $Revision: 1.3 $ $Date: 2004/03/10 09:59:25 $ -->
+
+<project default="default"
+    xmlns:j="jelly:core"
+    xmlns:ant="jelly:ant"
+    xmlns:maven="jelly:maven">
+
+    <preGoal name="xdoc:jelly-transform">
+        <attainGoal name="html2xdoc"/>
+    </preGoal>
+
+</project>

Added: incubator/directory/asn1/branches/ber-decoder/modules/der/project.properties
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/der/project.properties?view=auto&rev=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/der/project.properties (added)
+++ incubator/directory/asn1/branches/ber-decoder/modules/der/project.properties Wed Feb 16 10:57:26 2005
@@ -0,0 +1,20 @@
+##
+##
+##   Copyright 2004 The Apache Software Foundation
+##
+##   Licensed under the Apache License, Version 2.0 (the "License");
+##   you may not use this file except in compliance with the License.
+##   You may obtain a copy of the License at
+##
+##       http://www.apache.org/licenses/LICENSE-2.0
+##
+##   Unless required by applicable law or agreed to in writing, software
+##   distributed under the License is distributed on an "AS IS" BASIS,
+##   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##   See the License for the specific language governing permissions and
+##   limitations under the License.
+##
+
+##
+## $Revision: 1.6 $ $Date: 2004/07/13 02:19:38 $
+##

Modified: incubator/directory/asn1/branches/ber-decoder/modules/der/project.xml
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/der/project.xml?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/der/project.xml (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/der/project.xml Wed Feb 16 10:57:26 2005
@@ -1,20 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <extend>${basedir}/../project.xml</extend>
-  <groupId>incubator-directory</groupId>
-  <id>asn1-der</id>
-  
-  <name>ASN.1 DER Runtime</name>
-  <package>org.apache.asn1.der</package>
-  <inceptionYear>2005</inceptionYear>
-      
-  <shortDescription>ASN.1 DER Runtime</shortDescription>
-
-  <description>
-    API containing functionality used for encoding and decoding DER 
-    streams in blocking mode.  This is stepping-stone code meant to
-    facilitate the migration of Kerberos, which was developed outside of
-    the ASF, to the Apache Directory project's ASN.1 Runtime.
-  </description>
-</project>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2004-2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  
+
+<!-- $Revision: 1.21 $ $Date: 2004/07/11 21:48:46 $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>${basedir}/../../etc/project.xml</extend>
+
+    <!-- ===================== -->
+    <!-- Module Identification -->
+    <!-- ===================== -->
+
+    <name>ASN.1 DER Runtime</name>
+    <inceptionYear>2004</inceptionYear>
+    <id>asn1-der</id>
+    <shortDescription>ASN.1 DER Runtime</shortDescription>
+    <description>
+        API containing functionality used for encoding and decoding DER 
+        streams in blocking mode.  This is stepping-stone code meant to
+        facilitate the migration of Kerberos, which was developed outside of
+        the ASF, to the Apache Directory project's ASN.1 Runtime.
+    </description>
+    <url>http://incubator.apache.org/directory/subprojects/asn1/</url>
+    <siteDirectory>/www/incubator.apache.org/projects/directory/subprojects/asn1</siteDirectory>
+    <distributionDirectory>/www/incubator.apache.org/projects/directory/subprojects/asn1</distributionDirectory>
+
+    <package>org.apache.asn1.der</package>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+
+    </dependencies>
+
+
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <unitTest>
+            <includes>
+                <include>**/*Test.java</include>
+            </includes>
+            <excludes>
+                <exclude>**/Abstract*.java</exclude>
+            </excludes>
+        </unitTest>
+    </build>
+</project>

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/project.xml
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/project.xml?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/project.xml (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/project.xml Wed Feb 16 10:57:26 2005
@@ -28,7 +28,7 @@
     <!-- ===================== -->
 
     <name>Snickers :: Runtime</name>
-    <id>snickers-runtime</id>
+    <id>asn1-runtime</id>
     <shortDescription>Snickers Runtime</shortDescription>
     <description>Snickers Runtime</description>
     <url>http://incubator.apache.org/directory/subprojects/snickers/</url>

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/Decoder.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/Decoder.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/Decoder.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/Decoder.java Wed Feb 16 10:57:26 2005
@@ -26,5 +26,5 @@
  */
 public interface Decoder
 {
-    ASN1Type decode( InputStream stream ) throws DecoderException;
+    public ASN1Type decode( InputStream stream ) throws DecoderException;
 }

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/ASN1ObjectIdentifierEncoder.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/ASN1ObjectIdentifierEncoder.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/ASN1ObjectIdentifierEncoder.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/ASN1ObjectIdentifierEncoder.java Wed Feb 16 10:57:26 2005
@@ -64,11 +64,6 @@
 
     public void encode( BEROutputStream out, ASN1Type object ) throws EncoderException
     {
-        if ( !( object instanceof ASN1ObjectIdentifier ) )
-        {
-            throw new EncoderException( "Object not instance of ASN1ObjectIdentifier" );
-        }
-
         ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier) object;
 
         try

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/ASN1OctetStringEncoder.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/ASN1OctetStringEncoder.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/ASN1OctetStringEncoder.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/ASN1OctetStringEncoder.java Wed Feb 16 10:57:26 2005
@@ -62,7 +62,7 @@
 
         int length = 0;
 
-        length = Util.calculateLength( tagNumber, BEROutputStream.contentLength( ( tagNumber < 0 ? 4 : tagNumber ), octetString ) );
+        length = Util.calculateLength( tagNumber, octetString.getOctetString().length );
 
         return length;
     }

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BERDecoder.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BERDecoder.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BERDecoder.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BERDecoder.java Wed Feb 16 10:57:26 2005
@@ -16,10 +16,8 @@
  */
 package org.apache.snickers.encoding.ber;
 
-import java.io.InputStream;
-
-import org.apache.snickers.runtime.ASN1Type;
 import org.apache.snickers.encoding.DecoderException;
+import org.apache.snickers.runtime.ASN1Type;
 
 
 /**
@@ -27,7 +25,5 @@
  */
 public interface BERDecoder extends org.apache.snickers.encoding.Decoder
 {
-    public ASN1Type decode( InputStream stream ) throws DecoderException;
-
     public ASN1Type decode( BERInputStream stream ) throws DecoderException;
 }

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BERInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BERInputStream.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BERInputStream.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BERInputStream.java Wed Feb 16 10:57:26 2005
@@ -19,6 +19,9 @@
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Stack;
+
+import org.apache.snickers.runtime.ASN1BitString;
 
 
 /**
@@ -26,8 +29,12 @@
  */
 public class BERInputStream extends FilterInputStream
 {
+    private Stack lengthStack = new Stack();
+    private TypeClass typeClass;
     private boolean constructed;
     private int tag;
+    private boolean loaded = false;
+    private int length;
 
     /**
      * Creates a <code>FilterInputStream</code>
@@ -43,46 +50,109 @@
         super( in );
     }
 
-    public TypeClass readTypeClass() throws IOException
+    public void loadImplicitIdentificaiton() throws IOException
     {
-        byte b = (byte) in.read();
+        if ( !loaded )
+        {
+            byte b = (byte) readByte();
 
-        constructed = ( b & 0x20 ) != 0;
+            constructed = ( b & 0x20 ) != 0;
 
-        tag = b & 0x1F;
-        if ( tag == 0x1F )
-        {
-            tag = 0;
-            while ( true )
+            tag = b & 0x1F;
+            if ( tag == 0x1F )
             {
-                tag <<= 7;
-                b = (byte) in.read();
-                tag |= b & 0x7f;
-                if ( ( b & 0x80 ) != 0x80 ) break;
+                tag = 0;
+                while ( true )
+                {
+                    tag <<= 7;
+                    b = (byte) readByte();
+                    tag |= b & 0x7f;
+                    if ( ( b & 0x80 ) != 0x80 ) break;
+
+                }
+            }
 
+            switch ( b & 0xc0 )
+            {
+                case 0x40:
+                    typeClass = TypeClass.APPLICATION;
+                    break;
+                case 0x80:
+                    typeClass = TypeClass.CONTEXT_SPECIFIC;
+                    break;
+                case 0xC0:
+                    typeClass = TypeClass.PRIVATE;
+                    break;
+                default:
+                    typeClass = TypeClass.UNIVERSAL;
+                    break;
             }
+            loaded = true;
         }
+    }
 
-        switch ( b & 0xc0 )
+    public void loadExplicitIdentification() throws IOException
+    {
+        if ( !loaded )
         {
-            case 0x40:
-                return TypeClass.APPLICATION;
-            case 0x80:
-                return TypeClass.CONTEXT_SPECIFIC;
-            case 0xC0:
-                return TypeClass.PRIVATE;
-            default:
-                return TypeClass.UNIVERSAL;
+            loadImplicitIdentificaiton();
         }
+        loaded = false;
     }
 
-    public boolean readConstructed() throws IOException
+    public void loaadLength() throws IOException
+    {
+        int l = 0;
+        byte b = (byte) readByte();
+        if ( ( b & 0x80 ) == 0 )
+        {
+            l = ( b & 0x7f );
+        }
+        else
+        {
+            int count = ( b & 0x7f );
+            if ( count == 0 )
+            {
+                l = -1;
+            }
+            else
+            {
+                l = 0;
+                for ( int i = 0; i < count; i++ )
+                {
+                    l <<= 8;
+                    l |= (byte) readByte();
+                }
+            }
+        }
+        this.lengthStack.push( new Integer(length));
+        
+        length = l;
+    }
+
+    public TypeClass getTypeClass() throws IOException
+    {
+        return typeClass;
+    }
+
+    public boolean isConstructed() throws IOException
     {
         return constructed;
     }
 
-    public int readTag() throws IOException
+    public int getTag() throws IOException
     {
         return tag;
     }
+
+    public void readBitString(ASN1BitString bitString)  throws IOException
+    {
+        byte emptyBits = readByte();
+    }
+
+    protected byte readByte() throws IOException
+    {
+        return (byte) in.read();
+    }
+
 }

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BEROutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BEROutputStream.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BEROutputStream.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/encoding/ber/BEROutputStream.java Wed Feb 16 10:57:26 2005
@@ -39,7 +39,7 @@
 /**
  * @version $Revision$ $Date: $
  */
-public class BEROutputStream extends FilterOutputStream
+public final class BEROutputStream extends FilterOutputStream
 {
     private final static Boolean INDEFINITE = new Boolean( true );
     private final static Boolean DEFINITE = new Boolean( false );
@@ -197,21 +197,23 @@
 
     public void encode( ASN1BitString value ) throws IOException
     {
+        encodeExplicit( org.apache.snickers.encoding.ber.TypeClass.UNIVERSAL, true, 3 );
+        encodeLengthBegin( value.getNumBytes() + 1 );
+
+        out.write( 8 - value.getNumBits() % 8 );
+        out.write( value.getBytes() );
+
+        encodeLengthEnd();
     }
 
     public void encode( ASN1OctetString value ) throws IOException
     {
         encodeExplicit( org.apache.snickers.encoding.ber.TypeClass.UNIVERSAL, true, 4 );
-        encodeLengthBegin( contentLength( 4, value ) );
+        encodeLengthBegin( value.getOctetString().length );
 
         out.write( value.getOctetString() );
 
         encodeLengthEnd();
-    }
-
-    static int contentLength( int tagNumber, ASN1OctetString octetString )
-    {
-        return octetString.getOctetString().length;
     }
 
     public void encode( byte[] value ) throws IOException

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/runtime/ASN1BitString.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/runtime/ASN1BitString.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/runtime/ASN1BitString.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/runtime/ASN1BitString.java Wed Feb 16 10:57:26 2005
@@ -24,8 +24,44 @@
  */
 public class ASN1BitString extends BitSet implements ASN1Type
 {
-    public boolean isConsistent()
+    private final int nbits;
+    private final int nbytes;
+
+    public ASN1BitString( int nbits, int nbytes )
     {
-        return false;  //todo: consider this autogenerated code
+        super( nbits );
+
+        this.nbits = nbits;
+        this.nbytes = nbytes;
+    }
+
+    public final boolean isConsistent()
+    {
+        return length() <= nbits;
+    }
+
+    public final int getNumBits()
+    {
+        return nbytes;
+    }
+
+    public final int getNumBytes()
+    {
+        return nbytes;
+    }
+
+    public final byte[] getBytes()
+    {
+        byte[] result = new byte[nbytes];
+
+        for ( int i = 0; i < nbits + 1; i++ )
+        {
+            if ( get( i ) )
+            {
+                result[i / 8] |= 1 << ( 7-  ( i % 8 ) );
+            }
+        }
+
+        return result;
     }
 }

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/runtime/ASN1OctetString.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/runtime/ASN1OctetString.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/runtime/ASN1OctetString.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/java/org/apache/snickers/runtime/ASN1OctetString.java Wed Feb 16 10:57:26 2005
@@ -37,4 +37,18 @@
     {
         return true;
     }
+
+    public boolean equals( Object obj )
+    {
+        if ( !( obj instanceof ASN1OctetString ) ) return false;
+
+        ASN1OctetString ASN1OctetString = (ASN1OctetString) obj;
+
+        return ASN1Util.equals( octetString, ASN1OctetString.octetString );
+    }
+
+    public int hashCode()
+    {
+        return ASN1Util.hashCode( octetString );
+    }
 }

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ContextFlags.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ContextFlags.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ContextFlags.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ContextFlags.java Wed Feb 16 10:57:26 2005
@@ -22,7 +22,7 @@
 /**
  * @version $Revision$ $Date: $
  */
-public class ContextFlags extends org.apache.snickers.runtime.ASN1BitString implements ContextFlagsType
+public final class ContextFlags extends org.apache.snickers.runtime.ASN1BitString implements ContextFlagsType
 {
     public static final int delegFlag = 0;
     public static final int mutualFlag = 1;
@@ -31,4 +31,21 @@
     public static final int anonFlag = 4;
     public static final int confFlag = 5;
     public static final int integFlag = 6;
+
+    public ContextFlags()
+    {
+        super( 6, 2 );
+    }
+
+    public boolean equals( Object obj )
+    {
+        if ( !( obj instanceof ContextFlags ) ) return false;
+
+        return super.equals( obj );
+    }
+
+    public int hashCode()
+    {
+        return super.hashCode();
+    }
 }

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/MechType.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/MechType.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/MechType.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/MechType.java Wed Feb 16 10:57:26 2005
@@ -18,20 +18,18 @@
 
 import com.acme.spnego.type.MechTypeType;
 
-import org.apache.snickers.runtime.ASN1ObjectIdentifier;
-
 
 /**
  * @version $Revision$ $Date: $
  */
-public class MechType extends org.apache.snickers.runtime.ASN1ObjectIdentifier implements MechTypeType
+public final class MechType extends org.apache.snickers.runtime.ASN1ObjectIdentifier implements MechTypeType
 {
     public MechType( String oid )
     {
         super( oid );
     }
 
-    public MechType( ASN1ObjectIdentifier oid )
+    public MechType( org.apache.snickers.runtime.ASN1ObjectIdentifier oid )
     {
         super( oid );
     }
@@ -41,7 +39,7 @@
         super( id );
     }
 
-    public MechType( ASN1ObjectIdentifier oid, int id[] )
+    public MechType( org.apache.snickers.runtime.ASN1ObjectIdentifier oid, int id[] )
     {
         super( oid, id );
     }

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/MechTypeList.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/MechTypeList.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/MechTypeList.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/MechTypeList.java Wed Feb 16 10:57:26 2005
@@ -22,7 +22,7 @@
 /**
  * @version $Revision$ $Date: $
  */
-public class MechTypeList extends org.apache.snickers.runtime.ASN1SequenceOf implements MechTypeListType
+public final class MechTypeList extends org.apache.snickers.runtime.ASN1SequenceOf implements MechTypeListType
 {
     protected boolean instanceOf( Object o )
     {
@@ -32,5 +32,17 @@
     public boolean isConsistent()
     {
         return true;
+    }
+
+    public boolean equals( Object obj )
+    {
+        if ( !( obj instanceof MechTypeList ) ) return false;
+
+        return super.equals( obj );
+    }
+
+    public int hashCode()
+    {
+        return super.hashCode();
     }
 }

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegTokenInit.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegTokenInit.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegTokenInit.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegTokenInit.java Wed Feb 16 10:57:26 2005
@@ -22,7 +22,7 @@
 /**
  * @version $Revision$ $Date: $
  */
-public class NegTokenInit implements NegTokenInitType, org.apache.snickers.runtime.ASN1Type
+public final class NegTokenInit implements NegTokenInitType, org.apache.snickers.runtime.ASN1Type
 {
     private MechTypeList mechTypes;
     private ContextFlags reqFlags;
@@ -88,5 +88,50 @@
             return false;
         }
         return true;
+    }
+
+    public boolean equals( Object obj )
+    {
+        if ( !( obj instanceof NegTokenInit ) ) return false;
+
+        NegTokenInit negTokenInit = (NegTokenInit) obj;
+
+        if ( mechTypes != null && !mechTypes.equals( negTokenInit.mechTypes ) )
+        {
+            return false;
+        }
+        else if ( negTokenInit.mechTypes != null ) return false;
+
+        if ( reqFlags != null && !reqFlags.equals( negTokenInit.reqFlags ) )
+        {
+            return false;
+        }
+        else if ( negTokenInit.reqFlags != null ) return false;
+
+        if ( mechToken != null && !mechToken.equals( negTokenInit.mechToken ) )
+        {
+            return false;
+        }
+        else if ( negTokenInit.mechToken != null ) return false;
+
+        if ( mechListMIC != null && !mechListMIC.equals( negTokenInit.mechListMIC ) )
+        {
+            return false;
+        }
+        else if ( negTokenInit.mechListMIC != null ) return false;
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        int result = 0;
+
+        if ( mechTypes != null ) result ^= mechTypes.hashCode();
+        if ( reqFlags != null ) result ^= reqFlags.hashCode();
+        if ( mechToken != null ) result ^= mechToken.hashCode();
+        if ( mechListMIC != null ) result ^= mechListMIC.hashCode();
+
+        return result;
     }
 }

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegTokenTarg.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegTokenTarg.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegTokenTarg.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegTokenTarg.java Wed Feb 16 10:57:26 2005
@@ -22,7 +22,7 @@
 /**
  * @version $Revision$ $Date: $
  */
-public class NegTokenTarg implements NegTokenTargType, org.apache.snickers.runtime.ASN1Type
+public final class NegTokenTarg implements NegTokenTargType, org.apache.snickers.runtime.ASN1Type
 {
 
     private negResultEnum negResult;
@@ -72,7 +72,23 @@
 
     public boolean isConsistent()
     {
-        return false;  //todo: consider this autogenerated code
+        if ( negResult != null && !negResult.isConsistent() )
+        {
+            return false;
+        }
+        if ( supportedMech != null && !supportedMech.isConsistent() )
+        {
+            return false;
+        }
+        if ( responseToken != null && !responseToken.isConsistent() )
+        {
+            return false;
+        }
+        if ( mechListMIC != null && !mechListMIC.isConsistent() )
+        {
+            return false;
+        }
+        return true;
     }
 
     public static class negResultEnum extends org.apache.commons.lang.enum.ValuedEnum implements org.apache.snickers.runtime.ASN1Type

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegotiationToken.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegotiationToken.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegotiationToken.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/NegotiationToken.java Wed Feb 16 10:57:26 2005
@@ -22,7 +22,7 @@
 /**
  * @version $Revision$ $Date: $
  */
-public class NegotiationToken implements NegotiationTokenType, org.apache.snickers.runtime.ASN1Type
+public final class NegotiationToken implements NegotiationTokenType, org.apache.snickers.runtime.ASN1Type
 {
     private NegTokenInit negTokenInit;
     private NegTokenTarg negTokenTarg;
@@ -64,5 +64,36 @@
         }
 
         return true;
+    }
+
+    public boolean equals( Object obj )
+    {
+        if ( !( obj instanceof NegotiationToken ) ) return false;
+
+        NegotiationToken negotiationToken = (NegotiationToken) obj;
+
+        if ( negTokenInit != null && !negTokenInit.equals( negotiationToken.negTokenInit ) )
+        {
+            return false;
+        }
+        else if ( negotiationToken.negTokenInit != null ) return false;
+
+        if ( negTokenTarg != null && !negTokenTarg.equals( negotiationToken.negTokenTarg ) )
+        {
+            return false;
+        }
+        else if ( negotiationToken.negTokenTarg != null ) return false;
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        int result = 0;
+
+        if ( negTokenInit != null ) result ^= negTokenInit.hashCode();
+        if ( negTokenTarg != null ) result ^= negTokenTarg.hashCode();
+
+        return result;
     }
 }

Modified: incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ber/ContextFlagsDecoder.java
URL: http://svn.apache.org/viewcvs/incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ber/ContextFlagsDecoder.java?view=diff&r1=154062&r2=154063
==============================================================================
--- incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ber/ContextFlagsDecoder.java (original)
+++ incubator/directory/asn1/branches/ber-decoder/modules/runtime/src/test/com/acme/spnego/ber/ContextFlagsDecoder.java Wed Feb 16 10:57:26 2005
@@ -16,19 +16,44 @@
  */
 package com.acme.spnego.ber;
 
-import java.io.InputStream;
-
-import org.apache.snickers.encoding.Decoder;
-import org.apache.snickers.runtime.ASN1Type;
+import com.acme.spnego.ContextFlags;
 
 
 /**
  * @version $Revision$ $Date: $
  */
-public class ContextFlagsDecoder implements Decoder
+public class ContextFlagsDecoder extends org.apache.snickers.encoding.ber.ASN1BitStringDecoder
 {
-    public ASN1Type decode( InputStream stream )
+    public org.apache.snickers.runtime.ASN1Type decode( org.apache.snickers.encoding.ber.BERInputStream stream ) throws org.apache.snickers.encoding.DecoderException
+    {
+        ContextFlags negTokenInit = new ContextFlags();
+
+        try
+        {
+            int tag;
+
+            stream.loadImplicitIdentificaiton();
+            if ( stream.getTypeClass() != org.apache.snickers.encoding.ber.TypeClass.UNIVERSAL ) throw new org.apache.snickers.encoding.DecoderException( "Invalid type class" );
+            if ( stream.isConstructed() ) throw new org.apache.snickers.encoding.DecoderException( "Flags should not be constructed" );
+            if ( stream.getTag() != 3 ) throw new org.apache.snickers.encoding.DecoderException( "Wrong tag.  Found " + stream.getTag() + " needed 3" );
+
+            stream.readBitString(negTokenInit);
+
+//            tag = stream.getTag();
+//            if (tag == 0) {
+//                negTokenInit.setMechTypes( (com.acme.spnego.MechTypeList) mechTypesDecoder.decode( stream ) );
+//            }
+        }
+        catch ( java.io.IOException ioe )
+        {
+            throw new org.apache.snickers.encoding.DecoderException( ioe );
+        }
+
+        return negTokenInit;
+    }
+
+    public org.apache.snickers.runtime.ASN1Type decode( java.io.InputStream stream ) throws org.apache.snickers.encoding.DecoderException
     {
-        return null;  //todo: consider this autogenerated code
+        return decode( new org.apache.snickers.encoding.ber.BERInputStream( stream ) );
     }
 }



Mime
View raw message