Return-Path: Delivered-To: apmail-incubator-abdera-commits-archive@locus.apache.org Received: (qmail 86679 invoked from network); 8 Sep 2006 02:05:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Sep 2006 02:05:10 -0000 Received: (qmail 15227 invoked by uid 500); 8 Sep 2006 02:05:10 -0000 Delivered-To: apmail-incubator-abdera-commits-archive@incubator.apache.org Received: (qmail 15209 invoked by uid 500); 8 Sep 2006 02:05:10 -0000 Mailing-List: contact abdera-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: abdera-dev@incubator.apache.org Delivered-To: mailing list abdera-commits@incubator.apache.org Received: (qmail 15200 invoked by uid 99); 8 Sep 2006 02:05:10 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Sep 2006 19:05:10 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Sep 2006 19:05:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 905991A981A; Thu, 7 Sep 2006 19:04:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r441334 - in /incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security: AbderaSecurity.java util/SecurityBase.java util/servlet/SignedResponseFilter.java xmlsec/XmlSecurityOptions.java Date: Fri, 08 Sep 2006 02:04:49 -0000 To: abdera-commits@incubator.apache.org From: jmsnell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060908020449.905991A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jmsnell Date: Thu Sep 7 19:04:48 2006 New Revision: 441334 URL: http://svn.apache.org/viewvc?view=rev&rev=441334 Log: General code improvements Modified: incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/AbderaSecurity.java incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/SecurityBase.java incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/servlet/SignedResponseFilter.java incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSecurityOptions.java Modified: incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/AbderaSecurity.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/AbderaSecurity.java?view=diff&rev=441334&r1=441333&r2=441334 ============================================================================== --- incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/AbderaSecurity.java (original) +++ incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/AbderaSecurity.java Thu Sep 7 19:04:48 2006 @@ -23,20 +23,22 @@ public class AbderaSecurity { - private Abdera abdera = null; - private Encryption encryption = null; - private Signature signature = null; + private final Abdera abdera; + private final Encryption encryption; + private final Signature signature; public AbderaSecurity() { - abdera = new Abdera(); + this(new Abdera()); } public AbderaSecurity(Abdera abdera) { this.abdera = abdera; + this.encryption = newEncryption(); + this.signature = newSignature(); } public AbderaSecurity(AbderaConfiguration config) { - this.abdera = new Abdera(config); + this(new Abdera(config)); } private Abdera getAbdera() { @@ -52,8 +54,6 @@ } public Encryption getEncryption() { - if (encryption == null) - encryption = newEncryption(); return encryption; } @@ -66,8 +66,6 @@ } public Signature getSignature() { - if (signature == null) - signature = newSignature(); return signature; } Modified: incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/SecurityBase.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/SecurityBase.java?view=diff&rev=441334&r1=441333&r2=441334 ============================================================================== --- incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/SecurityBase.java (original) +++ incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/SecurityBase.java Thu Sep 7 19:04:48 2006 @@ -33,7 +33,7 @@ public abstract class SecurityBase { - protected Abdera abdera = null; + protected final Abdera abdera; protected SecurityBase(Abdera abdera) { this.abdera = abdera; Modified: incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/servlet/SignedResponseFilter.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/servlet/SignedResponseFilter.java?view=diff&rev=441334&r1=441333&r2=441334 ============================================================================== --- incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/servlet/SignedResponseFilter.java (original) +++ incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/servlet/SignedResponseFilter.java Thu Sep 7 19:04:48 2006 @@ -92,8 +92,8 @@ private static final String keystoreType = "JKS"; - private Abdera abdera = null; - private AbderaSecurity security = null; + private final Abdera abdera; + private final AbderaSecurity security; private String keystoreFile = null; private String keystorePass = null; private String privateKeyAlias = null; @@ -102,6 +102,11 @@ private PrivateKey signingKey = null; private X509Certificate cert = null; + public SignedResponseFilter() { + this.abdera = new Abdera(); + this.security = new AbderaSecurity(abdera); + } + public void init( FilterConfig config) throws ServletException { @@ -110,8 +115,6 @@ privateKeyAlias = config.getInitParameter(KEY); privateKeyPass = config.getInitParameter(KEYPASS); certificateAlias = config.getInitParameter(CERT); - abdera = new Abdera(); - security = new AbderaSecurity(abdera); try { KeyStore ks = KeyStore.getInstance(keystoreType); Modified: incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSecurityOptions.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSecurityOptions.java?view=diff&rev=441334&r1=441333&r2=441334 ============================================================================== --- incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSecurityOptions.java (original) +++ incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSecurityOptions.java Thu Sep 7 19:04:48 2006 @@ -26,7 +26,7 @@ implements SecurityOptions { protected Parser parser = null; - protected Abdera abdera = null; + protected final Abdera abdera; protected XmlSecurityOptions(Abdera abdera) { this.abdera = abdera;