Fortress modifications (Will apply by hand since it has moved):
Index: fortress/container/project.xml
===================================================================
RCS file: /home/cvspublic/avalon/fortress/container/Attic/project.xml,v
retrieving revision 1.9
diff -u -r1.9 project.xml
--- fortress/container/project.xml 13 Sep 2003 10:35:47 -0000 1.9
+++ fortress/container/project.xml 1 Apr 2004 18:43:29 -0000
@@ -18,9 +18,14 @@
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>20030616</version>
- <groupId>framework</groupId>
+ <id>avalon-framework-api</id>
+ <version>4.1.5</version>
+ <groupId>avalon-framework</groupId>
+ </dependency>
+ <dependency>
+ <id>avalon-framework-impl</id>
+ <version>4.1.5</version>
+ <groupId>avalon-framework</groupId>
</dependency>
<dependency>
<id>logkit</id>
@@ -88,9 +93,9 @@
</dependency>
<dependency>
- <id>avalon-fortress-tools</id>
- <version>1.1-dev</version>
- <groupId>avalon-fortress</groupId>
+ <id>excalibur-fortress-tools</id>
+ <version>1.0</version>
+ <groupId>excalibur-fortress</groupId>
</dependency>
<!-- dependencies for tools -->
Index:
fortress/container/src/impl/org/apache/avalon/fortress/util/ContextManager.j
ava
===================================================================
RCS file:
/home/cvspublic/avalon/fortress/container/src/impl/org/apache/avalon/fortres
s/util/Attic/ContextManager.java,v
retrieving revision 1.49
diff -u -r1.49 ContextManager.java
---
fortress/container/src/impl/org/apache/avalon/fortress/util/ContextManager.j
ava 16 Sep 2003 14:44:43 -0000 1.49
+++
fortress/container/src/impl/org/apache/avalon/fortress/util/ContextManager.j
ava 1 Apr 2004 18:43:42 -0000
@@ -89,7 +89,11 @@
import org.apache.excalibur.source.impl.ResourceSourceFactory;
import org.apache.excalibur.source.impl.SourceResolverImpl;
import org.apache.excalibur.source.impl.URLSourceFactory;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -798,6 +802,7 @@
if ( configBuilder == null )
{
configBuilder = new DefaultConfigurationBuilder();
+ configBuilder.setEntityResolver( new
FortressEntityResolver() );
}
return configBuilder.build( src.getInputStream(), src.getURI()
);
+ }
+
+ /**
+ * FortressEntityResolver relies on SourceResolve
+ * to obtain external entities declared on xml files.
+ */
+ private final class FortressEntityResolver implements EntityResolver
+ {
+ public InputSource resolveEntity(String publicId, String systemId)
throws SAXException, IOException
+ {
+ Source source = m_defaultSourceResolver.resolveURI( systemId );
+ return new InputSource( source.getInputStream() );
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
