svn commit: r785138 - /cayenne/site/trunk/tlp-site/bin/javadoc-update.sh

[am...@apache.org]

Author: amaniatis
Date: Tue Jun 16 09:56:48 2009
New Revision: 785138

URL: http://svn.apache.org/viewvc?rev=785138&view=rev
Log:
CAY-1242
Simplify javadoc build script which seems to fix the duplicate packages problem. Someone with greater knowledge of maven might like to review this since I can't
see why the old script had problems and this one doesn't, but it is simpler now and runs much faster.


Modified:
    cayenne/site/trunk/tlp-site/bin/javadoc-update.sh

Modified: cayenne/site/trunk/tlp-site/bin/javadoc-update.sh
URL: http://svn.apache.org/viewvc/cayenne/site/trunk/tlp-site/bin/javadoc-update.sh?rev=785138&r1=785137&r2=785138&view=diff
==============================================================================
--- cayenne/site/trunk/tlp-site/bin/javadoc-update.sh (original)
+++ cayenne/site/trunk/tlp-site/bin/javadoc-update.sh Tue Jun 16 09:56:48 2009
@@ -1,37 +1,32 @@
 #!/usr/local/bin/bash
 
 CAYSVN="/home/amaniatis/svn/cayenne"
-MVNINSTALLDIR="/home/amaniatis/.m2/repository/org/apache/cayenne/docs/cayenne-doc/3.0-SNAPSHOT"
-TARGETDIR="/x1/home/amaniatis/svn/cayenne/docs/doc/target"
-DOCJAR="cayenne-doc-3.0-SNAPSHOT.jar"
+SOURCEDIR="${CAYSVN}/framework/cayenne-jdk1.5-unpublished"
+
 MVN="/home/amaniatis/maven/bin/mvn"
 SVN="/usr/local/bin/svn"
 
 JAVA_HOME="/usr/local"
 export JAVA_HOME
 
-# rebuild Javadoc
+# update to current version
 cd ${CAYSVN}
 ${SVN} up
 
 # update schema
 /usr/local/bin/rsync --exclude .svn -r --delete ${CAYSVN}/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema /www/cayenne.apache.org/
 
+# Special hack: remove next line after 3.0beta1
+cp ${CAYSVN}/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd /www/cayenne.apache.org/schema/3.0/modelMap
+
 # update schema docs
 /usr/local/bin/rsync --exclude .svn -r ${CAYSVN}/docs/doc/src/main/resources/doc/schema /www/cayenne.apache.org/
 
-# next line is needed to build source jar (can't figure a simpler way)
-${MVN} -Dmaven.test.skip=true install
-cd docs/doc
-${MVN} clean
-${MVN}
-
-# unpack javadocs
-cd ${TARGETDIR}
-rm -rf ${TARGETDIR}/doc
-/usr/local/bin/unzip ${DOCJAR}
+cd ${SOURCEDIR}
+${MVN} clean javadoc:javadoc
+
 rm -rf /home/amaniatis/public_html/nightly-javadoc
-mv ${TARGETDIR}/doc/api /home/amaniatis/public_html/nightly-javadoc
+mv ${SOURCEDIR}/target/site/apidocs /home/amaniatis/public_html/nightly-javadoc
 
 # Copy to main web site
-/usr/local/bin/rsync --exclude .svn -r --delete /home/amaniatis/public_html/nightly-javadoc/ /www/cayenne.apache.org/doc/api/
+/usr/local/bin/rsync --exclude .svn -r --delete /home/amaniatis/public_html/nightly-javadoc/ /www/cayenne.apache.org/doc/api/
\ No newline at end of file