remm 2003/10/24 04:57:27
Modified: catalina/src/share/org/apache/catalina/core
StandardDefaultContext.java
Log:
- Add support for resource links to StdDefContext.
Revision Changes Path
1.8 +16 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StandardDefaultContext.java 21 Oct 2003 00:18:25 -0000 1.7
+++ StandardDefaultContext.java 24 Oct 2003 11:57:27 -0000 1.8
@@ -1373,6 +1373,14 @@
}
listener.addResource(contextEntry);
}
+ ContextResourceLink [] resourceLinks = findResourceLinks();
+ for (int i = 0; i < resourceLinks.length; i++) {
+ ContextResourceLink contextEntry = resourceLinks[i];
+ if (contextResources.exists(contextEntry.getName())) {
+ listener.removeResourceLink(contextEntry.getName());
+ }
+ listener.addResourceLink(contextEntry);
+ }
String [] envRefs = findResourceEnvRefs();
for (int i = 0; i < envRefs.length; i++) {
if (contextResources.exists(envRefs[i])) {
@@ -1498,6 +1506,10 @@
ContextResource [] resources = findResources();
for( int i = 0; i < resources.length; i++ ) {
context.addResource(resources[i]);
+ }
+ ContextResourceLink [] resourceLinks = findResourceLinks();
+ for( int i = 0; i < resourceLinks.length; i++ ) {
+ context.addResourceLink(resourceLinks[i]);
}
String [] envRefs = findResourceEnvRefs();
for( int i = 0; i < envRefs.length; i++ ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
