You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2005/12/28 07:23:19 UTC
svn commit: r359417 - in /directory/trunk/asn1: ./ pom.xml
src/main/java/org/apache/asn1new/ber/Asn1Decoder.java
src/test/java/org/apache/asn1new/primitives/PrimitivesTest.java
Author: akarasulu
Date: Tue Dec 27 22:23:13 2005
New Revision: 359417
URL: http://svn.apache.org/viewcvs?rev=359417&view=rev
Log:
changes ...
o Fixed logger deps for slf4j removing log4j deps
o Added required deps to pom
o ASN.1 now compiles on 1.4, and 1.5
Added:
directory/trunk/asn1/pom.xml
Modified:
directory/trunk/asn1/ (props changed)
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java
directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/PrimitivesTest.java
Propchange: directory/trunk/asn1/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Dec 27 22:23:13 2005
@@ -1,4 +1,7 @@
target
+.deployables
+.wtpmodules
+.settings
*.iml
*.ber
*.log
Added: directory/trunk/asn1/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/pom.xml?rev=359417&view=auto
==============================================================================
--- directory/trunk/asn1/pom.xml (added)
+++ directory/trunk/asn1/pom.xml Tue Dec 27 22:23:13 2005
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.asn1</groupId>
+ <artifactId>asn1</artifactId>
+ <packaging>jar</packaging>
+ <version>0.3.3-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina</artifactId>
+ <version>0.9.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Modified: directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java?rev=359417&r1=359416&r2=359417&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java Tue Dec 27 22:23:13 2005
@@ -27,8 +27,8 @@
import org.apache.asn1new.ber.tlv.UniversalTag;
import org.apache.asn1new.ber.tlv.Value;
import org.apache.asn1.codec.util.Asn1StringUtils;
-
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.nio.ByteBuffer;
@@ -46,7 +46,7 @@
//~ Static fields/initializers -----------------------------------------------------------------
/** The logger */
- private static final Logger log = Logger.getLogger( Asn1Decoder.class );
+ private static final Logger log = LoggerFactory.getLogger( Asn1Decoder.class );
/** A speedup for logs */
private static boolean DEBUG;
Modified: directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/PrimitivesTest.java
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/PrimitivesTest.java?rev=359417&r1=359416&r2=359417&view=diff
==============================================================================
--- directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/PrimitivesTest.java (original)
+++ directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/PrimitivesTest.java Tue Dec 27 22:23:13 2005
@@ -22,7 +22,6 @@
import org.apache.asn1new.ber.tlv.Value;
import org.apache.asn1new.util.IntegerDecoder;
import org.apache.asn1new.util.IntegerDecoderException;
-import org.apache.log4j.PropertyConfigurator;
/**
* Test the Primitives
@@ -32,15 +31,6 @@
*/
public class PrimitivesTest extends TestCase
{
- //~ Static fields/initializers -----------------------------------------------------------------
-
- static
- {
- PropertyConfigurator.configure( "conf/log4j.conf" );
- }
-
- //~ Methods ------------------------------------------------------------------------------------
-
/**
* Test the Integer Primitive
*/