luetzkendorf 2005/02/02 09:17:40 Modified: src/webdav/server/org/apache/slide/webdav/util/resourcekind ResourceKindConfigurator.java ResourceKindManager.java Log: configurator now accepts referenes to resource too Revision Changes Path 1.2 +21 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/ResourceKindConfigurator.java Index: ResourceKindConfigurator.java =================================================================== RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/ResourceKindConfigurator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ResourceKindConfigurator.java 10 Jan 2005 18:21:05 -0000 1.1 +++ ResourceKindConfigurator.java 2 Feb 2005 17:17:40 -0000 1.2 @@ -22,13 +22,23 @@ */ package org.apache.slide.webdav.util.resourcekind; +import java.io.IOException; +import java.io.InputStream; import java.util.Enumeration; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + import org.apache.slide.event.DomainEvent; import org.apache.slide.event.DomainListener; import org.apache.slide.util.conf.Configurable; import org.apache.slide.util.conf.Configuration; +import org.apache.slide.util.conf.ConfigurationElement; import org.apache.slide.util.conf.ConfigurationException; +import org.apache.slide.util.conf.Populate; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; /** @@ -74,8 +84,14 @@ public void initialized(DomainEvent event) { if (config != null) { - Enumeration e = config.getConfigurations("resource-kind"); - for (; e.hasMoreElements();) { + for(Enumeration e = config.getConfigurations("definition");e.hasMoreElements();) { + Configuration c = (Configuration)e.nextElement(); + + String resource = c.getAttribute("resource", null); + ResourceKindManager.initFromResource(resource); + } + + for (Enumeration e = config.getConfigurations("resource-kind"); e.hasMoreElements();) { ResourceKindManager.initResourceKind( (Configuration)e.nextElement()); } 1.8 +13 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/ResourceKindManager.java Index: ResourceKindManager.java =================================================================== RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/ResourceKindManager.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ResourceKindManager.java 2 Feb 2005 11:35:11 -0000 1.7 +++ ResourceKindManager.java 2 Feb 2005 17:17:40 -0000 1.8 @@ -23,6 +23,7 @@ package org.apache.slide.webdav.util.resourcekind; import java.io.IOException; +import java.io.InputStream; import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; @@ -176,6 +177,14 @@ } static void initFromDefaultConfig() { + initFromResource("/org/apache/slide/webdav/util/resourcekind/resource_kinds.xml"); + } + + static void initFromResource(String resourceName) { + initFromStream(ResourceKindManager.class.getResourceAsStream(resourceName)); + } + + static void initFromStream(InputStream inputStream) { SAXParserFactory factory = SAXParserFactory.newInstance(); factory.setNamespaceAware(false); factory.setValidating(false); @@ -184,8 +193,7 @@ Populate pop = new Populate(); Configuration configuration = new ConfigurationElement(pop.load( - new InputSource(ResourceKindManager.class.getResource("/org/apache/slide/webdav/util/resourcekind/resource_kinds.xml").toString()), - parser.getXMLReader())); + new InputSource(inputStream), parser.getXMLReader())); for (Enumeration e = configuration.getConfigurations("resource-kind"); e.hasMoreElements();) { initResourceKind((Configuration)e.nextElement());
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]