[jboss-svn-commits] JBL Code SVN: r32140 - in labs/jbossrules/trunk/drools-core: src/main/java/org/drools/agent and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: jervisliu
Date: 2010-03-18 11:52:14 -0400 (Thu, 18 Mar 2010)
New Revision: 32140

Modified:
   labs/jbossrules/trunk/drools-core/pom.xml
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/HttpClientImpl.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/UrlResource.java
Log:
GUVNOR-133: Rules Agent provides access to all users' rules without authentication. Replaced Sun Base64Encoder with apache common codec. The good thing about Apache common codec is that the jar size is very small(64k). 

Modified: labs/jbossrules/trunk/drools-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-core/pom.xml	2010-03-18 14:46:13 UTC (rev 32139)
+++ labs/jbossrules/trunk/drools-core/pom.xml	2010-03-18 15:52:14 UTC (rev 32140)
@@ -58,6 +58,11 @@
             <artifactId>jaxb-xjc</artifactId>
             <version>2.0.3</version>
         </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.4</version>
+        </dependency>        
 	</dependencies>
 
 	<profiles>

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/HttpClientImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/HttpClientImpl.java	2010-03-18 14:46:13 UTC (rev 32139)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/HttpClientImpl.java	2010-03-18 15:52:14 UTC (rev 32140)
@@ -9,7 +9,7 @@
 import org.drools.definitions.impl.KnowledgePackageImp;
 import org.drools.rule.Package;
 
-import sun.misc.BASE64Encoder;
+import org.apache.commons.codec.binary.Base64;
 
 public class HttpClientImpl
     implements
@@ -49,10 +49,9 @@
         try {
             httpCon.setRequestMethod( "GET" );
 
-            BASE64Encoder enc = new sun.misc.BASE64Encoder();
+        	Base64 enc = new Base64();
             String userpassword = username + ":" + password;
-            String encodedAuthorization = enc.encode( userpassword.getBytes() );
-            httpCon.setRequestProperty("Authorization", "Basic " + encodedAuthorization);
+            httpCon.setRequestProperty("Authorization", "Basic " + enc.encode(userpassword.getBytes()));
             
             Object o = DroolsStreamUtils.streamIn( httpCon.getInputStream() );
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/UrlResource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/UrlResource.java	2010-03-18 14:46:13 UTC (rev 32139)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/UrlResource.java	2010-03-18 15:52:14 UTC (rev 32140)
@@ -26,8 +26,9 @@
 import org.drools.io.Resource;
 import org.drools.io.internal.InternalResource;
 
-import sun.misc.BASE64Encoder;
+import org.apache.commons.codec.binary.Base64;
 
+
 /**
  * Borrowed gratuitously from Spring under ASL2.0.
  *
@@ -180,15 +181,11 @@
         con.setUseCaches( false );
 
         if ( con instanceof HttpURLConnection) {
-            //((HttpURLConnection) con).setRequestMethod( "GET" );
-            boolean useBasicAuth = true;
             if ("enabled".equalsIgnoreCase(basicAuthentication)) {
-				BASE64Encoder enc = new sun.misc.BASE64Encoder();
+            	Base64 enc = new Base64();
 				String userpassword = username + ":" + password;
-				String encodedAuthorization = enc.encode(userpassword
-						.getBytes());
 				((HttpURLConnection) con).setRequestProperty("Authorization",
-						"Basic " + encodedAuthorization);
+						"Basic " + enc.encode(userpassword.getBytes()));
 			}
 
         }