cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From owu...@apache.org
Subject svn commit: r1571102 - in /cxf/fediz/trunk/services/idp: ./ src/main/java/org/apache/cxf/fediz/service/idp/beans/ src/main/java/org/apache/cxf/fediz/service/idp/domain/ src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ src/main/resources/META...
Date Sun, 23 Feb 2014 21:57:33 GMT
Author: owulff
Date: Sun Feb 23 21:57:32 2014
New Revision: 1571102

URL: http://svn.apache.org/r1571102
Log:
Properties renamed

Modified:
    cxf/fediz/trunk/services/idp/pom.xml
    cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/ValidateTokenAction.java
    cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java
    cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/DBLoaderImpl.java
    cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java
    cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java
    cxf/fediz/trunk/services/idp/src/main/resources/META-INF/orm.xml
    cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
    cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
    cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
    cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPATest.java
    cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java
    cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java
    cxf/fediz/trunk/services/idp/src/test/resources/idp-config.xml

Modified: cxf/fediz/trunk/services/idp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/pom.xml?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/pom.xml (original)
+++ cxf/fediz/trunk/services/idp/pom.xml Sun Feb 23 21:57:32 2014
@@ -27,7 +27,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>fediz-idp</artifactId>
-    <name>Apache Fediz IDP (Spring Security &amp; Spring Web Flow)</name>
+    <name>Apache Fediz IDP</name>
     <packaging>war</packaging>
     <dependencyManagement>
         <dependencies>

Modified: cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/ValidateTokenAction.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/ValidateTokenAction.java?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/ValidateTokenAction.java
(original)
+++ cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/ValidateTokenAction.java
Sun Feb 23 21:57:32 2014
@@ -84,7 +84,7 @@ public class ValidateTokenAction {
                     TYPE.BAD_REQUEST);
         }
 
-        TrustedIdp trustedIDPConfig = idpConfig.findTrustedIDP(whr);
+        TrustedIdp trustedIDPConfig = idpConfig.findTrustedIdp(whr);
 
         if (trustedIDPConfig == null) {
             throw new ProcessingException(

Modified: cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java
(original)
+++ cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java
Sun Feb 23 21:57:32 2014
@@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlType
 
 @XmlRootElement(name = "idp", namespace = "http://org.apache.cxf.fediz/")
 @XmlType(propOrder = {"realm", "uri", "serviceDisplayName", "serviceDescription", "idpUrl",
"stsUrl",
-                     "certificate", "certificatePassword", "provideIDPList", "useCurrentIDP",
"hrds",
+                     "certificate", "certificatePassword", "provideIdpList", "useCurrentIdp",
"hrds",
                      "supportedProtocols", "tokenTypesOffered", "claimTypesOffered", "authenticationURIs",
                      "applications", "trustedIdps", "id" })
 public class Idp implements Serializable {
@@ -57,12 +57,12 @@ public class Idp implements Serializable
     // @Column(name = "INACTIVE", nullable = true, length = FIELD_LENGTH)
     // if HRDS can't determine the home realm, should
     // the list of trusted IDPs be shown to make a choice
-    protected boolean provideIDPList;
+    protected boolean provideIdpList;
 
     // If HRDS can't discover a home realm and displaying IDP list is not
     // enabled
     // it falls back to current IDP if an authentication domain is configured
-    protected boolean useCurrentIDP;
+    protected boolean useCurrentIdp;
 
     // Store certificate in DB or filesystem, provide options?
     // md:KeyDescriptor, use="signing"
@@ -144,20 +144,20 @@ public class Idp implements Serializable
         this.hrds = hrds;
     }
 
-    public boolean isProvideIDPList() {
-        return provideIDPList;
+    public boolean isProvideIdpList() {
+        return provideIdpList;
     }
 
-    public void setProvideIDPList(boolean provideIDPList) {
-        this.provideIDPList = provideIDPList;
+    public void setProvideIdpList(boolean provideIdpList) {
+        this.provideIdpList = provideIdpList;
     }
 
-    public boolean isUseCurrentIDP() {
-        return useCurrentIDP;
+    public boolean isUseCurrentIdp() {
+        return useCurrentIdp;
     }
 
-    public void setUseCurrentIDP(boolean useCurrentIDP) {
-        this.useCurrentIDP = useCurrentIDP;
+    public void setUseCurrentIdp(boolean useCurrentIdp) {
+        this.useCurrentIdp = useCurrentIdp;
     }
 
     public String getCertificate() {
@@ -220,7 +220,7 @@ public class Idp implements Serializable
         this.applications = applications;
     }
 
-    public TrustedIdp findTrustedIDP(String realmTrustedIdp) {
+    public TrustedIdp findTrustedIdp(String realmTrustedIdp) {
         for (TrustedIdp item : trustedIdpList) {
             if (realmTrustedIdp.equals(item.getRealm())) {
                 return item;

Modified: cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/DBLoaderImpl.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/DBLoaderImpl.java?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/DBLoaderImpl.java
(original)
+++ cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/DBLoaderImpl.java
Sun Feb 23 21:57:32 2014
@@ -86,10 +86,9 @@ public class DBLoaderImpl implements DBL
             entity.setProtocol("http://docs.oasis-open.org/wsfed/federation/200706");
             entity.setRealm("urn:org:apache:cxf:fediz:fedizhelloworld");
             entity.setRole("ApplicationServiceType");
-            entity.setServiceDescription("Fedizhelloworld description");
+            entity.setServiceDescription("Web Application to illustrate WS-Federation");
             entity.setServiceDisplayName("Fedizhelloworld");
             entity.setTokenType("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0");
-            entity.setPolicyNamespace("http://www.w3.org/ns/ws-policy");
             // must be persistet here already as the ApplicationClaimEntity requires the
Application Id
             em.persist(entity);
             ApplicationClaimEntity ace1 = new ApplicationClaimEntity(entity, claimEntity1);
@@ -120,12 +119,12 @@ public class DBLoaderImpl implements DBL
             entity3.setProtocol("http://docs.oasis-open.org/wsfed/federation/200706");
             entity3.setRealm("urn:org:apache:cxf:fediz:idp:realm-B");
             entity3.setTrustType("PEER_TRUST");
-            entity3.setUrl("https://localhost:${realmB.port}/fediz-idp-remote/federation");
+            entity3.setUrl("https://localhost:12443/fediz-idp-remote/federation");
             em.persist(entity3);
             
             IdpEntity idpEntity = new IdpEntity();
             idpEntity.getApplications().add(entity);
-            idpEntity.getTrustedIDPs().add(entity3);
+            idpEntity.getTrustedIdps().add(entity3);
             idpEntity.setCertificate("stsKeystoreA.properties");
             idpEntity.setCertificatePassword("realma");
             idpEntity.setIdpUrl("https://localhost:9443/fediz-idp/federation");
@@ -134,7 +133,7 @@ public class DBLoaderImpl implements DBL
             idpEntity.setServiceDisplayName("REALM A");
             idpEntity.setServiceDescription("IDP of Realm A");
             idpEntity.setUri("realma");
-            idpEntity.setProvideIDPList(true);
+            idpEntity.setProvideIdpList(true);
             Map<String, String> authUris = new HashMap<String, String>();
             authUris.put("default", "/login/default");
             idpEntity.setAuthenticationURIs(authUris);
@@ -150,7 +149,7 @@ public class DBLoaderImpl implements DBL
             tokenTypes.add(WSConstants.SAML2_NS);
             tokenTypes.add(WSConstants.SAML_NS);
             idpEntity.setTokenTypesOffered(tokenTypes);
-            idpEntity.setUseCurrentIDP(true);
+            idpEntity.setUseCurrentIdp(true);
             em.persist(idpEntity);
             
             em.flush();

Modified: cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java
(original)
+++ cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java
Sun Feb 23 21:57:32 2014
@@ -201,7 +201,7 @@ public class IdpDAOJPAImpl implements Id
             trustedIdpEntity = TrustedIdpDAOJPAImpl.getTrustedIdpEntity(trustedIdp.getRealm(),
em);
         }
         
-        idpEntity.getTrustedIDPs().add(trustedIdpEntity);
+        idpEntity.getTrustedIdps().add(trustedIdpEntity);
         
         if (LOG.isDebugEnabled()) {
             LOG.debug("Trusted IDP '" + trustedIdp.getRealm() + "' added to IDP '" + idp.getRealm()
+ "'");
@@ -224,7 +224,7 @@ public class IdpDAOJPAImpl implements Id
             trustedIdpEntity = TrustedIdpDAOJPAImpl.getTrustedIdpEntity(trustedIdp.getRealm(),
em);
         }
         
-        idpEntity.getTrustedIDPs().remove(trustedIdpEntity);
+        idpEntity.getTrustedIdps().remove(trustedIdpEntity);
         
         if (LOG.isDebugEnabled()) {
             LOG.debug("Trusted IDP '" + trustedIdp.getRealm() + "' removed from IDP '" +
idp.getRealm() + "'");
@@ -307,10 +307,10 @@ public class IdpDAOJPAImpl implements Id
         entity.setServiceDisplayName(idp.getServiceDisplayName());
         entity.setHrds(idp.getHrds());
         entity.setIdpUrl(idp.getIdpUrl());
-        entity.setProvideIDPList(idp.isProvideIDPList());
+        entity.setProvideIdpList(idp.isProvideIdpList());
         entity.setStsUrl(idp.getStsUrl());
         entity.setUri(idp.getUri());
-        entity.setUseCurrentIDP(idp.isUseCurrentIDP());
+        entity.setUseCurrentIdp(idp.isUseCurrentIdp());
         
         entity.getAuthenticationURIs().clear();
         for (Map.Entry<String, String> item : idp.getAuthenticationURIs().entrySet())
{
@@ -339,10 +339,10 @@ public class IdpDAOJPAImpl implements Id
         idp.setServiceDisplayName(entity.getServiceDisplayName());
         idp.setHrds(entity.getHrds());
         idp.setIdpUrl(entity.getIdpUrl());
-        idp.setProvideIDPList(entity.isProvideIDPList());
+        idp.setProvideIdpList(entity.isProvideIdpList());
         idp.setStsUrl(entity.getStsUrl());
         idp.setUri(entity.getUri());
-        idp.setUseCurrentIDP(entity.isUseCurrentIDP());
+        idp.setUseCurrentIdp(entity.isUseCurrentIdp());
         
         
         if (expandList != null && (expandList.contains("all") || expandList.contains("applications")))
{
@@ -353,7 +353,7 @@ public class IdpDAOJPAImpl implements Id
         }
         
         if (expandList != null && (expandList.contains("all") || expandList.contains("trusted-idps")))
{
-            for (TrustedIdpEntity item : entity.getTrustedIDPs()) {
+            for (TrustedIdpEntity item : entity.getTrustedIdps()) {
                 TrustedIdp trustedIdp = TrustedIdpDAOJPAImpl.entity2domain(item);
                 idp.getTrustedIdps().add(trustedIdp);
             }

Modified: cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java
(original)
+++ cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java
Sun Feb 23 21:57:32 2014
@@ -57,12 +57,12 @@ public class IdpEntity {
 
     // if HRDS can't determine the home realm, should
     // the list of trusted IDPs be shown to make a choice
-    private boolean provideIDPList;
+    private boolean provideIdpList;
 
     // If HRDS can't discover a home realm and displaying IDP list is not
     // enabled
     // it falls back to current IDP if an authentication domain is configured
-    private boolean useCurrentIDP;
+    private boolean useCurrentIdp;
 
     // Store certificate in DB or filesystem, provide options?
     // md:KeyDescriptor, use="signing"
@@ -97,7 +97,7 @@ public class IdpEntity {
     // list of trusted IDP from whom we accept SignInResponse
     // key: whr
     @ManyToMany(cascade = CascadeType.ALL)
-    private List<TrustedIdpEntity> trustedIDPs = new ArrayList<TrustedIdpEntity>();
+    private List<TrustedIdpEntity> trustedIdps = new ArrayList<TrustedIdpEntity>();
 
     // which URI to redirect for authentication
     // fediz-idp/<IDP uri>/login/auth/<auth URI>
@@ -160,20 +160,20 @@ public class IdpEntity {
         this.hrds = hrds;
     }
 
-    public boolean isProvideIDPList() {
-        return provideIDPList;
+    public boolean isProvideIdpList() {
+        return provideIdpList;
     }
 
-    public void setProvideIDPList(boolean provideIDPList) {
-        this.provideIDPList = provideIDPList;
+    public void setProvideIdpList(boolean provideIdpList) {
+        this.provideIdpList = provideIdpList;
     }
 
-    public boolean isUseCurrentIDP() {
-        return useCurrentIDP;
+    public boolean isUseCurrentIdp() {
+        return useCurrentIdp;
     }
 
-    public void setUseCurrentIDP(boolean useCurrentIDP) {
-        this.useCurrentIDP = useCurrentIDP;
+    public void setUseCurrentIdp(boolean useCurrentIdp) {
+        this.useCurrentIdp = useCurrentIdp;
     }
 
     public String getCertificate() {
@@ -224,12 +224,12 @@ public class IdpEntity {
         this.applications = applications;
     }
 
-    public List<TrustedIdpEntity> getTrustedIDPs() {
-        return trustedIDPs;
+    public List<TrustedIdpEntity> getTrustedIdps() {
+        return trustedIdps;
     }
 
-    public void setTrustedIDPs(List<TrustedIdpEntity> trustedIDPs) {
-        this.trustedIDPs = trustedIDPs;
+    public void setTrustedIdps(List<TrustedIdpEntity> trustedIdps) {
+        this.trustedIdps = trustedIdps;
     }
 
     public Map<String, String> getAuthenticationURIs() {

Modified: cxf/fediz/trunk/services/idp/src/main/resources/META-INF/orm.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/resources/META-INF/orm.xml?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/resources/META-INF/orm.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/resources/META-INF/orm.xml Sun Feb 23 21:57:32 2014
@@ -61,7 +61,7 @@
                     </unique-constraint>
                 </join-table>
             </many-to-many>
-            <many-to-many name="trustedIDPs">
+            <many-to-many name="trustedIdps">
                 <join-table name="idp_trustedidps">
                     <join-column name="idp_id" />
                     <inverse-join-column name="trustedidp_id" />

Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml Sun Feb 23
21:57:32 2014
@@ -49,8 +49,8 @@
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-A" />
         <property name="uri" value="realma" />
         <!--<property name="hrds" value="" /> --> <!-- TBD, not defined, provide
list if enabled -->
-        <property name="provideIDPList" value="true" />
-        <property name="useCurrentIDP" value="true" />
+        <property name="provideIdpList" value="true" />
+        <property name="useCurrentIdp" value="true" />
         <property name="certificate" value="stsKeystoreA.properties" />
         <property name="certificatePassword" value="realma" />
         <property name="stsUrl"

Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml Sun Feb 23
21:57:32 2014
@@ -49,8 +49,8 @@
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-B" />
         <property name="uri" value="realmb" />
         <!--<property name="hrds" value="" /> --> <!-- TBD, not defined, provide
list if enabled -->
-        <property name="provideIDPList" value="false" />
-        <property name="useCurrentIDP" value="true" />
+        <property name="provideIdpList" value="false" />
+        <property name="useCurrentIdp" value="true" />
         <property name="certificate" value="stsKeystoreB.properties" />
         <property name="certificatePassword" value="realmb" />
         <property name="stsUrl"

Modified: cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
(original)
+++ cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
Sun Feb 23 21:57:32 2014
@@ -101,8 +101,8 @@ public class RestITTest {
                             "https://localhost:9443/fediz-idp-sts/REALMA", idp.getStsUrl());
         Assert.assertEquals("Uri doesn't match",
                             "realma", idp.getUri());
-        Assert.assertTrue("ProvideIDPList doesn't match", idp.isProvideIDPList());
-        Assert.assertTrue("UseCurrentIDP doesn't match", idp.isUseCurrentIDP());
+        Assert.assertTrue("ProvideIDPList doesn't match", idp.isProvideIdpList());
+        Assert.assertTrue("UseCurrentIDP doesn't match", idp.isUseCurrentIdp());
         Assert.assertEquals("Number of AuthenticationURIs doesn't match",
                             1, idp.getAuthenticationURIs().size());
         Assert.assertEquals("Number of SupportedProtocols doesn't match",

Modified: cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPATest.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPATest.java?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPATest.java
(original)
+++ cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPATest.java
Sun Feb 23 21:57:32 2014
@@ -73,8 +73,6 @@ public class ApplicationDAOJPATest {
         Application application = applicationDAO.getApplication("urn:org:apache:cxf:fediz:fedizhelloworld",
                                                                 Arrays.asList("all"));
         
-        Assert.isTrue("".equals(application.getEncryptionCertificate()),
-                      "EncryptionCertificate doesn't match");
         Assert.isTrue("3600".equals(application.getLifeTime()),
                       "LifeTime doesn't match");
         Assert.isTrue("http://docs.oasis-open.org/wsfed/federation/200706".equals(application.getProtocol()),
@@ -83,16 +81,13 @@ public class ApplicationDAOJPATest {
                       "Realm doesn't match");
         Assert.isTrue("ApplicationServiceType".equals(application.getRole()),
                       "Role doesn't match");
-        Assert.isTrue("Fedizhelloworld description".equals(application.getServiceDescription()),
+        Assert.isTrue("Web Application to illustrate WS-Federation".equals(application.getServiceDescription()),
                       "ServiceDescription doesn't match");
         Assert.isTrue("Fedizhelloworld".equals(application.getServiceDisplayName()),
                       "ServiceDisplayName doesn't match");
         Assert.isTrue("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"
                       .equals(application.getTokenType()),
                       "TokenType doesn't match");
-        Assert.isTrue("http://www.w3.org/ns/ws-policy"
-                      .equals(application.getPolicyNamespace()),
-                      "Policy Namespace doesn't match");
         Assert.isTrue(4 == application.getRequestedClaims().size(),
                       "Number of claims doesn't match [" + application.getRequestedClaims().size()
+ "]");
     }

Modified: cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java
(original)
+++ cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java
Sun Feb 23 21:57:32 2014
@@ -86,9 +86,9 @@ public class IdpDAOJPATest {
                       "StsUrl doesn't match");
         Assert.isTrue("realma".equals(idp.getUri()),
                       "Uri doesn't match");
-        Assert.isTrue(idp.isProvideIDPList(),
+        Assert.isTrue(idp.isProvideIdpList(),
                       "ProvideIDPList doesn't match");
-        Assert.isTrue(idp.isUseCurrentIDP(),
+        Assert.isTrue(idp.isUseCurrentIdp(),
                       "UseCurrentIDP doesn't match");
         Assert.isTrue(1 == idp.getAuthenticationURIs().size(),
                       "Number of AuthenticationURIs doesn't match");
@@ -163,7 +163,7 @@ public class IdpDAOJPATest {
         idp.setServiceDisplayName("NEW REALM");
         idp.setServiceDescription("IDP of New Realm");
         idp.setUri("realmn");
-        idp.setProvideIDPList(true);
+        idp.setProvideIdpList(true);
         Map<String, String> authUris = new HashMap<String, String>();
         authUris.put("default", "/login/default");
         idp.setAuthenticationURIs(authUris);
@@ -175,7 +175,7 @@ public class IdpDAOJPATest {
         tokenTypes.add(WSConstants.SAML2_NS);
         tokenTypes.add(WSConstants.SAML_NS);
         idp.setTokenTypesOffered(tokenTypes);
-        idp.setUseCurrentIDP(true);
+        idp.setUseCurrentIdp(true);
         
         idpDAO.addIdp(idp);
         
@@ -197,9 +197,9 @@ public class IdpDAOJPATest {
                       "StsUrl doesn't match");
         Assert.isTrue("realmn".equals(idp.getUri()),
                       "Uri doesn't match");
-        Assert.isTrue(idp.isProvideIDPList(),
+        Assert.isTrue(idp.isProvideIdpList(),
                       "ProvideIDPList doesn't match");
-        Assert.isTrue(idp.isUseCurrentIDP(),
+        Assert.isTrue(idp.isUseCurrentIdp(),
                       "UseCurrentIDP doesn't match");
         Assert.isTrue(1 == idp.getAuthenticationURIs().size(),
                       "Number of AuthenticationURIs doesn't match");
@@ -261,7 +261,7 @@ public class IdpDAOJPATest {
         idp.setServiceDisplayName("UNEW REALM");
         idp.setServiceDescription("UIDP of New Realm");
         idp.setUri("Urealmn");
-        idp.setProvideIDPList(true);
+        idp.setProvideIdpList(true);
         Map<String, String> authUris = new HashMap<String, String>();
         authUris.put("default", "/login/default");
         idp.setAuthenticationURIs(authUris);
@@ -271,7 +271,7 @@ public class IdpDAOJPATest {
         List<String> tokenTypes = new ArrayList<String>();
         tokenTypes.add(WSConstants.SAML2_NS);
         idp.setTokenTypesOffered(tokenTypes);
-        idp.setUseCurrentIDP(false);
+        idp.setUseCurrentIdp(false);
         idpDAO.updateIdp(realm, idp);
         
         idp = idpDAO.getIdp(realm, null);
@@ -292,9 +292,9 @@ public class IdpDAOJPATest {
                       "StsUrl doesn't match");
         Assert.isTrue("Urealmn".equals(idp.getUri()),
                       "Uri doesn't match");
-        Assert.isTrue(idp.isProvideIDPList(),
+        Assert.isTrue(idp.isProvideIdpList(),
                       "ProvideIDPList doesn't match");
-        Assert.isTrue(!idp.isUseCurrentIDP(),
+        Assert.isTrue(!idp.isUseCurrentIdp(),
                       "UseCurrentIDP doesn't match");
         Assert.isTrue(1 == idp.getAuthenticationURIs().size(),
                       "Number of AuthenticationURIs doesn't match");
@@ -329,7 +329,7 @@ public class IdpDAOJPATest {
         idp.setServiceDisplayName("UNEW REALM");
         idp.setServiceDescription("UIDP of New Realm");
         idp.setUri("Urealmn");
-        idp.setProvideIDPList(true);
+        idp.setProvideIdpList(true);
         Map<String, String> authUris = new HashMap<String, String>();
         authUris.put("default", "/login/default");
         idp.setAuthenticationURIs(authUris);
@@ -339,7 +339,7 @@ public class IdpDAOJPATest {
         List<String> tokenTypes = new ArrayList<String>();
         tokenTypes.add(WSConstants.SAML2_NS);
         idp.setTokenTypesOffered(tokenTypes);
-        idp.setUseCurrentIDP(false);
+        idp.setUseCurrentIdp(false);
         idpDAO.updateIdp("urn:UNKNOWN", idp);
     }
     
@@ -623,7 +623,7 @@ public class IdpDAOJPATest {
         idp.setServiceDisplayName("NEW REALM");
         idp.setServiceDescription("IDP of New Realm");
         idp.setUri("realma");
-        idp.setProvideIDPList(true);
+        idp.setProvideIdpList(true);
         Map<String, String> authUris = new HashMap<String, String>();
         authUris.put("default", "/login/default");
         idp.setAuthenticationURIs(authUris);
@@ -635,7 +635,7 @@ public class IdpDAOJPATest {
         tokenTypes.add(WSConstants.SAML2_NS);
         tokenTypes.add(WSConstants.SAML_NS);
         idp.setTokenTypesOffered(tokenTypes);
-        idp.setUseCurrentIDP(true);
+        idp.setUseCurrentIdp(true);
         return idp;
     }
     /*

Modified: cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java
(original)
+++ cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java
Sun Feb 23 21:57:32 2014
@@ -72,7 +72,7 @@ public class TrustedIdpDAOJPATest {
                       "Realm doesn't match");          
         Assert.isTrue("PEER_TRUST".equals(trustedIdp.getTrustType()),
                       "TrustType doesn't match");
-        Assert.isTrue("https://localhost:${realmB.port}/fediz-idp-remote/federation".equals(trustedIdp.getUrl()),
+        Assert.isTrue("https://localhost:12443/fediz-idp-remote/federation".equals(trustedIdp.getUrl()),
                       "Url doesn't match"); 
         Assert.isTrue(trustedIdp.isCacheTokens(), "CacheTokens doesn't match"); 
     }

Modified: cxf/fediz/trunk/services/idp/src/test/resources/idp-config.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/test/resources/idp-config.xml?rev=1571102&r1=1571101&r2=1571102&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/test/resources/idp-config.xml (original)
+++ cxf/fediz/trunk/services/idp/src/test/resources/idp-config.xml Sun Feb 23 21:57:32 2014
@@ -62,8 +62,8 @@
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-A" />
         <property name="uri" value="realma" />
         <!--<property name="hrds" value="" /> --> <!-- TBD, not defined, provide
list if enabled -->
-        <property name="provideIDPList" value="true" />
-        <property name="useCurrentIDP" value="true" />
+        <property name="provideIdpList" value="true" />
+        <property name="useCurrentIdp" value="true" />
         <!-- <property name="certificate" value="realma.cert" /> -->   <!--
STS will sign token, IDP signs Metadata -->
         <property name="certificate" value="stsKeystoreA.properties" />
         <property name="certificatePassword" value="realma" />



Mime
View raw message