Author: jkuhnert
Date: Tue Mar 14 05:47:10 2006
New Revision: 385802
URL: http://svn.apache.org/viewcvs?rev=385802&view=rev
Log:
Applied patches/fixed bugs
Removed:
jakarta/tapestry/branches/branch-3-0/examples/Tutorial2/
Modified:
jakarta/tapestry/branches/branch-3-0/config/common.properties
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/FormTable.jwc
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableUtils.java
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/ognl/OgnlTableColumnEvaluator.java
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnFormRendererSource.java
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnRendererSource.java
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java
jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/enhance/DefaultComponentClassEnhancer.java
jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/enhance/javassist/EnhancedClassFactory.java
jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/util/LocalizedContextResourceFinder.java
jakarta/tapestry/branches/branch-3-0/status.xml
Modified: jakarta/tapestry/branches/branch-3-0/config/common.properties
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/config/common.properties?rev=385802&r1=385801&r2=385802&view=diff
==============================================================================
--- jakarta/tapestry/branches/branch-3-0/config/common.properties (original)
+++ jakarta/tapestry/branches/branch-3-0/config/common.properties Tue Mar 14
05:47:10 2006
@@ -86,7 +86,7 @@
# ---- Javassist ----
javassist.version=2.5.1
-javassist.loc=http://telia.dl.sourceforge.net/sourceforge/jboss/javassist-${javassist.version}.zip
+javassist.loc=http://umn.dl.sourceforge.net/sourceforge/jboss/javassist-${javassist.version}.zip
javassist.dest=${ext.download.dir}/javassist-${javassist.version}
javassist.ext.jar=${root.lib.dir}/${ext.dir}/javassist-${javassist.version}.jar
javassist.jar=${javassist.dest}/javassist.jar
Modified:
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/FormTable.jwc
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/FormTable.jwc?rev=385802&r1=385801&r2=385802&view=diff
==============================================================================
---
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/FormTable.jwc
(original)
+++
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/FormTable.jwc
Tue Mar 14 05:47:10 2006
@@ -234,7 +234,7 @@
<component id="tableRows" type="TableFormRows">
<inherited-binding name="row" parameter-name="row"/>
<inherited-binding name="class" parameter-name="rowsClass"/>
- <binding name="convertor" expression="convertor"/>
+ <inherited-binding name="convertor" expression="convertor"/>
</component>
<component id="tableValues" type="TableValues">
Modified:
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableUtils.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableUtils.java?rev=385802&r1=385801&r2=385802&view=diff
==============================================================================
---
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableUtils.java
(original)
+++
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableUtils.java
Tue Mar 14 05:47:10 2006
@@ -54,12 +54,10 @@
public static String format(String key, Object[] args)
{
- if (s_objStrings == null) {
synchronized (TableUtils.class) {
if (s_objStrings == null)
s_objStrings =
ResourceBundle.getBundle("org.apache.tapestry.contrib.table.components.TableStrings");
}
- }
String pattern = s_objStrings.getString(key);
Modified:
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/ognl/OgnlTableColumnEvaluator.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/ognl/OgnlTableColumnEvaluator.java?rev=385802&r1=385801&r2=385802&view=diff
==============================================================================
---
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/ognl/OgnlTableColumnEvaluator.java
(original)
+++
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/ognl/OgnlTableColumnEvaluator.java
Tue Mar 14 05:47:10 2006
@@ -49,15 +49,12 @@
if (m_strExpression == null || m_strExpression.equals(""))
return "";
- if (m_objParsedExpression == null)
- {
synchronized (this)
{
if (m_objParsedExpression == null)
m_objParsedExpression =
OgnlUtils.getParsedExpression(m_strExpression);
}
- }
try
{
Modified:
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnFormRendererSource.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnFormRendererSource.java?rev=385802&r1=385801&r2=385802&view=diff
==============================================================================
---
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnFormRendererSource.java
(original)
+++
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnFormRendererSource.java
Tue Mar 14 05:47:10 2006
@@ -52,8 +52,6 @@
ITableColumn objColumn,
Object objRow)
{
- if (m_objComponentRenderer == null)
- {
synchronized (this)
{
if (m_objComponentRenderer == null)
@@ -67,7 +65,6 @@
new
ComponentTableRendererSource(objAddress);
}
}
- }
return m_objComponentRenderer.getRenderer(
objCycle,
Modified:
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnRendererSource.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnRendererSource.java?rev=385802&r1=385801&r2=385802&view=diff
==============================================================================
---
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnRendererSource.java
(original)
+++
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnRendererSource.java
Tue Mar 14 05:47:10 2006
@@ -52,8 +52,6 @@
ITableColumn objColumn,
Object objRow)
{
- if (m_objComponentRenderer == null)
- {
synchronized (this)
{
if (m_objComponentRenderer == null)
@@ -67,7 +65,6 @@
new
ComponentTableRendererSource(objAddress);
}
}
- }
return m_objComponentRenderer.getRenderer(
objCycle,
Modified:
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java?rev=385802&r1=385801&r2=385802&view=diff
==============================================================================
---
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java
(original)
+++
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java
Tue Mar 14 05:47:10 2006
@@ -51,8 +51,6 @@
ITableColumn objColumn,
Object objRow)
{
- if (m_objComponentRenderer == null)
- {
synchronized (this)
{
if (m_objComponentRenderer == null)
@@ -67,7 +65,6 @@
new
ComponentTableRendererSource(objAddress);
}
}
- }
return m_objComponentRenderer.getRenderer(
objCycle,
Modified:
jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/enhance/DefaultComponentClassEnhancer.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/enhance/DefaultComponentClassEnhancer.java?rev=385802&r1=385801&r2=385802&view=diff
==============================================================================
---
jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/enhance/DefaultComponentClassEnhancer.java
(original)
+++
jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/enhance/DefaultComponentClassEnhancer.java
Tue Mar 14 05:47:10 2006
@@ -85,22 +85,18 @@
public Class getEnhancedClass(IComponentSpecification specification,
String className)
{
- Class result = getCachedClass(specification);
-
- if (result == null)
- {
- synchronized (this)
+ synchronized (specification)
{
- result = getCachedClass(specification);
+ Class result = getCachedClass(specification);
+
if (result == null)
{
result = constructComponentClass(specification, className);
storeCachedClass(specification, result);
}
- }
- }
- return result;
+ return result;
+ }
}
protected void storeCachedClass(IComponentSpecification specification,
Class cachedClass)
Modified:
jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/enhance/javassist/EnhancedClassFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/enhance/javassist/EnhancedClassFactory.java?rev=385802&r1=385801&r2=385802&view=diff
==============================================================================
---
jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/enhance/javassist/EnhancedClassFactory.java
(original)
+++
jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/enhance/javassist/EnhancedClassFactory.java
Tue Mar 14 05:47:10 2006
@@ -101,12 +101,9 @@
public CtClass getObjectType(String type)
{
- CtClass result = getClassMapping().getType(type);
- if (result == null)
- {
synchronized (this) {
- result = getClassMapping().getType(type);
+ CtClass result = getClassMapping().getType(type);
if (result == null)
{
@@ -120,10 +117,9 @@
throw new CodeGenerationException(e);
}
}
+ return result;
}
- }
- return result;
}
Modified:
jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/util/LocalizedContextResourceFinder.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/util/LocalizedContextResourceFinder.java?rev=385802&r1=385801&r2=385802&view=diff
==============================================================================
---
jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/util/LocalizedContextResourceFinder.java
(original)
+++
jakarta/tapestry/branches/branch-3-0/framework/src/org/apache/tapestry/util/LocalizedContextResourceFinder.java
Tue Mar 14 05:47:10 2006
@@ -54,8 +54,16 @@
public LocalizedResource resolve(String contextPath, Locale locale)
{
int dotx = contextPath.lastIndexOf('.');
- String basePath = contextPath.substring(0, dotx);
- String suffix = contextPath.substring(dotx);
+ String basePath = null;
+ String suffix = null;
+ // This handles assets without extensions - still allows them to be
localized.
+ if (dotx > -1) {
+ basePath = contextPath.substring(0, dotx);
+ suffix = contextPath.substring(dotx);
+ } else {
+ basePath = contextPath;
+ suffix = "";
+ }
LocalizedNameGenerator generator = new
LocalizedNameGenerator(basePath, locale, suffix);
Modified: jakarta/tapestry/branches/branch-3-0/status.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/status.xml?rev=385802&r1=385801&r2=385802&view=diff
==============================================================================
--- jakarta/tapestry/branches/branch-3-0/status.xml (original)
+++ jakarta/tapestry/branches/branch-3-0/status.xml Tue Mar 14 05:47:10 2006
@@ -11,6 +11,7 @@
<person name="Tsvetelin Saykov" id="TS"/>
<person name="Neil Clayton" id="NC"/>
<person name="Paul Ferraro" id="PF"/>
+ <person name="Jesse Kuhnert" id="JK" />
<!-- Retired -->
<person name="Malcom Edgar" id="ME"/>
<!-- Add more people here -->
@@ -126,6 +127,21 @@
<changes>
<release version="3.0.4" date="unreleased">
<action type="fix" dev="GL" fixes-bug="TAPESTRY-431"> Fixed
TemplateParser throws an exception and stops parsing when duplicate attributes
are found in a tag. </action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-877" due-to="Brian K.
Wallace">
+ Javassist url was incorrect.
+ </action>
+ <action type="remove" dev="JK" fixes-bug="TAPESTRY-878" due-to="Brian K.
Wallace" >
+ Removed old tutorial example.
+ </action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-806" due-to="Nick
Westgate" >
+ Double checked locking bug prevents use of multi processor environments
(efficiently).
+ </action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-241" due-to="Kurtis
Williams" >
+ binding for convertor needed to be inherited-binding
+ </action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-193" due-to="Brian K.
Wallace" >
+ AssetService not resolving file prefixes correctly.
+ </action>
</release>
<release version="3.0.3" date="Mar 26 2005">
<action type="fix" dev="PF" fixes-bug="TAPESTRY-278"> Fixes security
flaw in asset service. </action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
