根据zDoc 1.11版更新build2.xml构建脚本,添加PDF输出.修正String2Mirror的编译警告. 添加生成PDF所需的…

…jar和ttf文件.

git-svn-id: http://nutz.googlecode.com/svn/trunk@1588 423f10f2-e3a4-11dd-a6ea-a32d6b26a33d

build/build2.xml

@@ -36,7 +36,7 @@
 
 	<property name="nutz-version" value="1.a.32"></property>
 	<tstamp>
-		<format property="now-date" locale="zh" pattern="yyyyMMdd_hhmm" timezone="Asia/Shanghai" />
+		<format property="now-date" locale="zh" pattern="yyyyMMdd_hhmmaa" timezone="Asia/Shanghai" />
 	</tstamp>
 	<property name="tmp-dir" value="build/tmp"></property>
 	<property name="pub-dir" value="build/pub"></property>
@@ -50,13 +50,15 @@
 	<property name="zdoc-dir" value="${pub-dir}/manual"></property>
 	<property name="zdoc-en-dir" value="${pub-dir}/manual_en"></property>
 
-	<property name="nutz.jar.pre" value="nutz-${nutz-version}-snapshot-${now-date}"></property>
+	<property name="nutz.dest.pre" value="nutz-${nutz-version}-snapshot-${now-date}"></property>
 	<!-- <property name="nutz.jar.pre" value="nutz-${nutz-version}"></property> --> <!-- 用于正式版 -->
 
-	<property name="nutz.jar.source" value="${pub-dir}/${nutz.jar.pre}-source.jar"></property>
-	<property name="nutz.jar.jdk5" value="${pub-dir}/${nutz.jar.pre}-jdk5.jar"></property>
-	<property name="nutz.jar.jdk6" value="${pub-dir}/${nutz.jar.pre}-jdk6.jar"></property>
-	<property name="nutz.pub.zip" value="${OUTPUT}/${nutz.jar.pre}.zip"></property>
+	<property name="nutz.jar.source" value="${pub-dir}/${nutz.dest.pre}-source.jar"></property>
+	<property name="nutz.jar.jdk5" value="${pub-dir}/${nutz.dest.pre}-jdk5.jar"></property>
+	<property name="nutz.jar.jdk6" value="${pub-dir}/${nutz.dest.pre}-jdk6.jar"></property>
+	<property name="nutz.manual.pdf" value="${pub-dir}/${nutz.dest.pre}-manual.pdf"></property>
+	<property name="nutz.manual_en.pdf" value="${pub-dir}/${nutz.dest.pre}-manual_en.pdf"></property>
+	<property name="nutz.pub.zip" value="${OUTPUT}/${nutz.dest.pre}.zip"></property>
 
 	<!-- 允许emma -->
 	<property name="emma.enabled" value="true" />
@@ -176,27 +178,49 @@
 
 	<target name="manual">
 		<java classname="org.nutz.doc.Doc" fork="true">
-			<sysproperty key="jaxp.debug" value="true"/>
 			<classpath>
 				<path refid="nutz-classpath"></path>
 				<path path="${classes-dir-jdk6}"></path>
 			</classpath>
+			<arg value="html"/>
 			<arg value="${basedir}/doc/manual"/>
 			<arg value="${basedir}/${zdoc-dir}"/>
-			<arg value=".html"/>
 		</java>
 	</target>
 
 	<target name="manual_en">
 			<java classname="org.nutz.doc.Doc" fork="true">
-				<sysproperty key="jaxp.debug" value="true"/>
 				<classpath>
 					<path refid="nutz-classpath"></path>
 					<path path="${classes-dir-jdk6}"></path>
 				</classpath>
+				<arg value="html"/>
 				<arg value="${basedir}/doc/manual_en"/>
 				<arg value="${basedir}/${zdoc-en-dir}"/>
-				<arg value=".html"/>
+			</java>
+		</target>
+
+	<target name="manual_pdf">
+		<java classname="org.nutz.doc.Doc" fork="true">
+			<classpath>
+				<path refid="nutz-classpath"></path>
+				<path path="${classes-dir-jdk6}"></path>
+			</classpath>
+			<arg value="pdf"/>
+			<arg value="${basedir}/doc/manual"/>
+			<arg value="${nutz.manual.pdf}"/>
+		</java>
+	</target>
+
+	<target name="manual_en_pdf">
+			<java classname="org.nutz.doc.Doc" fork="true">
+				<classpath>
+					<path refid="nutz-classpath"></path>
+					<path path="${classes-dir-jdk6}"></path>
+				</classpath>
+				<arg value="pdf"/>
+				<arg value="${basedir}/doc/manual_en"/>
+				<arg value="${nutz.manual_en.pdf}"/>
 			</java>
 		</target>
 
@@ -214,6 +238,8 @@
 		<antcall target="jdoc"></antcall>
 		<antcall target="manual"></antcall>
 		<antcall target="manual_en"></antcall>
+		<antcall target="manual_pdf"></antcall>
+		<antcall target="manual_en_pdf"></antcall>
 		<antcall target="create-zip"></antcall>
 		<antcall target="clean"></antcall>
 	</target>

build/deps/log4j.properties

@@ -1,33 +1,5 @@
-##########################################################################
-#                                                                        #
-#       本文件内容会影响到nutz log的测试结果。请谨慎修改、提交。                                #
-#                                                                        #
-##########################################################################
-
-log4j.rootLogger=DEBUG, Test
+log4j.rootLogger=DEBUG,Console
 
 log4j.appender.Console=org.apache.log4j.ConsoleAppender
 log4j.appender.Console.layout=org.apache.log4j.PatternLayout
 log4j.appender.Console.layout.ConversionPattern=log4j: %d [%t] %-5p %c - %m%n
-
-# 测试时会用到TestAppender来检查log4j输出的内容、日志级别等是否和预期的一直。
-log4j.appender.Test = org.nutz.log.helper.log4j.TestAppender
-
-# 测试输出到文件时使用
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=log4j.log
-log4j.appender.R.MaxFileSize=100KB
-log4j.appender.R.MaxBackupIndex=0
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
-
-#用来测试nutz log的日志级别是否与log4j保持一致。
-log4j.logger.org.nutz.log.level.fatal=FATAL
-log4j.logger.org.nutz.log.level.error=ERROR
-log4j.logger.org.nutz.log.level.warn=WARN
-log4j.logger.org.nutz.log.level.info=info
-log4j.logger.org.nutz.log.level.debug=DEBUG
-log4j.logger.org.nutz.log.level.trace=TRACE
-
-#log4j.logger.performance1.test.logger=Test
-#log4j.logger.performance2.test.logger=Test

src/org/nutz/castor/castor/String2Mirror.java

@@ -3,8 +3,7 @@
 import org.nutz.castor.Castor;
 import org.nutz.lang.Mirror;
 
-@SuppressWarnings({"rawtypes"})
-public class String2Mirror extends Castor<String, Mirror> {
+public class String2Mirror extends Castor<String, Mirror<?>> {
 
 	private static final String2Class castor = new String2Class();