You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemind.apache.org by kn...@apache.org on 2004/11/10 14:26:22 UTC
cvs commit: jakarta-hivemind/framework/src/test/org/apache/hivemind/impl TestVisibility.java
knut 2004/11/10 05:26:22
Modified: framework/src/test/hivemind/test/parse
TestDescriptorParser.java
framework/src/java/org/apache/hivemind/impl
RegistryBuilder.java
XmlModuleDescriptorProvider.java
framework/src/java/org/apache/hivemind/test
HiveMindTestCase.java
framework/src/java/org/apache/hivemind/parse
DescriptorParser.java
framework/src/test/hivemind/test FrameworkTestCase.java
SimpleModuleDescriptorProvider.java
framework/src/java/org/apache/hivemind/servlet
HiveMindFilter.java
framework/src/java/org/apache/hivemind/ant
ConstructRegistry.java RegistrySerializer.java
framework/src/test/org/apache/hivemind/impl
TestVisibility.java
Added: framework/src/java/org/apache/hivemind
ModuleDescriptorProvider.java
framework/src/java/org/apache/hivemind/parse
XmlResourceProcessor.java
Removed: framework/src/java/org/apache/hivemind/impl
ModuleDescriptorProvider.java
Log:
(in preparation for groovy support):
- moved ModuleDescriptorProvider into org.apache.hivemind
- refactored DescriptorParser into pure SAX content handler resulting in a wrapping XmlResourceProcessor
Revision Changes Path
1.26 +3 -3 jakarta-hivemind/framework/src/test/hivemind/test/parse/TestDescriptorParser.java
Index: TestDescriptorParser.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/parse/TestDescriptorParser.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TestDescriptorParser.java 25 Oct 2004 09:02:31 -0000 1.25
+++ TestDescriptorParser.java 10 Nov 2004 13:26:21 -0000 1.26
@@ -34,11 +34,11 @@
import org.apache.hivemind.parse.ContributionDescriptor;
import org.apache.hivemind.parse.CreateInstanceDescriptor;
import org.apache.hivemind.parse.DependencyDescriptor;
-import org.apache.hivemind.parse.DescriptorParser;
import org.apache.hivemind.parse.ImplementationDescriptor;
import org.apache.hivemind.parse.InterceptorDescriptor;
import org.apache.hivemind.parse.ModuleDescriptor;
import org.apache.hivemind.parse.ServicePointDescriptor;
+import org.apache.hivemind.parse.XmlResourceProcessor;
import org.apache.hivemind.schema.AttributeModel;
import org.apache.hivemind.schema.ElementModel;
import org.apache.hivemind.schema.Schema;
@@ -544,9 +544,9 @@
RegistryAssemblyImpl assembly = new RegistryAssemblyImpl(eh);
- DescriptorParser p = new DescriptorParser(eh, assembly);
+ XmlResourceProcessor p = new XmlResourceProcessor(_resolver, eh, assembly);
- p.parse(location, _resolver);
+ p.processResource(location);
SchemaImpl s = (SchemaImpl) assembly.getSchema("hivemind.test.parse.PrivateSchema");
1.25 +1 -0 jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java
Index: RegistryBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- RegistryBuilder.java 28 Sep 2004 10:24:02 -0000 1.24
+++ RegistryBuilder.java 10 Nov 2004 13:26:21 -0000 1.25
@@ -24,6 +24,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.ErrorHandler;
+import org.apache.hivemind.ModuleDescriptorProvider;
import org.apache.hivemind.Registry;
import org.apache.hivemind.internal.ConfigurationPoint;
import org.apache.hivemind.internal.Contribution;
1.4 +45 -37 jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProvider.java
Index: XmlModuleDescriptorProvider.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XmlModuleDescriptorProvider.java 14 Oct 2004 14:31:32 -0000 1.3
+++ XmlModuleDescriptorProvider.java 10 Nov 2004 13:26:21 -0000 1.4
@@ -31,10 +31,11 @@
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.ErrorHandler;
import org.apache.hivemind.HiveMind;
+import org.apache.hivemind.ModuleDescriptorProvider;
import org.apache.hivemind.Resource;
-import org.apache.hivemind.parse.DescriptorParser;
import org.apache.hivemind.parse.ModuleDescriptor;
import org.apache.hivemind.parse.SubModuleDescriptor;
+import org.apache.hivemind.parse.XmlResourceProcessor;
import org.apache.hivemind.util.URLResource;
/**
@@ -58,11 +59,6 @@
public static final String HIVE_MODULE_XML = "META-INF/hivemodule.xml";
/**
- * Parser instance used by all parsing of module descriptors.
- */
- private DescriptorParser _parser;
-
- /**
* Set of all specified resources processed by this ModuleDescriptorProvider. Descriptors of
* sub-modules are not included.
*/
@@ -76,6 +72,15 @@
private ClassResolver _resolver;
+ private ErrorHandler _errorHandler;
+
+ private RegistryAssembly _assembly;
+
+ /**
+ * Parser instance used by all parsing of module descriptors.
+ */
+ private XmlResourceProcessor _processor;
+
/**
* Convenience constructor. Equivalent to using
* {@link #XmlModuleDescriptorProvider(ClassResolver, String)}with {@link #HIVE_MODULE_XML}as
@@ -118,17 +123,6 @@
_resources.addAll(resources);
}
- public List getModuleDescriptors(ErrorHandler handler, RegistryAssembly assembly)
- {
- for (Iterator i = _resources.iterator(); i.hasNext();)
- {
- Resource resource = (Resource) i.next();
- processModule(resource, handler, assembly);
- }
-
- return new ArrayList(_moduleDescriptors.values());
- }
-
private List getDescriptorResources(String resourcePath, ClassResolver resolver)
{
if (LOG.isDebugEnabled())
@@ -159,43 +153,54 @@
return descriptors;
}
- private void processModule(Resource moduleDescriptorResource, ErrorHandler handler,
- RegistryAssembly assembly)
+ public List getModuleDescriptors(ErrorHandler handler, RegistryAssembly assembly)
{
- if (_parser == null)
- _parser = new DescriptorParser(handler, assembly);
+ _errorHandler = handler;
+ _assembly = assembly;
+ _processor = new XmlResourceProcessor(_resolver, handler, assembly);
+
+ for (Iterator i = _resources.iterator(); i.hasNext();)
+ {
+ Resource resource = (Resource) i.next();
+
+ processResource(resource);
+ }
+
+ _processor = null;
+
+ _assembly = null;
+ _errorHandler = null;
+
+ return new ArrayList(_moduleDescriptors.values());
+ }
+
+ private void processResource(Resource resource)
+ {
try
{
- ModuleDescriptor md = _parser.parse(moduleDescriptorResource, _resolver);
+ ModuleDescriptor md = _processor.processResource(resource);
String moduleId = md.getModuleId();
ModuleDescriptor existing = (ModuleDescriptor) _moduleDescriptors.get(moduleId);
if (existing != null)
- handler.error(LOG, ImplMessages.duplicateModuleId(
- moduleId,
- existing.getLocation(),
- md.getLocation()), null, null);
+ _errorHandler.error(LOG, ImplMessages.duplicateModuleId(moduleId, existing
+ .getLocation(), md.getLocation()), null, null);
else
_moduleDescriptors.put(moduleId, md);
// After parsing a module, parse any additional modules identified
// within the module (using the <sub-module> element) recursively.
- processSubModules(md, handler, assembly);
+ processSubModules(md);
}
catch (RuntimeException ex)
{
- // An exception may leave the parser in an unknown state, so
- // give up on that instance and start with a fresh one.
- _parser = null;
-
- handler.error(LOG, ex.getMessage(), HiveMind.getLocation(ex), ex);
+ _errorHandler.error(LOG, ex.getMessage(), HiveMind.getLocation(ex), ex);
}
}
- private void processSubModules(ModuleDescriptor moduleDescriptor, ErrorHandler handler,
- RegistryAssembly assembly)
+ private void processSubModules(ModuleDescriptor moduleDescriptor)
{
List subModules = moduleDescriptor.getSubModules();
@@ -210,12 +215,15 @@
if (descriptorResource.getResourceURL() == null)
{
- handler.error(LOG, ImplMessages.subModuleDoesNotExist(descriptorResource), smd
- .getLocation(), null);
+ _errorHandler.error(
+ LOG,
+ ImplMessages.subModuleDoesNotExist(descriptorResource),
+ smd.getLocation(),
+ null);
continue;
}
- processModule(smd.getDescriptor(), handler, assembly);
+ processResource(smd.getDescriptor());
}
}
1.1 jakarta-hivemind/framework/src/java/org/apache/hivemind/ModuleDescriptorProvider.java
Index: ModuleDescriptorProvider.java
===================================================================
// Copyright 2004 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package org.apache.hivemind;
import java.util.List;
import org.apache.hivemind.impl.RegistryAssembly;
import org.apache.hivemind.impl.RegistryBuilder;
import org.apache.hivemind.impl.XmlModuleDescriptorProvider;
/**
* ModuleDescriptorProviders are used by the {@link RegistryBuilder}(see
* {@link RegistryBuilder#addModuleDescriptorProvider(ModuleDescriptorProvider)}) to load the
* {@link org.apache.hivemind.parse.ModuleDescriptor}objects describing the Modules which will be
* exposed by the Registry.
* <p>
* HiveMind's default ModuleDescriptorProvider is the {@link XmlModuleDescriptorProvider}, which
* can load module descriptors from XML files or resources on the classpath.
*
* @author Knut Wannheden
* @since 1.1
*/
public interface ModuleDescriptorProvider
{
/**
* Returns a List of {@link org.apache.hivemind.parse.ModuleDescriptor module descriptors}. Any
* referenced submodules must also be included in this List.
*/
public List getModuleDescriptors(ErrorHandler handler, RegistryAssembly assembly);
}
1.18 +2 -2 jakarta-hivemind/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java
Index: HiveMindTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- HiveMindTestCase.java 5 Oct 2004 17:45:25 -0000 1.17
+++ HiveMindTestCase.java 10 Nov 2004 13:26:21 -0000 1.18
@@ -26,11 +26,11 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.Location;
+import org.apache.hivemind.ModuleDescriptorProvider;
import org.apache.hivemind.Registry;
import org.apache.hivemind.Resource;
import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.impl.LocationImpl;
-import org.apache.hivemind.impl.ModuleDescriptorProvider;
import org.apache.hivemind.impl.RegistryBuilder;
import org.apache.hivemind.impl.XmlModuleDescriptorProvider;
import org.apache.hivemind.util.ClasspathResource;
@@ -370,7 +370,7 @@
/**
* Builds a registry, containing only the modules delivered by the specified
- * {@link org.apache.hivemind.impl.ModuleDescriptorProvider}, plus the master module descriptor
+ * {@link org.apache.hivemind.ModuleDescriptorProvider}, plus the master module descriptor
* (i.e., those visible on the classpath).
*/
protected Registry buildFrameworkRegistry(ModuleDescriptorProvider customProvider)
1.40 +23 -79 jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/DescriptorParser.java
Index: DescriptorParser.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/DescriptorParser.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- DescriptorParser.java 25 Oct 2004 09:02:31 -0000 1.39
+++ DescriptorParser.java 10 Nov 2004 13:26:21 -0000 1.40
@@ -17,18 +17,12 @@
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hivemind.ApplicationRuntimeException;
@@ -60,8 +54,6 @@
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
/**
* Used to parse HiveMind module deployment descriptors.
@@ -161,8 +153,6 @@
private ModuleDescriptor _moduleDescriptor;
- private SAXParser _parser;
-
private ErrorHandler _errorHandler;
/**
@@ -170,6 +160,7 @@
*/
private RegistryAssembly _registryAssembly;
+
private ClassResolver _resolver;
private Perl5Compiler _compiler;
@@ -680,11 +671,11 @@
break;
default:
-
+
String content = peekContent();
- if (content != null && (peekObject() instanceof AnnotationHolder))
- ((AnnotationHolder) peekObject()).setAnnotation(content);
+ if (content != null && (peekObject() instanceof AnnotationHolder))
+ ((AnnotationHolder) peekObject()).setAnnotation(content);
break;
}
@@ -1280,15 +1271,6 @@
}
}
- private SAXParser getSAXParser() throws ParserConfigurationException, SAXException,
- FactoryConfigurationError
- {
- if (_parser == null)
- _parser = SAXParserFactory.newInstance().newSAXParser();
-
- return _parser;
- }
-
private void initializeFromProperties(Properties p)
{
Enumeration e = p.propertyNames();
@@ -1407,73 +1389,35 @@
r.run();
}
- /**
- * Enters a new state, pushing an object onto the stack. If the object implements
- * {@link ILocationHolder}then its location property is set to the current location.
- */
- public ModuleDescriptor parse(Resource resource, ClassResolver resolver)
+ private String qualify(String id)
{
- try
- {
- if (LOG.isDebugEnabled())
- LOG.debug("Parsing " + resource);
-
- initializeParser(resource, STATE_START);
-
- _resolver = resolver;
-
- parseXML(resource);
-
- if (LOG.isDebugEnabled())
- LOG.debug("Result: " + _moduleDescriptor);
-
- return _moduleDescriptor;
- }
- catch (Exception ex)
- {
- throw new ApplicationRuntimeException(ParseMessages
- .errorReadingDescriptor(resource, ex), resource, getLocation(), ex);
- }
- finally
- {
- resetParser();
+ if (id.indexOf('.') >= 0)
+ return id;
- _moduleDescriptor = null;
- _attributes.clear();
- _resolver = null;
- }
+ return _moduleDescriptor.getModuleId() + "." + id;
}
- /**
- * Parses a document in the original format: unvalidated XML (with no document type).
- */
- private void parseXML(Resource resource) throws Exception
+ /** @since 1.1 */
+ public void initialize(Resource resource, ClassResolver resolver)
{
- URL url = resource.getResourceURL();
-
- if (url == null)
- throw new ApplicationRuntimeException(ParseMessages.missingResource(resource),
- resource, null, null);
-
- InputSource source = new InputSource(url.toExternalForm());
+ initializeParser(resource, STATE_START);
- try
- {
- getSAXParser().parse(source, this);
- }
- catch (Exception ex)
- {
- _parser = null;
+ _resolver = resolver;
+ }
- throw ex;
- }
+ /** @since 1.1 */
+ public ModuleDescriptor getModuleDescriptor()
+ {
+ return _moduleDescriptor;
}
- private String qualify(String id)
+ /** @since 1.1 */
+ public void reset()
{
- if (id.indexOf('.') >= 0)
- return id;
+ super.resetParser();
- return _moduleDescriptor.getModuleId() + "." + id;
+ _moduleDescriptor = null;
+ _attributes.clear();
+ _resolver = null;
}
}
1.1 jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/XmlResourceProcessor.java
Index: XmlResourceProcessor.java
===================================================================
//Copyright 2004 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package org.apache.hivemind.parse;
import java.net.URL;
import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.ErrorHandler;
import org.apache.hivemind.Resource;
import org.apache.hivemind.impl.RegistryAssembly;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/**
* The XmlResourceProcessor processes XML {@link Resource resources}using the
* {@link DescriptorParser}which is used as a SAX ContentHandler. The result of
* {@link #processResource(Resource) processing a resource}is a {@link ModuleDescriptor}.
*
* @see org.apache.hivemind.parse.DescriptorParser
* @see org.apache.hivemind.ModuleDescriptorProvider
* @since 1.1
* @author Knut Wannheden
*/
public class XmlResourceProcessor
{
private static final Log LOG = LogFactory.getLog(XmlResourceProcessor.class);
private ErrorHandler _errorHandler;
private RegistryAssembly _assembly;
private DescriptorParser _contentHandler;
private ClassResolver _resolver;
private SAXParser _saxParser;
public XmlResourceProcessor(ClassResolver resolver, ErrorHandler errorHandler,
RegistryAssembly assembly)
{
_resolver = resolver;
_errorHandler = errorHandler;
_assembly = assembly;
}
public ModuleDescriptor processResource(Resource resource)
{
if (_contentHandler == null)
_contentHandler = new DescriptorParser(_errorHandler, _assembly);
_contentHandler.initialize(resource, _resolver);
URL url = resource.getResourceURL();
if (url == null)
throw new ApplicationRuntimeException(ParseMessages.missingResource(resource),
resource, null, null);
try
{
InputSource source = new InputSource(url.openStream());
if (LOG.isDebugEnabled())
LOG.debug("Parsing " + resource);
getSAXParser().parse(source, _contentHandler);
ModuleDescriptor descriptor = _contentHandler.getModuleDescriptor();
if (LOG.isDebugEnabled())
LOG.debug("Result: " + descriptor);
return descriptor;
}
catch (Exception e)
{
_saxParser = null;
throw new ApplicationRuntimeException(
ParseMessages.errorReadingDescriptor(resource, e), resource, _contentHandler
.getLocation(), e);
}
finally
{
_contentHandler.resetParser();
}
}
private SAXParser getSAXParser() throws ParserConfigurationException, SAXException,
FactoryConfigurationError
{
if (_saxParser == null)
_saxParser = SAXParserFactory.newInstance().newSAXParser();
return _saxParser;
}
}
1.16 +3 -3 jakarta-hivemind/framework/src/test/hivemind/test/FrameworkTestCase.java
Index: FrameworkTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/FrameworkTestCase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FrameworkTestCase.java 14 Oct 2004 14:31:34 -0000 1.15
+++ FrameworkTestCase.java 10 Nov 2004 13:26:22 -0000 1.16
@@ -21,9 +21,9 @@
import org.apache.hivemind.impl.RegistryAssemblyImpl;
import org.apache.hivemind.parse.ConfigurationPointDescriptor;
import org.apache.hivemind.parse.DependencyDescriptor;
-import org.apache.hivemind.parse.DescriptorParser;
import org.apache.hivemind.parse.ModuleDescriptor;
import org.apache.hivemind.parse.ServicePointDescriptor;
+import org.apache.hivemind.parse.XmlResourceProcessor;
import org.apache.hivemind.test.HiveMindTestCase;
/**
@@ -49,9 +49,9 @@
RegistryAssemblyImpl assembly = new RegistryAssemblyImpl(eh);
- DescriptorParser p = new DescriptorParser(eh, assembly);
+ XmlResourceProcessor p = new XmlResourceProcessor(_resolver, eh, assembly);
- ModuleDescriptor result = p.parse(location, _resolver);
+ ModuleDescriptor result = p.processResource(location);
assembly.performPostProcessing();
1.2 +2 -2 jakarta-hivemind/framework/src/test/hivemind/test/SimpleModuleDescriptorProvider.java
Index: SimpleModuleDescriptorProvider.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/SimpleModuleDescriptorProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleModuleDescriptorProvider.java 27 Sep 2004 15:50:47 -0000 1.1
+++ SimpleModuleDescriptorProvider.java 10 Nov 2004 13:26:22 -0000 1.2
@@ -20,12 +20,12 @@
import java.util.Set;
import org.apache.hivemind.ErrorHandler;
-import org.apache.hivemind.impl.ModuleDescriptorProvider;
+import org.apache.hivemind.ModuleDescriptorProvider;
import org.apache.hivemind.impl.RegistryAssembly;
import org.apache.hivemind.parse.ModuleDescriptor;
/**
- * An implementation of the {@link org.apache.hivemind.impl.ModuleDescriptorProvider}
+ * An implementation of the {@link org.apache.hivemind.ModuleDescriptorProvider}
* interface convenient for testing purposes. This provider simply provides
* ModuleDescriptors registered with it beforehand.
*
1.14 +1 -1 jakarta-hivemind/framework/src/java/org/apache/hivemind/servlet/HiveMindFilter.java
Index: HiveMindFilter.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/servlet/HiveMindFilter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- HiveMindFilter.java 28 Sep 2004 10:24:02 -0000 1.13
+++ HiveMindFilter.java 10 Nov 2004 13:26:22 -0000 1.14
@@ -28,9 +28,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hivemind.ClassResolver;
+import org.apache.hivemind.ModuleDescriptorProvider;
import org.apache.hivemind.Registry;
import org.apache.hivemind.impl.DefaultClassResolver;
-import org.apache.hivemind.impl.ModuleDescriptorProvider;
import org.apache.hivemind.impl.RegistryBuilder;
import org.apache.hivemind.impl.XmlModuleDescriptorProvider;
1.17 +1 -1 jakarta-hivemind/framework/src/java/org/apache/hivemind/ant/ConstructRegistry.java
Index: ConstructRegistry.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/ant/ConstructRegistry.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ConstructRegistry.java 14 Oct 2004 15:37:18 -0000 1.16
+++ ConstructRegistry.java 10 Nov 2004 13:26:22 -0000 1.17
@@ -23,9 +23,9 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.hivemind.ModuleDescriptorProvider;
import org.apache.hivemind.Resource;
import org.apache.hivemind.impl.DefaultClassResolver;
-import org.apache.hivemind.impl.ModuleDescriptorProvider;
import org.apache.hivemind.impl.XmlModuleDescriptorProvider;
import org.apache.hivemind.util.FileResource;
import org.apache.hivemind.util.URLResource;
1.4 +1 -1 jakarta-hivemind/framework/src/java/org/apache/hivemind/ant/RegistrySerializer.java
Index: RegistrySerializer.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/ant/RegistrySerializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RegistrySerializer.java 4 Nov 2004 14:32:33 -0000 1.3
+++ RegistrySerializer.java 10 Nov 2004 13:26:22 -0000 1.4
@@ -28,10 +28,10 @@
import org.apache.hivemind.Attribute;
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.ErrorHandler;
+import org.apache.hivemind.ModuleDescriptorProvider;
import org.apache.hivemind.Occurances;
import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.impl.DefaultErrorHandler;
-import org.apache.hivemind.impl.ModuleDescriptorProvider;
import org.apache.hivemind.impl.RegistryAssembly;
import org.apache.hivemind.impl.RegistryAssemblyImpl;
import org.apache.hivemind.impl.XmlModuleDescriptorProvider;
1.4 +6 -6 jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestVisibility.java
Index: TestVisibility.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestVisibility.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestVisibility.java 5 Oct 2004 17:45:25 -0000 1.3
+++ TestVisibility.java 10 Nov 2004 13:26:22 -0000 1.4
@@ -26,10 +26,10 @@
import org.apache.hivemind.internal.ServicePoint;
import org.apache.hivemind.internal.Visibility;
import org.apache.hivemind.parse.ContributionDescriptor;
-import org.apache.hivemind.parse.DescriptorParser;
import org.apache.hivemind.parse.ImplementationDescriptor;
import org.apache.hivemind.parse.InterceptorDescriptor;
import org.apache.hivemind.parse.ModuleDescriptor;
+import org.apache.hivemind.parse.XmlResourceProcessor;
import org.apache.hivemind.service.ObjectProvider;
import org.apache.hivemind.test.HiveMindTestCase;
import org.easymock.MockControl;
@@ -284,18 +284,18 @@
RegistryAssemblyImpl assembly = new RegistryAssemblyImpl(errorHandler);
- DescriptorParser parser = new DescriptorParser(errorHandler, assembly);
+ ClassResolver resolver = new DefaultClassResolver();
+
+ XmlResourceProcessor parser = new XmlResourceProcessor(resolver, errorHandler, assembly);
RegistryInfrastructureConstructor cons = new RegistryInfrastructureConstructor(
errorHandler, LOG, assembly);
- ClassResolver resolver = new DefaultClassResolver();
-
- ModuleDescriptor md = parser.parse(getResource("Privates.xml"), resolver);
+ ModuleDescriptor md = parser.processResource(getResource("Privates.xml"));
cons.addModuleDescriptor(md);
- md = parser.parse(getResource("ContributePrivate.xml"), resolver);
+ md = parser.processResource(getResource("ContributePrivate.xml"));
ContributionDescriptor cd = (ContributionDescriptor) md.getContributions().get(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org