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

[noreply at shibboleth.net]

Author: lajoie
Date: Sun Oct 30 17:10:38 2011
New Revision: 159

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=159&view=rev
Log:
fix javadoc
fix up some generics

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomFilesystemSourceStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomFilesystemSourceStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomFilesystemSourceStage.java?rev=159&r1=158&r2=159&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomFilesystemSourceStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomFilesystemSourceStage.java Sun Oct 30 17:10:38 2011
@@ -41,7 +41,7 @@
  * This stage requires the following properties be set prior to initialization:
  * <ul>
  * <li><code>parserPool</code></li>
- * <li><code>sourceFile</code></li>
+ * <li><code>source</code></li>
  * </ul>
  */
 @ThreadSafe

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java?rev=159&r1=158&r2=159&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java Sun Oct 30 17:10:38 2011
@@ -54,7 +54,7 @@
 
  * @param <ItemType> type of items upon which this stage operates
  */
-public class PipelineDemultiplexerStage<ItemType extends Item> extends BaseStage<ItemType> {
+public class PipelineDemultiplexerStage<ItemType extends Item<?>> extends BaseStage<ItemType> {
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(PipelineDemultiplexerStage.class);

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java?rev=159&r1=158&r2=159&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java Sun Oct 30 17:10:38 2011
@@ -37,7 +37,7 @@
  * 
  * @param <ItemType> type of items upon which this stage operates
  */
-public class SerializationStage<ItemType extends Item> extends BaseStage<ItemType> {
+public class SerializationStage<ItemType extends Item<?>> extends BaseStage<ItemType> {
 
     /** File to which the item will be written. */
     private File outputFile;

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java?rev=159&r1=158&r2=159&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java Sun Oct 30 17:10:38 2011
@@ -56,7 +56,7 @@
  * 
  * @param <ItemType> type of items upon which this stage operates
  */
-public class SplitMergeStage<ItemType extends Item> extends BaseStage<ItemType> {
+public class SplitMergeStage<ItemType extends Item<?>> extends BaseStage<ItemType> {
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(SplitMergeStage.class);