Update of /var/cvs/all/maven-base
In directory james.mmbase.org:/tmp/cvs-serv18204/maven-base
Modified Files:
maven.xml project.xml project.properties
Log Message:
Improvements in maven build for site and documentation generation
See also: http://cvs.mmbase.org/viewcvs/all/maven-base
Index: maven.xml
===================================================================
RCS file: /var/cvs/all/maven-base/maven.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- maven.xml 21 Mar 2008 11:57:02 -0000 1.10
+++ maven.xml 25 Mar 2008 21:03:08 -0000 1.11
@@ -175,22 +175,20 @@
</preGoal>
-<!-- disabled documentation, because documentation dir contains xml's which
are not docs.
<preGoal name="site">
<attainGoal name="sdocbook:generate-html"/>
</preGoal>
--->
<postGoal name="sdocbook:prepare-filesystem">
<maven:get var="maven.sdocbook.stylesheets.dir"
plugin="maven-sdocbook-plugin"
property="maven.sdocbook.stylesheets.dir"/>
- <echo>${maven.sdocbook.stylesheets.dir} from
${maven.sdocbook.src.dir}</echo>
+ <echo>${maven.sdocbook.stylesheets.dir} from
${maven.sdocbook.stylesheets.mmbase}</echo>
<!-- use a custom html stylesheet -->
<copy todir="${maven.sdocbook.stylesheets.dir}/html">
- <fileset dir="${maven.sdocbook.src.dir}/style"/>
+ <fileset dir="${maven.sdocbook.stylesheets.mmbase}/style"/>
</copy>
<replace
file="${maven.sdocbook.stylesheets.dir}/html/docbook2xhtml.xslt"
token="[BASESTYLESHEET]"
@@ -198,7 +196,7 @@
<!-- copy images -->
<copy todir="${maven.sdocbook.stylesheets.dir}/images">
- <fileset dir="${maven.sdocbook.src.dir}/style"/>
+ <fileset dir="${maven.sdocbook.stylesheets.mmbase}/style"/>
</copy>
</postGoal>
Index: project.xml
===================================================================
RCS file: /var/cvs/all/maven-base/project.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- project.xml 21 Mar 2008 11:57:01 -0000 1.29
+++ project.xml 25 Mar 2008 21:03:08 -0000 1.30
@@ -46,15 +46,19 @@
<url>http://www.mmbase.org/license</url>
</license>
</licenses>
- <description>MMBase is a Web Content Management System with strong multi
media features. MMBase has a large installed base in The Netherlands, and is
used by major Dutch broadcasters, publishers, educational institutes, national
and local governments. MMBase is written in Java, it is Open Source Software
(MPL) and all standards used are as 'open' as possible. The system can be used
with all major operating systems, webservers and databases.</description>
+ <description>
+ MMBase is a Web Content Management System with strong multi media
features.
+ MMBase has a large installed base in The Netherlands, and is used by major
+ Dutch broadcasters, publishers, educational institutes, national and local
+ governments. MMBase is written in Java, it is Open Source Software (MPL)
+ and all standards used are as 'open' as possible. The system can be used
+ with all major operating systems, webservers and databases.
+ </description>
<url>http://www.mmbase.org</url>
- <issueTrackingUrl>http://www.mmbase.org/bug</issueTrackingUrl>
- <siteAddress>http://www.mmbase.org</siteAddress>
- <siteDirectory>/home/maven/site/mmbase</siteDirectory>
- <distributionDirectory>/home/maven/site/mmapps/jars/</distributionDirectory>
+
<issueTrackingUrl>http://www.mmbase.org/jira/secure/Dashboard.jspa</issueTrackingUrl>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/var/cvs:mmbase-core</connection>
- <developerConnection>scm:cvs:pserver:[EMAIL
PROTECTED]:/var/cvs:mmbase-core</developerConnection>
+ <developerConnection>scm:cvs:ext:[EMAIL
PROTECTED]:/var/cvs:mmbase-core</developerConnection>
<url>http://cvs.mmbase.org/viewcvs/</url>
</repository>
<mailingLists>
@@ -283,7 +287,6 @@
<type>plugin</type>
<url>http://mmapps.sourceforge.net/maven-mmbase-module-plugin/</url>
</dependency>
-<!-- disabled documentation, because documentation dir contains xml's which
are not docs.
<dependency>
<groupId>maven-plugins</groupId>
<artifactId>maven-sdocbook-plugin</artifactId>
@@ -291,7 +294,6 @@
<type>plugin</type>
<url>http://maven-plugins.sourceforge.net</url>
</dependency>
--->
</dependencies>
<build>
<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
@@ -311,28 +313,24 @@
<filtering>false</filtering>
</resource>
<resource>
- <directory>${basedir}/html/WEB-INF/classes</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <targetPath>META-INF</targetPath>
+ <targetPath>${basedir}/META-INF</targetPath>
<directory>META-INF</directory>
<excludes>
<exclude>"**/CVS"</exclude>
</excludes>
+ <filtering>false</filtering>
</resource>
- <!-- This does not work the same way as the ant build does.
- We have to change more in the build to get it working -->
<resource>
<targetPath>org/mmbase/config</targetPath>
<directory>config</directory>
<excludes>
<exclude>"**/CVS"</exclude>
</excludes>
+ <filtering>false</filtering>
</resource>
</resources>
<!-- Unit test cases -->
- <unitTestSourceDirectory>${basedir}/tests</unitTestSourceDirectory><!--
does this work?? -->
+ <unitTestSourceDirectory>${basedir}/unittests</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Tests.java</include>
@@ -350,14 +348,12 @@
<report>maven-developer-activity-plugin</report>
<report>maven-file-activity-plugin</report>
<report>maven-javadoc-plugin</report>
- <!--
- <report>maven-jdepend-plugin</report>
- <report>maven-junit-report-plugin</report>
<report>maven-jxr-plugin</report>
- -->
- <report>maven-license-plugin</report>
<report>maven-tasklist-plugin</report>
+ <report>maven-license-plugin</report>
<!--
+ <report>maven-jdepend-plugin</report>
+ <report>maven-junit-report-plugin</report>
<report>maven-linkcheck-plugin</report>
<report>maven-jdiff-plugin</report>
<report>maven-checkstyle-plugin</report>
@@ -366,4 +362,3 @@
-->
</reports>
</project>
-
Index: project.properties
===================================================================
RCS file: /var/cvs/all/maven-base/project.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- project.properties 21 Mar 2008 11:57:02 -0000 1.8
+++ project.properties 25 Mar 2008 21:03:08 -0000 1.9
@@ -64,7 +64,7 @@
maven.javadoc.links=http://java.sun.com/j2se/1.5.0/docs/api/
# Specifies custom tags to use for the generated Javadocs.
-maven.javadoc.customtags=todo application bad-constant bad-literal
code-conventions core deprecated-now deprecation-used dependency duplicate
javadoc language license move performance rename requires scope sql vpro
+maven.javadoc.customtags=todo application bad-constant code-conventions core
deprecation-used duplicate javadoc license move rename scope sql
todo.name=todo
todo.description=To Do:
@@ -78,10 +78,6 @@
bad-constant.description=Section contains hard-coded values, which should be
made configurable.
bad-constant.enabled=true
bad-constant.scope=Field
-bad-literal.name=bad-literal
-bad-literal.description=Section contains literals (numeric or string
constants), where constants (public final static identifiers) should be used.
-bad-literal.enabled=true
-bad-literal.scope=Method
code-conventions.name=code-conventions
code-conventions.description=The class needs to be adapted to the MMBase
Coding Standards.
code-conventions.enabled=true
@@ -90,18 +86,10 @@
core.description=Classifies the class as a CORE class
core.enabled=true
core.scope=Class
-deprecated-now.name=deprecated-now
-deprecated-now.description=Section is deprecated and will be removed from the
code. If this is a Class, the entire Class will be removed.
-deprecated-now.enabled=true
-deprecated-now.scope=Class, Method, Field
deprecation-used.name=deprecation-used
deprecation-used.description=Section uses deprecated (java) code, which will
be fixed
deprecation-used.enabled=true
deprecation-used.scope=Method, Field
-dependency.name=dependency
-dependency.description=Section contains code which is depedent on a class,
where it is undesirable. The code will be adapated to be more generic or moved
to a more appropriate class.
-dependency.enabled=true
-dependency.scope=Class, Method, Field
duplicate.name=duplicate
duplicate.description=Section contains code which will be moved to an higher
(possibly abstract) class, identified with <classname>
duplicate.enabled=true
@@ -110,10 +98,6 @@
javadoc.description=Section needs Javadoc..
javadoc.enabled=true
javadoc.scope=Class, Method, Field
-language.name=language
-language.description=Section needs to be altered to use internationalization,
using english ('en') as a default.
-language.enabled=true
-language.scope=Class, Method, Field
license.name=license
license.description=The code for this class falls under a different (and
conflicting) license, such as GPL. The code needs to be replaced or moved out
of the core.
license.enabled=true
@@ -122,18 +106,10 @@
move.description=Class will be moved to package <packagename≶
move.enabled=true
move.scope=Class
-performance.name=performance
-performance.description=Section need be improved for performance reasons.
-performance.enabled=true
-performance.scope=Class, Method, Field
rename.name=rename
rename.description=Class wil be renamed to <classname>
rename.enabled=true
rename.scope=Class
-requires.name=requires
-requires.description=This Class needs the indicated version of the MMBase core.
-requires.enabled=true
-requires.scope=Class
scope.name=scope
scope.description=Section scope will be narrowed to <scope> (i.e. private,
package, protected)
scope.enabled=true
@@ -142,15 +118,12 @@
sql.description=Section uses (direct) SQL queries, which will be removed/fixed
sql.enabled=true
sql.scope=Method, Field
-vpro.name=vpro
-vpro.description=Section contains VPRO-specific code, which will be
removed/fixed
-vpro.enabled=true
-vpro.scope=Method, Field
# The stylesheet to use instead of the default one
maven.sdocbook.html.xsl=${maven.sdocbook.stylesheets.dir}/html/docbook2xhtml.xslt
#maven.sdocbook.html.params=
maven.sdocbook.src.dir=${basedir}/documentation
+maven.sdocbook.stylesheets.mmbase=${basedir}/documentation
maven.sdocbook.use.entityresolver=true
maven.sdocbook.catalogmanager.properties=${basedir}/maven-base/CatalogManager.properties
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
