portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
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 GMT
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 @@
         
         <!-- Test Dependencies -->
         <dependency>
+          <groupId>${pom.groupId}</groupId>
+          <artifactId>jetspeed-cm</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>${pom.groupId}</groupId>
+          <artifactId>jetspeed-id-generator</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>${pom.groupId}</groupId>
+          <artifactId>jetspeed-file-cache</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>${pom.groupId}</groupId>
+          <artifactId>jetspeed-page-manager</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
           <scope>test</scope>
@@ -68,4 +88,46 @@
 
     </dependencies>
 
+    <build>
+      <plugins>
+        <plugin>
+          <groupId>${pom.groupId}</groupId>
+          <artifactId>jetspeed-unpack-maven-plugin</artifactId>
+          <version>${pom.version}</version>
+          <executions>
+            <execution>
+              <id>unpack-test-resources</id>
+              <goals>
+                <goal>unpack</goal>
+              </goals>
+              <phase>process-test-resources</phase>
+              <configuration>
+                <skip>${skipTests}</skip>
+                <unpack>
+                  <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
+                  <resources>
+                    <resource>
+                      <path>assembly</path>
+                      <include>boot/datasource.xml</include>
+                    </resource>
+                    <resource>
+                      <path>db-ojb</path>
+                      <include>ehcache.xml</include>
+                    </resource>
+                  </resources>
+                </unpack>
+              </configuration>
+            </execution>
+          </executions>
+          <dependencies>
+            <dependency>
+              <groupId>${pom.groupId}</groupId>
+              <artifactId>jetspeed-portal-resources</artifactId>
+              <version>${pom.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </build>
+
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message