Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 2767 invoked from network); 30 Mar 2010 08:15:23 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 30 Mar 2010 08:15:23 -0000 Received: (qmail 74383 invoked by uid 500); 30 Mar 2010 08:15:23 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 74288 invoked by uid 500); 30 Mar 2010 08:15:22 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 74264 invoked by uid 99); 30 Mar 2010 08:15:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Mar 2010 08:15:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Mar 2010 08:15:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 95C142388A2C; Tue, 30 Mar 2010 08:14:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r929033 [1/5] - in /portals/jetspeed-2/portal/trunk: components/jetspeed-page-layout/ components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/ components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/i... Date: Tue, 30 Mar 2010 08:14:55 -0000 To: jetspeed-dev@portals.apache.org From: rwatler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100330081456.95C142388A2C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rwatler Date: Tue Mar 30 08:14:54 2010 New Revision: 929033 URL: http://svn.apache.org/viewvc?rev=929033&view=rev Log: JS2-1138: page layout/portal site support support for *.tpsml, *.fpsml, and *.dpsml documents Added: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/JETSPEED-INF/ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/JETSPEED-INF/spring/ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/JETSPEED-INF/spring/test-spring.xml portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/log4j.properties portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/org/ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/org/apache/ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/org/apache/jetspeed/ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/org/apache/jetspeed/layout/ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/org/apache/jetspeed/layout/TestPageLayout.java portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/cache-test.xml portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/castor.properties portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/contentpage.dpsml portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/definition0.fpsml portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/definition1.fpsml portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/docpage.dpsml portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/page.psml portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/page.security portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/template.tpsml Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteContentTypeMapperImpl.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/view/AbstractSiteView.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/org/apache/jetspeed/portalsite/TestPortalSite.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/AbstractPageValveImpl.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/PageValveImpl.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentFragment.java portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/DynamicPage.java portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/FragmentDefinition.java portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteContentTypeMapper.java portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml?rev=929033&r1=929032&r2=929033&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml Tue Mar 30 08:14:54 2010 @@ -61,6 +61,26 @@ + ${pom.groupId} + jetspeed-cm + test + + + ${pom.groupId} + jetspeed-id-generator + test + + + ${pom.groupId} + jetspeed-file-cache + test + + + ${pom.groupId} + jetspeed-page-manager + test + + org.slf4j slf4j-log4j12 test @@ -68,4 +88,46 @@ + + + + ${pom.groupId} + jetspeed-unpack-maven-plugin + ${pom.version} + + + unpack-test-resources + + unpack + + process-test-resources + + ${skipTests} + + ${project.build.testOutputDirectory} + + + assembly + boot/datasource.xml + + + db-ojb + ehcache.xml + + + + + + + + + ${pom.groupId} + jetspeed-portal-resources + ${pom.version} + + + + + + --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org