Menu
▾
▴
[mmapps-cvs] maven-plugins/maven-mmbase-module-plugin plugin.jelly, 1.4, 1.5 project.xml, 1.4, 1.5 plugin.properties, 1.1, 1.2
|
From: Nico K. <nkl...@us...> - 2008-03-21 10:23:15
|
Update of /cvsroot/mmapps/maven-plugins/maven-mmbase-module-plugin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16156/maven-mmbase-module-plugin Modified Files: plugin.jelly project.xml plugin.properties Log Message: Add mmbase 1.9 block support Index: plugin.properties =================================================================== RCS file: /cvsroot/mmapps/maven-plugins/maven-mmbase-module-plugin/plugin.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** plugin.properties 5 Sep 2005 09:32:59 -0000 1.1 --- plugin.properties 21 Mar 2008 10:22:32 -0000 1.2 *************** *** 1,2 **** --- 1,9 ---- + # This software is OSI Certified Open Source Software. + # OSI Certified is a certification mark of the Open Source Initiative. + # + # The license (Mozilla version 1.0) can be read at the MMBase site. + # See http://www.MMBase.org/license + # + #------------------------------------------------------------------------------ # P L U G I N P R O P E R T I E S *************** *** 7,10 **** --- 14,18 ---- maven.mmbasemodule.config=${maven.mmbasemodule.src}/config maven.mmbasemodule.examples=${maven.mmbasemodule.src}/examples + maven.mmbasemodule.blocks=${maven.mmbasemodule.src}/blocks maven.mmbasemodule.final.name=${maven.final.name} *************** *** 17,20 **** --- 25,29 ---- maven.mmbasemodule.templates.dir=templates maven.mmbasemodule.examples.dir=examples + maven.mmbasemodule.blocks.dir=blocks maven.mmbasemodule.src.includes=${maven.war.src.includes} *************** *** 26,29 **** maven.mmbasemodule.examples.includes=** maven.mmbasemodule.examples.excludes= ! maven.mmbasemodule.repo=http://mmapps.sourceforge.net/distributions/ \ No newline at end of file --- 35,42 ---- maven.mmbasemodule.examples.includes=** maven.mmbasemodule.examples.excludes= + maven.mmbasemodule.blocks.includes=** + maven.mmbasemodule.blocks.excludes= ! maven.mmbasemodule.blocks.path=mmbase/components ! ! maven.mmbasemodule.repo=http://mmapps.sourceforge.net/distributions/ Index: project.xml =================================================================== RCS file: /cvsroot/mmapps/maven-plugins/maven-mmbase-module-plugin/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** project.xml 27 Sep 2007 16:07:40 -0000 1.4 --- project.xml 21 Mar 2008 10:22:30 -0000 1.5 *************** *** 1,3 **** ! <project> <extend>mmapps-base/mmapps-project.xml</extend> <pomVersion>3</pomVersion> --- 1,4 ---- ! <?xml version="1.0" encoding="ISO-8859-1"?> ! <project> <extend>mmapps-base/mmapps-project.xml</extend> <pomVersion>3</pomVersion> *************** *** 6,10 **** <name>MMBase module plugin</name> <groupId>mmapps</groupId> ! <currentVersion>1.2</currentVersion> <shortDescription>maven plugin to assemble a mmbase module</shortDescription> <inceptionYear>2004</inceptionYear> --- 7,11 ---- <name>MMBase module plugin</name> <groupId>mmapps</groupId> ! <currentVersion>1.3</currentVersion> <shortDescription>maven plugin to assemble a mmbase module</shortDescription> <inceptionYear>2004</inceptionYear> Index: plugin.jelly =================================================================== RCS file: /cvsroot/mmapps/maven-plugins/maven-mmbase-module-plugin/plugin.jelly,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** plugin.jelly 27 Sep 2007 16:07:40 -0000 1.4 --- plugin.jelly 21 Mar 2008 10:22:29 -0000 1.5 *************** *** 11,15 **** <!-- Default goal : Builds a war file --> <!--==================================================================--> ! <goal name="mmbase-module" prereqs="mmbase-module:mmbase-module" description="delegates to mmbase-module:mmbase-module"/> <!--==================================================================--> --- 11,16 ---- <!-- Default goal : Builds a war file --> <!--==================================================================--> ! <goal name="mmbase-module" prereqs="mmbase-module:mmbase-module" ! description="delegates to mmbase-module:mmbase-module"/> <!--==================================================================--> *************** *** 28,31 **** --- 29,35 ---- <ant:available property="examplesSourcesPresent" type="dir" file="${maven.mmbasemodule.examples}"/> + + <ant:available property="blocksSourcesPresent" type="dir" + file="${maven.mmbasemodule.blocks}"/> <ant:echo message="mmbase module: ${maven.mmbasemodule.final.name}"/> *************** *** 47,53 **** </j:forEach> ! <ant:touch> ! <ant:fileset dir="${maven.mmbasemodule.webapp.dir}"/> ! </ant:touch> <ant:mkdir dir="${maven.mmbasemodule.build.dir}" /> --- 51,57 ---- </j:forEach> ! <ant:touch> ! <ant:fileset dir="${maven.mmbasemodule.webapp.dir}"/> ! </ant:touch> <ant:mkdir dir="${maven.mmbasemodule.build.dir}" /> *************** *** 64,68 **** <j:set var="classPath" value="${maven.mmbasemodule.classpath}"/> <j:if test="${!empty(classPath)}"> ! <ant:attribute name="Class-Path" value="${maven.mmbasemodule.classpath}"/> </j:if> --- 68,72 ---- <j:set var="classPath" value="${maven.mmbasemodule.classpath}"/> <j:if test="${!empty(classPath)}"> ! <ant:attribute name="Class-Path" value="${maven.mmbasemodule.classpath}"/> </j:if> *************** *** 96,119 **** <ant:mkdir dir="${maven.mmbasemodule.webapp.dir}"/> ! <j:set var="webapp.build.webinf" value="${maven.mmbasemodule.webapp.dir}/WEB-INF"/> ! <ant:mkdir dir="${webapp.build.webinf}"/> ! ! <j:set var="webapp.build.lib" value="${webapp.build.webinf}/lib"/> <ant:mkdir dir="${webapp.build.lib}"/> - - <j:set var="webapp.build.classes" value="${webapp.build.webinf}/classes"/> - <ant:mkdir dir="${webapp.build.classes}"/> - - <j:set var="webapp.build.tlds" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.tld.dir}"/> - <ant:mkdir dir="${webapp.build.tlds}"/> <j:set var="webapp.build.config" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.config.dir}"/> - <ant:mkdir dir="${webapp.build.config}"/> <j:set var="webapp.build.templates" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.templates.dir}"/> - <ant:mkdir dir="${webapp.build.templates}"/> <j:set var="webapp.build.examples" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.examples.dir}"/> ! <ant:mkdir dir="${webapp.build.examples}"/> <j:if test="${templatesSourcesPresent == 'true'}"> <ant:copy todir="${webapp.build.templates}" preservelastmodified="true"> <ant:fileset dir="${maven.mmbasemodule.templates}" --- 100,113 ---- <ant:mkdir dir="${maven.mmbasemodule.webapp.dir}"/> ! <j:set var="webapp.build.lib" value="${maven.mmbasemodule.webapp.dir}/lib"/> <ant:mkdir dir="${webapp.build.lib}"/> <j:set var="webapp.build.config" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.config.dir}"/> <j:set var="webapp.build.templates" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.templates.dir}"/> <j:set var="webapp.build.examples" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.examples.dir}"/> ! <j:set var="webapp.build.blocks" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.blocks.dir}"/> <j:if test="${templatesSourcesPresent == 'true'}"> + <ant:mkdir dir="${webapp.build.templates}"/> <ant:copy todir="${webapp.build.templates}" preservelastmodified="true"> <ant:fileset dir="${maven.mmbasemodule.templates}" *************** *** 125,128 **** --- 119,123 ---- <j:if test="${examplesSourcesPresent == 'true'}"> + <ant:mkdir dir="${webapp.build.examples}"/> <ant:copy todir="${webapp.build.examples}" preservelastmodified="true"> <ant:fileset dir="${maven.mmbasemodule.examples}" *************** *** 133,137 **** --- 128,143 ---- </j:if> + <j:if test="${blocksSourcesPresent == 'true'}"> + <ant:mkdir dir="${webapp.build.blocks}"/> + <ant:copy todir="${webapp.build.blocks}" preservelastmodified="true"> + <ant:fileset dir="${maven.mmbasemodule.blocks}" + includes="${maven.mmbasemodule.blocks.includes}" + excludes="${maven.mmbasemodule.blocks.excludes}"> + </ant:fileset> + </ant:copy> + </j:if> + <j:if test="${configSourcesPresent == 'true'}"> + <ant:mkdir dir="${webapp.build.config}"/> <ant:copy todir="${webapp.build.config}" preservelastmodified="true"> <ant:fileset dir="${maven.mmbasemodule.config}" *************** *** 142,146 **** </j:if> ! <!-- What to do with dependencies? --> <j:forEach var="lib" items="${pom.artifacts}"> --- 148,152 ---- </j:if> ! <!-- What to do with dependencies? --> <j:forEach var="lib" items="${pom.artifacts}"> *************** *** 180,183 **** --- 186,191 ---- <j:set var="build.temp.config" value="${maven.mmbasemodule.build.dir}/temp/config"/> <ant:mkdir dir="${build.temp.config}"/> + <j:set var="build.temp.blocks" value="${maven.mmbasemodule.build.dir}/temp/blocks"/> + <ant:mkdir dir="${build.temp.blocks}"/> <j:set var="build.temp.webapp.dir" value="${maven.mmbasemodule.build.dir}/temp/webapp"/> *************** *** 188,270 **** <j:if test="${dep.type == 'mmbase-module'}"> <j:choose> ! <j:when test="dep.groupId != 'mmbase' and dep.artifactId != 'mmbase'"> ! <j:set var="overwriteSources" value="true"/> ! </j:when> ! <j:otherwise> ! <j:set var="overwriteSources" value="false"/> ! </j:otherwise> </j:choose> ! <j:if test="${dep.getProperty('mmbase.templates.bundle')!='false'}"> ! <j:set var="templatesPath" value="${dep.getProperty('mmbase.templates.path')}"/> ! <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="${build.temp.webapp.dir}/${templatesPath}" ! overwrite="${overwriteSources}" 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> ! </j:if> ! ! <j:if test="${dep.getProperty('mmbase.examples.bundle')=='true'}"> ! <j:set var="examplesPath" value="${dep.getProperty('mmbase.examples.path')}"/> ! <ant:unjar src="${lib.path}" dest="${build.temp.examples}"> ! <patternset> ! <include name="${maven.mmbasemodule.examples.dir}/**"/> ! </patternset> ! </ant:unjar> ! <util:available file="${build.temp.examples}/${maven.mmbasemodule.examples.dir}"> ! <ant:move todir="${build.temp.webapp.dir}/${examplesPath}" ! overwrite="${overwriteSources}" preservelastmodified="true" includeEmptyDirs="no"> ! <ant:fileset dir="${build.temp.examples}/${maven.mmbasemodule.examples.dir}"/> ! </ant:move> ! <ant:delete dir="${build.temp.examples}/${maven.mmbasemodule.examples.dir}" /> ! </util:available> ! </j:if> - <j:if test="${dep.getProperty('mmbase.config.bundle')!='false'}"> - <ant:unjar src="${lib.path}" dest="${build.temp.config}"> - <patternset> - <include name="${maven.mmbasemodule.config.dir}/**"/> - </patternset> - </ant:unjar> - <!-- merge some config files? --> - <util:available file="${build.temp.config}/${maven.mmbasemodule.config.dir}"> - <ant:move todir="${build.temp.webapp.dir}/WEB-INF/config" - overwrite="${overwriteSources}" preservelastmodified="true" includeEmptyDirs="no"> - <ant:fileset dir="${build.temp.config}/${maven.mmbasemodule.config.dir}"/> - </ant:move> - <ant:delete dir="${build.temp.config}/${maven.mmbasemodule.config.dir}" /> - </util:available> - </j:if> <ant:unjar src="${lib.path}" dest="${maven.mmbasemodule.webapp.dir}"> ! <patternset> ! <include name="WEB-INF/lib/**"/> ! </patternset> </ant:unjar> </j:if> </j:forEach> ! <ant:touch> ! <ant:fileset dir="${maven.mmbasemodule.webapp.dir}"/> ! </ant:touch> <util:available file="${build.temp.webapp.dir}"> ! <ant:move todir="${maven.mmbasemodule.webapp.dir}" overwrite="false" includeEmptyDirs="no"> ! <ant:fileset dir="${build.temp.webapp.dir}"/> ! </ant:move> ! </util:available> ! ! <ant:delete dir="${build.temp.templates}" /> ! <ant:delete dir="${build.temp.examples}" /> ! <ant:delete dir="${build.temp.config}" /> ! <ant:delete dir="${build.temp.webapp.dir}" /> <util:available file="${maven.build.dir}/${maven.final.name}.jar"> --- 196,321 ---- <j:if test="${dep.type == 'mmbase-module'}"> <j:choose> ! <j:when test="${dep.groupId != 'mmbase' and dep.artifactId != 'mmbase'}"> ! <j:set var="overwriteSources" value="true"/> ! </j:when> ! <j:otherwise> ! <j:set var="overwriteSources" value="false"/> ! </j:otherwise> </j:choose> ! <j:if test="${dep.getProperty('mmbase.templates.bundle')!='false'}"> ! <j:set var="templatesPath" value="${dep.getProperty('mmbase.templates.path')}"/> ! <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="${build.temp.webapp.dir}/${templatesPath}" ! overwrite="${overwriteSources}" 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> ! </j:if> ! ! <j:if test="${dep.getProperty('mmbase.examples.bundle')=='true'}"> ! <j:set var="examplesPath" value="${dep.getProperty('mmbase.examples.path')}"/> ! <ant:unjar src="${lib.path}" dest="${build.temp.examples}"> ! <patternset> ! <include name="${maven.mmbasemodule.examples.dir}/**"/> ! </patternset> ! </ant:unjar> ! ! <util:available file="${build.temp.examples}/${maven.mmbasemodule.examples.dir}"> ! <ant:move todir="${build.temp.webapp.dir}/${examplesPath}" ! overwrite="${overwriteSources}" preservelastmodified="true" includeEmptyDirs="no"> ! <ant:fileset dir="${build.temp.examples}/${maven.mmbasemodule.examples.dir}"/> ! </ant:move> ! <ant:delete dir="${build.temp.examples}/${maven.mmbasemodule.examples.dir}" /> ! </util:available> ! </j:if> ! ! <j:if test="${dep.getProperty('mmbase.blocks.bundle')!='false'}"> ! <j:choose> ! <j:when test="${dep.getProperty('mmbase.blocks.path') and dep.getProperty('mmbase.blocks.path') != ''}"> ! <j:set var="blocksPath" value="${dep.getProperty('mmbase.blocks.path')}"/> ! </j:when> ! <j:otherwise> ! <j:choose> ! <j:when test="${dep.artifactId.startsWith('mmbase-')}"> ! <j:set var="blocksPath" value="${maven.mmbasemodule.blocks.path}/${dep.artifactId.substring(7)}"/> ! </j:when> ! <j:otherwise> ! <j:set var="blocksPath" value="${maven.mmbasemodule.blocks.path}/${dep.artifactId}"/> ! </j:otherwise> ! </j:choose> ! </j:otherwise> ! </j:choose> ! ! <ant:unjar src="${lib.path}" dest="${build.temp.blocks}"> ! <patternset> ! <include name="${maven.mmbasemodule.blocks.dir}/**"/> ! </patternset> ! </ant:unjar> ! ! <util:available file="${build.temp.blocks}/${maven.mmbasemodule.blocks.dir}"> ! <ant:move todir="${build.temp.webapp.dir}/${blocksPath}" ! overwrite="${overwriteSources}" preservelastmodified="true" includeEmptyDirs="no"> ! <ant:fileset dir="${build.temp.blocks}/${maven.mmbasemodule.blocks.dir}"/> ! </ant:move> ! <ant:delete dir="${build.temp.blocks}/${maven.mmbasemodule.blocks.dir}" /> ! </util:available> ! </j:if> + <j:if test="${dep.getProperty('mmbase.config.bundle')=='true'}"> + <ant:unjar src="${lib.path}" dest="${build.temp.config}"> + <patternset> + <include name="${maven.mmbasemodule.config.dir}/**"/> + </patternset> + </ant:unjar> + + <!-- merge some config files? --> + <util:available file="${build.temp.config}/${maven.mmbasemodule.config.dir}"> + <ant:move todir="${build.temp.webapp.dir}/WEB-INF/config" + overwrite="${overwriteSources}" preservelastmodified="true" includeEmptyDirs="no"> + <ant:fileset dir="${build.temp.config}/${maven.mmbasemodule.config.dir}"/> + </ant:move> + <ant:delete dir="${build.temp.config}/${maven.mmbasemodule.config.dir}" /> + </util:available> + </j:if> + + <ant:unjar src="${lib.path}" dest="${maven.mmbasemodule.webapp.dir}/WEB-INF"> + <patternset> + <include name="lib/**"/> + </patternset> + </ant:unjar> + <!-- lib include of 1.2- plugin version artifacts --> <ant:unjar src="${lib.path}" dest="${maven.mmbasemodule.webapp.dir}"> ! <patternset> ! <include name="WEB-INF/lib/**"/> ! </patternset> </ant:unjar> </j:if> </j:forEach> ! <ant:touch> ! <ant:fileset dir="${maven.mmbasemodule.webapp.dir}"/> ! </ant:touch> <util:available file="${build.temp.webapp.dir}"> ! <ant:move todir="${maven.mmbasemodule.webapp.dir}" overwrite="false" includeEmptyDirs="no"> ! <ant:fileset dir="${build.temp.webapp.dir}"/> ! </ant:move> ! </util:available> ! <ant:delete dir="${build.temp.blocks}" /> ! <ant:delete dir="${build.temp.templates}" /> ! <ant:delete dir="${build.temp.examples}" /> ! <ant:delete dir="${build.temp.config}" /> ! <ant:delete dir="${build.temp.webapp.dir}" /> <util:available file="${maven.build.dir}/${maven.final.name}.jar"> *************** *** 273,334 **** </goal> ! <goal name="mmbase-module:install-builders"> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/lib"> ! <fileScanner var="libScanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/lib" /> ! </fileScanner> ! <j:forEach var="library" items="${libScanner.iterator()}"> ! <ant:unjar src="${library}" dest="${maven.war.webapp.dir}/WEB-INF/classes"> ! <patternset> ! <include name="org/mmbase/config/applications/**/builders/**" /> ! </patternset> ! </ant:unjar> ! </j:forEach> ! </util:available> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config/applications"> ! <fileScanner var="scanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config/applications" /> ! </fileScanner> ! <j:forEach var="dir" items="${scanner.directories()}"> ! <j:if test="${dir.path.endsWith('builders')}"> ! <ant:copy todir="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config/builders/applications"> ! <ant:fileset dir="${dir.path}" /> ! </ant:copy> ! </j:if> ! </j:forEach> ! </util:available> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config"> ! <fileScanner var="scanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config"/> ! </fileScanner> ! <j:forEach var="dir" items="${scanner.directories()}"> ! <fileScanner var="filescan"> ! <fileset dir="${dir.path}" > ! <exclude name="INDEX"/> ! <include name="*"/> ! </fileset> ! </fileScanner> <!-- ## Generate INDEX file with each filename and directory on a new line ## --> <echo file="${dir.path}/INDEX"><j:forEach var="file" items="${filescan.iterator()}">${file.name} </j:forEach><j:forEach var="filedir" items="${filescan.directories()}">${filedir.name}/ </j:forEach></echo> ! </j:forEach> ! </util:available> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/config/applications"> ! <fileScanner var="scanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/config/applications" /> ! </fileScanner> ! <j:forEach var="dir" items="${scanner.directories()}"> ! <j:if test="${dir.path.endsWith('builders')}"> ! <ant:copy todir="${maven.war.webapp.dir}/WEB-INF/config/builders/applications"> ! <ant:fileset dir="${dir.path}" /> ! </ant:copy> ! </j:if> ! </j:forEach> ! </util:available> ! </goal> <!--==================================================================--> --- 324,385 ---- </goal> ! <goal name="mmbase-module:install-builders"> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/lib"> ! <fileScanner var="libScanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/lib" /> ! </fileScanner> ! <j:forEach var="library" items="${libScanner.iterator()}"> ! <ant:unjar src="${library}" dest="${maven.war.webapp.dir}/WEB-INF/classes"> ! <patternset> ! <include name="org/mmbase/config/applications/**/builders/**" /> ! </patternset> ! </ant:unjar> ! </j:forEach> ! </util:available> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config/applications"> ! <fileScanner var="scanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config/applications" /> ! </fileScanner> ! <j:forEach var="dir" items="${scanner.directories()}"> ! <j:if test="${dir.path.endsWith('builders')}"> ! <ant:copy todir="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config/builders/applications"> ! <ant:fileset dir="${dir.path}" /> ! </ant:copy> ! </j:if> ! </j:forEach> ! </util:available> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config"> ! <fileScanner var="scanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config"/> ! </fileScanner> ! <j:forEach var="dir" items="${scanner.directories()}"> ! <fileScanner var="filescan"> ! <fileset dir="${dir.path}" > ! <exclude name="INDEX"/> ! <include name="*"/> ! </fileset> ! </fileScanner> <!-- ## Generate INDEX file with each filename and directory on a new line ## --> <echo file="${dir.path}/INDEX"><j:forEach var="file" items="${filescan.iterator()}">${file.name} </j:forEach><j:forEach var="filedir" items="${filescan.directories()}">${filedir.name}/ </j:forEach></echo> ! </j:forEach> ! </util:available> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/config/applications"> ! <fileScanner var="scanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/config/applications" /> ! </fileScanner> ! <j:forEach var="dir" items="${scanner.directories()}"> ! <j:if test="${dir.path.endsWith('builders')}"> ! <ant:copy todir="${maven.war.webapp.dir}/WEB-INF/config/builders/applications"> ! <ant:fileset dir="${dir.path}" /> ! </ant:copy> ! </j:if> ! </j:forEach> ! </util:available> ! </goal> <!--==================================================================--> *************** *** 343,352 **** type="jar" project="${pom}"/> - <artifact:install artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.mmbase-module" type="mmbase-module" project="${pom}"/> - </goal> --- 394,401 ---- *************** *** 362,371 **** type="jar" project="${pom}"/> - <artifact:install-snapshot artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.mmbase-module" type="mmbase-module" project="${pom}"/> - </goal> --- 411,418 ---- *************** *** 381,390 **** type="jar" project="${pom}"/> - <artifact:deploy artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.mmbase-module" type="mmbase-module" project="${pom}"/> - </goal> --- 428,435 ---- *************** *** 397,409 **** <artifact:deploy-snapshot ! artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.jar" type="jar" project="${pom}"/> - <artifact:deploy-snapshot ! artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.mmbase-module" type="mmbase-module" project="${pom}"/> - </goal> --- 442,452 ---- <artifact:deploy-snapshot ! artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.jar" type="jar" project="${pom}"/> <artifact:deploy-snapshot ! artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.mmbase-module" type="mmbase-module" project="${pom}"/> </goal> *************** *** 421,427 **** </goal> ! ! <goal name="mmbase-module:report" description="generates the installation documentation"> ! <mkdir dir="${maven.build.dir}/generated-xdocs"/> <copy todir="${maven.build.dir}/generated-xdocs" file="${plugin.resources}/ModuleInstallation.xml"> --- 464,468 ---- </goal> ! <goal name="mmbase-module:report" description="generates the installation documentation"> <mkdir dir="${maven.build.dir}/generated-xdocs"/> <copy todir="${maven.build.dir}/generated-xdocs" file="${plugin.resources}/ModuleInstallation.xml"> *************** *** 434,454 **** </filterset> </copy> ! ! </goal> ! <goal name="maven-mmbase-module-plugin:register" description="site documentation bundle callback registration" > ! <doc:registerReport ! name="mmbase-module installation" ! pluginName="mmbase-module" ! link="ModuleInstallation" ! description="mmbase-module installation instructions"/> ! ! </goal> ! <goal name="maven-mmbase-module-plugin:deregister"> ! <doc:deregisterReport name="mmbase-module installation"/> ! </goal> </project> \ No newline at end of file --- 475,493 ---- </filterset> </copy> ! </goal> ! <goal name="maven-mmbase-module-plugin:register" description="site documentation bundle callback registration" > ! <doc:registerReport ! name="mmbase-module installation" ! pluginName="mmbase-module" ! link="ModuleInstallation" ! description="mmbase-module installation instructions"/> ! </goal> ! <goal name="maven-mmbase-module-plugin:deregister"> ! <doc:deregisterReport name="mmbase-module installation"/> ! </goal> </project> \ No newline at end of file |
