[Identity-dev] svn commit r15254 - in trunk/solutions/identity/modules/identity-provider: conf src/main/java/org/wso2/solutions/identity src/main/java/org/wso2/solutions/identity/cards src/main/java/org/wso2/solutions/identity/sts

[svn]

Author: dimuthul
Date: Thu Mar 27 21:06:40 2008
New Revision: 15254

Log:

Adding the additivity flag.
This will prevented unwanted log lines in the console.
Logs will only will be written to files.



Modified:
   trunk/solutions/identity/modules/identity-provider/conf/log4j.properties
   
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/IdentityProviderConstants.java
   
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
   
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java

Modified: 
trunk/solutions/identity/modules/identity-provider/conf/log4j.properties
==============================================================================
--- trunk/solutions/identity/modules/identity-provider/conf/log4j.properties    
(original)
+++ trunk/solutions/identity/modules/identity-provider/conf/log4j.properties    
Thu Mar 27 21:06:40 2008
@@ -25,8 +25,10 @@
 
 log4j.rootLogger=INFO, WSO2WSAS_LOGFILE, WSO2WSAS_MEMORY, WSO2WSAS_SYS_LOG
 
-log4j.logger.org.wso2.solutions.identity.card=DEBUG, CARDISSUER_LOGFILE
+log4j.logger.org.wso2.solutions.identity.card=DEBUB, CARDISSUER_LOGFILE
 log4j.logger.org.wso2.solutions.identity.token=DEBUG, TOKENISSUER_LOGFILE
+log4j.additivity.org.wso2.solutions.identity.card=false
+log4j.additivity.org.wso2.solutions.identity.token=false
 
 log4j.logger.org.wso2.solutions.identity.error=ERROR, WSO2WSAS_LOGFILE, 
WSO2WSAS_MEMORY, WSO2WSAS_CONSOLE
 log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR, 
WSO2WSAS_LOGFILE, WSO2WSAS_MEMORY, WSO2WSAS_CONSOLE

Modified: 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/IdentityProviderConstants.java
==============================================================================
--- 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/IdentityProviderConstants.java
 (original)
+++ 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/IdentityProviderConstants.java
 Thu Mar 27 21:06:40 2008
@@ -95,7 +95,7 @@
 
     public final static String CARD_ISSUSER_LOG = 
         "org.wso2.solutions.identity.card";
-
+         
     public final static String TOKEN_ISSUSER_LOG = 
         "org.wso2.solutions.identity.token";
 

Modified: 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
==============================================================================
--- 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
  (original)
+++ 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
  Thu Mar 27 21:06:40 2008
@@ -70,21 +70,22 @@
 
     private static Log log = LogFactory.getLog(CardIssuer.class);
 
-    private static Log cardIssuerLog = LogFactory
-            .getLog(IdentityProviderConstants.CARD_ISSUSER_LOG);
-
     private static Messages messages = Messages
             .getInstance(IdentityProviderConstants.RESOURCES);
 
     // track whether an OpenIdInfoCard which is based on OpenIDToken type or
     // an InfoCard based on SAML token type.
     private boolean isOpenIdInfoCard = false;
+    
+    private static Log cardIssuerLog = LogFactory
+            .getLog(IdentityProviderConstants.CARD_ISSUSER_LOG);
+    private boolean isCardLogDebug = false; 
 
-    private boolean isCardLogDebug = cardIssuerLog.isDebugEnabled();
     private static CardIssuerConfig issuerConfig = null;
 
     public CardIssuer() throws IdentityProviderException {
         issuerConfig = CardIssuerConfig.getInstance();
+        isCardLogDebug = cardIssuerLog.isDebugEnabled();
     }
 
     public Element issueCardForUsername(String username,

Modified: 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
==============================================================================
--- 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
   (original)
+++ 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
   Thu Mar 27 21:06:40 2008
@@ -533,7 +533,7 @@
      * [EMAIL PROTECTED]
      */
     public void setConfigurationFile(String configFile) {
-        //Nothing to do
+        // Nothing to do
     }
 
     /**
@@ -585,11 +585,10 @@
         Element elem = null;
         SAMLTokenBuilder builder = null;
         final String requiredTokenType = ipData.getRequiredTokenType();
-        if (requiredTokenType.equals(IdentityConstants.SAML10_URL) ||
-                requiredTokenType.equals(IdentityConstants.SAML11_URL)) {
+        if (requiredTokenType.equals(IdentityConstants.SAML10_URL)
+                || requiredTokenType.equals(IdentityConstants.SAML11_URL)) {
             builder = new SAML1TokenBuilder();
-        } else if (requiredTokenType.equals(
-                IdentityConstants.SAML20_URL)) {
+        } else if (requiredTokenType.equals(IdentityConstants.SAML20_URL)) {
             builder = new SAML2TokenBuilder();
         }
 

_______________________________________________
Identity-dev mailing list
Identity-dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev