Author: kevinshen
Date: 2009-06-04 08:33:24 +0200 (Thu, 04 Jun 2009)
New Revision: 35685
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.xml
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/maven.xml
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/maven.xml
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-single/maven.xml
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-staging/maven.xml
Log:
CMSC-893 Replace the current Rich Text Editor with a better one
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.xml
2009-06-04 05:57:59 UTC (rev 35684)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.xml
2009-06-04 06:33:24 UTC (rev 35685)
@@ -224,8 +224,6 @@
<version>${cmsc.version}</version>
<type>mmbase-module</type>
</dependency>
-
-
<!-- MMBase -->
<dependency>
<groupId>mmbase</groupId>
@@ -621,7 +619,13 @@
<war.bundle>${war.bundle}</war.bundle>
</properties>
</dependency>
-
+<!-- Xinha -->
+ <dependency>
+ <groupId>xinha</groupId>
+ <artifactId>xinha</artifactId>
+ <version>0.96beta2</version>
+ <type>war</type>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>${basedir}/src/java</sourceDirectory>
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/maven.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/maven.xml
2009-06-04 05:57:59 UTC (rev 35684)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/maven.xml
2009-06-04 06:33:24 UTC (rev 35685)
@@ -5,8 +5,34 @@
<postGoal name="war:webapp">
<attainGoal name="mmbase-module:obtain-modules" />
+
+ <ant:delete
dir="${maven.mmbasemodule.webapp.dir}/mmbase/edit/wizard/xinha" />
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="dep" value="${lib.dependency}"/>
+ <j:if test="${dep.type == 'war'}">
+ <ant:unjar src="${lib.path}"
dest="${maven.mmbasemodule.webapp.dir}/${mmbase.templates.path}"
overwrite="false"/>
+ </j:if>
+ <!--If the maven-module-plugin add a exclude attribute at the next
version, we can exclude the xinha by setting the attribute, the following code
will be removed-->
+ <j:if test="${dep.type == 'mmbase-module' and dep.artifactId ==
'cmsc-richtext'}">
+ <j:set var="build.temp.templates"
value="${maven.mmbasemodule.build.dir}/temp/templates"/>
+ <ant:mkdir dir="${build.temp.templates}"/>
+ <ant:unjar src="${lib.path}" dest="${build.temp.templates}">
+ <patternset>
+ <include name="${maven.mmbasemodule.templates.dir}/**" />
+ </patternset>
+ </ant:unjar>
+ <util:available
file="${build.temp.templates}/${maven.mmbasemodule.templates.dir}">
+ <ant:move
todir="${maven.mmbasemodule.webapp.dir}/${mmbase.templates.path}"
+ overwrite="true" preservelastmodified="true"
includeEmptyDirs="no">
+ <ant:fileset
dir="${build.temp.templates}/${maven.mmbasemodule.templates.dir}"/>
+ </ant:move>
+
+ <ant:delete
dir="${build.temp.templates}/${maven.mmbasemodule.templates.dir}" />
+ </util:available>
+ <ant:delete dir="${build.temp.templates}" />
+ </j:if>
+ </j:forEach>
</postGoal>
-
<preGoal name="war:war">
<attainGoal name="mmbase-module:install-builders" />
</preGoal>
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/maven.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/maven.xml
2009-06-04 05:57:59 UTC (rev 35684)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/maven.xml
2009-06-04 06:33:24 UTC (rev 35685)
@@ -5,6 +5,33 @@
<postGoal name="war:webapp">
<attainGoal name="mmbase-module:obtain-modules" />
+
+ <ant:delete
dir="${maven.mmbasemodule.webapp.dir}/mmbase/edit/wizard/xinha" />
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="dep" value="${lib.dependency}"/>
+ <j:if test="${dep.type == 'war'}">
+ <ant:unjar src="${lib.path}"
dest="${maven.mmbasemodule.webapp.dir}/${mmbase.templates.path}"
overwrite="false"/>
+ </j:if>
+ <!--If the maven-module-plugin add a exclude attribute at the next
version, we can exclude the xinha by setting the attribute, the following code
will be removed-->
+ <j:if test="${dep.type == 'mmbase-module' and dep.artifactId ==
'cmsc-richtext'}">
+ <j:set var="build.temp.templates"
value="${maven.mmbasemodule.build.dir}/temp/templates"/>
+ <ant:mkdir dir="${build.temp.templates}"/>
+ <ant:unjar src="${lib.path}" dest="${build.temp.templates}">
+ <patternset>
+ <include name="${maven.mmbasemodule.templates.dir}/**" />
+ </patternset>
+ </ant:unjar>
+ <util:available
file="${build.temp.templates}/${maven.mmbasemodule.templates.dir}">
+ <ant:move
todir="${maven.mmbasemodule.webapp.dir}/${mmbase.templates.path}"
+ overwrite="true" preservelastmodified="true"
includeEmptyDirs="no">
+ <ant:fileset
dir="${build.temp.templates}/${maven.mmbasemodule.templates.dir}"/>
+ </ant:move>
+
+ <ant:delete
dir="${build.temp.templates}/${maven.mmbasemodule.templates.dir}" />
+ </util:available>
+ <ant:delete dir="${build.temp.templates}" />
+ </j:if>
+ </j:forEach>
</postGoal>
<preGoal name="war:war">
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-single/maven.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-single/maven.xml
2009-06-04 05:57:59 UTC (rev 35684)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-single/maven.xml
2009-06-04 06:33:24 UTC (rev 35685)
@@ -5,6 +5,33 @@
<postGoal name="war:webapp">
<attainGoal name="mmbase-module:obtain-modules" />
+
+ <ant:delete
dir="${maven.mmbasemodule.webapp.dir}/mmbase/edit/wizard/xinha" />
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="dep" value="${lib.dependency}"/>
+ <j:if test="${dep.type == 'war'}">
+ <ant:unjar src="${lib.path}"
dest="${maven.mmbasemodule.webapp.dir}/${mmbase.templates.path}"
overwrite="false"/>
+ </j:if>
+ <!--If the maven-module-plugin add a exclude attribute at the next
version, we can exclude the xinha by setting the attribute, the following code
will be removed-->
+ <j:if test="${dep.type == 'mmbase-module' and dep.artifactId ==
'cmsc-richtext'}">
+ <j:set var="build.temp.templates"
value="${maven.mmbasemodule.build.dir}/temp/templates"/>
+ <ant:mkdir dir="${build.temp.templates}"/>
+ <ant:unjar src="${lib.path}" dest="${build.temp.templates}">
+ <patternset>
+ <include name="${maven.mmbasemodule.templates.dir}/**" />
+ </patternset>
+ </ant:unjar>
+ <util:available
file="${build.temp.templates}/${maven.mmbasemodule.templates.dir}">
+ <ant:move
todir="${maven.mmbasemodule.webapp.dir}/${mmbase.templates.path}"
+ overwrite="true" preservelastmodified="true"
includeEmptyDirs="no">
+ <ant:fileset
dir="${build.temp.templates}/${maven.mmbasemodule.templates.dir}"/>
+ </ant:move>
+
+ <ant:delete
dir="${build.temp.templates}/${maven.mmbasemodule.templates.dir}" />
+ </util:available>
+ <ant:delete dir="${build.temp.templates}" />
+ </j:if>
+ </j:forEach>
</postGoal>
<preGoal name="war:war">
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-staging/maven.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-staging/maven.xml
2009-06-04 05:57:59 UTC (rev 35684)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-staging/maven.xml
2009-06-04 06:33:24 UTC (rev 35685)
@@ -5,6 +5,33 @@
<postGoal name="war:webapp">
<attainGoal name="mmbase-module:obtain-modules" />
+
+ <ant:delete
dir="${maven.mmbasemodule.webapp.dir}/mmbase/edit/wizard/xinha" />
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="dep" value="${lib.dependency}"/>
+ <j:if test="${dep.type == 'war'}">
+ <ant:unjar src="${lib.path}"
dest="${maven.mmbasemodule.webapp.dir}/${mmbase.templates.path}"
overwrite="false"/>
+ </j:if>
+ <!--If the maven-module-plugin add a exclude attribute at the next
version, we can exclude the xinha by setting the attribute, the following code
will be removed-->
+ <j:if test="${dep.type == 'mmbase-module' and dep.artifactId ==
'cmsc-richtext'}">
+ <j:set var="build.temp.templates"
value="${maven.mmbasemodule.build.dir}/temp/templates"/>
+ <ant:mkdir dir="${build.temp.templates}"/>
+ <ant:unjar src="${lib.path}" dest="${build.temp.templates}">
+ <patternset>
+ <include name="${maven.mmbasemodule.templates.dir}/**" />
+ </patternset>
+ </ant:unjar>
+ <util:available
file="${build.temp.templates}/${maven.mmbasemodule.templates.dir}">
+ <ant:move
todir="${maven.mmbasemodule.webapp.dir}/${mmbase.templates.path}"
+ overwrite="true" preservelastmodified="true"
includeEmptyDirs="no">
+ <ant:fileset
dir="${build.temp.templates}/${maven.mmbasemodule.templates.dir}"/>
+ </ant:move>
+
+ <ant:delete
dir="${build.temp.templates}/${maven.mmbasemodule.templates.dir}" />
+ </util:available>
+ <ant:delete dir="${build.temp.templates}" />
+ </j:if>
+ </j:forEach>
</postGoal>
<preGoal name="war:war">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
