[jboss-svn-commits] JBL Code SVN: r22708 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss: soa/esb/services/security and 1 other directory.

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

Author: beve
Date: 2008-09-12 06:23:48 -0400 (Fri, 12 Sep 2008)
New Revision: 22708

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/services/security/PrivateCryptoUtil.java
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/PublicCryptoUtil.java
Log:
Attempting to fix the java1.6 build:
Used java version "1.6.0_10-rc" and Apache Ant version 1.6.5 compiled on June 2 2005 which runs without failure on my linux os.


Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/services/security/PrivateCryptoUtil.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/services/security/PrivateCryptoUtil.java	2008-09-12 09:01:29 UTC (rev 22707)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/services/security/PrivateCryptoUtil.java	2008-09-12 10:23:48 UTC (rev 22708)
@@ -53,7 +53,7 @@
 {
     INSTANCE;
 
-    private final Logger log = Logger.getLogger(PrivateCryptoUtil.class);
+    private Logger log;
     private Key key;
     private PublicKey publicKey;
     private String transformation;
@@ -62,6 +62,7 @@
     {
         try
         {
+            log = Logger.getLogger(PrivateCryptoUtil.class);
             init();
         }
         catch (final Exception e)
@@ -75,7 +76,7 @@
         String keystorePath = Configuration.getSecurityServicePrivateKeystore();
         if (keystorePath == null)
         {
-            throw new SecurityServiceException("No private keystore was specified in jbossesb-properites.xml. Add '" + Environment.SECURITY_SERVICE_PRIVATE_KEYSTORE + "'");
+            log.info("No private keystore was specified in jbossesb-properites.xml. Add '" + Environment.SECURITY_SERVICE_PUBLIC_KEYSTORE + "'");
         }
         else
         {

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/PublicCryptoUtil.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/PublicCryptoUtil.java	2008-09-12 09:01:29 UTC (rev 22707)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/PublicCryptoUtil.java	2008-09-12 10:23:48 UTC (rev 22708)
@@ -52,7 +52,7 @@
 {
     INSTANCE;
 
-    private final Logger log = Logger.getLogger(PublicCryptoUtil.class);
+    private Logger log;
     private Key key;
     private PublicKey publicKey;
     private String transformation;
@@ -62,6 +62,7 @@
     {
         try
         {
+            log = Logger.getLogger(PublicCryptoUtil.class);
             init();
         }
         catch (final Exception e)
@@ -260,5 +261,4 @@
         return newBytes;
     }
 
-
 }