cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/page - New directory
taylor 2004/02/21 00:56:39 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/page - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/page/impl - New directory
taylor 2004/02/21 00:56:47 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/page/impl - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/page - New directory
taylor 2004/02/21 00:57:12 jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/page - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-jetspeed-2/portal/test/assembly - New directory
taylor 2004/02/21 00:58:05 jakarta-jetspeed-2/portal/test/assembly - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly jetspeed.groovy
taylor 2004/02/21 01:19:43 Modified:portal/src/java/org/apache/jetspeed/profiler/impl JetspeedProfilerService.java portal/src/webapp/WEB-INF/assembly jetspeed.groovy Log: next candidate the profiler (save that one for next time) need to wire into the constructor the PageService dep just making a note to make a second pass over the static configuration files used in assembly i think that files like: - castor XML mapping files - OJB mappings and settings files can be moved into the class path to minimize configuration Revision ChangesPath 1.5 +7 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerService.java Index: JetspeedProfilerService.java === RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerService.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- JetspeedProfilerService.java 17 Dec 2003 20:46:33 - 1.4 +++ JetspeedProfilerService.java 21 Feb 2004 09:19:43 - 1.5 @@ -62,6 +62,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.InitializationException; +import org.apache.jetspeed.Jetspeed; import org.apache.jetspeed.cps.BaseCommonService; import org.apache.jetspeed.cps.CommonPortletServices; import org.apache.jetspeed.om.desktop.Desktop; @@ -78,7 +79,7 @@ import org.apache.jetspeed.request.RequestContext; import org.apache.jetspeed.security.SecurityHelper; import org.apache.jetspeed.security.UserPrincipal; -import org.apache.jetspeed.services.page.PageManager; +import org.apache.jetspeed.page.PageManager; /** * JetspeedProfilerService @@ -259,7 +260,10 @@ public Page getPage(ProfileLocator locator) { // TODO: under construction, for now use the name -return PageManager.getPage(locator); + +// TODO: NEXT load the page manager as a dependency when i make the profiler a service +PageManager pm = (PageManager)Jetspeed.getComponentManager().getComponent("CastorXmlPageManager"); +return pm.getPage(locator); /* Page page = null; 1.4 +1 -0 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy Index: jetspeed.groovy === RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jetspeed.groovy 21 Feb 2004 09:01:30 - 1.3 +++ jetspeed.groovy 21 Feb 2004 09:19:43 - 1.4 @@ -27,6 +27,7 @@ // Page Manager // root = applicationRoot + "/WEB-INF/pages" +// TODO: move this into a class loader resource mapping = applicationRoot + "/WEB-INF/conf/page-mapping.xml" // TODO: modelclasses, extension, scanrate, cachesize container.registerComponentInstance("CastorXmlPageManager", - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly jetspeed.groovy
taylor 2004/02/21 01:33:43 Modified:portal maven.xml portal/src/java/org/apache/jetspeed/engine JetspeedEngine.java portal/src/webapp/WEB-INF/assembly jetspeed.groovy Log: missing include in groovy script Revision ChangesPath 1.41 +1 -1 jakarta-jetspeed-2/portal/maven.xml Index: maven.xml === RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- maven.xml 21 Feb 2004 09:01:30 - 1.40 +++ maven.xml 21 Feb 2004 09:33:43 - 1.41 @@ -4,7 +4,7 @@ xmlns:reactor="reactor"> - + 1.12 +4 -1 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java Index: JetspeedEngine.java === RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- JetspeedEngine.java 21 Feb 2004 03:51:34 - 1.11 +++ JetspeedEngine.java 21 Feb 2004 09:33:43 - 1.12 @@ -245,6 +245,9 @@ public void shutdown() throws JetspeedException { CommonPortletServices.getInstance().shutdownServices(); + +// TODO: DST: can I hook into Component Manager shutdown here? + try { PortletContainer container = PortletContainerFactory.getPortletContainer(); 1.5 +1 -0 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy Index: jetspeed.groovy === RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jetspeed.groovy 21 Feb 2004 09:19:43 - 1.4 +++ jetspeed.groovy 21 Feb 2004 09:33:43 - 1.5 @@ -2,6 +2,7 @@ import org.apache.jetspeed.locator.JetspeedTemplateLocator import org.apache.jetspeed.components.ComponentAssemblyTestCase import org.apache.jetspeed.idgenerator.JetspeedIdGenerator +import org.apache.jetspeed.page.impl.CastorXmlPageManager import org.apache.jetspeed.Jetspeed applicationRoot = Jetspeed.getRealPath("/") - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]