Author: thorsten
Date: Wed May 19 18:51:54 2010
New Revision: 946337
URL: http://svn.apache.org/viewvc?rev=946337&view=rev
Log:
FOR-1194 Fixing problematic changes introduced by r945269
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-logo.contract.xml
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties?rev=946337&r1=946336&r2=946337&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties Wed May 19 18:51:54 2010
@@ -19,7 +19,7 @@
# See the full set of default properties in a 'forrest seed-sample' site.
# Copy properties from there as needed.
##############
-
+forrest.jvmargs=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
# FIXME: FOR-785
forrest.validate.skinconf=false
project.required.plugins=org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.input.glossary,org.apache.forrest.plugin.output.POD
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java?rev=946337&r1=946336&r2=946337&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java Wed May 19 18:51:54 2010
@@ -1098,11 +1098,9 @@ public class DispatcherTransformer exten
* @throws IOException
* if I/O error occured.
*/
- private static InputSource getInputSource(final Source source)
- throws IOException, SourceException {
- final InputSource inputSource = new InputSource(new InputStreamReader(source.getInputStream(), "UTF-8"));
- inputSource.setEncoding("UTF-8");
- inputSource.setSystemId(source.getURI());
- return inputSource;
+ private static InputSource getInputSource(final Source source) throws IOException, SourceException {
+ final InputSource newObject = new InputSource(source.getInputStream());
+ newObject.setSystemId(source.getURI());
+ return newObject;
}
}
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-logo.contract.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-logo.contract.xml?rev=946337&r1=946336&r2=946337&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-logo.contract.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-logo.contract.xml Wed May 19 18:51:54 2010
@@ -67,7 +67,7 @@ xmlns:forrest="http://apache.org/forrest
<forrest:content>
<forrest:part>
<xsl:comment>+ |start Logo +</xsl:comment>
- <xsl:call-template name="renderlogo">
+ <!-- <xsl:call-template name="renderlogo">
<xsl:with-param name="name"
select="normalize-space($branding-logo-name)" />
<xsl:with-param name="url"
@@ -83,7 +83,7 @@ xmlns:forrest="http://apache.org/forrest
<xsl:with-param name="root" select="$root" />
<xsl:with-param name="description"
select="normalize-space($branding-logo-description)" />
- </xsl:call-template>
+ </xsl:call-template>-->
<xsl:comment>+ |end group Logo +</xsl:comment>
</forrest:part>
</forrest:content>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.