Author: taylor
Date: Fri Mar 2 00:32:50 2007
New Revision: 513659
URL: http://svn.apache.org/viewvc?view=rev&rev=513659
Log:
bugfix: fix the maven-2 build for dbpsml for normal build and plugin
patch from Hajo Birthelmer
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
portals/jetspeed-2/trunk/portal/build.xml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jetspeed.psml
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml?view=diff&rev=513659&r1=513658&r2=513659
==============================================================================
---
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
Fri Mar 2 00:32:50 2007
@@ -21,6 +21,7 @@
<!-- Properties -->
<property name="org.apache.jetspeed.catalina.version.major" value=""/>
+ <property name="org.apache.jetspeed.database.psml" value="false"/>
<property name="org.apache.jetspeed.services.autodeployment.server"
value=""/>
<property name="org.apache.jetspeed.services.autodeployment.port"
value=""/>
<property name="org.apache.jetspeed.services.autodeployment.user"
value=""/>
@@ -62,7 +63,8 @@
new version of the archetype plugin is developed and released.
-->
<!-- Assemble required portal webapp resources -->
- <delete dir="\${basedir}/target/webapp"/>
+ <delete dir="\${basedir}/target"/>
+ <mkdir dir="\${basedir}/target"/>
<mkdir dir="\${basedir}/target/webapp"/>
<dependencies filesetId="portal.resources.dependencies.id"
useScope="runtime">
<dependency groupId="${org.apache.jetspeed.groupid}"
@@ -78,7 +80,7 @@
<exclude name="META-INF/**"/>
</patternset>
</unjar>
- <delete
file="\${basedir}/target/portal-archetype-resources-${org.apache.jetspeed.version}.jar"/>
+ <delete
file="\${basedir}/target/portal-archetype-resources-${org.apache.jetspeed.version}.jar"/>
<!-- Merge webapp resource overrides from src -->
<copy todir="\${basedir}/target/webapp" overwrite="on">
@@ -122,6 +124,7 @@
</copy>
<!-- Add support for dbpsml -->
+ <antcall target="configure-database-psml"/>
<!-- Configure runtime portal properties resource -->
<replace
file="\${basedir}/target/webapp/WEB-INF/conf/jetspeed.properties">
@@ -138,5 +141,24 @@
</replace>
</target>
+
+ <target name="configure-database-psml"
depends="test-configure-database-psml"
if="org.apache.jetspeed.configure.database.psml">
+ <echo message="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"/>
+ <echo message="moved
\${basedir}/target/webapp/WEB-INF/assembly/page-manager.xml to
\${basedir}/target/webapp/WEB-INF/assembly/alternate"/>
+ <delete
file="\${basedir}/target/webapp/WEB-INF/assembly/page-manager.xml"/>
+ <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-configure-database-psml">
+ <condition
property="org.apache.jetspeed.configure.database.psml">
+ <equals arg1="${org.apache.jetspeed.database.psml}"
arg2="true"/>
+ </condition>
+ </target>
</project>
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml?view=diff&rev=513659&r1=513658&r2=513659
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
Fri Mar 2 00:32:50 2007
@@ -73,6 +73,8 @@
<ant target="configure" antfile="build.xml"
dir="\${basedir}" inheritall="off">
<property
name="org.apache.jetspeed.catalina.version.major"
value="${org.apache.jetspeed.catalina.version.major}"/>
+ <property
name="org.apache.jetspeed.database.psml"
+
value="${org.apache.jetspeed.env.deploy.db.psml}"/>
<property
name="org.apache.jetspeed.services.autodeployment.server"
value="${org.apache.jetspeed.services.autodeployment.server}"/>
<property
name="org.apache.jetspeed.services.autodeployment.port"
Modified: portals/jetspeed-2/trunk/portal/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/portal/build.xml?view=diff&rev=513659&r1=513658&r2=513659
==============================================================================
--- portals/jetspeed-2/trunk/portal/build.xml (original)
+++ portals/jetspeed-2/trunk/portal/build.xml Fri Mar 2 00:32:50 2007
@@ -50,7 +50,8 @@
<target name="configure" depends="test-deploy-type">
<!-- Build required webapp resources -->
- <delete dir="${basedir}/target/webapp"/>
+ <delete dir="${basedir}/target"/>
+ <mkdir dir="${basedir}/target"/>
<mkdir dir="${basedir}/target/webapp"/>
<copy todir="${basedir}/target/webapp">
<fileset dir="${basedir}/../src/webapp">
@@ -115,9 +116,12 @@
</target>
<target name="configure-database-psml"
depends="test-configure-database-psml"
if="org.apache.jetspeed.configure.database.psml">
+ <echo message="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"/>
+ <echo message="moved
${basedir}/target/webapp/WEB-INF/assembly/page-manager.xml to
${basedir}/target/webapp/WEB-INF/assembly/alternate"/>
+ <delete
file="${basedir}/target/webapp/WEB-INF/assembly/page-manager.xml"/>
<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"
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jetspeed.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jetspeed.psml?view=diff&rev=513659&r1=513658&r2=513659
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jetspeed.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jetspeed.psml Fri Mar 2
00:32:50 2007
@@ -28,10 +28,10 @@
</fragment>
<fragment id="jsabout-12" type="portlet" name="j2-admin::AboutJetspeed">
<property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="2" />
+ <property layout="TwoColumns" name="column" value="1" />
</fragment>
<fragment id="jsabout-13" type="portlet"
name="j2-admin::JetspeedDeveloper">
- <property layout="TwoColumns" name="row" value="0" />
+ <property layout="TwoColumns" name="row" value="1" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
</fragment>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
