Author: jkuhnert
Date: Tue Mar 28 08:24:54 2006
New Revision: 389535
URL: http://svn.apache.org/viewcvs?rev=389535&view=rev
Log:
various bug fixes
Modified:
jakarta/tapestry/branches/4.0/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Shell.xml
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/html/Shell.java
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/html/Shell.jwc
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/resolver/ComponentSpecificationResolverImpl.java
jakarta/tapestry/branches/4.0/status.xml
Modified:
jakarta/tapestry/branches/4.0/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Shell.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Shell.xml?rev=389535&r1=389534&r2=389535&view=diff
==============================================================================
---
jakarta/tapestry/branches/4.0/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Shell.xml
(original)
+++
jakarta/tapestry/branches/4.0/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Shell.xml
Tue Mar 28 08:24:54 2006
@@ -131,6 +131,16 @@
<td>If specified, the delegate is rendered before the close of the
<head>
tag. Typically, this is used to provide additional &meta; tags.</td>
</tr>
+ <tr>
+ <td>renderBaseTag</td>
+ <td>boolean</td>
+ <td>in</td>
+ <td>no</td>
+ <td>true</td>
+ <td>
+ Specifies whether or not to render the html basetag element in the
document head.
+ </td>
+ </tr>
</table>
Modified:
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/html/Shell.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/html/Shell.java?rev=389535&r1=389534&r2=389535&view=diff
==============================================================================
---
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/html/Shell.java
(original)
+++
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/html/Shell.java
Tue Mar 28 08:24:54 2006
@@ -75,7 +75,8 @@
if (getRenderContentType())
writeMetaTag(writer, "http-equiv", "Content-Type",
writer.getContentType());
- getBaseTagWriter().render(writer, cycle);
+ if (getRenderBaseTag())
+ getBaseTagWriter().render(writer, cycle);
writer.begin("title");
@@ -204,4 +205,8 @@
/** @since 4.0 */
public abstract IRender getBaseTagWriter();
+
+ /** @since 4.0.1 */
+
+ public abstract boolean getRenderBaseTag();
}
Modified:
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/html/Shell.jwc
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/html/Shell.jwc?rev=389535&r1=389534&r2=389535&view=diff
==============================================================================
---
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/html/Shell.jwc
(original)
+++
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/html/Shell.jwc
Tue Mar 28 08:24:54 2006
@@ -82,6 +82,13 @@
</description>
</parameter>
+ <parameter name="renderBaseTag" default-value="true" >
+ <description>
+ Specifies whether or not to render the html basetag element in
the document
+ head.
+ </description>
+ </parameter>
+
<inject property="valueConverter"
object="service:tapestry.coerce.ValueConverter"/>
<inject property="pageService" object="engine-service:page"/>
<inject property="applicationSpecification"
object="infrastructure:applicationSpecification"/>
Modified:
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/resolver/ComponentSpecificationResolverImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/resolver/ComponentSpecificationResolverImpl.java?rev=389535&r1=389534&r2=389535&view=diff
==============================================================================
---
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/resolver/ComponentSpecificationResolverImpl.java
(original)
+++
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/resolver/ComponentSpecificationResolverImpl.java
Tue Mar 28 08:24:54 2006
@@ -19,6 +19,7 @@
import org.apache.hivemind.Location;
import org.apache.hivemind.Resource;
import org.apache.hivemind.impl.LocationImpl;
+import org.apache.hivemind.util.Defense;
import org.apache.tapestry.INamespace;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.services.ClassFinder;
@@ -92,7 +93,9 @@
public void resolve(IRequestCycle cycle, INamespace containerNamespace,
String type,
Location location)
{
- int colonx = type.indexOf(':');
+ Defense.notNull(type, "type");
+
+ int colonx = type.indexOf(':');
if (colonx > 0)
{
Modified: jakarta/tapestry/branches/4.0/status.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/status.xml?rev=389535&r1=389534&r2=389535&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/status.xml (original)
+++ jakarta/tapestry/branches/4.0/status.xml Tue Mar 28 08:24:54 2006
@@ -171,6 +171,13 @@
<action type="update" dev="JK" fixes-bug="TAPESTRY-880"
due-to="Fernando" >
Added new port scheme documentation.
</action>
+ <action type="update" dev="JK" fixes-bug="TAPESTRY-897" >
+ Added a renderBaseTag parameter to Shell.
+ </action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-896" >
+ Added a hivemind defense check for the incoming type parameter to
+ ComponentSpecificationResolverImpl.
+ </action>
</release>
<release version="4.0" date="Jan 6 2006">
<action type="update" dev="HLS">Add link to DeveloperWorks Tapestry
article</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
