[utilities COMMIT] in /java-support/trunk/src: main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.ja...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Feb  7 17:23:14 2012
New Revision: 232

URL: http://svn.shibboleth.net/view/utilities?rev=232&view=rev
Log:
Change BasicParsePool to extend AbstractDestructableInitializableComponent

Also fix regression in schema tests.

Added:
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-fails.xml   (contents, props changed)
      - copied, changed from r224, java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTest-fails.xml
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaFirstLoaded.xsd   (contents, props changed)
      - copied, changed from r224, java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTest-schemaFirstLoaded.xsd
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaSecondLoaded.xsd   (contents, props changed)
      - copied, changed from r224, java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTest-schemaSecondLoaded.xsd
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-works.xml   (contents, props changed)
      - copied, changed from r224, java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTest-works.xml
Removed:
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTest-fails.xml
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTest-schemaFirstLoaded.xsd
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTest-schemaSecondLoaded.xsd
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTest-works.xml
Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java?rev=232&r1=231&r2=232&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java Tue Feb  7 17:23:14 2012
@@ -37,12 +37,9 @@
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
+import net.shibboleth.utilities.java.support.component.AbstractDestructableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.DestroyedComponentException;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
-import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
-import net.shibboleth.utilities.java.support.component.UnmodifiableComponent;
-import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
 import net.shibboleth.utilities.java.support.logic.Assert;
 
 import org.slf4j.Logger;
@@ -73,17 +70,11 @@
  * This implementation of {@link ParserPool} does not allow its properties to be modified once it has been initialized.
  */
 @ThreadSafe
-public class BasicParserPool implements ParserPool, InitializableComponent, UnmodifiableComponent {
+public class BasicParserPool extends AbstractDestructableInitializableComponent implements ParserPool {
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(BasicParserPool.class);
 
-    /** Flag to track whether pool is in the initialized state. */
-    private boolean initialized;
-
-    /** Flag to track whether pool is in the destroyed state. */
-    private boolean destroyed;
-
     /** Factory used to create new builders. */
     private DocumentBuilderFactory builderFactory;
 
@@ -131,7 +122,7 @@
 
     /** Constructor. */
     public BasicParserPool() {
-        initialized = false;
+        super();
         maxPoolSize = 5;
         builderPool = new Stack<SoftReference<DocumentBuilder>>();
         builderAttributes = Collections.emptyMap();
@@ -150,18 +141,13 @@
 
     /**
      * Initialize the pool.
+     * @return 
      * 

[... 228 lines stripped ...]