portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r921661 - in /portals/jetspeed-2/portal/trunk: ./ applications/jetspeed-demo/ applications/jetspeed/src/main/webapp/WEB-INF/min-pages/ applications/jetspeed/src/main/webapp/WEB-INF/min-pages/system/sitemanager/ applications/jetspeed/src/mai...
Date Thu, 11 Mar 2010 01:37:13 GMT
Author: rwatler
Date: Thu Mar 11 01:37:13 2010
New Revision: 921661

URL: http://svn.apache.org/viewvc?rev=921661&view=rev
Log:
JS2-1121: build support for ui and min-ui deploy configurations

Removed:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/system/sitemanager/template.tpsml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/template.tpsml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/choosers/template.tpsml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/sitemanager/template.tpsml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml
Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
    portals/jetspeed-2/portal/trunk/maven/jetspeed-fileutils-maven-plugin/src/main/java/org/apache/jetspeed/maven/fileutils/FileUtilsMojo.java
    portals/jetspeed-2/portal/trunk/pom.xml

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml?rev=921661&r1=921660&r2=921661&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml Thu
Mar 11 01:37:13 2010
@@ -47,6 +47,12 @@
   </build>
 
   <profiles>
+
+    <!--
+        seed profile:
+
+        - invoke the serializer on /seed/${seed.file} resource from jetspeed-portal-resources
+    -->
     <profile>
       <id>seed</id>
       <build>
@@ -123,6 +129,11 @@
       </build>
     </profile>
 
+    <!--
+        seed-dbpsml profile:
+
+        - invoke the page serializer on /WEB-INF/${seed.pages} in demo portal
+    -->
     <profile>
       <id>seed-dbpsml</id>
       <build>
@@ -147,6 +158,7 @@
                     <applicationRootPath>
                       ${project.build.directory}/jetspeed-demo-${pom.version}
                     </applicationRootPath>
+					<psmlPagesPath>${project.build.directory}/jetspeed-demo-${pom.version}/WEB-INF/${seed.pages}</psmlPagesPath>
                     <initProperties>
                       <org.apache.jetspeed.database.user>${org.apache.jetspeed.production.database.user}</org.apache.jetspeed.database.user>
                       <org.apache.jetspeed.database.password>${org.apache.jetspeed.production.database.password}</org.apache.jetspeed.database.password>
@@ -179,63 +191,16 @@
       </build>
     </profile>
 
-    <profile>
-      <id>minseed-dbpsml</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.portals.jetspeed-2</groupId>
-            <artifactId>jetspeed-db-maven-plugin</artifactId>
-            <version>${org.apache.portals.jetspeed.version}</version>
-            <executions>
-              <execution>
-                <id>minseed-dbpsml</id>
-                <goals>
-                  <goal>init</goal>
-                </goals>
-                <phase>process-resources</phase>
-                <configuration>
-                  <psml>
-					<psmlPagesPath>${project.build.directory}/jetspeed-demo-${pom.version}/WEB-INF/min-pages</psmlPagesPath>
-                    <categories>pageSerializer</categories>
-                    <filterPropertiesFileName>
-                      ${project.build.directory}/jetspeed-demo-${pom.version}/WEB-INF/conf/spring-filter.properties
-                    </filterPropertiesFileName>
-                    <applicationRootPath>
-                      ${project.build.directory}/jetspeed-demo-${pom.version}
-                    </applicationRootPath>
-                    <initProperties>
-                      <org.apache.jetspeed.database.user>${org.apache.jetspeed.production.database.user}</org.apache.jetspeed.database.user>
-                      <org.apache.jetspeed.database.password>${org.apache.jetspeed.production.database.password}</org.apache.jetspeed.database.password>
-                      <org.apache.jetspeed.database.url>${org.apache.jetspeed.production.database.url}</org.apache.jetspeed.database.url>
-                      <org.apache.jetspeed.database.driver>${org.apache.jetspeed.production.database.driver}</org.apache.jetspeed.database.driver>
-                    </initProperties>
-                  </psml>
-                </configuration>
-              </execution>
-            </executions>
-            <dependencies>
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>jetspeed-portal-resources</artifactId>
-                <version>${org.apache.portals.jetspeed.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>jetspeed-db-tools</artifactId>
-                <version>${org.apache.portals.jetspeed.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>${org.apache.jetspeed.production.jdbc.driver.groupId}</groupId>
-                <artifactId>${org.apache.jetspeed.production.jdbc.driver.artifactId}</artifactId>
-                <version>${org.apache.jetspeed.production.jdbc.driver.version}</version>
-              </dependency>
-            </dependencies>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
+    <!--
+        deploy-min profile:
 
+        - deploy minimal portal configuration to tomcat application server:
+          + jetspeed portal context /conf/tomcat/context.xml from jetspeed-portal-resources
+          + shared and system logging jetspeed jars
+          + expanded jetspeed portal
+          + j2-admin portlet application
+          + configure logging in server.xml
+    -->
     <profile>
       <id>deploy-min</id>
       <build>
@@ -437,43 +402,6 @@
               </dependency>
             </dependencies>
           </plugin>
-	        <plugin>
-	        <groupId>org.apache.portals.jetspeed-2</groupId>
-	        <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
-	        <version>${org.apache.portals.jetspeed.version}</version>
-	        <executions>
-	          <execution>
-	            <id>min-pages2</id>
-	            <goals>
-	              <goal>event</goal>
-	            </goals>
-	            <phase>process-resources</phase>
-	            <configuration>
-	              <srcDirectoryPath>${org.apache.jetspeed.server.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/min-pages</srcDirectoryPath>
-	              <destDirectoryPath>${org.apache.jetspeed.server.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/pages</destDirectoryPath>
-	              <event>move</event>
-	            </configuration>
-	           </execution>
-	         </executions>
-	        </plugin>           
-            <plugin>
-            <groupId>org.apache.portals.jetspeed-2</groupId>
-            <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
-            <version>${org.apache.portals.jetspeed.version}</version>
-            <executions>
-              <execution>
-                <id>min-pages1</id>
-                <goals>
-                  <goal>event</goal>
-                </goals>
-                <phase>process-resources</phase>
-                <configuration>
-                  <srcDirectoryPath>${org.apache.jetspeed.server.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/pages</srcDirectoryPath>
-                  <event>delete</event>
-                </configuration>
-               </execution>
-             </executions>
-            </plugin>           
         </plugins>
         <resources>
           <resource>
@@ -485,6 +413,16 @@
       </build>
     </profile>    
     
+    <!--
+        deploy profile:
+
+        - deploy demo portal configuration to tomcat application server:
+          + jetspeed portal context /conf/tomcat/context.xml from jetspeed-portal-resources
+          + shared and system logging jetspeed jars
+          + expanded jetspeed portal
+          + j2-admin and demo portlet applications
+          + configure logging in server.xml
+    -->
     <profile>
       <id>deploy</id>
       <build>
@@ -748,6 +686,11 @@
       </build>
     </profile>
 
+    <!--
+        deploy-dbpsml profile:
+
+        - install dbpsml version of spring-filter-key.properties into deployed jetspeed portal
at /WEB-INF/conf
+    -->
     <profile>
       <id>deploy-dbpsml</id>
       <build>
@@ -792,6 +735,151 @@
       </build>
     </profile>
     
+    <!--
+        deploy-pages profile:
+
+        - replace /WEB-INF/pages with /WEB-INF/${deploy.pages} in deployed jetspeed portal
+    -->
+    <profile>
+      <id>deploy-pages</id>
+      <build>
+        <plugins>
+	      <plugin>
+	        <groupId>org.apache.portals.jetspeed-2</groupId>
+	        <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
+	        <version>${org.apache.portals.jetspeed.version}</version>
+	        <executions>
+	          <execution>
+	            <id>deploy-pages</id>
+	            <goals>
+	              <goal>event</goal>
+	            </goals>
+	            <phase>process-resources</phase>
+	            <configuration>
+	              <srcDirectoryPath>${org.apache.jetspeed.server.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/${deploy.pages}</srcDirectoryPath>
+	              <destDirectoryPath>${org.apache.jetspeed.server.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/pages</destDirectoryPath>
+	              <event>move</event>
+	            </configuration>
+	          </execution>
+	        </executions>
+	      </plugin>           
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>deploy-pages1</id>
+                <goals>
+                  <goal>event</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <srcDirectoryPath>${org.apache.jetspeed.server.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/pages</srcDirectoryPath>
+                  <event>delete</event>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>           
+        </plugins>
+      </build>
+    </profile>
+
+    <!--
+        delete-pages profile:
+
+        - remove /WEB-INF/${delete.pages} from deployed jetspeed portal
+    -->
+    <profile>
+      <id>delete-pages</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>delete-pages</id>
+                <goals>
+                  <goal>event</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <srcDirectoryPath>${org.apache.jetspeed.server.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/${delete.pages}</srcDirectoryPath>
+                  <event>delete</event>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>           
+        </plugins>
+      </build>
+    </profile>
+
+    <!--
+        configure profile:
+
+        - configure portal deployed /WEB-INF/${config.file} by replacing all ${config.pattern}
occurences with ${config.replacement}
+    -->
+    <profile>
+      <id>configure</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>configure</id>
+                <goals>
+                  <goal>event</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <srcFilePath>${org.apache.jetspeed.server.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/${config.file}</srcFilePath>
+                  <editPattern>${config.pattern}</editPattern>
+                  <replacePattern>${config.replacement}</replacePattern>
+                  <event>edit</event>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>           
+        </plugins>
+      </build>
+    </profile>
+
+    <!--
+        delete-file profile:
+
+        - remove /WEB-INF/${delete.file} from deployed jetspeed portal
+    -->
+    <profile>
+      <id>delete-file</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>delete-file</id>
+                <goals>
+                  <goal>event</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <srcFilePath>${org.apache.jetspeed.server.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/${delete.file}</srcFilePath>
+                  <event>delete</event>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>           
+        </plugins>
+      </build>
+    </profile>
+
   </profiles>
 
 </project>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties?rev=921661&r1=921660&r2=921661&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
Thu Mar 11 01:37:13 2010
@@ -376,7 +376,7 @@ registration.rules.default = 
 #-------------------------------------------------------------------------
 # customization method, only applicable when jetui.render.engine = server
 # values ( ajax | server ) 
-jetui.customization.method = ajax
+jetui.customization.method = server
 # CCRE | SSRE
 jetui.render.engine = SSRE
 # xml | json

Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-fileutils-maven-plugin/src/main/java/org/apache/jetspeed/maven/fileutils/FileUtilsMojo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-fileutils-maven-plugin/src/main/java/org/apache/jetspeed/maven/fileutils/FileUtilsMojo.java?rev=921661&r1=921660&r2=921661&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-fileutils-maven-plugin/src/main/java/org/apache/jetspeed/maven/fileutils/FileUtilsMojo.java
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-fileutils-maven-plugin/src/main/java/org/apache/jetspeed/maven/fileutils/FileUtilsMojo.java
Thu Mar 11 01:37:13 2010
@@ -16,9 +16,12 @@
  */
 package org.apache.jetspeed.maven.fileutils;
 
-
 import java.io.File;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
+import java.util.ListIterator;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.FileFilterUtils;
@@ -36,15 +39,37 @@ public class FileUtilsMojo extends Abstr
      * The Source directory on which event need to happen
      * 
      * @parameter expression="${srcDirectoryPath}"
-     * @required
      */
     private String srcDirectoryPath;
+
     /**
      * The destination directory on which event need to happen
      * 
      * @parameter expression="${destDirectoryPath}"
      */
     private String destDirectoryPath;
+
+    /**
+     * The target file
+     * 
+     * @parameter expression="${srcFilePath}"
+     */
+    private String srcFilePath;
+
+    /**
+     * The edit pattern, (accepts url encoded string)
+     * 
+     * @parameter expression="${editPattern}"
+     */
+    private String editPattern;
+
+    /**
+     * The edit replace pattern, (accepts url encoded string)
+     * 
+     * @parameter expression="${replacePattern}"
+     */
+    private String replacePattern;
+
     /**
      * The Event need to occur
      * 
@@ -57,15 +82,49 @@ public class FileUtilsMojo extends Abstr
     {
         if (event.equals("copy"))
         {
-            copy(srcDirectoryPath, destDirectoryPath);
+            if (srcDirectoryPath != null)
+            {
+                copy(srcDirectoryPath, destDirectoryPath);
+            }
+            else if (srcFilePath != null)
+            {
+                copyFile(srcFilePath, destDirectoryPath);                
+            }
         }
         if (event.equals("move"))
         {
-            move(srcDirectoryPath, destDirectoryPath);
+            if (srcDirectoryPath != null)
+            {
+                move(srcDirectoryPath, destDirectoryPath);
+            }
+            else if (srcFilePath != null)
+            {
+                moveFile(srcFilePath, destDirectoryPath);                
+            }
         }
         else if (event.equals("delete"))
         {
-            delete(srcDirectoryPath);
+            if (srcDirectoryPath != null)
+            {
+                delete(srcDirectoryPath);
+            }
+            else if (srcFilePath != null)
+            {
+                deleteFile(srcFilePath);
+            }
+        }
+        else if (event.equals("edit"))
+        {
+            if ((srcFilePath != null) && (editPattern != null))
+            {
+                try
+                {
+                    editFile(srcFilePath, URLDecoder.decode(editPattern, "UTF-8"), URLDecoder.decode(((replacePattern
!= null) ? replacePattern : ""), "UTF-8"));
+                }
+                catch (UnsupportedEncodingException uee)
+                {
+                }
+            }
         }
     }
     
@@ -77,10 +136,15 @@ public class FileUtilsMojo extends Abstr
         }
         catch (IOException IOex)
         {
-            throw new MojoExecutionException("Error in deleting the directory", IOex);
+            throw new MojoExecutionException("Error in deleting directory", IOex);
         }
     }
 
+    private static void deleteFile(String srcFilePath) throws MojoExecutionException
+    {
+        FileUtils.deleteQuietly(new File(srcFilePath));
+    }
+
     private static void copy(String srcDirectoryPath, String destDir) throws MojoExecutionException
     {
         try
@@ -89,7 +153,19 @@ public class FileUtilsMojo extends Abstr
         }
         catch (IOException IOex)
         {
-            throw new MojoExecutionException("Error in copying the directory", IOex);
+            throw new MojoExecutionException("Error in copying directory", IOex);
+        }
+    }
+
+    private static void copyFile(String srcFilePath, String destDir) throws MojoExecutionException
+    {
+        try
+        {
+            FileUtils.copyFileToDirectory(new File(srcFilePath), new File(destDir));
+        }
+        catch (IOException IOex)
+        {
+            throw new MojoExecutionException("Error in copying file to directory", IOex);
         }
     }
 
@@ -101,7 +177,37 @@ public class FileUtilsMojo extends Abstr
         }
         catch (IOException IOex)
         {
-            throw new MojoExecutionException("Error in moving the directory", IOex);
+            throw new MojoExecutionException("Error in moving directory", IOex);
+        }
+    }
+
+    private static void moveFile(String srcFilePath, String destDir) throws MojoExecutionException
+    {
+        try
+        {
+            FileUtils.moveFileToDirectory(new File(srcFilePath), new File(destDir), true);
+        }
+        catch (IOException IOex)
+        {
+            throw new MojoExecutionException("Error in moving file to directory", IOex);
+        }
+    }
+
+    private static void editFile(String srcFilePath, String editPattern, String replacePattern)
throws MojoExecutionException
+    {
+        try
+        {
+            File srcFile = new File(srcFilePath);
+            List lines = FileUtils.readLines(srcFile);
+            for (ListIterator i = lines.listIterator(); i.hasNext();)
+            {
+                i.set(((String)i.next()).replaceAll(editPattern, replacePattern));
+            }
+            FileUtils.writeLines(srcFile, lines);
+        }
+        catch (IOException IOex)
+        {
+            throw new MojoExecutionException("Error in editing file", IOex);
         }
     }
 }

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=921661&r1=921660&r2=921661&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Thu Mar 11 01:37:13 2010
@@ -1608,6 +1608,15 @@
                 </properties>
               </target>
               <target>
+                <id>ui-seed</id>
+                <name>demo</name>
+                <dir>@rootdir@/applications/jetspeed-demo</dir>
+                <profiles>seed</profiles>
+                <properties>
+                  <seed.file>j2-ui-seed.xml</seed.file>
+                </properties>
+              </target>
+              <target>
                 <id>min-seed</id>
                 <name>demo</name>
                 <dir>@rootdir@/applications/jetspeed-demo</dir>
@@ -1616,16 +1625,33 @@
                   <seed.file>min/j2-seed.xml</seed.file>
                 </properties>
               </target>
+              <target>
+                <id>min-ui-seed</id>
+                <name>demo</name>
+                <dir>@rootdir@/applications/jetspeed-demo</dir>
+                <profiles>seed</profiles>
+                <properties>
+                  <seed.file>min/j2-ui-seed.xml</seed.file>
+                </properties>
+              </target>
               <!-- initialize and seed db intermediate targets -->
               <target>
                 <id>demo-db</id>
                 <depends>proddb,demo-seed</depends>
               </target>
               <target>
+                <id>ui-db</id>
+                <depends>proddb,ui-seed</depends>
+              </target>
+              <target>
                 <id>min-db</id>
                 <depends>proddb,min-seed</depends>
               </target>
-              <!-- portal and portal app deployment intermediate targets -->
+              <target>
+                <id>min-ui-db</id>
+                <depends>proddb,min-ui-seed</depends>
+              </target>
+              <!-- portal and portal applications deployment intermediate targets -->
               <target>
                 <id>demo-deploy</id>
                 <name>demo</name>
@@ -1633,18 +1659,100 @@
                 <profiles>deploy</profiles>
               </target>
               <target>
-                <id>demo-deploy-min</id>
+                <id>min-deploy</id>
                 <name>demo</name>
                 <dir>@rootdir@/applications/jetspeed-demo</dir>
                 <profiles>deploy-min</profiles>
-              </target>              
-              <!-- portal dbpsml config deployment intermediate targets -->
+              </target>
               <target>
-                <id>demo-deploy-dbpsml</id>
+                <id>deploy-ui</id>
+                <name>demo</name>
+                <dir>@rootdir@/applications/jetspeed-demo</dir>
+                <profiles>configure</profiles>
+                <properties>
+                  <config.file>conf/jetspeed.properties</config.file>
+                  <config.pattern>^jetui.customization.method%5Cs*=.*%24</config.pattern><!--
use %24 for '$' and %5C for '\' -->
+                  <config.replacement>jetui.customization.method%20=%20ajax</config.replacement><!--
use %20 for space -->
+                </properties>
+              </target>
+              <target>
+                <id>deploy-dbpsml</id>
                 <name>demo</name>
                 <dir>@rootdir@/applications/jetspeed-demo</dir>
                 <profiles>deploy-dbpsml</profiles>
               </target>
+              <!-- pages deployment intermediate targets -->
+              <target>
+                <id>undeploy-ui-pages</id>
+                <name>demo</name>
+                <dir>@rootdir@/applications/jetspeed-demo</dir>
+                <profiles>delete-pages</profiles>
+                <properties>
+                  <delete.pages>ui-pages</delete.pages>
+                </properties>
+              </target>              
+              <target>
+                <id>undeploy-min-pages</id>
+                <name>demo</name>
+                <dir>@rootdir@/applications/jetspeed-demo</dir>
+                <profiles>delete-pages</profiles>
+                <properties>
+                  <delete.pages>min-pages</delete.pages>
+                </properties>
+              </target>              
+              <target>
+                <id>undeploy-min-ui-pages</id>
+                <name>demo</name>
+                <dir>@rootdir@/applications/jetspeed-demo</dir>
+                <profiles>delete-pages</profiles>
+                <properties>
+                  <delete.pages>min-ui-pages</delete.pages>
+                </properties>
+              </target>
+              <target>
+                <id>demo-deploy-pages</id>
+                <depends>undeploy-ui-pages,undeploy-min-pages,undeploy-min-ui-pages</depends>
+              </target>              
+              <target>
+                <id>ui-deploy-pages</id>
+                <depends>undeploy-min-pages,undeploy-min-ui-pages</depends>
+                <name>demo</name>
+                <dir>@rootdir@/applications/jetspeed-demo</dir>
+                <profiles>deploy-pages</profiles>
+                <properties>
+                  <deploy.pages>ui-pages</deploy.pages>
+                </properties>
+              </target>
+              <target>
+                <id>min-deploy-pages</id>
+                <depends>undeploy-ui-pages,undeploy-min-ui-pages</depends>
+                <name>demo</name>
+                <dir>@rootdir@/applications/jetspeed-demo</dir>
+                <profiles>deploy-pages</profiles>
+                <properties>
+                  <deploy.pages>min-pages</deploy.pages>
+                </properties>
+              </target>
+              <target>
+                <id>min-ui-deploy-pages</id>
+                <depends>undeploy-ui-pages,undeploy-min-pages</depends>
+                <name>demo</name>
+                <dir>@rootdir@/applications/jetspeed-demo</dir>
+                <profiles>deploy-pages</profiles>
+                <properties>
+                  <deploy.pages>min-ui-pages</deploy.pages>
+                </properties>
+              </target>
+              <target>
+                <id>undeploy-pages</id>
+                <depends>undeploy-ui-pages,undeploy-min-pages,undeploy-min-ui-pages</depends>
+                <name>demo</name>
+                <dir>@rootdir@/applications/jetspeed-demo</dir>
+                <profiles>delete-pages</profiles>
+                <properties>
+                  <delete.pages>pages</delete.pages>
+                </properties>
+              </target>              
               <!-- dbpsml seed db intermediate targets -->
               <target>
                 <id>demo-seed-dbpsml</id>
@@ -1652,30 +1760,72 @@
                 <name>demo</name>
                 <dir>@rootdir@/applications/jetspeed-demo</dir>
                 <profiles>seed-dbpsml</profiles>
+                <properties>
+                  <seed.pages>pages</seed.pages>
+                </properties>
+              </target>
+              <target>
+                <id>ui-seed-dbpsml</id>
+                <depends>ui-db</depends>
+                <name>demo</name>
+                <dir>@rootdir@/applications/jetspeed-demo</dir>
+                <profiles>seed-dbpsml</profiles>
+                <properties>
+                  <seed.pages>ui-pages</seed.pages>
+                </properties>
               </target>
               <target>
                 <id>min-seed-dbpsml</id>
                 <depends>min-db</depends>
                 <name>demo</name>
                 <dir>@rootdir@/applications/jetspeed-demo</dir>
-                <profiles>minseed-dbpsml</profiles>
+                <profiles>seed-dbpsml</profiles>
+                <properties>
+                  <seed.pages>min-pages</seed.pages>
+                </properties>
+              </target>           
+              <target>
+                <id>min-ui-seed-dbpsml</id>
+                <depends>min-ui-db</depends>
+                <name>demo</name>
+                <dir>@rootdir@/applications/jetspeed-demo</dir>
+                <profiles>seed-dbpsml</profiles>
+                <properties>
+                  <seed.pages>min-ui-pages</seed.pages>
+                </properties>
               </target>           
               <!-- demo top level targets -->
               <target>
                 <id>demo</id>
-                <depends>demo-install,demo-db,demo-deploy</depends>
+                <depends>demo-install,demo-db,demo-deploy,demo-deploy-pages</depends>
               </target>
               <target>
                 <id>min</id>
-                <depends>demo-install,min-db,demo-deploy-min</depends>
+                <depends>demo-install,min-db,min-deploy,min-deploy-pages</depends>
               </target>               
               <target>
                 <id>demo-dbpsml</id>
-                <depends>demo-install,demo-db,demo-deploy,demo-deploy-dbpsml,demo-seed-dbpsml</depends>
+                <depends>demo-install,demo-db,demo-deploy,deploy-dbpsml,demo-seed-dbpsml,undeploy-pages</depends>
               </target>
               <target>
                 <id>min-dbpsml</id>
-                <depends>demo-install,min-db,demo-deploy-min,demo-deploy-dbpsml,min-seed-dbpsml</depends>
+                <depends>demo-install,min-db,min-deploy,deploy-dbpsml,min-seed-dbpsml,undeploy-pages</depends>
+              </target>           
+              <target>
+                <id>ui</id>
+                <depends>demo-install,ui-db,demo-deploy,ui-deploy-pages,deploy-ui</depends>
+              </target>
+              <target>
+                <id>min-ui</id>
+                <depends>demo-install,min-ui-db,min-deploy,min-ui-deploy-pages,deploy-ui</depends>
+              </target>               
+              <target>
+                <id>ui-dbpsml</id>
+                <depends>demo-install,ui-db,demo-deploy,deploy-dbpsml,ui-seed-dbpsml,undeploy-pages,deploy-ui</depends>
+              </target>
+              <target>
+                <id>min-ui-dbpsml</id>
+                <depends>demo-install,min-ui-db,min-deploy,deploy-dbpsml,min-ui-seed-dbpsml,undeploy-pages,deploy-ui</depends>
               </target>           
             </targets>
           </configuration>



---------------------------------------------------------------------
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