From jboss-identity-commits at lists.jboss.org Tue Oct 13 04:13:14 2009
Content-Type: multipart/mixed; boundary="===============7998215975177418885=="
MIME-Version: 1.0
From: jboss-identity-commits at lists.jboss.org
To: jboss-identity-commits at lists.jboss.org
Subject: [jboss-identity-commits] JBoss Identity SVN: r855 - in
 identity-federation/trunk/jboss-identity-fed-core:
 src/main/java/org/jboss/identity/federation/core/wstrust and 2 other
 directories.
Date: Tue, 13 Oct 2009 04:13:14 -0400
Message-ID: <200910130813.n9D8DEf5021317@svn01.web.mwc.hst.phx2.redhat.com>

--===============7998215975177418885==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: beve
Date: 2009-10-13 04:13:13 -0400 (Tue, 13 Oct 2009)
New Revision: 855

Modified:
   identity-federation/trunk/jboss-identity-fed-core/pom.xml
   identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jbos=
s/identity/federation/core/wstrust/STSClientConfig.java
   identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jbos=
s/identity/federation/core/wstrust/handlers/STSSecurityHandler.java
   identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jbos=
s/test/identity/federation/core/wstrust/STSClientConfigUnitTestCase.java
   identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jbos=
s/test/identity/federation/core/wstrust/STSClientUnitTestCase.java
Log:
Work for https://jira.jboss.org/jira/browse/JBID-202 "STSClientConfig: Add =
parse method to populate the builder to allow properties overrides"


Modified: identity-federation/trunk/jboss-identity-fed-core/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- identity-federation/trunk/jboss-identity-fed-core/pom.xml	2009-10-13 03=
:32:56 UTC (rev 854)
+++ identity-federation/trunk/jboss-identity-fed-core/pom.xml	2009-10-13 08=
:13:13 UTC (rev 855)
@@ -114,6 +114,12 @@
         <version>2.2.14.GA</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.jboss</groupId>
+        <artifactId>jbossxb</artifactId>
+        <version>2.0.1.GA</version>
+        <scope>test</scope>
+      </dependency>
    </dependencies>
    =

    <reporting>

Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/o=
rg/jboss/identity/federation/core/wstrust/STSClientConfig.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jbo=
ss/identity/federation/core/wstrust/STSClientConfig.java	2009-10-13 03:32:5=
6 UTC (rev 854)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jbo=
ss/identity/federation/core/wstrust/STSClientConfig.java	2009-10-13 08:13:1=
3 UTC (rev 855)
@@ -44,7 +44,7 @@
  * <h3>Configure from file</h3>
  * Example:
  * <pre>{@code
- * STSClientConfig config =3D new STSClientConfig.Builder().build(configFi=
le);
+ * STSClientConfig config =3D new STSClientConfig.Builder(configFile).buil=
d();
  * }</pre>
  * =

  * @author <a href=3D"mailto:dbevenius(a)jboss.com">Daniel Bevenius</a>
@@ -112,6 +112,15 @@
         private String endpointAddress;
         private String username;
         private String password;
+        =

+        public Builder()
+        {
+        }
+        =

+        public Builder(final String configFile)
+        {
+            populate(configFile);
+        }
 =

         public Builder serviceName(final String serviceName)
         {
@@ -149,31 +158,10 @@
             return new STSClientConfig(this);
         }
 =

-        private void validate(Builder builder)
+        private void populate(final String configFile)
         {
-            checkPropertyShowValue(serviceName, SERVICE_NAME);
-            checkPropertyShowValue(portName, PORT_NAME);
-            checkPropertyShowValue(endpointAddress, endpointAddress);
-            checkProperty(username, USERNAME);
-            checkProperty(password, PASSWORD);
-        }
-
-        private void checkPropertyShowValue(final String propertyName, fin=
al String propertyValue)
-        {
-            if (propertyValue =3D=3D null || propertyValue.equals(""))
-                throw new IllegalArgumentException(propertyName + " proper=
ty must not be null or empty was:" + propertyValue);
-        }
-
-        private void checkProperty(final String propertyName, final String=
 propertyValue)
-        {
-            if (propertyValue =3D=3D null || propertyValue.equals(""))
-                throw new IllegalArgumentException(propertyName + " proper=
ty must not be null");
-        }
-
-        public STSClientConfig build(final String configFile)
-        {
             InputStream in =3D null;
-
+        =

             try
             {
                 in =3D getResource(configFile);
@@ -206,10 +194,28 @@
                     ignored.printStackTrace();
                 }
             }
+        }
 =

-            validate(this);
-            return new STSClientConfig(this);
+        private void validate(Builder builder)
+        {
+            checkPropertyShowValue(serviceName, SERVICE_NAME);
+            checkPropertyShowValue(portName, PORT_NAME);
+            checkPropertyShowValue(endpointAddress, endpointAddress);
+            checkProperty(username, USERNAME);
+            checkProperty(password, PASSWORD);
         }
+
+        private void checkPropertyShowValue(final String propertyName, fin=
al String propertyValue)
+        {
+            if (propertyValue =3D=3D null || propertyValue.equals(""))
+                throw new IllegalArgumentException(propertyName + " proper=
ty must not be null or empty was:" + propertyValue);
+        }
+
+        private void checkProperty(final String propertyName, final String=
 propertyValue)
+        {
+            if (propertyValue =3D=3D null || propertyValue.equals(""))
+                throw new IllegalArgumentException(propertyName + " proper=
ty must not be null");
+        }
     }
 =

     private static InputStream getResource(String resource) throws IOExcep=
tion

Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/o=
rg/jboss/identity/federation/core/wstrust/handlers/STSSecurityHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jbo=
ss/identity/federation/core/wstrust/handlers/STSSecurityHandler.java	2009-1=
0-13 03:32:56 UTC (rev 854)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jbo=
ss/identity/federation/core/wstrust/handlers/STSSecurityHandler.java	2009-1=
0-13 08:13:13 UTC (rev 855)
@@ -137,7 +137,7 @@
         {
             try
             {
-                final STSClientConfig config =3D new STSClientConfig.Build=
er().build(configFile);
+                final STSClientConfig config =3D new STSClientConfig.Build=
er(configFile).build();
                 wsTrustClient =3D STSClientFactory.getInstance().create(co=
nfig);
             }
             catch (final ParsingException e)

Modified: identity-federation/trunk/jboss-identity-fed-core/src/test/java/o=
rg/jboss/test/identity/federation/core/wstrust/STSClientConfigUnitTestCase.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jbo=
ss/test/identity/federation/core/wstrust/STSClientConfigUnitTestCase.java	2=
009-10-13 03:32:56 UTC (rev 854)
+++ identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jbo=
ss/test/identity/federation/core/wstrust/STSClientConfigUnitTestCase.java	2=
009-10-13 08:13:13 UTC (rev 855)
@@ -20,12 +20,11 @@
  */
 package org.jboss.test.identity.federation.core.wstrust;
 =

+import junit.framework.TestCase;
+
 import org.jboss.identity.federation.core.wstrust.STSClientConfig;
 import org.jboss.identity.federation.core.wstrust.STSClientConfig.Builder;
-import org.junit.Test;
 =

-import junit.framework.TestCase;
-
 /**
  * Unit test for {@link WSTrustClientConfig}.
  * =

@@ -40,7 +39,6 @@
     final String username =3D "admin";
     final String password =3D "admin";
     =

-    @Test
     public void testBuild()
     {
         final Builder builder =3D new STSClientConfig.Builder();
@@ -50,11 +48,21 @@
     =

     public void testBuildFromConfigPropertiesFile()
     {
-        final Builder builder =3D new STSClientConfig.Builder();
-        STSClientConfig config =3D builder.build("wstrust/sts-client.prope=
rties");
-        assertAllProperties(config);
+        final Builder builder =3D new STSClientConfig.Builder("wstrust/sts=
-client.properties");
+        assertAllProperties(builder.build());
     }
     =

+    public void testBuildFromConfigPropertiesFileOverridePassword()
+    {
+        final Builder builder =3D new STSClientConfig.Builder("wstrust/sts=
-client.properties");
+        assertAllProperties(builder.build());
+        =

+        final String overriddenPassword =3D "newPassword";
+        builder.password(overriddenPassword);
+        final STSClientConfig config =3D builder.build();
+        assertEquals(overriddenPassword, config.getPassword());
+    }
+    =

     private void assertAllProperties(final STSClientConfig config)
     {
         assertEquals(serviceName, config.getServiceName());

Modified: identity-federation/trunk/jboss-identity-fed-core/src/test/java/o=
rg/jboss/test/identity/federation/core/wstrust/STSClientUnitTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jbo=
ss/test/identity/federation/core/wstrust/STSClientUnitTestCase.java	2009-10=
-13 03:32:56 UTC (rev 854)
+++ identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jbo=
ss/test/identity/federation/core/wstrust/STSClientUnitTestCase.java	2009-10=
-13 08:13:13 UTC (rev 855)
@@ -223,11 +223,8 @@
       System.out.println("Renewed Token=3D" + DocumentUtil.getNodeAsString=
(renewedToken));
    }
    =

-   public void testIssue_Niehter_AppliesTo_Or_TokenType_Specified() =

+   public void testIssue_Neither_AppliesTo_Or_TokenType_Specified() =

    {
-      if(usetest =3D=3D false)
-         return;
-      =

       Builder stsConfigBuilder =3D new STSClientConfig.Builder();
       stsConfigBuilder.serviceName("JBossSTS");
       stsConfigBuilder.portName("JBossSTSPort");


--===============7998215975177418885==--