portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r929401 - in /portals/jetspeed-2/portal/trunk/jetspeed-installer: ./ etc/ant-installer/ etc/database/
Date Wed, 31 Mar 2010 06:23:13 GMT
Author: rwatler
Date: Wed Mar 31 06:23:12 2010
New Revision: 929401

URL: http://svn.apache.org/viewvc?rev=929401&view=rev
Log:
JS2-1137: upgrade J2 installer to select JetUI/Classic configurations

Removed:
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
Modified:
    portals/jetspeed-2/portal/trunk/jetspeed-installer/BUILD.txt
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/final-assembly-descriptor.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/BUILD.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/BUILD.txt?rev=929401&r1=929400&r2=929401&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/BUILD.txt (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/BUILD.txt Wed Mar 31 06:23:12 2010
@@ -13,18 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-There are two Jetspeed installers that can be built from command line: a portal
-with minimal functionality and a demo portal with more portlet applications.
+To build either of the installer, the Jetspeed Maven plugin for Maven-2 
+should be used as follows:
 
-To build either of these installers, the Jetspeed Maven plugin for Maven-2 
-should be used as follows:  
+> mvn jetspeed:mvn -Dtarget=installer
 
-> mvn jetspeed:mvn -Dtarget=installer-minimal
+The self executing installer can be found in the maven target directory
+after the build:
 
-  or	
+jetspeed-installer-2.2.1-SNAPSHOT.jar
 
-> mvn jetspeed:mvn -Dtarget=installer-demo
+It can be run simply enough:
 
-
-NB: the target directory will be cleaned so you cannot build both installers at the same
time
-without saveguarding the first build target.
+> java -jar jetspeed-installer-2.2.1-SNAPSHOT.jar

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml?rev=929401&r1=929400&r2=929401&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
Wed Mar 31 06:23:12 2010
@@ -80,16 +80,40 @@
     <validated property="jvmMaxMemory" defaultValue="512m" displayText="Enter JVM memory
size" regex="^[0-9][0-9]*[mgk]$"/>
   </page>
 
-  <page type="input" name="requiredComponents" displayText="Components selection" ifProperty="${operation}=install">
+  <page type="input" name="installationSelection" displayText="Installation type" ifProperty="${operation}=install">
+    <comment displayText="Please select the type of portal installation to perform." />
+    <select property="installationType" displayText="Installation type" defaultValue="demo">
+      <option text="Demo" value="demo" />
+      <option text="Minimal" value="minimal" />
+    </select>
+    <comment displayText="And select the portal pipeline to install." />
+    <select property="pipelineType" displayText="Pipeline type" defaultValue="jetui">
+      <option text="JetUI" value="jetui" />
+      <option text="Classic" value="classic" />
+    </select>
+  </page>
+
+  <page type="input" name="requiredComponents" displayText="Components selection, (Demo)"
ifProperty="(${operation}=install) AND (${installationType}=demo)">
     <hidden property="setupDBAntTarget" value="runSetupNoDB" />
-    <comment displayText="Jetspeed Enterprise Portal version 2.2.1-SNAPSHOT" bold="true"
/>
+    <comment displayText="Jetspeed Enterprise Portal version 2.2.1-SNAPSHOT, (Demo)" bold="true"
/>
     <target displayText="Tomcat 6.0.18 Webserver" target="install" defaultValue="true"
force="true" />
     <checkbox displayText="Jetspeed Portal" property="dummy" defaultValue="true" force="true"
/>
     <checkbox displayText="Jetspeed Layout Portlets" property="dummy" defaultValue="true"
force="true" />
     <checkbox displayText="Jetspeed Administration Portlets" property="dummy" defaultValue="true"
force="true" />
     <checkbox displayText="Demo Portlets" property="dummy" defaultValue="true" force="true"
/>
     <checkbox displayText="RSS Portlets" property="dummy" defaultValue="true" force="true"
/>
-    <checkbox displayText="JPetstore Portlets" property="dummy" defaultValue="true" force="true"
/>
+    <checkbox displayText="Web Content Portlets" property="dummy" defaultValue="true"
force="true" />
+    <checkbox displayText="DB Browser Portlets" property="dummy" defaultValue="true" force="true"
/>
+    <checkbox displayText="Store PSML in the database?" property="dbImportPsml" defaultValue="false"
/>
+  </page>
+
+  <page type="input" name="requiredComponents" displayText="Components selection, (Minimal)"
ifProperty="(${operation}=install) AND (${installationType}=minimal)">
+    <hidden property="setupDBAntTarget" value="runSetupNoDB" />
+    <comment displayText="Jetspeed Enterprise Portal version 2.2.1-SNAPSHOT" bold="true"
/>
+    <target displayText="Tomcat 6.0.18 Webserver" target="install" defaultValue="true"
force="true" />
+    <checkbox displayText="Jetspeed Portal" property="dummy" defaultValue="true" force="true"
/>
+    <checkbox displayText="Jetspeed Layout Portlets" property="dummy" defaultValue="true"
force="true" />
+    <checkbox displayText="Jetspeed Administration Portlets" property="dummy" defaultValue="true"
force="true" />
     <checkbox displayText="Store PSML in the database?" property="dbImportPsml" defaultValue="false"
/>
   </page>
 
@@ -289,7 +313,7 @@
     <comment displayText="Continuing now will otherwise require manual setup of the database."/>
   </page>
 
-  <page type="input" name="beforeInstall" displayText="Before your install..."
+  <page type="input" name="beforeInstall" displayText="Before you install..."
     ifProperty="(${operation}=install) AND (${setupDBAntTarget}=runSetupNoDB)">
     <hidden property="db.username" value="" />
     <hidden property="db.password" value="" />

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml?rev=929401&r1=929400&r2=929401&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml Wed Mar
31 06:23:12 2010
@@ -71,10 +71,39 @@
 
   </target>
 
-  <target name="install" depends="setupInstallation">
+  <target name="install" depends="setupInstallation,checkMinimalInstall,minimalInstall,installPortal"
/>
+
+  <target name="installPortal">
 
     <echo>Moving pages out of jetspeed webapp</echo>
-    <move file="${installDir}/webapps/jetspeed/WEB-INF/pages" todir="${installDir}" />
+    <condition property="_installPagesDirName" value="ui-pages">
+      <and>
+        <equals arg1="${installationType}" arg2="demo" />
+        <equals arg1="${pipelineType}" arg2="jetui" />
+      </and>
+    </condition>
+    <condition property="_installPagesDirName" value="pages">
+      <and>
+        <equals arg1="${installationType}" arg2="demo" />
+        <equals arg1="${pipelineType}" arg2="classic" />
+      </and>
+    </condition>
+    <condition property="_installPagesDirName" value="min-ui-pages">
+      <and>
+        <equals arg1="${installationType}" arg2="minimal" />
+        <equals arg1="${pipelineType}" arg2="jetui" />
+      </and>
+    </condition>
+    <condition property="_installPagesDirName" value="min-pages">
+      <and>
+        <equals arg1="${installationType}" arg2="minimal" />
+        <equals arg1="${pipelineType}" arg2="classic" />
+      </and>
+    </condition>
+    <echo>Installing: ${_installPagesDirName}</echo>
+    <move todir="${installDir}/pages">
+      <fileset dir="${installDir}/webapps/jetspeed/WEB-INF/${_installPagesDirName}" includes="**/*"
/>
+    </move>
     <move file="${installDir}/webapps/jetspeed/WEB-INF/conf/jetspeed.properties" 
         tofile="${installDir}/webapps/jetspeed/WEB-INF/conf/jetspeed.properties.unfiltered"/>
     <move file="${installDir}/webapps/jetspeed/WEB-INF/conf/jetspeed.properties.unfiltered"

@@ -85,12 +114,60 @@
          <filter token=" = " value="psml.pages.path = $${applicationRoot}/../../pages"
/>
        </filterset>
     </move>
+    <delete includeEmptyDirs="true">
+      <fileset dir="${installDir}/webapps/jetspeed/WEB-INF/ui-pages" />
+      <fileset dir="${installDir}/webapps/jetspeed/WEB-INF/pages" />
+      <fileset dir="${installDir}/webapps/jetspeed/WEB-INF/min-ui-pages" />
+      <fileset dir="${installDir}/webapps/jetspeed/WEB-INF/min-pages" />
+    </delete>
+
+    <echo>Configure portal pipeline</echo>
+    <condition property="_jetuiCustomizationMethod" value="ajax">
+      <equals arg1="${pipelineType}" arg2="jetui" />
+    </condition>
+    <condition property="_jetuiCustomizationMethod" value="server">
+      <not>
+        <isset property="_jetuiCustomizationMethod" />
+      </not>
+    </condition>
+    <echo>Customization method: ${_jetuiCustomizationMethod}</echo>
+    <move file="${installDir}/webapps/jetspeed/WEB-INF/conf/jetspeed.properties" 
+        tofile="${installDir}/webapps/jetspeed/WEB-INF/conf/jetspeed.properties.unfiltered"/>
+    <move file="${installDir}/webapps/jetspeed/WEB-INF/conf/jetspeed.properties.unfiltered"

+        tofile="${installDir}/webapps/jetspeed/WEB-INF/conf/jetspeed.properties"
+        overwrite="true">
+       <filterset begintoken="jetui.customization.method" endtoken="server" recurse="false">
+         <filter token=" = " value="jetui.customization.method = ${_jetuiCustomizationMethod}"
/>
+       </filterset>
+    </move>
 
     <echo>Setting up the Jetspeed database (if selected)</echo>
     <ant antfile="${installDir}/database/build.xml" target="${setupDBAntTarget}" dir="${installDir}/database"
inheritAll="true" />
 
   </target>
 
+  <target name="checkMinimalInstall">
+
+    <condition property="_minimalInstallationType" value="true">
+      <equals arg1="${installationType}" arg2="minimal" />
+    </condition>
+
+  </target>
+
+  <target name="minimalInstall" if="_minimalInstallationType">
+
+    <echo>Removing demo webapps</echo>
+    <delete>
+      <fileset dir="${installDir}/webapps">
+        <include name="demo.war" />      
+        <include name="rss.war" />
+        <include name="webcontent.war" />
+        <include name="dbbrowser.war" />
+      </fileset>
+    </delete>
+
+  </target>
+
   <target name="antinstaller-checkdb">
 
     <checkConnection driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}" password="${dbPassword}">

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml?rev=929401&r1=929400&r2=929401&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml Wed Mar 31 06:23:12
2010
@@ -72,7 +72,6 @@
     <target name="setupDB">
 
         <echo>Setting up the Jetspeed database for ${db.type}</echo>
-
         <echo>All existing Jetspeed data is going to be deleted from the database.</echo>
         <echo>
         </echo>
@@ -117,7 +116,6 @@
     <target name="exportDB" depends="checkDerby" unless="_derby" if="exportDataDir">
 
         <echo>Export Jetspeed database to ${exportDataDir}/j2-data.xml</echo>
-
         <mkdir dir="${exportDataDir}"/>
         <java classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl"
fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">
             <classpath refid="installationClasspath"/>
@@ -129,7 +127,6 @@
         </java>
 
         <echo>Export Jetspeed database pages to ${exportDataDir}/pages directory</echo>
-
         <mkdir dir="${exportDataDir}/pages"/>
         <java classname="org.apache.jetspeed.tools.page.serializer.JetspeedPageSerializerApplicationImpl"
fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">
             <classpath refid="installationClasspath"/>
@@ -151,7 +148,6 @@
             </or>
         </condition>
         <antcall target="cleanupExportedPages"/>
-
         <echo>Export Jetspeed database complete!</echo>
 
     </target>
@@ -168,7 +164,6 @@
         <antcall target="importPrefs"/>
         <available file="${importDataDir}/pages" type="dir" property="_importPages"/>
         <antcall target="importPages"/>
-
         <echo>Import Jetspeed database complete!</echo>
 
     </target>
@@ -190,7 +185,6 @@
     <target name="importPrefs" if="_importPrefs">
 
         <echo>Import Jetspeed database from ${importDataDir}/j2-prefs-data.xml</echo>
-
         <java classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl"
fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">
             <classpath refid="installationClasspath"/>
             <syspropertyset refid="installationProps"/>
@@ -199,12 +193,12 @@
               -c &quot;serializer&quot;
               -p &quot;${jetspeedWebInfDir}/conf/spring-filter.properties&quot;"
/>
         </java>
+
     </target>
 
     <target name="importPages" if="_importPages">
 
         <echo>Import Jetspeed database pages from ${importDataDir}/pages directory</echo>
-
         <java classname="org.apache.jetspeed.tools.page.serializer.JetspeedPageSerializerApplicationImpl"
fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">
             <classpath refid="installationClasspath"/>
             <syspropertyset refid="installationProps"/>
@@ -214,6 +208,7 @@
               -p &quot;${jetspeedWebInfDir}/conf/spring-filter.properties&quot;
               -psml &quot;${importDataDir}/pages&quot;" />
         </java>
+
     </target>
 
     <target name="checkInput" unless="failSetup">
@@ -312,11 +307,35 @@
     <target name="seedDB">
 
         <echo>Seeding the database</echo>
-
+        <condition property="_seedDataFile" value="j2-ui-seed.xml">
+          <and>
+            <equals arg1="${installationType}" arg2="demo" />
+            <equals arg1="${pipelineType}" arg2="jetui" />
+          </and>
+        </condition>
+        <condition property="_seedDataFile" value="j2-seed.xml">
+          <and>
+            <equals arg1="${installationType}" arg2="demo" />
+            <equals arg1="${pipelineType}" arg2="classic" />
+          </and>
+        </condition>
+        <condition property="_seedDataFile" value="min/j2-ui-seed.xml">
+          <and>
+            <equals arg1="${installationType}" arg2="minimal" />
+            <equals arg1="${pipelineType}" arg2="jetui" />
+          </and>
+        </condition>
+        <condition property="_seedDataFile" value="min/j2-seed.xml">
+          <and>
+            <equals arg1="${installationType}" arg2="minimal" />
+            <equals arg1="${pipelineType}" arg2="classic" />
+          </and>
+        </condition>
+        <echo>Importing: ${_seedDataFile}</echo>
         <java classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl"
fork="yes" failonerror="yes">
             <classpath refid="installationClasspath"/>
             <syspropertyset refid="installationProps"/>
-            <arg line="-I &quot;${basedir}/resources/j2-seed.xml&quot; 
+            <arg line="-I &quot;${basedir}/resources/${_seedDataFile}&quot; 
               -a &quot;${basedir}/../webapps/${portalName}&quot;
               -c &quot;serializer&quot;
               -p &quot;${jetspeedWebInfDir}/conf/spring-filter.properties&quot;"
/>
@@ -327,7 +346,6 @@
     <target name="dbPsml" if="_doImportPsml">
 
         <echo>Importing psml into the database</echo>
-
         <java classname="org.apache.jetspeed.tools.page.serializer.JetspeedPageSerializerApplicationImpl"
fork="yes" failonerror="yes">
             <classpath refid="installationClasspath"/>
             <syspropertyset refid="installationProps"/>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/final-assembly-descriptor.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/final-assembly-descriptor.xml?rev=929401&r1=929400&r2=929401&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/final-assembly-descriptor.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/final-assembly-descriptor.xml Wed Mar
31 06:23:12 2010
@@ -54,7 +54,7 @@
       <outputDirectory>/</outputDirectory>
     </file>
     <file>
-      <source>target/resources/ant-installer/antinstall-config.xml</source>
+      <source>etc/ant-installer/antinstall-config.xml</source>
       <outputDirectory>/</outputDirectory>
     </file>
     <file>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml?rev=929401&r1=929400&r2=929401&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml
Wed Mar 31 06:23:12 2010
@@ -18,8 +18,8 @@
   $Id$
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
   <prerequisites>
@@ -62,17 +62,17 @@
             <configuration>
               <tasks>
                 <unjar src="etc/ant-installer/lib/ai-icons-eclipse.jar"
-                  dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
+                       dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
                 <unjar src="etc/ant-installer/lib/ant.jar"
-                  dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
+                       dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
                 <unjar src="etc/ant-installer/lib/ant-installer.jar"
-                  dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
+                       dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
                 <unjar src="etc/ant-installer/lib/ant-launcher.jar"
-                  dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
+                       dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
                 <unjar src="etc/ant-installer/lib/jgoodies-edited-1_2_2.jar"
-                  dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
+                       dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
                 <unjar src="etc/ant-installer/lib/xml-apis.jar"
-                  dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
+                       dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
                 <delete dir="${project.build.directory}/ant-installer-classes/META-INF"/>
               </tasks>
             </configuration>
@@ -83,30 +83,7 @@
         </executions>
       </plugin>
 
-     <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.2</version>
-        <executions>
-          
-          <!-- copy some ant-installer configuration file to target/resources/ant-installer
-->
-          <execution>
-            <id>copy-configuration</id>
-            <phase>generate-resources</phase>
-            <configuration>
-              <tasks>
-                <copy file="etc/ant-installer/@antinstall.filename@" 
-                  tofile="${project.build.directory}/resources/ant-installer/antinstall-config.xml"/>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-     <!-- assembly: create self extracting jar -->
+      <!-- assembly: create self extracting jar -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -132,20 +109,5 @@
         </executions>
       </plugin>
     </plugins>
-   </build>
-  
-  <profiles>
-    <profile>
-      <id>demo</id>
-      <build>
-        <finalName>${artifactId}-demo-${pom.version}</finalName>
-      </build> 
-    </profile>
-    <profile>
-      <id>minimal</id>
-      <build>
-        <finalName>${artifactId}-minimal-${pom.version}</finalName>
-      </build> 
-    </profile>
-  </profiles>
+  </build>
 </project>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml?rev=929401&r1=929400&r2=929401&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml Wed Mar
31 06:23:12 2010
@@ -228,8 +228,7 @@
                     <destination>resources</destination>
                   </resource>
                   <resource>
-                    <path>@seed.path@</path>
-                    <include>j2-seed.xml</include>
+                    <path>seed</path>
                     <destination>database/resources</destination>
                   </resource>
                   <resource>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml?rev=929401&r1=929400&r2=929401&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
Wed Mar 31 06:23:12 2010
@@ -51,6 +51,8 @@
   </build>
 
   <profiles>
+
+    <!-- unpack: unzip tomcat-portal and portal resources -->
     <profile>
       <id>unpack</id>
       <build>
@@ -131,12 +133,11 @@
     </profile>
 
     <profile>
-      <id>minimal</id>
+      <id>portal</id>
       <build>
         <defaultGoal>package</defaultGoal>
-
-        <!-- create a minimal jetspeed deployment into the expanded tomcat -->
         <plugins>
+          <!-- create a full demo jetspeed deployment into the expanded tomcat -->
           <plugin>
             <groupId>org.apache.portals.jetspeed-2</groupId>
             <artifactId>jetspeed-deploy-maven-plugin</artifactId>
@@ -156,196 +157,7 @@
                     <context>webapps/jetspeed/META-INF</context>
                   </destinations>
                   <deployments>
-                    <deployment>
-                      <artifact>org.apache.portals:portlet-api_2.0_spec:jar</artifact>
-                    </deployment>
-                    <deployment>
-                      <artifact>javax.ccpp:ccpp:jar</artifact>
-                    </deployment>
-                    <deployment>
-                      <artifact>org.apache.portals.jetspeed-2:jetspeed-api:jar</artifact>
-                    </deployment>
-                    <deployment>
-                      <artifact>org.apache.portals.jetspeed-2:jetspeed-commons:jar</artifact>
-                    </deployment>
-                    <deployment>
-                      <artifact>org.apache.portals.pluto:pluto-container-api:jar</artifact>
-                    </deployment>
-                    <deployment>
-                      <artifact>org.apache.portals.pluto:pluto-taglib:jar</artifact>
-                    </deployment>
-                    <deployment>
-                      <artifact>org.apache.portals.bridges:portals-bridges-common:jar</artifact>
-                    </deployment>
-                    <!-- jetspeed portal expanded -->
-                    <deployment>
-                      <artifact>org.apache.portals.jetspeed-2:jetspeed-demo:war</artifact>
-                      <expand>true</expand>
-                      <targetName>${org.apache.jetspeed.portal.context.name}</targetName>
-                      <delete>./${org.apache.jetspeed.portal.context.name}</delete>
-                    </deployment>
-                    <!-- demo portal tomcat context -->
-                    <deployment>
-                      <file>${project.build.directory}/resources/tomcat/context.xml</file>
-                      <destination>context</destination>
-                    </deployment>
-                    <!-- Tomcat server conf override -->
-                    <deployment>
-                      <file>${project.build.directory}/../etc/tomcat/conf/server.xml</file>
-                      <destination>server-conf</destination>
-                    </deployment>
-                    <!-- admin pa -->
-                    <deployment>
-                      <artifact>org.apache.portals.jetspeed-2:j2-admin:war</artifact>
-                      <expand>true</expand>
-                      <delete>./j2-admin</delete>
-                    </deployment>
-                    <!-- logging -->
-                    <deployment>
-                      <artifact>org.apache.portals.applications:apa-logging:jar</artifact>
-                      <destination>server-lib</destination>
-                    </deployment>
-                  </deployments>
-                  <edits>
-                    <!-- logging -->
-                    <edit>
-                      <targetName>server.xml</targetName>
-                      <destination>server-conf</destination>
-                      <editorClassName>org.apache.portals.applications.logging.tomcat.ServerXMLConfigurer</editorClassName>
-                    </edit>
-                  </edits>
-                </configuration>
-              </execution>
-            </executions>
-
-            <dependencies>
-
-              <dependency>
-                <groupId>org.apache.portals</groupId>
-                <artifactId>portlet-api_2.0_spec</artifactId>
-                <version>${portals.portlet2-api-spec.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>javax.ccpp</groupId>
-                <artifactId>ccpp</artifactId>
-                <version>${ccpp.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>jetspeed-api</artifactId>
-                <version>${org.apache.portals.jetspeed.version}</version>
-                <scope>runtime</scope>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>jetspeed-commons</artifactId>
-                <version>${org.apache.portals.jetspeed.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.pluto</groupId>
-                <artifactId>pluto-container-api</artifactId>
-                <version>${org.apache.pluto.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.pluto</groupId>
-                <artifactId>pluto-taglib</artifactId>
-                <version>${org.apache.pluto.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.bridges</groupId>
-                <artifactId>portals-bridges-common</artifactId>
-                <version>${org.apache.portals.bridges.common.version}</version>
-              </dependency>
-              <!-- jetspeed-demo -->
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>jetspeed-demo</artifactId>
-                <version>${pom.version}</version>
-                <type>war</type>
-              </dependency>
-              <!-- j2-admin -->
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>j2-admin</artifactId>
-                <version>${org.apache.portals.jetspeed.version}</version>
-                <type>war</type>
-              </dependency>
-              <!-- logging -->
-              <dependency>
-                <groupId>org.apache.portals.applications</groupId>
-                <artifactId>apa-logging</artifactId>
-                <version>${org.apache.portals.applications.apa-logging.version}</version>
-              </dependency>
-
-              <!-- plugin own dependencies -->
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>jetspeed-deploy-tools</artifactId>
-                <version>${org.apache.portals.jetspeed.version}</version>
-              </dependency>
-            </dependencies>
-          </plugin>
-
-          <!-- remove pages and move min-pages to pages -->
-          <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.portal.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/pages</srcDirectoryPath>
-                  <event>delete</event>
-                </configuration>
-              </execution>
-              <execution>
-                <id>move-min-pages</id>
-                <goals>
-                  <goal>event</goal>
-                </goals>
-                <phase>process-resources</phase>
-                <configuration>
-                  <srcDirectoryPath>${org.apache.jetspeed.portal.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/min-pages</srcDirectoryPath>
-                  <destDirectoryPath>${org.apache.jetspeed.portal.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/pages</destDirectoryPath>
-                  <event>move</event>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>demo</id>
-      <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-          <!-- create a demo jetspeed deployment into the expanded tomcat -->
-          <plugin>
-            <groupId>org.apache.portals.jetspeed-2</groupId>
-            <artifactId>jetspeed-deploy-maven-plugin</artifactId>
-            <version>${org.apache.portals.jetspeed.version}</version>
-            <executions>
-              <execution>
-                <id>deploy</id>
-                <goals>
-                  <goal>deploy</goal>
-                </goals>
-                <phase>generate-resources</phase>
-                <configuration>
-                  <targetBaseDir>${org.apache.jetspeed.portal.home}</targetBaseDir>
-                  <portalName>${org.apache.jetspeed.portal.context.name}</portalName>
-                  <profile>tomcat${tomcat.version.major}</profile>
-                  <destinations>
-                    <context>webapps/jetspeed/META-INF</context>
-                  </destinations>
-                  <deployments>
+                    <!-- commons -->
                     <deployment>
                       <artifact>org.apache.portals:portlet-api_2.0_spec:jar</artifact>
                     </deployment>
@@ -384,13 +196,13 @@
                       <file>${project.build.directory}/../etc/tomcat/conf/server.xml</file>
                       <destination>server-conf</destination>
                     </deployment>                    
-                    <!-- admin pa -->
+                    <!-- admin portlet application -->
                     <deployment>
                       <artifact>org.apache.portals.jetspeed-2:j2-admin:war</artifact>
                       <expand>true</expand>
                       <delete>./j2-admin</delete>
                     </deployment>
-                    <!-- demo pa's, not for minimal! -->
+                    <!-- demo portlet applications -->
                     <deployment>
                       <artifact>org.apache.portals.applications:apa-demo:war</artifact>
                       <targetName>demo.war</targetName>
@@ -434,6 +246,7 @@
             </executions>
 
             <dependencies>
+              <!-- commons -->
               <dependency>
                 <groupId>org.apache.portals</groupId>
                 <artifactId>portlet-api_2.0_spec</artifactId>
@@ -470,22 +283,21 @@
                 <artifactId>portals-bridges-common</artifactId>
                 <version>${org.apache.portals.bridges.common.version}</version>
               </dependency>
-              <!-- jetspeed-demo -->
+              <!-- jetspeed demo portal -->
               <dependency>
                 <groupId>org.apache.portals.jetspeed-2</groupId>
                 <artifactId>jetspeed-demo</artifactId>
                 <version>${pom.version}</version>
                 <type>war</type>
               </dependency>
-              <!-- j2-admin -->
+              <!-- j2-admin portal applications -->
               <dependency>
                 <groupId>org.apache.portals.jetspeed-2</groupId>
                 <artifactId>j2-admin</artifactId>
                 <version>${org.apache.portals.jetspeed.version}</version>
                 <type>war</type>
               </dependency>
-
-              <!-- demo pa's, not for minimal! -->
+              <!-- demo portal applications -->
               <dependency>
                 <groupId>org.apache.portals.applications</groupId>
                 <artifactId>apa-rss-war</artifactId>
@@ -510,14 +322,12 @@
                 <version>${org.apache.portals.applications.apa-dbbrowser.version}</version>
                 <type>war</type>
               </dependency>
-
               <!-- logging -->
               <dependency>
                 <groupId>org.apache.portals.applications</groupId>
                 <artifactId>apa-logging</artifactId>
                 <version>${org.apache.portals.applications.apa-logging.version}</version>
               </dependency>
-              
               <!-- plugin own dependencies -->
               <dependency>
                 <groupId>org.apache.portals.jetspeed-2</groupId>
@@ -526,26 +336,6 @@
               </dependency>
             </dependencies>
           </plugin>
-
-          <!-- remove min-pages from deployed jetspeed -->
-          <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-min-pages</id>
-                <goals>
-                  <goal>event</goal>
-                </goals>
-                <phase>process-resources</phase>
-                <configuration>
-                  <srcDirectoryPath>${org.apache.jetspeed.portal.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/min-pages</srcDirectoryPath>
-                  <event>delete</event>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml?rev=929401&r1=929400&r2=929401&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml Wed Mar 31 06:23:12 2010
@@ -49,18 +49,8 @@
               <goals>clean</goals>
             </target>
             <target>
-              <id>database-minimal</id>
+              <id>database</id>
               <name>database</name>
-              <properties>
-                <seed.path>seed/min</seed.path>
-              </properties>
-            </target>
-            <target>
-              <id>database-demo</id>
-              <name>database</name>
-              <properties>
-                <seed.path>seed</seed.path>
-              </properties>
             </target>
             <target>
               <id>tomcat-portal-unpack</id>
@@ -68,14 +58,9 @@
               <profiles>unpack</profiles>
             </target>
             <target>
-              <id>tomcat-portal-minimal</id>
-              <name>tomcat-portal</name>
-              <profiles>minimal</profiles>
-            </target>
-            <target>
-              <id>tomcat-portal-demo</id>
+              <id>tomcat-portal</id>
               <name>tomcat-portal</name>
-              <profiles>demo</profiles>
+              <profiles>portal</profiles>
             </target>
             <target>
               <id>tomcat-portal-pack</id>
@@ -83,28 +68,12 @@
               <profiles>pack</profiles>
             </target>
             <target>
-              <id>ant-installer-demo</id>
+              <id>ant-installer</id>
               <name>ant-installer</name>
-              <profiles>demo</profiles>
-              <properties>
-                <antinstall.filename>antinstall-config.xml</antinstall.filename>
-              </properties>
-            </target>
-            <target>
-              <id>ant-installer-minimal</id>
-              <name>ant-installer</name>
-              <profiles>minimal</profiles>
-              <properties>
-                <antinstall.filename>antinstall-config-min.xml</antinstall.filename>
-              </properties>
-            </target>
-            <target>
-              <id>installer-demo</id>
-              <depends>clean,database-demo,tomcat-portal-unpack,tomcat-portal-demo,tomcat-portal-pack,ant-installer-demo</depends>
             </target>
             <target>
-              <id>installer-minimal</id>
-              <depends>clean,database-minimal,tomcat-portal-unpack,tomcat-portal-minimal,tomcat-portal-pack,ant-installer-minimal</depends>
+              <id>installer</id>
+              <depends>clean,database,tomcat-portal-unpack,tomcat-portal,tomcat-portal-pack,ant-installer</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