Index: applications/struts-demo/src/java/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed-2/applications/struts-demo/src/java/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java,v retrieving revision 1.1 diff -u -r1.1 MemoryUserDatabase.java --- applications/struts-demo/src/java/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java 29 Jul 2004 22:23:04 -0000 1.1 +++ applications/struts-demo/src/java/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java 31 May 2005 09:38:07 -0000 @@ -161,6 +161,7 @@ // Construct a digester to use for parsing Digester digester = new Digester(); + digester.setUseContextClassLoader(true); digester.push(this); digester.setValidating(false); digester.addFactoryCreate Index: portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java,v retrieving revision 1.21 diff -u -r1.21 PortletApplicationManager.java --- portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java 9 Apr 2005 00:24:44 -0000 1.21 +++ portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java 31 May 2005 09:38:10 -0000 @@ -218,7 +218,7 @@ // load the web.xml log.info("Loading web.xml...." + paName); - MutableWebApplication wa = paWar.createWebApp(); + MutableWebApplication wa = paWar.createWebApp(paClassLoader); paWar.validate(); if (local) Index: portal/src/java/org/apache/jetspeed/util/descriptor/ExtendedPortletMetadata.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/ExtendedPortletMetadata.java,v retrieving revision 1.3 diff -u -r1.3 ExtendedPortletMetadata.java --- portal/src/java/org/apache/jetspeed/util/descriptor/ExtendedPortletMetadata.java 31 Jul 2004 20:05:27 -0000 1.3 +++ portal/src/java/org/apache/jetspeed/util/descriptor/ExtendedPortletMetadata.java 31 May 2005 09:38:10 -0000 @@ -58,12 +58,13 @@ * Performs the actual loading and mapping of the metadata into the PortletApplicationDefinition. * */ - public void load() throws MetaDataException + public void load(ClassLoader classLoader) throws MetaDataException { boolean result = false; try { Digester digester = new Digester(); + digester.setClassLoader (classLoader); digester.setValidating(false); digester.setNamespaceAware(true); digester.push(portletApp); Index: portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java,v retrieving revision 1.6 diff -u -r1.6 PortletApplicationDescriptor.java --- portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java 9 Apr 2005 17:57:39 -0000 1.6 +++ portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java 31 May 2005 09:38:10 -0000 @@ -86,6 +86,7 @@ // TODO move config to digester-rules.xml. Example: http://www.onjava.com/pub/a/onjava/2002/10/23/digester.html?page=3 Digester digester = new Digester(); digester.setValidating(false); + digester.setClassLoader(classLoader); // digester.addRuleSet(new PortletApplicationRuleSet(appName)); Index: portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java,v retrieving revision 1.23 diff -u -r1.23 PortletApplicationWar.java --- portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java 9 Apr 2005 17:57:39 -0000 1.23 +++ portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java 31 May 2005 09:38:10 -0000 @@ -167,14 +167,15 @@ * @throws IOException * @see org.apache.jetspeed.util.descriptor.WebApplicationDescriptor */ - public MutableWebApplication createWebApp() throws PortletApplicationException, IOException + public MutableWebApplication createWebApp(ClassLoader classLoader) + throws PortletApplicationException, IOException { Reader webXmlReader = getReader(WEB_XML_PATH); try { WebApplicationDescriptor webAppDescriptor = new WebApplicationDescriptor(webXmlReader, webAppContextRoot); - webApp = webAppDescriptor.createWebApplication(); + webApp = webAppDescriptor.createWebApplication(classLoader); return webApp; } @@ -224,7 +225,7 @@ if (extMetaDataXml != null) { ExtendedPortletMetadata extMetaData = new ExtendedPortletMetadata(extMetaDataXml, portletApp); - extMetaData.load(); + extMetaData.load(classLoader); } } catch (IOException e) Index: portal/src/java/org/apache/jetspeed/util/descriptor/WebApplicationDescriptor.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/WebApplicationDescriptor.java,v retrieving revision 1.3 diff -u -r1.3 WebApplicationDescriptor.java --- portal/src/java/org/apache/jetspeed/util/descriptor/WebApplicationDescriptor.java 8 Nov 2004 03:23:37 -0000 1.3 +++ portal/src/java/org/apache/jetspeed/util/descriptor/WebApplicationDescriptor.java 31 May 2005 09:38:10 -0000 @@ -60,7 +60,8 @@ * The display name of the web application * @return The Java object tree representing web.xml */ - public MutableWebApplication createWebApplication() throws PortletApplicationException + public MutableWebApplication createWebApplication(ClassLoader classLoader) + throws PortletApplicationException { try { @@ -68,6 +69,7 @@ // TODO move config to digester-rules.xml. Example: // http://www.onjava.com/pub/a/onjava/2002/10/23/digester.html?page=3 Digester digester = new Digester(); + digester.setClassLoader(classLoader); digester.setValidating(false); digester.register("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", WebApplicationDescriptor.class Index: portal/src/test/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java,v retrieving revision 1.10 diff -u -r1.10 TestJetspeedPortletDescriptor.java --- portal/src/test/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java 23 Mar 2005 22:57:10 -0000 1.10 +++ portal/src/test/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java 31 May 2005 09:38:10 -0000 @@ -82,7 +82,7 @@ app.getApplicationIdentifier().equals("TestRegistry")); ExtendedPortletMetadata md = new ExtendedPortletMetadata(new FileReader("./test/testdata/deploy/jetspeed-portlet.xml"), app); - md.load(); + md.load(Thread.currentThread().getContextClassLoader()); PortletDefinitionComposite def1 = (PortletDefinitionComposite)app.getPortletDefinitionByName(PORTLET_01); PortletDefinitionComposite def2 = (PortletDefinitionComposite)app.getPortletDefinitionByName(PORTLET_02); Index: portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java,v retrieving revision 1.12 diff -u -r1.12 TestPortletDescriptorSecurityRoles.java --- portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java 23 Mar 2005 22:57:10 -0000 1.12 +++ portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java 31 May 2005 09:38:10 -0000 @@ -83,7 +83,8 @@ MutablePortletApplication app = paWar.createPortletApp(); assertNotNull("App is null", app); - MutableWebApplication webApp = paWar.createWebApp(); + MutableWebApplication webApp = paWar.createWebApp + (Thread.currentThread().getContextClassLoader()); assertNotNull("WebApp is null", webApp); app.setWebApplicationDefinition(webApp); Index: portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java,v retrieving revision 1.19 diff -u -r1.19 TestUserInfoManager.java --- portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java 23 Mar 2005 22:57:11 -0000 1.19 +++ portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java 31 May 2005 09:38:10 -0000 @@ -117,7 +117,7 @@ // With linked attributes ExtendedPortletMetadata extMetaData = new ExtendedPortletMetadata(new FileReader("./test/testdata/deploy/jetspeed-portlet.xml"), app); - extMetaData.load(); + extMetaData.load(Thread.currentThread().getContextClassLoader()); userInfo = uim.getUserInfoMap(app.getId(), request); assertNotNull(PortletRequest.USER_INFO + " should not be null", userInfo); Index: portals-bridges/struts/src/java/org/apache/portals/bridges/struts/config/StrutsPortletConfig.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed-2/portals-bridges/struts/src/java/org/apache/portals/bridges/struts/config/StrutsPortletConfig.java,v retrieving revision 1.1 diff -u -r1.1 StrutsPortletConfig.java --- portals-bridges/struts/src/java/org/apache/portals/bridges/struts/config/StrutsPortletConfig.java 20 Jan 2005 01:41:14 -0000 1.1 +++ portals-bridges/struts/src/java/org/apache/portals/bridges/struts/config/StrutsPortletConfig.java 31 May 2005 09:38:11 -0000 @@ -24,7 +24,7 @@ } Digester digester = new Digester(); - digester.setClassLoader(Thread.currentThread().getContextClassLoader()); + digester.setUseContextClassLoader(true); renderContextAttributes.configure(digester); portletURLTypes.configure(digester);