You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by je...@apache.org on 2002/11/05 06:52:42 UTC
cvs commit: xml-forrest/src/scratchpad/src/java/org/outerj/yer/use/cocoon HierarchyGenerator.java
jefft 2002/11/04 21:52:41
Modified: src/scratchpad/src/java/org/apache/forrest/sax
SAXConvenience.java
src/scratchpad/src/java/org/apache/forrest/yer/hierarchy
AttributeReader.java Collection.java Entry.java
EntryFactory.java EntryList.java EntryVisitor.java
HierarchyConfig.java HierarchyConstants.java
HierarchyReader.java SimpleEntryList.java
SortingEntryList.java
src/scratchpad/src/java/org/apache/forrest/yer/impl/fs
CollectionImpl.java FileEntryConstants.java
FileEntryFactory.java FileEntryImpl.java
ItemImpl.java
src/scratchpad/src/java/org/apache/forrest/yer/libre
EntryFilter.java EntrySorter.java
LibreAttributeReader.java LibreConfig.java
LibreConfigBuilder.java LibreConfigHelper.java
LibreConstants.java PropertyAttributeReader.java
XPathAttributeReader.java
src/scratchpad/src/java/org/apache/forrest/yer/use/cli
HierarchyDump.java
src/scratchpad/src/java/org/apache/forrest/yer/use/cocoon
HierarchyGenerator.java
Removed: src/scratchpad/src/java/org/outerj/sax SAXConvenience.java
src/scratchpad/src/java/org/outerj/yer/hierarchy
AttributeReader.java Collection.java Entry.java
EntryFactory.java EntryList.java EntryVisitor.java
HierarchyConfig.java HierarchyConstants.java
HierarchyReader.java SimpleEntryList.java
SortingEntryList.java
src/scratchpad/src/java/org/outerj/yer/impl/fs
CollectionImpl.java FileEntryConstants.java
FileEntryFactory.java FileEntryImpl.java
ItemImpl.java
src/scratchpad/src/java/org/outerj/yer/libre
EntryFilter.java EntrySorter.java
LibreAttributeReader.java LibreConfig.java
LibreConfigBuilder.java LibreConfigHelper.java
LibreConstants.java PropertyAttributeReader.java
XPathAttributeReader.java
src/scratchpad/src/java/org/outerj/yer/use/cli
HierarchyDump.java
src/scratchpad/src/java/org/outerj/yer/use/cocoon
HierarchyGenerator.java
Log:
Move libre packages name from org.outerj.* to org.apache.forrest.*
Revision Changes Path
1.3 +4 -4 xml-forrest/src/scratchpad/src/java/org/apache/forrest/sax/SAXConvenience.java
Index: SAXConvenience.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/sax/SAXConvenience.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SAXConvenience.java 5 Nov 2002 04:46:14 -0000 1.2
+++ SAXConvenience.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.sax;
+package org.apache.forrest.sax;
//std
import java.util.Properties;
1.3 +5 -5 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/AttributeReader.java
Index: AttributeReader.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/AttributeReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AttributeReader.java 5 Nov 2002 04:46:14 -0000 1.2
+++ AttributeReader.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,13 +54,13 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.hierarchy;
+package org.apache.forrest.yer.hierarchy;
-/** Interface <code>org.apache.forrest.libre.yer.libre.AttributeReader</code> specifies
+/** Interface <code>org.apache.forrest.yer.libre.AttributeReader</code> specifies
* the contract for specific implentations of Classes that can read out
* specific (as coded into the implementation) information from <code>
- * org.apache.forrest.libre.yer.hierarchy.Entry</code> objects.
+ * org.apache.forrest.yer.hierarchy.Entry</code> objects.
*
* Typically these AttributeReaders will call the <code>getUserObject()</code>
* or the <code>getUserXMLStream()</code> on the passed Entry first and
1.3 +4 -4 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/Collection.java
Index: Collection.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/Collection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Collection.java 5 Nov 2002 04:46:14 -0000 1.2
+++ Collection.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,9 +54,9 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.hierarchy;
+package org.apache.forrest.yer.hierarchy;
-/** Interface <code>org.apache.forrest.libre.yer.hierarchy.Collection</code> defines the
+/** Interface <code>org.apache.forrest.yer.hierarchy.Collection</code> defines the
* extra methods that should be offered by those Entry implementations that
* want to be the hierarchical parrent of a set of child Entries.
*
1.3 +5 -5 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/Entry.java
Index: Entry.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/Entry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Entry.java 5 Nov 2002 04:46:14 -0000 1.2
+++ Entry.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,12 +54,12 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.hierarchy;
+package org.apache.forrest.yer.hierarchy;
import java.io.InputStream;
import java.io.IOException;
-/** Interface <code>org.apache.forrest.libre.yer.hierarchy.Entry</code> defines what
+/** Interface <code>org.apache.forrest.yer.hierarchy.Entry</code> defines what
* information <code>Entry</code>'s should be able to provide.
*
* @author $Author$
@@ -95,7 +95,7 @@
* implementation of this interface. However having this method public
* allows for implementations to delegate the actual setting/finding out
* of the attributeValue to a generic package (like the libre package)
- * @see org.apache.forrest.libre.outerj.hierarchy.*
+ * @see org.apache.forrest.outerj.hierarchy.*
* @param attrName specifies the name of the attribute to set a new value for
* @param attrValue the value to set.
*/
1.3 +6 -6 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/EntryFactory.java
Index: EntryFactory.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/EntryFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EntryFactory.java 5 Nov 2002 04:46:14 -0000 1.2
+++ EntryFactory.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,12 +54,12 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.hierarchy;
+package org.apache.forrest.yer.hierarchy;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-/** Class <code>org.apache.forrest.libre.yer.hierarchy.EntryFactory</code> functions as
+/** Class <code>org.apache.forrest.yer.hierarchy.EntryFactory</code> functions as
* an Abstract Factory for retrieving a concrete Entry Factory.
*
* @author $Author$
@@ -69,7 +69,7 @@
{
/** Constant for full qualified class name of the default EntryFactory */
public static final String DEFAULT_FACTORY =
- "org.apache.forrest.libre.yer.impl.fs.FileEntryFactory";
+ "org.apache.forrest.yer.impl.fs.FileEntryFactory";
/** Creates a new Instance of the default EntryFactory
* @return the new instance. */
@@ -81,7 +81,7 @@
* @param fcqn full qualified class name of the EntryFactory to create.
* @return the new instance.
* Remarks: the specified class must be in the classpath. Also it must
- * be a subclass of <code>org.apache.forrest.libre.yer.hierarchy.EntryFactory</code>.
+ * be a subclass of <code>org.apache.forrest.yer.hierarchy.EntryFactory</code>.
* Finally the class must have a public default constructor (no arguments).
*/
public static EntryFactory newInstance(String fqcn) {
1.3 +4 -4 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/EntryList.java
Index: EntryList.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/EntryList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EntryList.java 5 Nov 2002 04:46:14 -0000 1.2
+++ EntryList.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,9 +54,9 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.hierarchy;
+package org.apache.forrest.yer.hierarchy;
-/** Interface <code>org.apache.forrest.libre.yer.hierarchy.EntryList</code> ...
+/** Interface <code>org.apache.forrest.yer.hierarchy.EntryList</code> ...
*
* @author $Author$
* @version CVS $Id$
1.3 +4 -4 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/EntryVisitor.java
Index: EntryVisitor.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/EntryVisitor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EntryVisitor.java 5 Nov 2002 04:46:14 -0000 1.2
+++ EntryVisitor.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,9 +54,9 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.hierarchy;
+package org.apache.forrest.yer.hierarchy;
-/** Interface <code>org.apache.forrest.libre.yer.hierarchy.EntryVisitor</code> specifies
+/** Interface <code>org.apache.forrest.yer.hierarchy.EntryVisitor</code> specifies
* a very simple contract for a class that wants to perform an operation on
* an Entry. It's main use is in combination with the <code>EntryList</code>
* class to easily perform the same operation on all the members in a list
1.3 +4 -4 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/HierarchyConfig.java
Index: HierarchyConfig.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/HierarchyConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HierarchyConfig.java 5 Nov 2002 04:46:14 -0000 1.2
+++ HierarchyConfig.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,9 +54,9 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.hierarchy;
+package org.apache.forrest.yer.hierarchy;
-/** Interface <code>org.apache.forrest.libre.yer.hierarchy.HierarchyConfig</code> functions
+/** Interface <code>org.apache.forrest.yer.hierarchy.HierarchyConfig</code> functions
* as a tagger interface (no methods defined). It allows to specify the passing
* of an implementation specific Configuration object even on the more abstract
* level of Hierarchies and entries.
1.3 +4 -4 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/HierarchyConstants.java
Index: HierarchyConstants.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/HierarchyConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HierarchyConstants.java 5 Nov 2002 04:46:14 -0000 1.2
+++ HierarchyConstants.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,9 +54,9 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.hierarchy;
+package org.apache.forrest.yer.hierarchy;
-/** Interface <code>org.apache.forrest.libre.yer.hierarchy.HierarchyConstants</code> holds a
+/** Interface <code>org.apache.forrest.yer.hierarchy.HierarchyConstants</code> holds a
* number of constants related to the XML representation of the Hierarchy.
*
* @author $Author$
1.3 +5 -5 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/HierarchyReader.java
Index: HierarchyReader.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/HierarchyReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HierarchyReader.java 5 Nov 2002 04:46:14 -0000 1.2
+++ HierarchyReader.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,16 +54,16 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.hierarchy;
+package org.apache.forrest.yer.hierarchy;
//sax
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.Attributes;
import org.xml.sax.helpers.AttributesImpl;
-import org.apache.forrest.libre.sax.SAXConvenience;
+import org.apache.forrest.sax.SAXConvenience;
-/** Class <code>org.apache.forrest.libre.yer.hierarchy.HierarchyReader</code> will
+/** Class <code>org.apache.forrest.yer.hierarchy.HierarchyReader</code> will
* traverse the presented structure hanging under the rootEntry.
* Comparable to a <code>org.xml.sax.XMLReader</code> this class will
* generate SAXEvents to the registered contentHandler.
1.3 +4 -4 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/SimpleEntryList.java
Index: SimpleEntryList.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/SimpleEntryList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleEntryList.java 5 Nov 2002 04:46:14 -0000 1.2
+++ SimpleEntryList.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.hierarchy;
+package org.apache.forrest.yer.hierarchy;
import java.util.List;
@@ -62,7 +62,7 @@
import java.util.Iterator;
import java.util.ArrayList;
-/** Class <code>org.apache.forrest.libre.yer.hierarchy.SimpleEntryList</code> implements a
+/** Class <code>org.apache.forrest.yer.hierarchy.SimpleEntryList</code> implements a
* type-aware List of Entry objects. It just wraps a <code>java.util.List
* </code> and does the necessary typecasting for you. Also it offers a
* visitor mechanism so user of the list don't need to write their own
1.3 +4 -4 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/SortingEntryList.java
Index: SortingEntryList.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/SortingEntryList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SortingEntryList.java 5 Nov 2002 04:46:14 -0000 1.2
+++ SortingEntryList.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,14 +54,14 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.hierarchy;
+package org.apache.forrest.yer.hierarchy;
import java.util.Collection;
import java.util.Comparator;
import java.util.TreeSet;
import java.util.Iterator;
-/** Class <code>org.apache.forrest.libre.yer.hierarchy.SortingEntryList</code> ...
+/** Class <code>org.apache.forrest.yer.hierarchy.SortingEntryList</code> ...
*
* @author $Author$
* @version CVS $Id$
1.3 +20 -20 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/impl/fs/CollectionImpl.java
Index: CollectionImpl.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/impl/fs/CollectionImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CollectionImpl.java 5 Nov 2002 04:46:14 -0000 1.2
+++ CollectionImpl.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,16 +54,16 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.impl.fs;
+package org.apache.forrest.yer.impl.fs;
-import org.apache.forrest.libre.yer.hierarchy.Entry;
-import org.apache.forrest.libre.yer.hierarchy.SimpleEntryList;
-import org.apache.forrest.libre.yer.libre.LibreConfig;
-import org.apache.forrest.libre.yer.libre.LibreConfigHelper;
-import org.apache.forrest.libre.yer.hierarchy.AttributeReader;
-import org.apache.forrest.libre.yer.hierarchy.Collection;
-import org.apache.forrest.libre.yer.hierarchy.HierarchyConfig;
-import org.apache.forrest.libre.yer.hierarchy.EntryList;
+import org.apache.forrest.yer.hierarchy.Entry;
+import org.apache.forrest.yer.hierarchy.SimpleEntryList;
+import org.apache.forrest.yer.libre.LibreConfig;
+import org.apache.forrest.yer.libre.LibreConfigHelper;
+import org.apache.forrest.yer.hierarchy.AttributeReader;
+import org.apache.forrest.yer.hierarchy.Collection;
+import org.apache.forrest.yer.hierarchy.HierarchyConfig;
+import org.apache.forrest.yer.hierarchy.EntryList;
import org.apache.avalon.framework.component.ComponentManager;
import java.io.File;
@@ -73,8 +73,8 @@
import java.io.FileNotFoundException;
import java.io.FileInputStream;
-/** Class <code>org.apache.forrest.libre.yer.impl.fs.CollectionImpl</code> makes an
- * implementation of the <code>org.apache.forrest.libre.yer.hierarchy.Collection</code>
+/** Class <code>org.apache.forrest.yer.impl.fs.CollectionImpl</code> makes an
+ * implementation of the <code>org.apache.forrest.yer.hierarchy.Collection</code>
* interface that helps represent the hierarchy of a filesystem directory
* structure. As such the wrapped UserObject of this Entry is a java.io.File
* of which isDirectory() is true.
@@ -94,7 +94,7 @@
private LibreConfigHelper helper = null;
/**
- * @see org.apache.forrest.libre.yer.hierarchy.Entry
+ * @see org.apache.forrest.yer.hierarchy.Entry
* @return true to indicate that this Entry is in fact a collection that
* 'can' hold child Entries. Note that it can be the case that there are
* no actual children in this Collection. */
@@ -104,7 +104,7 @@
}
/**
- * @see org.apache.forrest.libre.yer.hierarchy.Collection
+ * @see org.apache.forrest.yer.hierarchy.Collection
* Creates and returns either an ItemImpl or CollectionImpl object that
* wraps the Child File object that reflects the Child File specified by
* the location of the wrapped directory of this CollectionImpl.
@@ -121,7 +121,7 @@
/**
- * @see org.apache.forrest.libre.yer.hierarchy.Collection
+ * @see org.apache.forrest.yer.hierarchy.Collection
* Creates and returns either an ItemImpl or CollectionImpl object that
* wraps the Child File object that reflects the Child File specified
* which should be a child of the wrapped directory of this CollectionImpl.
@@ -144,7 +144,7 @@
}
/**
- * @see org.apache.forrest.libre.yer.hierarchy.Collection
+ * @see org.apache.forrest.yer.hierarchy.Collection
* Creates and returns the List of ItemImpl and CollectionImpl objects
* that wrap the childFiles of the wrapped Directory of this CollectionImpl.
* @param cfg is the configuration object to fallback to for configuration
@@ -172,7 +172,7 @@
}
/**
- * @see org.apache.forrest.libre.yer.hierarchy.Entry
+ * @see org.apache.forrest.yer.hierarchy.Entry
*/
public EntryList getChildEntries()
{
@@ -180,7 +180,7 @@
}
/**
- * @see org.apache.forrest.libre.yer.hierarchy.Entry
+ * @see org.apache.forrest.yer.hierarchy.Entry
*/
public InputStream getUserXMLStream() throws IOException
{
@@ -190,7 +190,7 @@
}
/**
- * @see org.apache.forrest.libre.yer.hierarchy.Entry
+ * @see org.apache.forrest.yer.hierarchy.Entry
*/
public String[] getAvaliableAttributeNames()
{
1.3 +5 -5 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/impl/fs/FileEntryConstants.java
Index: FileEntryConstants.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/impl/fs/FileEntryConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileEntryConstants.java 5 Nov 2002 04:46:14 -0000 1.2
+++ FileEntryConstants.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,11 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.impl.fs;
+package org.apache.forrest.yer.impl.fs;
-/** Interface <code>org.apache.forrest.libre.yer.impl.fs.FileEntryConstants</code> holds
+/** Interface <code>org.apache.forrest.yer.impl.fs.FileEntryConstants</code> holds
* a number of Constants used inside the FileSystem oriented implmentation
- * of the org.apache.forrest.libre.yer.hierarchy package.
+ * of the org.apache.forrest.yer.hierarchy package.
*
* @author $Author$
* @version CVS $Id$
1.3 +8 -8 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/impl/fs/FileEntryFactory.java
Index: FileEntryFactory.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/impl/fs/FileEntryFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileEntryFactory.java 5 Nov 2002 04:46:14 -0000 1.2
+++ FileEntryFactory.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,11 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.impl.fs;
+package org.apache.forrest.yer.impl.fs;
-import org.apache.forrest.libre.yer.hierarchy.EntryFactory;
-import org.apache.forrest.libre.yer.hierarchy.Entry;
-import org.apache.forrest.libre.yer.libre.LibreConfigHelper;
+import org.apache.forrest.yer.hierarchy.EntryFactory;
+import org.apache.forrest.yer.hierarchy.Entry;
+import org.apache.forrest.yer.libre.LibreConfigHelper;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -67,7 +67,7 @@
import java.io.File;
-/** Class <code>org.apache.forrest.libre.yer.impl.fs.FileEntryFactory</code> makes a simple
+/** Class <code>org.apache.forrest.yer.impl.fs.FileEntryFactory</code> makes a simple
* implementation of the AbstractFactory for yer hierarchy factories.
*
* @author $Author$
@@ -76,7 +76,7 @@
public class FileEntryFactory extends EntryFactory
{
/**
- * @see org.apache.forrest.libre.yer.hierarchy.EntryFactory#getRootEntry
+ * @see org.apache.forrest.yer.hierarchy.EntryFactory#getRootEntry
*/
public Entry getRootEntry(final String pathIdentifier)
{
1.3 +13 -13 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/impl/fs/FileEntryImpl.java
Index: FileEntryImpl.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/impl/fs/FileEntryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileEntryImpl.java 5 Nov 2002 04:46:14 -0000 1.2
+++ FileEntryImpl.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,22 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.impl.fs;
+package org.apache.forrest.yer.impl.fs;
-import org.apache.forrest.libre.yer.hierarchy.Entry;
-import org.apache.forrest.libre.yer.hierarchy.SimpleEntryList;
-import org.apache.forrest.libre.yer.libre.LibreConfig;
-import org.apache.forrest.libre.yer.hierarchy.AttributeReader;
+import org.apache.forrest.yer.hierarchy.Entry;
+import org.apache.forrest.yer.hierarchy.SimpleEntryList;
+import org.apache.forrest.yer.libre.LibreConfig;
+import org.apache.forrest.yer.hierarchy.AttributeReader;
import java.io.*;
import java.util.HashMap;
import java.util.Properties;
-/** Class <code>org.apache.forrest.libre.yer.impl.fs.FileEntryImpl</code> is a base class
+/** Class <code>org.apache.forrest.yer.impl.fs.FileEntryImpl</code> is a base class
* for the ItemImpl and CollectionImpl classes that implement the
- * org.apache.forrest.libre.yer.hierarchy.* contracts for describing an underlaying
+ * org.apache.forrest.yer.hierarchy.* contracts for describing an underlaying
* file-system structure.
- * This implementation chooses to use the org.apache.forrest.libre.yer.libre configuration
+ * This implementation chooses to use the org.apache.forrest.yer.libre configuration
* mechanism to add some artificial yet semi-automatic sequence information
* to the file system.
*
@@ -130,7 +130,7 @@
return this.wrappedFile.getName();
}
/** For this implementation the userObject is the wrapped File Object.
- * @see org.apache.forrest.libre.yer.hierarchy.Entry
+ * @see org.apache.forrest.yer.hierarchy.Entry
*/
public Object getUserObject()
{
@@ -141,14 +141,14 @@
this.wrappedFile = f;
}
/**
- * @see org.apache.forrest.libre.yer.hierarchy.Entry#getParent()
+ * @see org.apache.forrest.yer.hierarchy.Entry#getParent()
*/
public Entry getParent()
{
return this.parent;
}
/**
- * @see org.apache.forrest.libre.yer.hierarchy.Entry
+ * @see org.apache.forrest.yer.hierarchy.Entry
*/
public void setParent(Entry parent)
{
1.3 +11 -11 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/impl/fs/ItemImpl.java
Index: ItemImpl.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/impl/fs/ItemImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ItemImpl.java 5 Nov 2002 04:46:14 -0000 1.2
+++ ItemImpl.java 5 Nov 2002 05:52:40 -0000 1.3
@@ -54,18 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.impl.fs;
+package org.apache.forrest.yer.impl.fs;
-import org.apache.forrest.libre.yer.hierarchy.Entry;
-import org.apache.forrest.libre.yer.hierarchy.SimpleEntryList;
-import org.apache.forrest.libre.yer.hierarchy.EntryList;
+import org.apache.forrest.yer.hierarchy.Entry;
+import org.apache.forrest.yer.hierarchy.SimpleEntryList;
+import org.apache.forrest.yer.hierarchy.EntryList;
import java.io.File;
import java.io.InputStream;
import java.io.IOException;
import java.io.FileInputStream;
-/** Class <code>org.apache.forrest.libre.yer.impl.fs.ItemImpl</code> represents a simple
+/** Class <code>org.apache.forrest.yer.impl.fs.ItemImpl</code> represents a simple
* FileEntryImpl that wraps a single file from a file system.
*
* @author $Author$
@@ -87,7 +87,7 @@
}
/**
- * @see org.apache.forrest.libre.yer.hierarchy.Entry#hasChildEntries
+ * @see org.apache.forrest.yer.hierarchy.Entry#hasChildEntries
* @return false to indicate that this is not a Collection of child Entries
*/
public boolean hasChildEntries()
@@ -96,7 +96,7 @@
}
/**
- * @see org.apache.forrest.libre.yer.hierarchy.Entry#getAvaliableAttributeNames
+ * @see org.apache.forrest.yer.hierarchy.Entry#getAvaliableAttributeNames
* @return the list of AtributeNames that are available for read on this
* EntryImpl
*/
@@ -106,7 +106,7 @@
}
/**
- * @see org.apache.forrest.libre.yer.hierarchy.Entry#getChildEntries
+ * @see org.apache.forrest.yer.hierarchy.Entry#getChildEntries
* @return null since this Impl doesn't have any children
*/
public EntryList getChildEntries()
@@ -115,7 +115,7 @@
}
/**
- * @see org.apache.forrest.libre.yer.hierarchy.Entry#getUserXMLStream
+ * @see org.apache.forrest.yer.hierarchy.Entry#getUserXMLStream
* @return the FileInputStream on the wrapped File userObject.
*/
public InputStream getUserXMLStream() throws IOException
1.3 +6 -6 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/EntryFilter.java
Index: EntryFilter.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/EntryFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EntryFilter.java 5 Nov 2002 04:46:14 -0000 1.2
+++ EntryFilter.java 5 Nov 2002 05:52:41 -0000 1.3
@@ -54,12 +54,12 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.libre;
+package org.apache.forrest.yer.libre;
-import org.apache.forrest.libre.yer.hierarchy.SimpleEntryList;
-import org.apache.forrest.libre.yer.hierarchy.EntryList;
+import org.apache.forrest.yer.hierarchy.SimpleEntryList;
+import org.apache.forrest.yer.hierarchy.EntryList;
-/** Interface <code>org.apache.forrest.libre.yer.libre.EntryFilter</code> ...
+/** Interface <code>org.apache.forrest.yer.libre.EntryFilter</code> ...
*
* @author $Author$
* @version CVS $Id$
1.3 +6 -6 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/EntrySorter.java
Index: EntrySorter.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/EntrySorter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EntrySorter.java 5 Nov 2002 04:46:14 -0000 1.2
+++ EntrySorter.java 5 Nov 2002 05:52:41 -0000 1.3
@@ -54,12 +54,12 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.libre;
+package org.apache.forrest.yer.libre;
-import org.apache.forrest.libre.yer.hierarchy.SimpleEntryList;
-import org.apache.forrest.libre.yer.hierarchy.EntryList;
+import org.apache.forrest.yer.hierarchy.SimpleEntryList;
+import org.apache.forrest.yer.hierarchy.EntryList;
-/** Interface <code>org.apache.forrest.libre.yer.libre.EntrySorter</code> ...
+/** Interface <code>org.apache.forrest.yer.libre.EntrySorter</code> ...
*
* @author $Author$
* @version CVS $Id$
1.3 +5 -5 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/LibreAttributeReader.java
Index: LibreAttributeReader.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/LibreAttributeReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LibreAttributeReader.java 5 Nov 2002 04:46:14 -0000 1.2
+++ LibreAttributeReader.java 5 Nov 2002 05:52:41 -0000 1.3
@@ -54,11 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.libre;
+package org.apache.forrest.yer.libre;
-import org.apache.forrest.libre.yer.hierarchy.AttributeReader;
+import org.apache.forrest.yer.hierarchy.AttributeReader;
-/** Interface <code>org.apache.forrest.libre.yer.libre.LibreAttributeReader</code> ...
+/** Interface <code>org.apache.forrest.yer.libre.LibreAttributeReader</code> ...
*
* @author $Author$
* @version CVS $Id$
1.3 +12 -12 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/LibreConfig.java
Index: LibreConfig.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/LibreConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LibreConfig.java 5 Nov 2002 04:46:14 -0000 1.2
+++ LibreConfig.java 5 Nov 2002 05:52:41 -0000 1.3
@@ -54,17 +54,17 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.libre;
+package org.apache.forrest.yer.libre;
import org.xml.sax.SAXException;
-import org.apache.forrest.libre.yer.hierarchy.SimpleEntryList;
-import org.apache.forrest.libre.yer.hierarchy.Entry;
-import org.apache.forrest.libre.yer.hierarchy.EntryVisitor;
-import org.apache.forrest.libre.yer.hierarchy.Collection;
-import org.apache.forrest.libre.yer.hierarchy.HierarchyConfig;
-import org.apache.forrest.libre.yer.hierarchy.AttributeReader;
-import org.apache.forrest.libre.yer.hierarchy.EntryList;
-import org.apache.forrest.libre.yer.hierarchy.SortingEntryList;
+import org.apache.forrest.yer.hierarchy.SimpleEntryList;
+import org.apache.forrest.yer.hierarchy.Entry;
+import org.apache.forrest.yer.hierarchy.EntryVisitor;
+import org.apache.forrest.yer.hierarchy.Collection;
+import org.apache.forrest.yer.hierarchy.HierarchyConfig;
+import org.apache.forrest.yer.hierarchy.AttributeReader;
+import org.apache.forrest.yer.hierarchy.EntryList;
+import org.apache.forrest.yer.hierarchy.SortingEntryList;
import java.io.InputStream;
import java.io.File;
@@ -78,7 +78,7 @@
import java.util.Comparator;
-/** Class <code>org.apache.forrest.libre.yer.libre.LibreConfig</code> holds the configuration
+/** Class <code>org.apache.forrest.yer.libre.LibreConfig</code> holds the configuration
* information that the libre system needs.
*
* @author $Author$
1.3 +5 -5 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/LibreConfigBuilder.java
Index: LibreConfigBuilder.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/LibreConfigBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LibreConfigBuilder.java 5 Nov 2002 04:46:14 -0000 1.2
+++ LibreConfigBuilder.java 5 Nov 2002 05:52:41 -0000 1.3
@@ -54,15 +54,15 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.libre;
+package org.apache.forrest.yer.libre;
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.SAXException;
import org.xml.sax.Attributes;
-import org.apache.forrest.libre.yer.hierarchy.HierarchyConfig;
+import org.apache.forrest.yer.hierarchy.HierarchyConfig;
-/** Class <code>org.apache.forrest.libre.yer.libre.LibreConfigBuilder</code> is a helper
+/** Class <code>org.apache.forrest.yer.libre.LibreConfigBuilder</code> is a helper
* that builds up a LibreConfig object from a stream of SAXEvents.
*
* It also provides a convenience constructor that will take a simple inputStream
1.4 +6 -6 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/LibreConfigHelper.java
Index: LibreConfigHelper.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/LibreConfigHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LibreConfigHelper.java 5 Nov 2002 04:46:14 -0000 1.3
+++ LibreConfigHelper.java 5 Nov 2002 05:52:41 -0000 1.4
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.libre;
+package org.apache.forrest.yer.libre;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.component.ComponentManager;
@@ -63,8 +63,8 @@
import org.apache.avalon.excalibur.xml.EntityResolver;
import org.apache.xml.resolver.tools.CatalogResolver;
//import org.apache.cocoon.components.resolver.Resolver;
-import org.apache.forrest.libre.yer.hierarchy.HierarchyConfig;
-import org.apache.forrest.libre.yer.hierarchy.Entry;
+import org.apache.forrest.yer.hierarchy.HierarchyConfig;
+import org.apache.forrest.yer.hierarchy.Entry;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -85,7 +85,7 @@
// hierarchy implementations that choose to use the libre package can
// provide a specific impl for this interface then!
-/** Class <code>org.apache.forrest.libre.yer.libre.LibreConfigHelper</code> ...
+/** Class <code>org.apache.forrest.yer.libre.LibreConfigHelper</code> ...
*
* @author $Author$
* @version CVS $Id$
1.3 +4 -4 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/LibreConstants.java
Index: LibreConstants.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/LibreConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LibreConstants.java 5 Nov 2002 04:46:14 -0000 1.2
+++ LibreConstants.java 5 Nov 2002 05:52:41 -0000 1.3
@@ -54,9 +54,9 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.libre;
+package org.apache.forrest.yer.libre;
-/** Interface <code>org.apache.forrest.libre.yer.libre.LibreConstants</code> holds
+/** Interface <code>org.apache.forrest.yer.libre.LibreConstants</code> holds
* constants for different element and attributenames of the libre.xml files.
*
* @author $Author$
1.3 +5 -5 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/PropertyAttributeReader.java
Index: PropertyAttributeReader.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/PropertyAttributeReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertyAttributeReader.java 5 Nov 2002 04:46:14 -0000 1.2
+++ PropertyAttributeReader.java 5 Nov 2002 05:52:41 -0000 1.3
@@ -54,9 +54,9 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.libre;
+package org.apache.forrest.yer.libre;
-import org.apache.forrest.libre.yer.hierarchy.Entry;
+import org.apache.forrest.yer.hierarchy.Entry;
import org.apache.oro.text.regex.PatternCompiler;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Pattern;
@@ -71,7 +71,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
-/** Class <code>org.apache.forrest.libre.yer.libre.PropertyAttributeReader</code> ...
+/** Class <code>org.apache.forrest.yer.libre.PropertyAttributeReader</code> ...
*
* @author $Author$
* @version CVS $Id$
1.3 +5 -5 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/XPathAttributeReader.java
Index: XPathAttributeReader.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/XPathAttributeReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathAttributeReader.java 5 Nov 2002 04:46:14 -0000 1.2
+++ XPathAttributeReader.java 5 Nov 2002 05:52:41 -0000 1.3
@@ -54,9 +54,9 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.libre;
+package org.apache.forrest.yer.libre;
-import org.apache.forrest.libre.yer.hierarchy.Entry;
+import org.apache.forrest.yer.hierarchy.Entry;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.DOMException;
@@ -71,7 +71,7 @@
import java.io.IOException;
-/** Class <code>org.apache.forrest.libre.yer.libre.XPathAttributeReader</code> ...
+/** Class <code>org.apache.forrest.yer.libre.XPathAttributeReader</code> ...
*
* [FIXME this babe needs serious Avalon enabling in the ]
* @author $Author$
1.3 +9 -9 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/use/cli/HierarchyDump.java
Index: HierarchyDump.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/use/cli/HierarchyDump.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HierarchyDump.java 5 Nov 2002 04:46:15 -0000 1.2
+++ HierarchyDump.java 5 Nov 2002 05:52:41 -0000 1.3
@@ -54,12 +54,12 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.use.cli;
+package org.apache.forrest.yer.use.cli;
-import org.apache.forrest.libre.yer.hierarchy.Entry;
-import org.apache.forrest.libre.yer.hierarchy.HierarchyReader;
-import org.apache.forrest.libre.yer.hierarchy.EntryFactory;
-import org.apache.forrest.libre.sax.SAXConvenience;
+import org.apache.forrest.yer.hierarchy.Entry;
+import org.apache.forrest.yer.hierarchy.HierarchyReader;
+import org.apache.forrest.yer.hierarchy.EntryFactory;
+import org.apache.forrest.sax.SAXConvenience;
import org.xml.sax.ContentHandler;
@@ -75,7 +75,7 @@
import java.io.PrintStream;
import java.io.FilterOutputStream;
-/** Class <code>org.apache.forrest.libre.yer.use.cli.HierarchyDump</code> ...
+/** Class <code>org.apache.forrest.yer.use.cli.HierarchyDump</code> ...
*
* @author $Author$
* @version CVS $Id$
@@ -98,7 +98,7 @@
public static void main(String[] args)
{
//FIXME: get these form CL or sysprops.
- String rootFactory = "org.apache.forrest.libre.yer.impl.fs.FileEntryFactory";
+ String rootFactory = "org.apache.forrest.yer.impl.fs.FileEntryFactory";
String rootLocation = "./src/documentation";
OutputStream sink = System.out;
if (args.length > 0) {
1.4 +8 -8 xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/use/cocoon/HierarchyGenerator.java
Index: HierarchyGenerator.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/use/cocoon/HierarchyGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HierarchyGenerator.java 5 Nov 2002 04:46:15 -0000 1.3
+++ HierarchyGenerator.java 5 Nov 2002 05:52:41 -0000 1.4
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-package org.apache.forrest.libre.yer.use.cocoon;
+package org.apache.forrest.yer.use.cocoon;
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.parameters.Parameters;
@@ -68,14 +68,14 @@
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceValidity;
import org.xml.sax.SAXException;
-import org.apache.forrest.libre.yer.hierarchy.EntryFactory;
-import org.apache.forrest.libre.yer.hierarchy.Entry;
-import org.apache.forrest.libre.yer.hierarchy.HierarchyReader;
+import org.apache.forrest.yer.hierarchy.EntryFactory;
+import org.apache.forrest.yer.hierarchy.Entry;
+import org.apache.forrest.yer.hierarchy.HierarchyReader;
import java.io.IOException;
import java.util.Map;
-/** Class <code>org.apache.forrest.libre.yer.use.cocoon.HierarchyGenerator</code> ...
+/** Class <code>org.apache.forrest.yer.use.cocoon.HierarchyGenerator</code> ...
*
* @author $Author$
* @version CVS $Id$
@@ -166,7 +166,7 @@
//START hack that needs to be replaced
//FIXME: get this through Avalon instead!
- String rootFactory = "org.apache.forrest.libre.yer.impl.fs.FileEntryFactory";
+ String rootFactory = "org.apache.forrest.yer.impl.fs.FileEntryFactory";
EntryFactory ef = EntryFactory.newInstance(rootFactory);
ef.compose(this.manager); // the container should of have done this then
//END hack that needs to be replaced by something like: