Author: jkuhnert
Date: Sat Mar 18 20:38:05 2006
New Revision: 386925
URL: http://svn.apache.org/viewcvs?rev=386925&view=rev
Log:
Fixed invalid hivemodule spec
Modified:
jakarta/tapestry/trunk/framework/src/descriptor/META-INF/tapestry.services.xml
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
Modified:
jakarta/tapestry/trunk/framework/src/descriptor/META-INF/tapestry.services.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/descriptor/META-INF/tapestry.services.xml?rev=386925&r1=386924&r2=386925&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/descriptor/META-INF/tapestry.services.xml
(original)
+++
jakarta/tapestry/trunk/framework/src/descriptor/META-INF/tapestry.services.xml
Sat Mar 18 20:38:05 2006
@@ -197,10 +197,10 @@
<property name="serviceMap" object="service:ServiceMap" />
</contribution>
- <service-point id="ResponseDelegateFactory"
interface="ResponseDelegateFactory">
+ <service-point id="ResponseDelegateFactory"
interface="org.apache.tapestry.services.ResponseDelegateFactory">
Delegates choosing an appropriate response to the configured response
builder contributions.
<invoke-factory>
- <construct class="impl.ResponseDelegateFactoryImpl">
+ <construct
class="org.apache.tapestry.services.impl.ResponseDelegateFactoryImpl">
<set-configuration property="responseContributors"
configuration-id="ResponseContributors" />
</construct>
@@ -222,12 +222,12 @@
</schema>
</configuration-point>
- <service-point id="JSONResponseContributor"
interface="ResponseContributor">
+ <service-point id="JSONResponseContributor"
interface="org.apache.tapestry.services.ResponseContributor">
Defines the factory service that is responsible for determining if a
particular request is
one that should recieve a JSON response.
<invoke-factory>
- <construct class="impl.JSONResponseContributorImpl" >
- <set-service property="localeManager"
service-id="RequestLocaleManager"/>
+ <construct
class="org.apache.tapestry.services.impl.JSONResponseContributorImpl" >
+ <set-service property="localeManager"
service-id="tapestry.request.RequestLocaleManager"/>
<set-object property="markupWriterSource"
value="infrastructure:markupWriterSource"/>
<set-object property="webResponse"
value="infrastructure:response"/>
<set-service property="webRequest"
service-id="tapestry.globals.WebRequest" />
@@ -235,12 +235,12 @@
</invoke-factory>
</service-point>
- <service-point id="DefaultResponseContributor"
interface="ResponseContributor">
+ <service-point id="DefaultResponseContributor"
interface="org.apache.tapestry.services.ResponseContributor">
Defines the factory service that is responsible for determining if a
particular request is
one that should recieve a JSON response.
<invoke-factory>
- <construct class="impl.DefaultResponseContributorImpl" >
- <set-service property="localeManager"
service-id="RequestLocaleManager"/>
+ <construct
class="org.apache.tapestry.services.impl.DefaultResponseContributorImpl" >
+ <set-service property="localeManager"
service-id="tapestry.request.RequestLocaleManager"/>
<set-object property="markupWriterSource"
value="infrastructure:markupWriterSource"/>
<set-object property="webResponse"
value="infrastructure:response"/>
</construct>
Modified:
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java?rev=386925&r1=386924&r2=386925&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
(original)
+++
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
Sat Mar 18 20:38:05 2006
@@ -92,11 +92,12 @@
protected TemplateToken[] run(InputStream stream, ITemplateParserDelegate
delegate,
Resource location) throws TemplateParseException
{
+
char[] data = null;
try
{
- data = IOUtils.toCharArray(stream, "UTF-8");
+ data = IOUtils.toCharArray(stream, "US-ASCII");
stream.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
