[java-metadata-aggregator COMMIT] in /trunk/aggregator-pipeline/src: main/java/net/shibboleth/metadata/dom/saml/Conta...

[noreply at shibboleth.net]

Author: lajoie
Date: Sun Mar 25 12:02:24 2012
New Revision: 206

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=206&view=rev
Log:
Use the same naming convention for the contact person filtering stage as the other filtering stages

Added:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java   (contents, props changed)
      - copied, changed from r200, trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveContactPersonStage.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java   (contents, props changed)
      - copied, changed from r200, trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/RemoveContactPersonStageTest.java
Removed:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveContactPersonStage.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/RemoveContactPersonStageTest.java
Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java

Copied: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java (from r200, trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveContactPersonStage.java)
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java?p2=trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java&p1=trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveContactPersonStage.java&r1=200&r2=206&rev=206&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveContactPersonStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java Sun Mar 25 12:02:24 2012
@@ -59,7 +59,7 @@
  * </p>
  */
 @ThreadSafe
-public class RemoveContactPersonStage extends BaseIteratingStage<DomElementItem> {
+public class ContactPersonFilterStage extends BaseIteratingStage<DomElementItem> {
 
     /** 'technical' person type constant. */
     public static final String TECHNICAL = "technical";
@@ -77,11 +77,11 @@
     public static final String OTHER = "other";
 
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(RemoveContactPersonStage.class);
+    private final Logger log = LoggerFactory.getLogger(ContactPersonFilterStage.class);
 
     /** Allowed contact person types. */
     private Set<String> allowedTypes = ImmutableSet.copyOf(new String[] {TECHNICAL, SUPPORT, ADMINISTRATIVE, BILLING,
-            OTHER});
+            OTHER,});
 
     /** Person types which are white/black listed depending on the value of {@link #whitelistingTypes}. */
     private Set<String> designatedTypes = ImmutableSet.copyOf(allowedTypes);

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java?rev=206&r1=205&r2=206&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java Sun Mar 25 12:02:24 2012
@@ -36,7 +36,7 @@
 public class RemoveOrganizationStage extends BaseIteratingStage<DomElementItem> {
 
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(RemoveContactPersonStage.class);
+    private final Logger log = LoggerFactory.getLogger(ContactPersonFilterStage.class);
 
     /** {@inheritDoc} */
     protected boolean doExecute(@Nonnull final DomElementItem item) throws StageProcessingException {

Copied: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java (from r200, trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/RemoveContactPersonStageTest.java)
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java?p2=trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java&p1=trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/RemoveContactPersonStageTest.java&r1=200&r2=206&rev=206&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/RemoveContactPersonStageTest.java (original)

[... 117 lines stripped ...]