• R/O
  • SSH
  • HTTPS

copper: Commit


Commit MetaInfo

Revision1577 (tree)
Time2018-12-21 11:07:20
Authormiyabe

Log Message

(empty log message)

Change Summary

Incremental Difference

--- copper/trunk/cti-java/build.xml (revision 1576)
+++ copper/trunk/cti-java/build.xml (revision 1577)
@@ -63,7 +63,7 @@
6363 </manifest>
6464 </jar>
6565
66- <jar destfile="build/release/cti-driver-min-${version.number}.jar" index="yes">
66+ <jar destfile="build/release/cti-driver-min-${version.number}.jar" index="yes">
6767 <zipfileset includes="**/*" src="cti-driver/target/dependencies/cti-driver-ctip-${version.number}.jar"/>
6868 <zipfileset includes="**/*" src="cti-driver/target/dependencies/cti-if-${version.number}.jar"/>
6969 <zipfileset includes="**/*" src="cti-driver/target/dependencies/zs-plugin-${version.number}.jar"/>
@@ -71,12 +71,12 @@
7171 <zipfileset includes="**/*" src="cti-driver/target/dependencies/zs-rsr-1.1.0.jar"/>
7272 </jar>
7373
74- <mkdir dir="build/release/apidoc" />
75- <copy todir="build/release/apidoc">
76- <fileset dir="cti-if/target/site/apidocs">
77- <include name="**/*"/>
78- </fileset>
79- </copy>
74+ <mkdir dir="build/release/apidoc" />
75+ <copy todir="build/release/apidoc">
76+ <fileset dir="cti-if/target/site/apidocs">
77+ <include name="**/*"/>
78+ </fileset>
79+ </copy>
8080 <zip destfile="build/${archive}.zip">
8181 <zipfileset dir="build/release" prefix="${archive}" />
8282 </zip>
--- copper/trunk/cti-java/cti-examples/src/main/java/jp/cssj/cti2/examples/ClientResource.java (revision 1576)
+++ copper/trunk/cti-java/cti-examples/src/main/java/jp/cssj/cti2/examples/ClientResource.java (revision 1577)
@@ -39,7 +39,7 @@
3939
4040 // 出力先ストリームを取得
4141 try (OutputStreamWriter out = new OutputStreamWriter(
42- session.transcode(new MetaSourceImpl(URI.create("."), "text/html")), "UTF-8")) {
42+ session.transcode(new MetaSourceImpl(URI.create("."), "text/html", "MS932")), "MS932")) {
4343 // 文書を出力
4444 out.write("<html>");
4545 out.write("<head>");
@@ -48,7 +48,7 @@
4848 out.write("<title>サンプル</title>");
4949 out.write("</head>");
5050 out.write("<body>");
51- out.write("<p>Hello World!</p>");
51+ out.write("<p>Hello World! サンプル</p>");
5252 out.write("</body>");
5353 out.write("</html>");
5454 }
--- copper/trunk/homare/pom.xml (revision 1576)
+++ copper/trunk/homare/pom.xml (revision 1577)
@@ -9,7 +9,7 @@
99 <groupId>net.zamasoft</groupId>
1010 <artifactId>homare</artifactId>
1111 <packaging>jar</packaging>
12- <version>3.2.2</version>
12+ <version>3.2.3</version>
1313 <name>Homare</name>
1414 <description>印刷向けのHTML/CSSレンダリングエンジンです。</description>
1515 <url>http://copper.osdn.jp/homare/</url>
--- copper/trunk/homare/src/main/java/jp/cssj/homare/driver/DirectSession.java (revision 1576)
+++ copper/trunk/homare/src/main/java/jp/cssj/homare/driver/DirectSession.java (revision 1577)
@@ -544,7 +544,7 @@
544544 try (InputStream in = new FileInputStream(profileFile)) {
545545 defaultProperties.load(in);
546546 } catch (IOException e) {
547- this.message(MessageCodes.WARN_MISSING_PROFILE, new String[] { profileFile.toString() });
547+ this.message(MessageCodes.WARN_MISSING_PROFILE, new String[] { String.valueOf(profileFile) });
548548 }
549549 for (Iterator<?> i = defaultProperties.entrySet().iterator(); i.hasNext();) {
550550 Entry<?, ?> e = (Entry<?, ?>) i.next();
--- copper/trunk/sakae/zs-resolver/src/main/java/jp/cssj/resolver/stream/StreamSource.java (revision 1576)
+++ copper/trunk/sakae/zs-resolver/src/main/java/jp/cssj/resolver/stream/StreamSource.java (revision 1577)
@@ -132,7 +132,7 @@
132132 }
133133
134134 public boolean isReader() {
135- return this.reader != null;
135+ return this.reader != null || this.encoding != null;
136136 }
137137
138138 public InputStream getInputStream() throws IOException {
Show on old repository browser