Author: hlship
Date: Sun May 27 16:45:56 2007
New Revision: 542055
URL: http://svn.apache.org/viewvc?view=rev&rev=542055
Log:
Third try to get TransformationException into the correct package (!).
Experiment with running Tapestry test suite in parallel.
Added:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ioc/internal/TransformationException.java
- copied, changed from r541921,
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/TransformationException.java
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/TransformationException.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java?view=diff&rev=542055&r1=542054&r2=542055
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
Sun May 27 16:45:56 2007
@@ -26,9 +26,9 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.events.InvalidationListener;
import org.apache.tapestry.internal.model.MutableComponentModelImpl;
-import org.apache.tapestry.internal.util.TransformationException;
import org.apache.tapestry.ioc.LogSource;
import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry.ioc.internal.TransformationException;
import org.apache.tapestry.ioc.internal.util.ClasspathResource;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.model.MutableComponentModel;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java?view=diff&rev=542055&r1=542054&r2=542055
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
Sun May 27 16:45:56 2007
@@ -878,11 +878,6 @@
return _nestedId;
}
- public Component getPage()
- {
- return _page.getRootComponent();
- }
-
public boolean handleEvent(ComponentEvent event)
{
// Simple case: no mixins
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java?view=diff&rev=542055&r1=542054&r2=542055
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java
Sun May 27 16:45:56 2007
@@ -342,10 +342,10 @@
public Block getBlockParameter(String parameterName)
{
- if (_bindings == null) return null;
+ // Is allowed explicitly to not exist and be informal, otherwise the
+ // component in question would just use @Parameter.
- if (_bindings.containsKey(parameterName))
- return (Block) _bindings.get(parameterName).get();
+ if (getBinding(parameterName) != null) return
readParameter(parameterName, Block.class);
return null;
}
Copied:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ioc/internal/TransformationException.java
(from r541921,
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/TransformationException.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ioc/internal/TransformationException.java?view=diff&rev=542055&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/TransformationException.java&r1=541921&p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ioc/internal/TransformationException.java&r2=542055
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/TransformationException.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ioc/internal/TransformationException.java
Sun May 27 16:45:56 2007
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal;
import org.apache.tapestry.ioc.internal.util.TapestryException;
import org.apache.tapestry.services.ClassTransformation;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml?view=diff&rev=542055&r1=542054&r2=542055
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml Sun May 27
16:45:56 2007
@@ -15,12 +15,16 @@
limitations under the License.
-->
-<suite name="Tapestry Core" parallel="false" thread-count="10"
annotations="1.5" verbose="2">
+<suite name="Tapestry Core" parallel="tests" thread-count="10"
annotations="1.5" verbose="2">
<parameter name="tapestry.integration-webapp" value="src/test/app1"/>
+ <test name="Tapestry Integration">
+ <packages>
+ <package name="org.apache.tapestry.integration"/>
+ </packages>
+ </test>
<test name="Tapestry Core">
<packages>
<package name="org.apache.tapestry"/>
- <package name="org.apache.tapestry.integration"/>
<package name="org.apache.tapestry.integration.pagelevel"/>
<package name="org.apache.tapestry.test.pagelevel"/>
<package name="org.apache.tapestry.corelib.components"/>
