Author: berndf
Date: Tue Apr 15 00:14:24 2008
New Revision: 648134
URL: http://svn.apache.org/viewvc?rev=648134&view=rev
Log:
no need to inline xml entity configuration files if you make them available to
the XML configuration loader properly. simple but great patch by Zsombor
(spring.patch) [JAMES-803]
Modified:
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java
Modified:
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java?rev=648134&r1=648133&r2=648134&view=diff
==============================================================================
---
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java
(original)
+++
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java
Tue Apr 15 00:14:24 2008
@@ -53,7 +53,7 @@
Resource resource = applicationContext.getResource(configuration);
InputStream inputStream;
try {
- inputStream =
applicationContext.getResource(configuration).getInputStream();
+ inputStream = resource.getInputStream();
} catch (IOException e) {
throw new RuntimeException("could not locate configuration file "
+ configuration, e);
}
@@ -61,6 +61,7 @@
Configuration configuration;
try
{
+ inputSource.setSystemId(resource.getURL().toString());
configuration = ConfigurationBuilder.build(inputSource, null,
null);
}
catch( final Exception e )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
