You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2006/03/28 23:45:23 UTC
svn commit: r389611 - in /portals/jetspeed-2/trunk: ./ app-servers/
components/deploy-tool/ components/page-manager/ components/portal-site/
etc/ etc/import/ etc/import/assembly/
maven-archetypes/portal/src/archetype/archetype-resources/etc/ maven-arch...
Author: rwatler
Date: Tue Mar 28 13:45:21 2006
New Revision: 389611
URL: http://svn.apache.org/viewcvs?rev=389611&view=rev
Log:
Maven2: support PSML import using dbpsml profile
Added:
portals/jetspeed-2/trunk/etc/import/build.xml (with props)
portals/jetspeed-2/trunk/etc/import/pom.xml (with props)
Modified:
portals/jetspeed-2/trunk/app-servers/build.xml
portals/jetspeed-2/trunk/app-servers/pom.xml
portals/jetspeed-2/trunk/app-servers/tomcat-build.xml
portals/jetspeed-2/trunk/components/deploy-tool/build.xml
portals/jetspeed-2/trunk/components/page-manager/build.xml
portals/jetspeed-2/trunk/components/portal-site/build.xml
portals/jetspeed-2/trunk/etc/build.xml
portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
portals/jetspeed-2/trunk/maven.xml
portals/jetspeed-2/trunk/pom.xml
portals/jetspeed-2/trunk/portal/build.xml
portals/jetspeed-2/trunk/portal/pom.xml
portals/jetspeed-2/trunk/settings.xml.sample
Modified: portals/jetspeed-2/trunk/app-servers/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/build.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/build.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/build.xml Tue Mar 28 13:45:21 2006
@@ -24,6 +24,7 @@
<property name="org.apache.jetspeed.deploy.skip" value="false"/>
<property name="org.apache.jetspeed.deploy.target" value="none"/>
<property name="org.apache.jetspeed.deploy.type" value="full"/>
+ <property name="org.apache.jetspeed.database.psml" value="false"/>
<property name="org.apache.jetspeed.server.home" value=""/>
<property name="org.apache.jetspeed.catalina.version.major" value=""/>
<property name="org.apache.jetspeed.production.database.default.name" value=""/>
@@ -62,6 +63,7 @@
<echo message=" org.apache.jetspeed.deploy.skip=${org.apache.jetspeed.deploy.skip}"/>
<echo message=" org.apache.jetspeed.deploy.target=${org.apache.jetspeed.deploy.target}"/>
<echo message=" org.apache.jetspeed.deploy.type=${org.apache.jetspeed.deploy.type}"/>
+ <echo message=" org.apache.jetspeed.database.psml=${org.apache.jetspeed.database.psml}"/>
<echo message=" org.apache.jetspeed.server.home=${org.apache.jetspeed.server.home}"/>
<echo message=" org.apache.jetspeed.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
<echo message=" org.apache.jetspeed.production.database.default.name=${org.apache.jetspeed.production.database.default.name}"/>
@@ -188,6 +190,8 @@
<ant antfile="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml" dir="${basedir}" target="hot-deploy" inheritall="off">
<property name="org.apache.jetspeed.deploy.type"
value="${org.apache.jetspeed.deploy.type}"/>
+ <property name="org.apache.jetspeed.database.psml"
+ value="${org.apache.jetspeed.database.psml}"/>
<property name="org.apache.jetspeed.server.home"
value="${org.apache.jetspeed.server.home}"/>
<property name="org.apache.jetspeed.groupid"
Modified: portals/jetspeed-2/trunk/app-servers/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/pom.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/pom.xml Tue Mar 28 13:45:21 2006
@@ -113,6 +113,8 @@
value="${org.apache.jetspeed.env.deploy.target}"/>
<property name="org.apache.jetspeed.deploy.type"
value="${org.apache.jetspeed.env.deploy.type}"/>
+ <property name="org.apache.jetspeed.database.psml"
+ value="${org.apache.jetspeed.env.deploy.db.psml}"/>
<property name="org.apache.jetspeed.server.home"
value="${org.apache.jetspeed.server.home}"/>
<property name="org.apache.jetspeed.groupid"
Modified: portals/jetspeed-2/trunk/app-servers/tomcat-build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/tomcat-build.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/tomcat-build.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/tomcat-build.xml Tue Mar 28 13:45:21 2006
@@ -21,6 +21,7 @@
<!-- Properties -->
<property name="org.apache.jetspeed.deploy.type" value="full"/>
+ <property name="org.apache.jetspeed.database.psml" value="false"/>
<property name="org.apache.jetspeed.server.home" value=""/>
<property name="org.apache.jetspeed.catalina.version.major" value=""/>
<property name="org.apache.jetspeed.production.database.default.name" value=""/>
@@ -55,10 +56,8 @@
<echo message=" hot-deploy-jar - hot deploy component jar Tomcat app server."/>
<echo message=" hot-deploy-war - hot deploy application war Tomcat app server."/>
<echo message="Configuration:"/>
- <echo message=" org.apache.jetspeed.deploy.enable=${org.apache.jetspeed.deploy.enable}"/>
- <echo message=" org.apache.jetspeed.deploy.skip=${org.apache.jetspeed.deploy.skip}"/>
- <echo message=" org.apache.jetspeed.deploy.target=${org.apache.jetspeed.deploy.target}"/>
<echo message=" org.apache.jetspeed.deploy.type=${org.apache.jetspeed.deploy.type}"/>
+ <echo message=" org.apache.jetspeed.database.psml=${org.apache.jetspeed.database.psml}"/>
<echo message=" org.apache.jetspeed.server.home=${org.apache.jetspeed.server.home}"/>
<echo message=" org.apache.jetspeed.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
<echo message=" org.apache.jetspeed.production.database.default.name=${org.apache.jetspeed.production.database.default.name}"/>
@@ -244,15 +243,33 @@
</target>
<target name="test-deploy-type">
- <condition property="org.apache.jetspeed.deploy.full">
+ <!-- application deploy types are additive -->
+ <condition property="org.apache.jetspeed.deploy.full.apps">
<equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
</condition>
- <condition property="org.apache.jetspeed.deploy.min">
+ <condition property="org.apache.jetspeed.deploy.min.apps">
<or>
<equals arg1="${org.apache.jetspeed.deploy.type}" arg2="min"/>
<equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
</or>
</condition>
+ <!-- pages deploy types are exclusive -->
+ <condition property="org.apache.jetspeed.deploy.full.pages">
+ <and>
+ <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
+ <not>
+ <equals arg1="${org.apache.jetspeed.database.psml}" arg2="true"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="org.apache.jetspeed.deploy.min.pages">
+ <and>
+ <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="min"/>
+ <not>
+ <equals arg1="${org.apache.jetspeed.database.psml}" arg2="true"/>
+ </not>
+ </and>
+ </condition>
</target>
<target name="embedded-database-derby" if="org.apache.jetspeed.production.database.is.derby.embedded">
@@ -289,7 +306,7 @@
</copy>
</target>
- <target name="deploy-min-apps" if="org.apache.jetspeed.deploy.min">
+ <target name="deploy-min-apps" if="org.apache.jetspeed.deploy.min.apps">
<!-- deploy minimal set of portlet and layout applications -->
<delete dir="${org.apache.jetspeed.server.home}/webapps/j2-admin"/>
<delete>
@@ -305,7 +322,7 @@
<antcall target="hot-deploy-min-apps"/>
</target>
- <target name="deploy-full-apps" if="org.apache.jetspeed.deploy.full">
+ <target name="deploy-full-apps" if="org.apache.jetspeed.deploy.full.apps">
<!-- deploy additional set of portlet applications -->
<delete dir="${org.apache.jetspeed.server.home}/webapps/demo"/>
<delete dir="${org.apache.jetspeed.server.home}/webapps/jpetstore"/>
@@ -331,7 +348,7 @@
<antcall target="hot-deploy-full-apps"/>
</target>
- <target name="hot-deploy-min-pages" if="org.apache.jetspeed.deploy.min">
+ <target name="hot-deploy-min-pages" if="org.apache.jetspeed.deploy.min.pages">
<!-- hot deploy minimum pages content -->
<copy todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/pages">
<fileset dir="${basedir}/../src/webapp/WEB-INF/pages">
@@ -347,14 +364,14 @@
token=" hidden="true""/>
</target>
- <target name="hot-deploy-full-pages" if="org.apache.jetspeed.deploy.full">
+ <target name="hot-deploy-full-pages" if="org.apache.jetspeed.deploy.full.pages">
<!-- hot deploy full pages content -->
<copy todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/pages">
<fileset dir="${basedir}/../src/webapp/WEB-INF/pages"/>
</copy>
</target>
- <target name="hot-deploy-full-apps" if="org.apache.jetspeed.deploy.full">
+ <target name="hot-deploy-full-apps" if="org.apache.jetspeed.deploy.full.apps">
<!-- hot deploy additional set of portlet applications -->
<antcall target="hot-deploy-war">
<param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
@@ -388,7 +405,7 @@
</antcall>
</target>
- <target name="hot-deploy-min-apps" if="org.apache.jetspeed.deploy.min">
+ <target name="hot-deploy-min-apps" if="org.apache.jetspeed.deploy.min.apps">
<!-- hot deploy minimal set of portlet and layout applications -->
<antcall target="hot-deploy-war">
<param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
Modified: portals/jetspeed-2/trunk/components/deploy-tool/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/deploy-tool/build.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/build.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/build.xml Tue Mar 28 13:45:21 2006
@@ -31,6 +31,7 @@
<target name="resources">
+ <!-- merge portlet.tld with existing component resources -->
<mkdir dir="${basedir}/target/classes/org/apache/jetspeed/tools/deploy"/>
<copy file="${basedir}/../../src/webapp/WEB-INF/tld/portlet.tld"
todir="${basedir}/target/classes/org/apache/jetspeed/tools/deploy"/>
Modified: portals/jetspeed-2/trunk/components/page-manager/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/build.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/build.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/build.xml Tue Mar 28 13:45:21 2006
@@ -32,7 +32,7 @@
<target name="testdata">
<delete dir="${basedir}/target/testdata"/>
- <mkdir dir="${basedir}/target"/>
+ <mkdir dir="${basedir}/target/testdata"/>
<copy todir="${basedir}/target/testdata">
<fileset dir="${basedir}/testdata"/>
</copy>
Modified: portals/jetspeed-2/trunk/components/portal-site/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/build.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/build.xml (original)
+++ portals/jetspeed-2/trunk/components/portal-site/build.xml Tue Mar 28 13:45:21 2006
@@ -32,7 +32,7 @@
<target name="testdata">
<delete dir="${basedir}/target/testdata"/>
- <mkdir dir="${basedir}/target"/>
+ <mkdir dir="${basedir}/target/testdata"/>
<copy todir="${basedir}/target/testdata">
<fileset dir="${basedir}/testdata"/>
</copy>
Modified: portals/jetspeed-2/trunk/etc/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/build.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/build.xml (original)
+++ portals/jetspeed-2/trunk/etc/build.xml Tue Mar 28 13:45:21 2006
@@ -81,6 +81,7 @@
<target name="schema" depends="test-database-default-name, test-database-filter-drops">
<!-- make target directory -->
+ <delete dir="${org.apache.jetspeed.database.target.sql}"/>
<mkdir dir="${org.apache.jetspeed.database.target.sql}"/>
<!-- copy general sql -->
@@ -256,7 +257,7 @@
<!-- Populate Database -->
- <target name="populate-db" depends="populate-skip" unless="org.apache.jetspeed.skip">
+ <target name="populate-db" depends="test-populate-skip" unless="org.apache.jetspeed.skip">
<!-- execute drop scripts -->
<antcall target="sql-execute" inheritall="on" inheritrefs="on">
@@ -292,16 +293,7 @@
</target>
- <target name="populate-skip">
- <condition property="org.apache.jetspeed.skip">
- <or>
- <equals arg1="${org.apache.jetspeed.database.skip}" arg2="true"/>
- <not>
- <equals arg1="${org.apache.jetspeed.database.enable}" arg2="true"/>
- </not>
- </or>
- </condition>
- </target>
+ <!-- SQL Execution -->
<target name="sql-execute" depends="sql-test-database-classpath, sql-execute-drivers-path, sql-execute-derby, sql-execute-hsql"/>
@@ -416,6 +408,19 @@
<include name="${database.arg.scripts}"/>
</fileset>
</sql>
+ </target>
+
+ <!-- Utilities -->
+
+ <target name="test-populate-skip">
+ <condition property="org.apache.jetspeed.skip">
+ <or>
+ <equals arg1="${org.apache.jetspeed.database.skip}" arg2="true"/>
+ <not>
+ <equals arg1="${org.apache.jetspeed.database.enable}" arg2="true"/>
+ </not>
+ </or>
+ </condition>
</target>
</project>
Modified: portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml (original)
+++ portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml Tue Mar 28 13:45:21 2006
@@ -60,7 +60,7 @@
<constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
<constructor-arg index="1"><value>.psml</value></constructor-arg>
<constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>
- <constructor-arg index="3" ><value>./src/webapp/WEB-INF/pages</value></constructor-arg>
+ <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
<constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
</bean>
@@ -69,7 +69,7 @@
<constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
<constructor-arg index="1"><value>.link</value></constructor-arg>
<constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>
- <constructor-arg index="3" ><value>./src/webapp/WEB-INF/pages</value></constructor-arg>
+ <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
<constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
</bean>
@@ -78,7 +78,7 @@
<constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
<constructor-arg index="1"><value>folder.metadata</value></constructor-arg>
<constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>
- <constructor-arg index="3" ><value>./src/webapp/WEB-INF/pages</value></constructor-arg>
+ <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
<constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
</bean>
@@ -87,7 +87,7 @@
<constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
<constructor-arg index="1"><value>page.security</value></constructor-arg>
<constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>
- <constructor-arg index="3" ><value>./src/webapp/WEB-INF/pages</value></constructor-arg>
+ <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
<constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
</bean>
@@ -113,7 +113,7 @@
<bean id="FolderHandler"
class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >
- <constructor-arg index="0"><value>./src/webapp/WEB-INF/pages</value></constructor-arg>
+ <constructor-arg index="0"><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
<constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
<constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>
</bean>
@@ -158,5 +158,8 @@
</constructor-arg>
</bean>
+
+ <!-- properties configurer used to pick up system properties -->
+ <bean id="propertiesConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
</beans>
Added: portals/jetspeed-2/trunk/etc/import/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/import/build.xml?rev=389611&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/etc/import/build.xml (added)
+++ portals/jetspeed-2/trunk/etc/import/build.xml Tue Mar 28 13:45:21 2006
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ $Id:$
+-->
+<project name="etc" default="help">
+
+ <!-- Properties -->
+
+ <property name="org.apache.jetspeed.database.enable" value="true"/>
+ <property name="org.apache.jetspeed.database.skip" value="false"/>
+ <property name="org.apache.jetspeed.database.psml" value="false"/>
+ <property name="org.apache.jetspeed.deploy.type" value="full"/>
+ <property name="org.apache.jetspeed.database.default.name" value=""/>
+ <property name="org.apache.jetspeed.database.url" value=""/>
+ <property name="org.apache.jetspeed.database.jdbc.drivers.path" value=""/>
+ <property name="org.apache.jetspeed.database.driver" value=""/>
+ <property name="org.apache.jetspeed.database.user" value=""/>
+ <property name="org.apache.jetspeed.database.password" value=""/>
+ <property name="org.apache.derby.version" value=""/>
+ <property name="hsqldb.version" value=""/>
+ <property name="org.apache.jetspeed.groupid" value=""/>
+ <property name="org.apache.jetspeed.version" value=""/>
+ <property name="org.apache.pluto.version" value=""/>
+ <property name="portlet-api.version" value=""/>
+
+ <property name="org.apache.jetspeed.page.import.configuration" value="${basedir}/import.properties"/>
+ <property name="org.apache.jetspeed.page.import.pages" value="${basedir}/target/data/pages"/>
+
+ <!-- Usage -->
+
+ <target name="help">
+ <echo message="Buildfile for the import maven POM."/>
+ <echo message="Usage: ant [ populate-db-psml ]"/>
+ <echo message="Where:"/>
+ <echo message=" populate-db-psml - build and populate database instance with imported PSML."/>
+ <echo message="Configuration:"/>
+ <echo message=" org.apache.jetspeed.database.enable=${org.apache.jetspeed.database.enable}"/>
+ <echo message=" org.apache.jetspeed.database.skip=${org.apache.jetspeed.database.skip}"/>
+ <echo message=" org.apache.jetspeed.database.psml=${org.apache.jetspeed.database.psml}"/>
+ <echo message=" org.apache.jetspeed.deploy.type=${org.apache.jetspeed.deploy.type}"/>
+ <echo message=" org.apache.jetspeed.database.default.name=${org.apache.jetspeed.database.default.name}"/>
+ <echo message=" org.apache.jetspeed.database.url=${org.apache.jetspeed.database.url}"/>
+ <echo message=" org.apache.jetspeed.database.jdbc.drivers.path=${org.apache.jetspeed.database.jdbc.drivers.path}"/>
+ <echo message=" org.apache.jetspeed.database.driver=${org.apache.jetspeed.database.driver}"/>
+ <echo message=" org.apache.jetspeed.database.user=${org.apache.jetspeed.database.user}"/>
+ <echo message=" org.apache.jetspeed.database.password=${org.apache.jetspeed.database.password}"/>
+ <echo message=" org.apache.derby.version=${org.apache.derby.version}"/>
+ <echo message=" hsqldb.version=${hsqldb.version}"/>
+ <echo message=" org.apache.jetspeed.groupid=${org.apache.jetspeed.groupid}"/>
+ <echo message=" org.apache.jetspeed.version=${org.apache.jetspeed.version}"/>
+ <echo message=" org.apache.pluto.version=${org.apache.pluto.version}"/>
+ <echo message=" portlet-api.version=${portlet-api.version}"/>
+ </target>
+
+ <!-- Additional Task Definitions -->
+
+ <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"/>
+
+ <!-- Populate Database -->
+
+ <target name="populate-db-psml" depends="test-populate-skip" unless="org.apache.jetspeed.skip.psml">
+
+ <!-- aggregate PSML to merge -->
+ <delete dir="${basedir}/target/data/pages"/>
+ <mkdir dir="${basedir}/target/data/pages"/>
+ <antcall target="aggregate-pages"/>
+
+ <!-- prepare a classes directory with resources and libraries to execute import -->
+ <delete dir="${basedir}/target/classes"/>
+ <mkdir dir="${basedir}/target/classes"/>
+ <copy todir="${basedir}/target/classes" flatten="on">
+ <fileset dir="${basedir}/../.." >
+ <include name="etc/log4j/log4j.properties"/>
+ <include name="etc/db-ojb/*"/>
+ <include name="etc/import/assembly/import-page-manager.xml"/>
+ <include name="etc/import/assembly/repository-datasource-spring.xml"/>
+ <include name="src/webapp/WEB-INF/assembly/transaction.xml"/>
+ <include name="src/webapp/WEB-INF/assembly/alternate/interceptors.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- construct page manager component classpath -->
+ <dependencies filesetId="page.manager.dependencies.id" useScope="test">
+ <dependency groupId="${org.apache.jetspeed.groupid}"
+ artifactId="jetspeed-api"
+ version="${org.apache.jetspeed.version}"/>
+ <dependency groupId="${org.apache.jetspeed.groupid}"
+ artifactId="jetspeed-commons"
+ version="${org.apache.jetspeed.version}"/>
+ <dependency groupId="org.apache.pluto"
+ artifactId="pluto"
+ version="${org.apache.pluto.version}"/>
+ <dependency groupId="${org.apache.jetspeed.groupid}"
+ artifactId="jetspeed-id-generator"
+ version="${org.apache.jetspeed.version}"/>
+ <dependency groupId="portlet-api"
+ artifactId="portlet-api"
+ version="${portlet-api.version}"/>
+ <dependency groupId="${org.apache.jetspeed.groupid}"
+ artifactId="jetspeed-page-manager"
+ version="${org.apache.jetspeed.version}"/>
+ </dependencies>
+
+ <!-- create sysproperty set to configure import utility -->
+ <propertyset id="import.syspropertyset.id">
+ <propertyref name="org.apache.jetspeed.page.import.configuration"/>
+ <propertyref name="org.apache.jetspeed.page.import.pages"/>
+ <propertyref name="org.apache.jetspeed.database.driver"/>
+ <propertyref name="org.apache.jetspeed.database.url"/>
+ <propertyref name="org.apache.jetspeed.database.user"/>
+ <propertyref name="org.apache.jetspeed.database.password"/>
+ </propertyset>
+
+ <!-- execute import utility within the page manager component -->
+ <antcall target="execute-import" inheritall="on" inheritrefs="on"/>
+ </target>
+
+ <target name="aggregate-pages" depends="test-deploy-type, aggregate-pages-min, aggregate-pages-full"/>
+
+ <target name="aggregate-pages-min" if="org.apache.jetspeed.deploy.min">
+ <copy todir="${basedir}/target/data/pages">
+ <fileset dir="${basedir}/../../src/webapp/WEB-INF/pages">
+ <include name="Administrative/**"/>
+ <include name="my-account.psml"/>
+ <include name="page.security"/>
+ <include name="system/**"/>
+ </fileset>
+ </copy>
+ <copy file="${basedir}/../../src/webapp/WEB-INF/pages/minimal-default-page.psml"
+ tofile="${basedir}/target/data/pages/default-page.psml"/>
+ <replace file="${basedir}/target/data/pages/default-page.psml"
+ token=" hidden="true""/>
+ </target>
+
+ <target name="aggregate-pages-full" if="org.apache.jetspeed.deploy.full">
+ <copy todir="${basedir}/target/data/pages">
+ <fileset dir="${basedir}/../../src/webapp/WEB-INF/pages"/>
+ </copy>
+ </target>
+
+ <target name="execute-import" depends="test-database-classpath, execute-import-drivers-path, execute-import-derby, execute-import-hsql"/>
+
+ <target name="execute-import-drivers-path" if="org.apache.jetspeed.database.use.drivers.path">
+
+ <!-- execute import utility with drivers path in classpath -->
+ <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
+ <classpath>
+ <fileset refid="page.manager.dependencies.id"/>
+ <pathelement path="${org.apache.jetspeed.database.jdbc.drivers.path}"/>
+ <pathelement path="${basedir}/target/classes"/>
+ </classpath>
+ <syspropertyset>
+ <propertyset refid="import.syspropertyset.id"/>
+ </syspropertyset>
+ </java>
+
+ </target>
+
+ <target name="execute-import-derby" if="org.apache.jetspeed.database.is.derby.embedded">
+
+ <!-- construct embedded derby classpath -->
+ <dependencies filesetId="derby.embedded.db.dependencies.id" useScope="test">
+ <dependency groupId="org.apache.derby"
+ artifactId="derby"
+ version="${org.apache.derby.version}"/>
+ </dependencies>
+
+ <!-- execute import utility with drivers path in classpath -->
+ <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
+ <classpath>
+ <fileset refid="page.manager.dependencies.id"/>
+ <fileset refid="derby.embedded.db.dependencies.id"/>
+ <pathelement path="${basedir}/target/classes"/>
+ </classpath>
+ <syspropertyset>
+ <propertyset refid="import.syspropertyset.id"/>
+ </syspropertyset>
+ </java>
+
+ </target>
+
+ <target name="execute-import-hsql" if="org.apache.jetspeed.database.is.hsql.embedded">
+
+ <!-- construct embedded hsql classpath -->
+ <dependencies filesetId="hsql.embedded.db.dependencies.id" useScope="test">
+ <dependency groupId="hsqldb"
+ artifactId="hsqldb"
+ version="${hsqldb.version}"/>
+ </dependencies>
+
+ <!-- execute import utility with drivers path in classpath -->
+ <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
+ <classpath>
+ <fileset refid="page.manager.dependencies.id"/>
+ <fileset refid="hsql.embedded.db.dependencies.id"/>
+ <pathelement path="${basedir}/target/classes"/>
+ </classpath>
+ <syspropertyset>
+ <propertyset refid="import.syspropertyset.id"/>
+ </syspropertyset>
+ </java>
+
+ </target>
+
+ <!-- Utilities -->
+
+ <target name="test-populate-skip">
+ <condition property="org.apache.jetspeed.skip.psml">
+ <or>
+ <equals arg1="${org.apache.jetspeed.database.skip}" arg2="true"/>
+ <not>
+ <equals arg1="${org.apache.jetspeed.database.enable}" arg2="true"/>
+ </not>
+ <not>
+ <equals arg1="${org.apache.jetspeed.database.psml}" arg2="true"/>
+ </not>
+ </or>
+ </condition>
+ </target>
+
+ <target name="test-database-classpath">
+ <condition property="org.apache.jetspeed.database.use.drivers.path">
+ <and>
+ <not><equals arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/></not>
+ <not><equals arg1="${org.apache.jetspeed.database.default.name}" arg2="derby"/></not>
+ <not><equals arg1="${org.apache.jetspeed.database.default.name}" arg2="hsql"/></not>
+ </and>
+ </condition>
+ <condition property="org.apache.jetspeed.database.is.derby.embedded">
+ <and>
+ <equals arg1="${org.apache.jetspeed.database.default.name}" arg2="derby"/>
+ <equals arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/>
+ </and>
+ </condition>
+ <condition property="org.apache.jetspeed.database.is.hsql.embedded">
+ <and>
+ <equals arg1="${org.apache.jetspeed.database.default.name}" arg2="hsql"/>
+ <equals arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="test-deploy-type">
+ <condition property="org.apache.jetspeed.deploy.full">
+ <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
+ </condition>
+ <condition property="org.apache.jetspeed.deploy.min">
+ <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="min"/>
+ </condition>
+ </target>
+
+</project>
Propchange: portals/jetspeed-2/trunk/etc/import/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/etc/import/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/import/pom.xml?rev=389611&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/etc/import/pom.xml (added)
+++ portals/jetspeed-2/trunk/etc/import/pom.xml Tue Mar 28 13:45:21 2006
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ $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">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- POM Identification -->
+
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>2.1-dev</version>
+ <artifactId>import</artifactId>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>2.1-dev</version>
+ <artifactId>jetspeed-2</artifactId>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <packaging>pom</packaging>
+ <name>Jetspeed-2 PSML Database Import</name>
+ <description>
+ Project used to import the PSML configuration into the production database.
+ </description>
+
+ <!-- Profiles -->
+
+ <profiles>
+
+ <!-- derby database profile -->
+ <profile>
+ <id>jetspeed-db-embedded-derby</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!-- hsql database profile -->
+ <profile>
+ <id>jetspeed-db-embedded-hsql</id>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ </profiles>
+
+ <!-- Build Configuration -->
+
+ <build>
+
+ <!-- Plugin Executions -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+
+ <!-- populate production database instance with PSML -->
+ <execution>
+ <id>etc-populate-production-psml</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <ant target="populate-db-psml" antfile="build.xml" dir="${basedir}" inheritRefs="on">
+ <property name="org.apache.jetspeed.database.enable"
+ value="${org.apache.jetspeed.env.deploy.db}"/>
+ <property name="org.apache.jetspeed.database.skip"
+ value="${org.apache.jetspeed.env.skip.production}"/>
+ <property name="org.apache.jetspeed.database.psml"
+ value="${org.apache.jetspeed.env.deploy.db.psml}"/>
+ <property name="org.apache.jetspeed.deploy.type"
+ value="${org.apache.jetspeed.env.deploy.type}"/>
+ <property name="org.apache.jetspeed.database.default.name"
+ value="${org.apache.jetspeed.production.database.default.name}"/>
+ <property name="org.apache.jetspeed.database.url"
+ value="${org.apache.jetspeed.production.database.url}"/>
+ <property name="org.apache.jetspeed.database.jdbc.drivers.path"
+ value="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
+ <property name="org.apache.jetspeed.database.driver"
+ value="${org.apache.jetspeed.production.database.driver}"/>
+ <property name="org.apache.jetspeed.database.user"
+ value="${org.apache.jetspeed.production.database.user}"/>
+ <property name="org.apache.jetspeed.database.password"
+ value="${org.apache.jetspeed.production.database.password}"/>
+ <property name="org.apache.derby.version"
+ value="${org.apache.derby.version}"/>
+ <property name="hsqldb.version"
+ value="${hsqldb.version}"/>
+ <property name="org.apache.jetspeed.groupid"
+ value="${pom.groupId}"/>
+ <property name="org.apache.jetspeed.version"
+ value="${pom.version}"/>
+ <property name="org.apache.pluto.version"
+ value="${org.apache.pluto.version}"/>
+ <property name="portlet-api.version"
+ value="${portlet-api.version}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ <!--
+ Bug: All plugin dependencies must be copied to the first instance
+ of the maven-antrun-plugin run, (e.g. to the root pom), since the
+ first set of deps sticks for the entire maven2 execution cycle.
+ Bug: Plugin dependencies are not propagated from pluginManagement.
+ Bug: Versions must be specified here and not in dependencyManagement.
+
+ Note: All three ant dependencies are listed to keep nodeps in sync.
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-ant</artifactId>
+ <version>${org.apache.maven.artifact.ant.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Dependencies -->
+
+ <dependencies>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>etc</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-page-manager</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <!-- Project Information -->
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/etc/import</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/etc/import</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/etc/import/</url>
+ </scm>
+
+</project>
Propchange: portals/jetspeed-2/trunk/etc/import/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml Tue Mar 28 13:45:21 2006
@@ -81,6 +81,7 @@
<target name="schema" depends="test-database-default-name, test-database-filter-drops">
<!-- make target directory -->
+ <delete dir="${org.apache.jetspeed.database.target.sql}"/>
<mkdir dir="${org.apache.jetspeed.database.target.sql}"/>
<!-- copy general sql -->
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml Tue Mar 28 13:45:21 2006
@@ -62,6 +62,7 @@
new version of the archetype plugin is developed and released.
-->
<!-- Assemble required portal webapp resources -->
+ <delete dir="${basedir}/target/webapp"/>
<mkdir dir="${basedir}/target/webapp"/>
<dependencies filesetId="portal.resources.dependencies.id" useScope="runtime">
<dependency groupId="${org.apache.jetspeed.groupid}"
Modified: portals/jetspeed-2/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven.xml (original)
+++ portals/jetspeed-2/trunk/maven.xml Tue Mar 28 13:45:21 2006
@@ -291,8 +291,10 @@
<pathelement path="${maven.build.dest}"/>
<pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
</classpath>
- <sysproperty key="org.apache.jetspeed.page.import.configuration"
- value="./etc/import/import.properties"/>
+ <sysproperty key="org.apache.jetspeed.page.import.configuration"
+ value="./etc/import/import.properties"/>
+ <sysproperty key="org.apache.jetspeed.page.import.pages"
+ value="./src/webapp/WEB-INF/pages"/>
</java>
</goal>
Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/pom.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Tue Mar 28 13:45:21 2006
@@ -55,6 +55,14 @@
</properties>
</profile>
+ <!-- Production Profile -->
+ <profile>
+ <id>prod</id>
+ <properties>
+ <org.apache.jetspeed.env.skip.production>false</org.apache.jetspeed.env.skip.production>
+ </properties>
+ </profile>
+
<!-- Tomcat Production Profile -->
<profile>
<id>tomcat</id>
@@ -97,6 +105,14 @@
</properties>
</profile>
+ <!-- Hot Deployment Profile -->
+ <profile>
+ <id>dbpsml</id>
+ <properties>
+ <org.apache.jetspeed.env.deploy.db.psml>true</org.apache.jetspeed.env.deploy.db.psml>
+ </properties>
+ </profile>
+
</profiles>
<!-- Properties -->
@@ -111,6 +127,7 @@
<org.apache.jetspeed.env.deploy.type>full</org.apache.jetspeed.env.deploy.type>
<org.apache.jetspeed.env.deploy.db>true</org.apache.jetspeed.env.deploy.db>
<org.apache.jetspeed.env.hotdeploy>false</org.apache.jetspeed.env.hotdeploy>
+ <org.apache.jetspeed.env.deploy.db.psml>false</org.apache.jetspeed.env.deploy.db.psml>
<!-- Dependency Version Properties -->
<ant.version>1.6.5</ant.version>
@@ -209,6 +226,7 @@
<module>portal</module>
<!-- J2 Application Server Deployment -->
+ <module>etc/import</module>
<module>app-servers</module>
<module>maven-archetypes</module>
Modified: portals/jetspeed-2/trunk/portal/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal/build.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal/build.xml (original)
+++ portals/jetspeed-2/trunk/portal/build.xml Tue Mar 28 13:45:21 2006
@@ -21,6 +21,7 @@
<!-- Properties -->
<property name="org.apache.jetspeed.deploy.type" value="full"/>
+ <property name="org.apache.jetspeed.database.psml" value="false"/>
<property name="org.apache.jetspeed.catalina.version.major" value=""/>
<property name="org.apache.jetspeed.services.autodeployment.server" value=""/>
<property name="org.apache.jetspeed.services.autodeployment.port" value=""/>
@@ -36,6 +37,7 @@
<echo message=" configure - setup runtime configuration for jetspeed."/>
<echo message="Configuration:"/>
<echo message=" org.apache.jetspeed.deploy.type=${org.apache.jetspeed.deploy.type}"/>
+ <echo message=" org.apache.jetspeed.database.psml=${org.apache.jetspeed.database.psml}"/>
<echo message=" org.apache.jetspeed.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
<echo message=" org.apache.jetspeed.services.autodeployment.server=${org.apache.jetspeed.services.autodeployment.server}"/>
<echo message=" org.apache.jetspeed.services.autodeployment.port=${org.apache.jetspeed.services.autodeployment.port}"/>
@@ -55,6 +57,7 @@
<exclude name="WEB-INF/pages/**"/>
</fileset>
</copy>
+ <antcall target="configure-database-psml"/>
<mkdir dir="${basedir}/target/webapp/javascript/dojo"/>
<unzip src="${basedir}/../src/javascript/dojo/dojo.zip"
dest="${basedir}/target/webapp/javascript/dojo">
@@ -111,12 +114,38 @@
</copy>
</target>
+ <target name="configure-database-psml" depends="test-configure-database-psml" if="org.apache.jetspeed.configure.database.psml">
+ <!-- swap spring configurations to configure database psml -->
+ <move file="${basedir}/target/webapp/WEB-INF/assembly/page-manager.xml"
+ todir="${basedir}/target/webapp/WEB-INF/assembly/alternate"/>
+ <move file="${basedir}/target/webapp/WEB-INF/assembly/alternate/db-page-manager.xml"
+ todir="${basedir}/target/webapp/WEB-INF/assembly"/>
+ <move file="${basedir}/target/webapp/WEB-INF/assembly/alternate/interceptors.xml"
+ todir="${basedir}/target/webapp/WEB-INF/assembly"/>
+ </target>
+
<target name="test-deploy-type">
<condition property="org.apache.jetspeed.deploy.full">
- <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
+ <and>
+ <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
+ <not>
+ <equals arg1="${org.apache.jetspeed.database.psml}" arg2="true"/>
+ </not>
+ </and>
</condition>
<condition property="org.apache.jetspeed.deploy.min">
- <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="min"/>
+ <and>
+ <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="min"/>
+ <not>
+ <equals arg1="${org.apache.jetspeed.database.psml}" arg2="true"/>
+ </not>
+ </and>
+ </condition>
+ </target>
+
+ <target name="test-configure-database-psml">
+ <condition property="org.apache.jetspeed.configure.database.psml">
+ <equals arg1="${org.apache.jetspeed.database.psml}" arg2="true"/>
</condition>
</target>
Modified: portals/jetspeed-2/trunk/portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal/pom.xml?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/portal/pom.xml Tue Mar 28 13:45:21 2006
@@ -72,6 +72,8 @@
<ant target="configure" antfile="build.xml" dir="${basedir}" inheritall="off">
<property name="org.apache.jetspeed.deploy.type"
value="${org.apache.jetspeed.env.deploy.type}"/>
+ <property name="org.apache.jetspeed.database.psml"
+ value="${org.apache.jetspeed.env.deploy.db.psml}"/>
<property name="org.apache.jetspeed.catalina.version.major"
value="${org.apache.jetspeed.catalina.version.major}"/>
<property name="org.apache.jetspeed.services.autodeployment.server"
Modified: portals/jetspeed-2/trunk/settings.xml.sample
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/settings.xml.sample?rev=389611&r1=389610&r2=389611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/settings.xml.sample (original)
+++ portals/jetspeed-2/trunk/settings.xml.sample Tue Mar 28 13:45:21 2006
@@ -36,6 +36,14 @@
</activation>
<properties>
+ <!-- Build profiles configuration -->
+
+ <!--
+ <org.apache.jetspeed.env.deploy.target>tomcat</org.apache.jetspeed.env.deploy.target>
+ <org.apache.jetspeed.env.deploy.type>full</org.apache.jetspeed.env.deploy.type>
+ <org.apache.jetspeed.env.deploy.db.psml>false</org.apache.jetspeed.env.deploy.db.psml>
+ -->
+
<!-- Jetspeed-2 deployment properties -->
<org.apache.jetspeed.server.home>c:/Program Files/Apache Software Foundation/Tomcat 5.5</org.apache.jetspeed.server.home>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org
Re: svn commit: r389611
Posted by Randy Watler <wa...@wispertel.net>.
Gang:
The dbpsml profile runs the PSML import utility on deploy if the db
population is enabled. It also configures the alternate Spring
configuration for the DatabasePageManager implementation. As usual, see
here for a summary of the new features:
http://wiki.apache.org/portals/Jetspeed2/Maven2BuildSupport
Makes using the DBPM much easier/nicer IMHO!
I might add to the custom portal build if i can get the archetype issues
resolved here in short order.
Randy
On Tue, 2006-03-28 at 21:45 +0000, rwatler@apache.org wrote:
> Author: rwatler
> Date: Tue Mar 28 13:45:21 2006
> New Revision: 389611
>
> URL: http://svn.apache.org/viewcvs?rev=389611&view=rev
> Log:
> Maven2: support PSML import using dbpsml profile
>
> Added:
> portals/jetspeed-2/trunk/etc/import/build.xml (with props)
> portals/jetspeed-2/trunk/etc/import/pom.xml (with props)
> Modified:
> portals/jetspeed-2/trunk/app-servers/build.xml
> portals/jetspeed-2/trunk/app-servers/pom.xml
> portals/jetspeed-2/trunk/app-servers/tomcat-build.xml
> portals/jetspeed-2/trunk/components/deploy-tool/build.xml
> portals/jetspeed-2/trunk/components/page-manager/build.xml
> portals/jetspeed-2/trunk/components/portal-site/build.xml
> portals/jetspeed-2/trunk/etc/build.xml
> portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml
> portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
> portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
> portals/jetspeed-2/trunk/maven.xml
> portals/jetspeed-2/trunk/pom.xml
> portals/jetspeed-2/trunk/portal/build.xml
> portals/jetspeed-2/trunk/portal/pom.xml
> portals/jetspeed-2/trunk/settings.xml.sample
>
> Modified: portals/jetspeed-2/trunk/app-servers/build.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/build.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/app-servers/build.xml (original)
> +++ portals/jetspeed-2/trunk/app-servers/build.xml Tue Mar 28 13:45:21 2006
> @@ -24,6 +24,7 @@
> <property name="org.apache.jetspeed.deploy.skip" value="false"/>
> <property name="org.apache.jetspeed.deploy.target" value="none"/>
> <property name="org.apache.jetspeed.deploy.type" value="full"/>
> + <property name="org.apache.jetspeed.database.psml" value="false"/>
> <property name="org.apache.jetspeed.server.home" value=""/>
> <property name="org.apache.jetspeed.catalina.version.major" value=""/>
> <property name="org.apache.jetspeed.production.database.default.name" value=""/>
> @@ -62,6 +63,7 @@
> <echo message=" org.apache.jetspeed.deploy.skip=${org.apache.jetspeed.deploy.skip}"/>
> <echo message=" org.apache.jetspeed.deploy.target=${org.apache.jetspeed.deploy.target}"/>
> <echo message=" org.apache.jetspeed.deploy.type=${org.apache.jetspeed.deploy.type}"/>
> + <echo message=" org.apache.jetspeed.database.psml=${org.apache.jetspeed.database.psml}"/>
> <echo message=" org.apache.jetspeed.server.home=${org.apache.jetspeed.server.home}"/>
> <echo message=" org.apache.jetspeed.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
> <echo message=" org.apache.jetspeed.production.database.default.name=${org.apache.jetspeed.production.database.default.name}"/>
> @@ -188,6 +190,8 @@
> <ant antfile="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml" dir="${basedir}" target="hot-deploy" inheritall="off">
> <property name="org.apache.jetspeed.deploy.type"
> value="${org.apache.jetspeed.deploy.type}"/>
> + <property name="org.apache.jetspeed.database.psml"
> + value="${org.apache.jetspeed.database.psml}"/>
> <property name="org.apache.jetspeed.server.home"
> value="${org.apache.jetspeed.server.home}"/>
> <property name="org.apache.jetspeed.groupid"
>
> Modified: portals/jetspeed-2/trunk/app-servers/pom.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/pom.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/app-servers/pom.xml (original)
> +++ portals/jetspeed-2/trunk/app-servers/pom.xml Tue Mar 28 13:45:21 2006
> @@ -113,6 +113,8 @@
> value="${org.apache.jetspeed.env.deploy.target}"/>
> <property name="org.apache.jetspeed.deploy.type"
> value="${org.apache.jetspeed.env.deploy.type}"/>
> + <property name="org.apache.jetspeed.database.psml"
> + value="${org.apache.jetspeed.env.deploy.db.psml}"/>
> <property name="org.apache.jetspeed.server.home"
> value="${org.apache.jetspeed.server.home}"/>
> <property name="org.apache.jetspeed.groupid"
>
> Modified: portals/jetspeed-2/trunk/app-servers/tomcat-build.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/tomcat-build.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/app-servers/tomcat-build.xml (original)
> +++ portals/jetspeed-2/trunk/app-servers/tomcat-build.xml Tue Mar 28 13:45:21 2006
> @@ -21,6 +21,7 @@
> <!-- Properties -->
>
> <property name="org.apache.jetspeed.deploy.type" value="full"/>
> + <property name="org.apache.jetspeed.database.psml" value="false"/>
> <property name="org.apache.jetspeed.server.home" value=""/>
> <property name="org.apache.jetspeed.catalina.version.major" value=""/>
> <property name="org.apache.jetspeed.production.database.default.name" value=""/>
> @@ -55,10 +56,8 @@
> <echo message=" hot-deploy-jar - hot deploy component jar Tomcat app server."/>
> <echo message=" hot-deploy-war - hot deploy application war Tomcat app server."/>
> <echo message="Configuration:"/>
> - <echo message=" org.apache.jetspeed.deploy.enable=${org.apache.jetspeed.deploy.enable}"/>
> - <echo message=" org.apache.jetspeed.deploy.skip=${org.apache.jetspeed.deploy.skip}"/>
> - <echo message=" org.apache.jetspeed.deploy.target=${org.apache.jetspeed.deploy.target}"/>
> <echo message=" org.apache.jetspeed.deploy.type=${org.apache.jetspeed.deploy.type}"/>
> + <echo message=" org.apache.jetspeed.database.psml=${org.apache.jetspeed.database.psml}"/>
> <echo message=" org.apache.jetspeed.server.home=${org.apache.jetspeed.server.home}"/>
> <echo message=" org.apache.jetspeed.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
> <echo message=" org.apache.jetspeed.production.database.default.name=${org.apache.jetspeed.production.database.default.name}"/>
> @@ -244,15 +243,33 @@
> </target>
>
> <target name="test-deploy-type">
> - <condition property="org.apache.jetspeed.deploy.full">
> + <!-- application deploy types are additive -->
> + <condition property="org.apache.jetspeed.deploy.full.apps">
> <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
> </condition>
> - <condition property="org.apache.jetspeed.deploy.min">
> + <condition property="org.apache.jetspeed.deploy.min.apps">
> <or>
> <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="min"/>
> <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
> </or>
> </condition>
> + <!-- pages deploy types are exclusive -->
> + <condition property="org.apache.jetspeed.deploy.full.pages">
> + <and>
> + <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
> + <not>
> + <equals arg1="${org.apache.jetspeed.database.psml}" arg2="true"/>
> + </not>
> + </and>
> + </condition>
> + <condition property="org.apache.jetspeed.deploy.min.pages">
> + <and>
> + <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="min"/>
> + <not>
> + <equals arg1="${org.apache.jetspeed.database.psml}" arg2="true"/>
> + </not>
> + </and>
> + </condition>
> </target>
>
> <target name="embedded-database-derby" if="org.apache.jetspeed.production.database.is.derby.embedded">
> @@ -289,7 +306,7 @@
> </copy>
> </target>
>
> - <target name="deploy-min-apps" if="org.apache.jetspeed.deploy.min">
> + <target name="deploy-min-apps" if="org.apache.jetspeed.deploy.min.apps">
> <!-- deploy minimal set of portlet and layout applications -->
> <delete dir="${org.apache.jetspeed.server.home}/webapps/j2-admin"/>
> <delete>
> @@ -305,7 +322,7 @@
> <antcall target="hot-deploy-min-apps"/>
> </target>
>
> - <target name="deploy-full-apps" if="org.apache.jetspeed.deploy.full">
> + <target name="deploy-full-apps" if="org.apache.jetspeed.deploy.full.apps">
> <!-- deploy additional set of portlet applications -->
> <delete dir="${org.apache.jetspeed.server.home}/webapps/demo"/>
> <delete dir="${org.apache.jetspeed.server.home}/webapps/jpetstore"/>
> @@ -331,7 +348,7 @@
> <antcall target="hot-deploy-full-apps"/>
> </target>
>
> - <target name="hot-deploy-min-pages" if="org.apache.jetspeed.deploy.min">
> + <target name="hot-deploy-min-pages" if="org.apache.jetspeed.deploy.min.pages">
> <!-- hot deploy minimum pages content -->
> <copy todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/pages">
> <fileset dir="${basedir}/../src/webapp/WEB-INF/pages">
> @@ -347,14 +364,14 @@
> token=" hidden="true""/>
> </target>
>
> - <target name="hot-deploy-full-pages" if="org.apache.jetspeed.deploy.full">
> + <target name="hot-deploy-full-pages" if="org.apache.jetspeed.deploy.full.pages">
> <!-- hot deploy full pages content -->
> <copy todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/pages">
> <fileset dir="${basedir}/../src/webapp/WEB-INF/pages"/>
> </copy>
> </target>
>
> - <target name="hot-deploy-full-apps" if="org.apache.jetspeed.deploy.full">
> + <target name="hot-deploy-full-apps" if="org.apache.jetspeed.deploy.full.apps">
> <!-- hot deploy additional set of portlet applications -->
> <antcall target="hot-deploy-war">
> <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
> @@ -388,7 +405,7 @@
> </antcall>
> </target>
>
> - <target name="hot-deploy-min-apps" if="org.apache.jetspeed.deploy.min">
> + <target name="hot-deploy-min-apps" if="org.apache.jetspeed.deploy.min.apps">
> <!-- hot deploy minimal set of portlet and layout applications -->
> <antcall target="hot-deploy-war">
> <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
>
> Modified: portals/jetspeed-2/trunk/components/deploy-tool/build.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/deploy-tool/build.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/components/deploy-tool/build.xml (original)
> +++ portals/jetspeed-2/trunk/components/deploy-tool/build.xml Tue Mar 28 13:45:21 2006
> @@ -31,6 +31,7 @@
>
> <target name="resources">
>
> + <!-- merge portlet.tld with existing component resources -->
> <mkdir dir="${basedir}/target/classes/org/apache/jetspeed/tools/deploy"/>
> <copy file="${basedir}/../../src/webapp/WEB-INF/tld/portlet.tld"
> todir="${basedir}/target/classes/org/apache/jetspeed/tools/deploy"/>
>
> Modified: portals/jetspeed-2/trunk/components/page-manager/build.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/build.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/components/page-manager/build.xml (original)
> +++ portals/jetspeed-2/trunk/components/page-manager/build.xml Tue Mar 28 13:45:21 2006
> @@ -32,7 +32,7 @@
> <target name="testdata">
>
> <delete dir="${basedir}/target/testdata"/>
> - <mkdir dir="${basedir}/target"/>
> + <mkdir dir="${basedir}/target/testdata"/>
> <copy todir="${basedir}/target/testdata">
> <fileset dir="${basedir}/testdata"/>
> </copy>
>
> Modified: portals/jetspeed-2/trunk/components/portal-site/build.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/build.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/components/portal-site/build.xml (original)
> +++ portals/jetspeed-2/trunk/components/portal-site/build.xml Tue Mar 28 13:45:21 2006
> @@ -32,7 +32,7 @@
> <target name="testdata">
>
> <delete dir="${basedir}/target/testdata"/>
> - <mkdir dir="${basedir}/target"/>
> + <mkdir dir="${basedir}/target/testdata"/>
> <copy todir="${basedir}/target/testdata">
> <fileset dir="${basedir}/testdata"/>
> </copy>
>
> Modified: portals/jetspeed-2/trunk/etc/build.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/build.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/etc/build.xml (original)
> +++ portals/jetspeed-2/trunk/etc/build.xml Tue Mar 28 13:45:21 2006
> @@ -81,6 +81,7 @@
> <target name="schema" depends="test-database-default-name, test-database-filter-drops">
>
> <!-- make target directory -->
> + <delete dir="${org.apache.jetspeed.database.target.sql}"/>
> <mkdir dir="${org.apache.jetspeed.database.target.sql}"/>
>
> <!-- copy general sql -->
> @@ -256,7 +257,7 @@
>
> <!-- Populate Database -->
>
> - <target name="populate-db" depends="populate-skip" unless="org.apache.jetspeed.skip">
> + <target name="populate-db" depends="test-populate-skip" unless="org.apache.jetspeed.skip">
>
> <!-- execute drop scripts -->
> <antcall target="sql-execute" inheritall="on" inheritrefs="on">
> @@ -292,16 +293,7 @@
>
> </target>
>
> - <target name="populate-skip">
> - <condition property="org.apache.jetspeed.skip">
> - <or>
> - <equals arg1="${org.apache.jetspeed.database.skip}" arg2="true"/>
> - <not>
> - <equals arg1="${org.apache.jetspeed.database.enable}" arg2="true"/>
> - </not>
> - </or>
> - </condition>
> - </target>
> + <!-- SQL Execution -->
>
> <target name="sql-execute" depends="sql-test-database-classpath, sql-execute-drivers-path, sql-execute-derby, sql-execute-hsql"/>
>
> @@ -416,6 +408,19 @@
> <include name="${database.arg.scripts}"/>
> </fileset>
> </sql>
> + </target>
> +
> + <!-- Utilities -->
> +
> + <target name="test-populate-skip">
> + <condition property="org.apache.jetspeed.skip">
> + <or>
> + <equals arg1="${org.apache.jetspeed.database.skip}" arg2="true"/>
> + <not>
> + <equals arg1="${org.apache.jetspeed.database.enable}" arg2="true"/>
> + </not>
> + </or>
> + </condition>
> </target>
>
> </project>
>
> Modified: portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml (original)
> +++ portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml Tue Mar 28 13:45:21 2006
> @@ -60,7 +60,7 @@
> <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
> <constructor-arg index="1"><value>.psml</value></constructor-arg>
> <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>
> - <constructor-arg index="3" ><value>./src/webapp/WEB-INF/pages</value></constructor-arg>
> + <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
> <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
> </bean>
>
> @@ -69,7 +69,7 @@
> <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
> <constructor-arg index="1"><value>.link</value></constructor-arg>
> <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>
> - <constructor-arg index="3" ><value>./src/webapp/WEB-INF/pages</value></constructor-arg>
> + <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
> <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
> </bean>
>
> @@ -78,7 +78,7 @@
> <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
> <constructor-arg index="1"><value>folder.metadata</value></constructor-arg>
> <constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>
> - <constructor-arg index="3" ><value>./src/webapp/WEB-INF/pages</value></constructor-arg>
> + <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
> <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
> </bean>
>
> @@ -87,7 +87,7 @@
> <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
> <constructor-arg index="1"><value>page.security</value></constructor-arg>
> <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>
> - <constructor-arg index="3" ><value>./src/webapp/WEB-INF/pages</value></constructor-arg>
> + <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
> <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
> </bean>
>
> @@ -113,7 +113,7 @@
>
> <bean id="FolderHandler"
> class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >
> - <constructor-arg index="0"><value>./src/webapp/WEB-INF/pages</value></constructor-arg>
> + <constructor-arg index="0"><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
> <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
> <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>
> </bean>
> @@ -158,5 +158,8 @@
> </constructor-arg>
> </bean>
>
> +
> + <!-- properties configurer used to pick up system properties -->
> + <bean id="propertiesConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
>
> </beans>
>
> Added: portals/jetspeed-2/trunk/etc/import/build.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/import/build.xml?rev=389611&view=auto
> ==============================================================================
> --- portals/jetspeed-2/trunk/etc/import/build.xml (added)
> +++ portals/jetspeed-2/trunk/etc/import/build.xml Tue Mar 28 13:45:21 2006
> @@ -0,0 +1,266 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> +Copyright 2006 The Apache Software Foundation
> +
> +Licensed under the Apache License, Version 2.0 (the "License");
> +you may not use this file except in compliance with the License.
> +You may obtain a copy of the License at
> +
> + http://www.apache.org/licenses/LICENSE-2.0
> +
> +Unless required by applicable law or agreed to in writing, software
> +distributed under the License is distributed on an "AS IS" BASIS,
> +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +See the License for the specific language governing permissions and
> +limitations under the License.
> +
> + $Id:$
> +-->
> +<project name="etc" default="help">
> +
> + <!-- Properties -->
> +
> + <property name="org.apache.jetspeed.database.enable" value="true"/>
> + <property name="org.apache.jetspeed.database.skip" value="false"/>
> + <property name="org.apache.jetspeed.database.psml" value="false"/>
> + <property name="org.apache.jetspeed.deploy.type" value="full"/>
> + <property name="org.apache.jetspeed.database.default.name" value=""/>
> + <property name="org.apache.jetspeed.database.url" value=""/>
> + <property name="org.apache.jetspeed.database.jdbc.drivers.path" value=""/>
> + <property name="org.apache.jetspeed.database.driver" value=""/>
> + <property name="org.apache.jetspeed.database.user" value=""/>
> + <property name="org.apache.jetspeed.database.password" value=""/>
> + <property name="org.apache.derby.version" value=""/>
> + <property name="hsqldb.version" value=""/>
> + <property name="org.apache.jetspeed.groupid" value=""/>
> + <property name="org.apache.jetspeed.version" value=""/>
> + <property name="org.apache.pluto.version" value=""/>
> + <property name="portlet-api.version" value=""/>
> +
> + <property name="org.apache.jetspeed.page.import.configuration" value="${basedir}/import.properties"/>
> + <property name="org.apache.jetspeed.page.import.pages" value="${basedir}/target/data/pages"/>
> +
> + <!-- Usage -->
> +
> + <target name="help">
> + <echo message="Buildfile for the import maven POM."/>
> + <echo message="Usage: ant [ populate-db-psml ]"/>
> + <echo message="Where:"/>
> + <echo message=" populate-db-psml - build and populate database instance with imported PSML."/>
> + <echo message="Configuration:"/>
> + <echo message=" org.apache.jetspeed.database.enable=${org.apache.jetspeed.database.enable}"/>
> + <echo message=" org.apache.jetspeed.database.skip=${org.apache.jetspeed.database.skip}"/>
> + <echo message=" org.apache.jetspeed.database.psml=${org.apache.jetspeed.database.psml}"/>
> + <echo message=" org.apache.jetspeed.deploy.type=${org.apache.jetspeed.deploy.type}"/>
> + <echo message=" org.apache.jetspeed.database.default.name=${org.apache.jetspeed.database.default.name}"/>
> + <echo message=" org.apache.jetspeed.database.url=${org.apache.jetspeed.database.url}"/>
> + <echo message=" org.apache.jetspeed.database.jdbc.drivers.path=${org.apache.jetspeed.database.jdbc.drivers.path}"/>
> + <echo message=" org.apache.jetspeed.database.driver=${org.apache.jetspeed.database.driver}"/>
> + <echo message=" org.apache.jetspeed.database.user=${org.apache.jetspeed.database.user}"/>
> + <echo message=" org.apache.jetspeed.database.password=${org.apache.jetspeed.database.password}"/>
> + <echo message=" org.apache.derby.version=${org.apache.derby.version}"/>
> + <echo message=" hsqldb.version=${hsqldb.version}"/>
> + <echo message=" org.apache.jetspeed.groupid=${org.apache.jetspeed.groupid}"/>
> + <echo message=" org.apache.jetspeed.version=${org.apache.jetspeed.version}"/>
> + <echo message=" org.apache.pluto.version=${org.apache.pluto.version}"/>
> + <echo message=" portlet-api.version=${portlet-api.version}"/>
> + </target>
> +
> + <!-- Additional Task Definitions -->
> +
> + <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"/>
> +
> + <!-- Populate Database -->
> +
> + <target name="populate-db-psml" depends="test-populate-skip" unless="org.apache.jetspeed.skip.psml">
> +
> + <!-- aggregate PSML to merge -->
> + <delete dir="${basedir}/target/data/pages"/>
> + <mkdir dir="${basedir}/target/data/pages"/>
> + <antcall target="aggregate-pages"/>
> +
> + <!-- prepare a classes directory with resources and libraries to execute import -->
> + <delete dir="${basedir}/target/classes"/>
> + <mkdir dir="${basedir}/target/classes"/>
> + <copy todir="${basedir}/target/classes" flatten="on">
> + <fileset dir="${basedir}/../.." >
> + <include name="etc/log4j/log4j.properties"/>
> + <include name="etc/db-ojb/*"/>
> + <include name="etc/import/assembly/import-page-manager.xml"/>
> + <include name="etc/import/assembly/repository-datasource-spring.xml"/>
> + <include name="src/webapp/WEB-INF/assembly/transaction.xml"/>
> + <include name="src/webapp/WEB-INF/assembly/alternate/interceptors.xml"/>
> + </fileset>
> + </copy>
> +
> + <!-- construct page manager component classpath -->
> + <dependencies filesetId="page.manager.dependencies.id" useScope="test">
> + <dependency groupId="${org.apache.jetspeed.groupid}"
> + artifactId="jetspeed-api"
> + version="${org.apache.jetspeed.version}"/>
> + <dependency groupId="${org.apache.jetspeed.groupid}"
> + artifactId="jetspeed-commons"
> + version="${org.apache.jetspeed.version}"/>
> + <dependency groupId="org.apache.pluto"
> + artifactId="pluto"
> + version="${org.apache.pluto.version}"/>
> + <dependency groupId="${org.apache.jetspeed.groupid}"
> + artifactId="jetspeed-id-generator"
> + version="${org.apache.jetspeed.version}"/>
> + <dependency groupId="portlet-api"
> + artifactId="portlet-api"
> + version="${portlet-api.version}"/>
> + <dependency groupId="${org.apache.jetspeed.groupid}"
> + artifactId="jetspeed-page-manager"
> + version="${org.apache.jetspeed.version}"/>
> + </dependencies>
> +
> + <!-- create sysproperty set to configure import utility -->
> + <propertyset id="import.syspropertyset.id">
> + <propertyref name="org.apache.jetspeed.page.import.configuration"/>
> + <propertyref name="org.apache.jetspeed.page.import.pages"/>
> + <propertyref name="org.apache.jetspeed.database.driver"/>
> + <propertyref name="org.apache.jetspeed.database.url"/>
> + <propertyref name="org.apache.jetspeed.database.user"/>
> + <propertyref name="org.apache.jetspeed.database.password"/>
> + </propertyset>
> +
> + <!-- execute import utility within the page manager component -->
> + <antcall target="execute-import" inheritall="on" inheritrefs="on"/>
> + </target>
> +
> + <target name="aggregate-pages" depends="test-deploy-type, aggregate-pages-min, aggregate-pages-full"/>
> +
> + <target name="aggregate-pages-min" if="org.apache.jetspeed.deploy.min">
> + <copy todir="${basedir}/target/data/pages">
> + <fileset dir="${basedir}/../../src/webapp/WEB-INF/pages">
> + <include name="Administrative/**"/>
> + <include name="my-account.psml"/>
> + <include name="page.security"/>
> + <include name="system/**"/>
> + </fileset>
> + </copy>
> + <copy file="${basedir}/../../src/webapp/WEB-INF/pages/minimal-default-page.psml"
> + tofile="${basedir}/target/data/pages/default-page.psml"/>
> + <replace file="${basedir}/target/data/pages/default-page.psml"
> + token=" hidden="true""/>
> + </target>
> +
> + <target name="aggregate-pages-full" if="org.apache.jetspeed.deploy.full">
> + <copy todir="${basedir}/target/data/pages">
> + <fileset dir="${basedir}/../../src/webapp/WEB-INF/pages"/>
> + </copy>
> + </target>
> +
> + <target name="execute-import" depends="test-database-classpath, execute-import-drivers-path, execute-import-derby, execute-import-hsql"/>
> +
> + <target name="execute-import-drivers-path" if="org.apache.jetspeed.database.use.drivers.path">
> +
> + <!-- execute import utility with drivers path in classpath -->
> + <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
> + <classpath>
> + <fileset refid="page.manager.dependencies.id"/>
> + <pathelement path="${org.apache.jetspeed.database.jdbc.drivers.path}"/>
> + <pathelement path="${basedir}/target/classes"/>
> + </classpath>
> + <syspropertyset>
> + <propertyset refid="import.syspropertyset.id"/>
> + </syspropertyset>
> + </java>
> +
> + </target>
> +
> + <target name="execute-import-derby" if="org.apache.jetspeed.database.is.derby.embedded">
> +
> + <!-- construct embedded derby classpath -->
> + <dependencies filesetId="derby.embedded.db.dependencies.id" useScope="test">
> + <dependency groupId="org.apache.derby"
> + artifactId="derby"
> + version="${org.apache.derby.version}"/>
> + </dependencies>
> +
> + <!-- execute import utility with drivers path in classpath -->
> + <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
> + <classpath>
> + <fileset refid="page.manager.dependencies.id"/>
> + <fileset refid="derby.embedded.db.dependencies.id"/>
> + <pathelement path="${basedir}/target/classes"/>
> + </classpath>
> + <syspropertyset>
> + <propertyset refid="import.syspropertyset.id"/>
> + </syspropertyset>
> + </java>
> +
> + </target>
> +
> + <target name="execute-import-hsql" if="org.apache.jetspeed.database.is.hsql.embedded">
> +
> + <!-- construct embedded hsql classpath -->
> + <dependencies filesetId="hsql.embedded.db.dependencies.id" useScope="test">
> + <dependency groupId="hsqldb"
> + artifactId="hsqldb"
> + version="${hsqldb.version}"/>
> + </dependencies>
> +
> + <!-- execute import utility with drivers path in classpath -->
> + <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
> + <classpath>
> + <fileset refid="page.manager.dependencies.id"/>
> + <fileset refid="hsql.embedded.db.dependencies.id"/>
> + <pathelement path="${basedir}/target/classes"/>
> + </classpath>
> + <syspropertyset>
> + <propertyset refid="import.syspropertyset.id"/>
> + </syspropertyset>
> + </java>
> +
> + </target>
> +
> + <!-- Utilities -->
> +
> + <target name="test-populate-skip">
> + <condition property="org.apache.jetspeed.skip.psml">
> + <or>
> + <equals arg1="${org.apache.jetspeed.database.skip}" arg2="true"/>
> + <not>
> + <equals arg1="${org.apache.jetspeed.database.enable}" arg2="true"/>
> + </not>
> + <not>
> + <equals arg1="${org.apache.jetspeed.database.psml}" arg2="true"/>
> + </not>
> + </or>
> + </condition>
> + </target>
> +
> + <target name="test-database-classpath">
> + <condition property="org.apache.jetspeed.database.use.drivers.path">
> + <and>
> + <not><equals arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/></not>
> + <not><equals arg1="${org.apache.jetspeed.database.default.name}" arg2="derby"/></not>
> + <not><equals arg1="${org.apache.jetspeed.database.default.name}" arg2="hsql"/></not>
> + </and>
> + </condition>
> + <condition property="org.apache.jetspeed.database.is.derby.embedded">
> + <and>
> + <equals arg1="${org.apache.jetspeed.database.default.name}" arg2="derby"/>
> + <equals arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/>
> + </and>
> + </condition>
> + <condition property="org.apache.jetspeed.database.is.hsql.embedded">
> + <and>
> + <equals arg1="${org.apache.jetspeed.database.default.name}" arg2="hsql"/>
> + <equals arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/>
> + </and>
> + </condition>
> + </target>
> +
> + <target name="test-deploy-type">
> + <condition property="org.apache.jetspeed.deploy.full">
> + <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
> + </condition>
> + <condition property="org.apache.jetspeed.deploy.min">
> + <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="min"/>
> + </condition>
> + </target>
> +
> +</project>
>
> Propchange: portals/jetspeed-2/trunk/etc/import/build.xml
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added: portals/jetspeed-2/trunk/etc/import/pom.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/import/pom.xml?rev=389611&view=auto
> ==============================================================================
> --- portals/jetspeed-2/trunk/etc/import/pom.xml (added)
> +++ portals/jetspeed-2/trunk/etc/import/pom.xml Tue Mar 28 13:45:21 2006
> @@ -0,0 +1,203 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> +Copyright 2006 The Apache Software Foundation
> +
> +Licensed under the Apache License, Version 2.0 (the "License");
> +you may not use this file except in compliance with the License.
> +You may obtain a copy of the License at
> +
> + http://www.apache.org/licenses/LICENSE-2.0
> +
> +Unless required by applicable law or agreed to in writing, software
> +distributed under the License is distributed on an "AS IS" BASIS,
> +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +See the License for the specific language governing permissions and
> +limitations under the License.
> +
> + $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">
> +
> + <modelVersion>4.0.0</modelVersion>
> +
> + <!-- POM Identification -->
> +
> + <groupId>org.apache.portals.jetspeed-2</groupId>
> + <version>2.1-dev</version>
> + <artifactId>import</artifactId>
> + <parent>
> + <groupId>org.apache.portals.jetspeed-2</groupId>
> + <version>2.1-dev</version>
> + <artifactId>jetspeed-2</artifactId>
> + <relativePath>../../pom.xml</relativePath>
> + </parent>
> + <packaging>pom</packaging>
> + <name>Jetspeed-2 PSML Database Import</name>
> + <description>
> + Project used to import the PSML configuration into the production database.
> + </description>
> +
> + <!-- Profiles -->
> +
> + <profiles>
> +
> + <!-- derby database profile -->
> + <profile>
> + <id>jetspeed-db-embedded-derby</id>
> + <dependencies>
> + <dependency>
> + <groupId>org.apache.derby</groupId>
> + <artifactId>derby</artifactId>
> + </dependency>
> + </dependencies>
> + </profile>
> +
> + <!-- hsql database profile -->
> + <profile>
> + <id>jetspeed-db-embedded-hsql</id>
> + <dependencies>
> + <dependency>
> + <groupId>hsqldb</groupId>
> + <artifactId>hsqldb</artifactId>
> + </dependency>
> + </dependencies>
> + </profile>
> +
> + </profiles>
> +
> + <!-- Build Configuration -->
> +
> + <build>
> +
> + <!-- Plugin Executions -->
> + <plugins>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-antrun-plugin</artifactId>
> + <executions>
> +
> + <!-- populate production database instance with PSML -->
> + <execution>
> + <id>etc-populate-production-psml</id>
> + <phase>install</phase>
> + <configuration>
> + <tasks>
> + <ant target="populate-db-psml" antfile="build.xml" dir="${basedir}" inheritRefs="on">
> + <property name="org.apache.jetspeed.database.enable"
> + value="${org.apache.jetspeed.env.deploy.db}"/>
> + <property name="org.apache.jetspeed.database.skip"
> + value="${org.apache.jetspeed.env.skip.production}"/>
> + <property name="org.apache.jetspeed.database.psml"
> + value="${org.apache.jetspeed.env.deploy.db.psml}"/>
> + <property name="org.apache.jetspeed.deploy.type"
> + value="${org.apache.jetspeed.env.deploy.type}"/>
> + <property name="org.apache.jetspeed.database.default.name"
> + value="${org.apache.jetspeed.production.database.default.name}"/>
> + <property name="org.apache.jetspeed.database.url"
> + value="${org.apache.jetspeed.production.database.url}"/>
> + <property name="org.apache.jetspeed.database.jdbc.drivers.path"
> + value="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
> + <property name="org.apache.jetspeed.database.driver"
> + value="${org.apache.jetspeed.production.database.driver}"/>
> + <property name="org.apache.jetspeed.database.user"
> + value="${org.apache.jetspeed.production.database.user}"/>
> + <property name="org.apache.jetspeed.database.password"
> + value="${org.apache.jetspeed.production.database.password}"/>
> + <property name="org.apache.derby.version"
> + value="${org.apache.derby.version}"/>
> + <property name="hsqldb.version"
> + value="${hsqldb.version}"/>
> + <property name="org.apache.jetspeed.groupid"
> + value="${pom.groupId}"/>
> + <property name="org.apache.jetspeed.version"
> + value="${pom.version}"/>
> + <property name="org.apache.pluto.version"
> + value="${org.apache.pluto.version}"/>
> + <property name="portlet-api.version"
> + value="${portlet-api.version}"/>
> + </ant>
> + </tasks>
> + </configuration>
> + <goals>
> + <goal>run</goal>
> + </goals>
> + </execution>
> +
> + </executions>
> + <!--
> + Bug: All plugin dependencies must be copied to the first instance
> + of the maven-antrun-plugin run, (e.g. to the root pom), since the
> + first set of deps sticks for the entire maven2 execution cycle.
> + Bug: Plugin dependencies are not propagated from pluginManagement.
> + Bug: Versions must be specified here and not in dependencyManagement.
> +
> + Note: All three ant dependencies are listed to keep nodeps in sync.
> + -->
> + <dependencies>
> + <dependency>
> + <groupId>ant</groupId>
> + <artifactId>ant</artifactId>
> + <version>${ant.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>ant</groupId>
> + <artifactId>ant-launcher</artifactId>
> + <version>${ant.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>ant</groupId>
> + <artifactId>ant-nodeps</artifactId>
> + <version>${ant.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.maven</groupId>
> + <artifactId>maven-artifact-ant</artifactId>
> + <version>${org.apache.maven.artifact.ant.version}</version>
> + </dependency>
> + </dependencies>
> + </plugin>
> + </plugins>
> + </build>
> +
> + <!-- Dependencies -->
> +
> + <dependencies>
> +
> + <!-- Provided Dependencies -->
> + <dependency>
> + <groupId>${pom.groupId}</groupId>
> + <artifactId>jetspeed-api</artifactId>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> + <groupId>${pom.groupId}</groupId>
> + <artifactId>jetspeed-commons</artifactId>
> + <scope>provided</scope>
> + </dependency>
> +
> + <!-- Test Dependencies -->
> + <dependency>
> + <groupId>${pom.groupId}</groupId>
> + <artifactId>etc</artifactId>
> + <type>pom</type>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>${pom.groupId}</groupId>
> + <artifactId>jetspeed-page-manager</artifactId>
> + <scope>test</scope>
> + </dependency>
> +
> + </dependencies>
> +
> + <!-- Project Information -->
> +
> + <scm>
> + <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/etc/import</connection>
> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/etc/import</developerConnection>
> + <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/etc/import/</url>
> + </scm>
> +
> +</project>
>
> Propchange: portals/jetspeed-2/trunk/etc/import/pom.xml
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml (original)
> +++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml Tue Mar 28 13:45:21 2006
> @@ -81,6 +81,7 @@
> <target name="schema" depends="test-database-default-name, test-database-filter-drops">
>
> <!-- make target directory -->
> + <delete dir="${org.apache.jetspeed.database.target.sql}"/>
> <mkdir dir="${org.apache.jetspeed.database.target.sql}"/>
>
> <!-- copy general sql -->
>
> Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml (original)
> +++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml Tue Mar 28 13:45:21 2006
> @@ -62,6 +62,7 @@
> new version of the archetype plugin is developed and released.
> -->
> <!-- Assemble required portal webapp resources -->
> + <delete dir="${basedir}/target/webapp"/>
> <mkdir dir="${basedir}/target/webapp"/>
> <dependencies filesetId="portal.resources.dependencies.id" useScope="runtime">
> <dependency groupId="${org.apache.jetspeed.groupid}"
>
> Modified: portals/jetspeed-2/trunk/maven.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/maven.xml (original)
> +++ portals/jetspeed-2/trunk/maven.xml Tue Mar 28 13:45:21 2006
> @@ -291,8 +291,10 @@
> <pathelement path="${maven.build.dest}"/>
> <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
> </classpath>
> - <sysproperty key="org.apache.jetspeed.page.import.configuration"
> - value="./etc/import/import.properties"/>
> + <sysproperty key="org.apache.jetspeed.page.import.configuration"
> + value="./etc/import/import.properties"/>
> + <sysproperty key="org.apache.jetspeed.page.import.pages"
> + value="./src/webapp/WEB-INF/pages"/>
> </java>
> </goal>
>
>
> Modified: portals/jetspeed-2/trunk/pom.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/pom.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/pom.xml (original)
> +++ portals/jetspeed-2/trunk/pom.xml Tue Mar 28 13:45:21 2006
> @@ -55,6 +55,14 @@
> </properties>
> </profile>
>
> + <!-- Production Profile -->
> + <profile>
> + <id>prod</id>
> + <properties>
> + <org.apache.jetspeed.env.skip.production>false</org.apache.jetspeed.env.skip.production>
> + </properties>
> + </profile>
> +
> <!-- Tomcat Production Profile -->
> <profile>
> <id>tomcat</id>
> @@ -97,6 +105,14 @@
> </properties>
> </profile>
>
> + <!-- Hot Deployment Profile -->
> + <profile>
> + <id>dbpsml</id>
> + <properties>
> + <org.apache.jetspeed.env.deploy.db.psml>true</org.apache.jetspeed.env.deploy.db.psml>
> + </properties>
> + </profile>
> +
> </profiles>
>
> <!-- Properties -->
> @@ -111,6 +127,7 @@
> <org.apache.jetspeed.env.deploy.type>full</org.apache.jetspeed.env.deploy.type>
> <org.apache.jetspeed.env.deploy.db>true</org.apache.jetspeed.env.deploy.db>
> <org.apache.jetspeed.env.hotdeploy>false</org.apache.jetspeed.env.hotdeploy>
> + <org.apache.jetspeed.env.deploy.db.psml>false</org.apache.jetspeed.env.deploy.db.psml>
>
> <!-- Dependency Version Properties -->
> <ant.version>1.6.5</ant.version>
> @@ -209,6 +226,7 @@
> <module>portal</module>
>
> <!-- J2 Application Server Deployment -->
> + <module>etc/import</module>
> <module>app-servers</module>
> <module>maven-archetypes</module>
>
>
> Modified: portals/jetspeed-2/trunk/portal/build.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal/build.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/portal/build.xml (original)
> +++ portals/jetspeed-2/trunk/portal/build.xml Tue Mar 28 13:45:21 2006
> @@ -21,6 +21,7 @@
> <!-- Properties -->
>
> <property name="org.apache.jetspeed.deploy.type" value="full"/>
> + <property name="org.apache.jetspeed.database.psml" value="false"/>
> <property name="org.apache.jetspeed.catalina.version.major" value=""/>
> <property name="org.apache.jetspeed.services.autodeployment.server" value=""/>
> <property name="org.apache.jetspeed.services.autodeployment.port" value=""/>
> @@ -36,6 +37,7 @@
> <echo message=" configure - setup runtime configuration for jetspeed."/>
> <echo message="Configuration:"/>
> <echo message=" org.apache.jetspeed.deploy.type=${org.apache.jetspeed.deploy.type}"/>
> + <echo message=" org.apache.jetspeed.database.psml=${org.apache.jetspeed.database.psml}"/>
> <echo message=" org.apache.jetspeed.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
> <echo message=" org.apache.jetspeed.services.autodeployment.server=${org.apache.jetspeed.services.autodeployment.server}"/>
> <echo message=" org.apache.jetspeed.services.autodeployment.port=${org.apache.jetspeed.services.autodeployment.port}"/>
> @@ -55,6 +57,7 @@
> <exclude name="WEB-INF/pages/**"/>
> </fileset>
> </copy>
> + <antcall target="configure-database-psml"/>
> <mkdir dir="${basedir}/target/webapp/javascript/dojo"/>
> <unzip src="${basedir}/../src/javascript/dojo/dojo.zip"
> dest="${basedir}/target/webapp/javascript/dojo">
> @@ -111,12 +114,38 @@
> </copy>
> </target>
>
> + <target name="configure-database-psml" depends="test-configure-database-psml" if="org.apache.jetspeed.configure.database.psml">
> + <!-- swap spring configurations to configure database psml -->
> + <move file="${basedir}/target/webapp/WEB-INF/assembly/page-manager.xml"
> + todir="${basedir}/target/webapp/WEB-INF/assembly/alternate"/>
> + <move file="${basedir}/target/webapp/WEB-INF/assembly/alternate/db-page-manager.xml"
> + todir="${basedir}/target/webapp/WEB-INF/assembly"/>
> + <move file="${basedir}/target/webapp/WEB-INF/assembly/alternate/interceptors.xml"
> + todir="${basedir}/target/webapp/WEB-INF/assembly"/>
> + </target>
> +
> <target name="test-deploy-type">
> <condition property="org.apache.jetspeed.deploy.full">
> - <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
> + <and>
> + <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
> + <not>
> + <equals arg1="${org.apache.jetspeed.database.psml}" arg2="true"/>
> + </not>
> + </and>
> </condition>
> <condition property="org.apache.jetspeed.deploy.min">
> - <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="min"/>
> + <and>
> + <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="min"/>
> + <not>
> + <equals arg1="${org.apache.jetspeed.database.psml}" arg2="true"/>
> + </not>
> + </and>
> + </condition>
> + </target>
> +
> + <target name="test-configure-database-psml">
> + <condition property="org.apache.jetspeed.configure.database.psml">
> + <equals arg1="${org.apache.jetspeed.database.psml}" arg2="true"/>
> </condition>
> </target>
>
>
> Modified: portals/jetspeed-2/trunk/portal/pom.xml
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal/pom.xml?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/portal/pom.xml (original)
> +++ portals/jetspeed-2/trunk/portal/pom.xml Tue Mar 28 13:45:21 2006
> @@ -72,6 +72,8 @@
> <ant target="configure" antfile="build.xml" dir="${basedir}" inheritall="off">
> <property name="org.apache.jetspeed.deploy.type"
> value="${org.apache.jetspeed.env.deploy.type}"/>
> + <property name="org.apache.jetspeed.database.psml"
> + value="${org.apache.jetspeed.env.deploy.db.psml}"/>
> <property name="org.apache.jetspeed.catalina.version.major"
> value="${org.apache.jetspeed.catalina.version.major}"/>
> <property name="org.apache.jetspeed.services.autodeployment.server"
>
> Modified: portals/jetspeed-2/trunk/settings.xml.sample
> URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/settings.xml.sample?rev=389611&r1=389610&r2=389611&view=diff
> ==============================================================================
> --- portals/jetspeed-2/trunk/settings.xml.sample (original)
> +++ portals/jetspeed-2/trunk/settings.xml.sample Tue Mar 28 13:45:21 2006
> @@ -36,6 +36,14 @@
> </activation>
> <properties>
>
> + <!-- Build profiles configuration -->
> +
> + <!--
> + <org.apache.jetspeed.env.deploy.target>tomcat</org.apache.jetspeed.env.deploy.target>
> + <org.apache.jetspeed.env.deploy.type>full</org.apache.jetspeed.env.deploy.type>
> + <org.apache.jetspeed.env.deploy.db.psml>false</org.apache.jetspeed.env.deploy.db.psml>
> + -->
> +
> <!-- Jetspeed-2 deployment properties -->
>
> <org.apache.jetspeed.server.home>c:/Program Files/Apache Software Foundation/Tomcat 5.5</org.apache.jetspeed.server.home>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
> For additional commands, e-mail: jetspeed-dev-help@portals.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org