You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2005/03/15 17:44:18 UTC
cvs commit: jakarta-tapestry/portlet/src/test/org/apache/tapestry/portlet TestPortletWebActivator.java
hlship 2005/03/15 08:44:18
Modified: portlet/src/java/org/apache/tapestry/portlet
PortletApplicationInitializer.java
examples/Workbench build.xml
. .classpath
framework/src/descriptor/META-INF tapestry.asset.xml
tapestry.multipart.xml
framework/src/java/org/apache/tapestry/form DatePicker.java
DatePicker.jwc
Added: portlet/src/java/org/apache/tapestry/portlet
PortletWebActivator.java
portlet/src/test/org/apache/tapestry/portlet
TestPortletWebActivator.java
Log:
Continue "genericising" Tapestry away from pure servlet dependency.
Revision Changes Path
1.2 +2 -2 jakarta-tapestry/portlet/src/java/org/apache/tapestry/portlet/PortletApplicationInitializer.java
Index: PortletApplicationInitializer.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/portlet/src/java/org/apache/tapestry/portlet/PortletApplicationInitializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletApplicationInitializer.java 14 Mar 2005 22:29:47 -0000 1.1
+++ PortletApplicationInitializer.java 15 Mar 2005 16:44:17 -0000 1.2
@@ -14,7 +14,7 @@
package org.apache.tapestry.portlet;
-import javax.portlet.Portlet;
+import javax.portlet.PortletConfig;
/**
* Command interface for the <code>tapestry.portlet.ApplicationInitializer</code> configuration
@@ -25,5 +25,5 @@
*/
public interface PortletApplicationInitializer
{
- public void initialize(Portlet portlet);
+ public void initialize(PortletConfig portletConfig);
}
\ No newline at end of file
1.1 jakarta-tapestry/portlet/src/java/org/apache/tapestry/portlet/PortletWebActivator.java
Index: PortletWebActivator.java
===================================================================
package org.apache.tapestry.portlet;
import java.util.List;
import javax.portlet.PortletConfig;
import org.apache.hivemind.util.Defense;
import org.apache.tapestry.describe.DescriptionReceiver;
import org.apache.tapestry.web.WebActivator;
import org.apache.tapestry.web.WebUtils;
/**
* Adapts a {@link javax.portlet.PortletConfig} as {@link org.apache.tapestry.web.WebActivator}.
*
* @author Howard M. Lewis Ship
* @since 3.1
*/
public class PortletWebActivator implements WebActivator
{
private final PortletConfig _config;
public PortletWebActivator(PortletConfig config)
{
Defense.notNull(config, "config");
_config = config;
}
public String getActivatorName()
{
return _config.getPortletName();
}
public List getInitParameterNames()
{
return WebUtils.toSortedList(_config.getInitParameterNames());
}
public String getInitParameterValue(String name)
{
return _config.getInitParameter(name);
}
public void describeTo(DescriptionReceiver receiver)
{
receiver.describeAlternate(_config);
}
}
1.16 +1 -2 jakarta-tapestry/examples/Workbench/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 10 Mar 2005 13:24:37 -0000 1.15
+++ build.xml 15 Mar 2005 16:44:17 -0000 1.16
@@ -46,8 +46,7 @@
<ibiblio-dependency artifact="servletapi" version="${servlet.version}" group="servletapi"/>
- <!-- This isn't actually uploaded to Maven yet! -->
- <ibiblio-dependency artifact="jCharts" version="0.6.0" group="krysalis" use="run"/>
+ <ibiblio-dependency artifact="jcharts" version="0.6.0" group="jcharts" use="run"/>
</target>
</project>
\ No newline at end of file
1.74 +1 -1 jakarta-tapestry/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/jakarta-tapestry/.classpath,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .classpath 10 Mar 2005 13:23:27 -0000 1.73
+++ .classpath 15 Mar 2005 16:44:17 -0000 1.74
@@ -25,7 +25,6 @@
<classpathentry kind="lib" path="ext-package/lib/ognl-2.6.7.jar"/>
<classpathentry kind="lib" path="ext-package/lib/oro-2.0.8.jar"/>
<classpathentry kind="lib" path="ext-package/lib/servletapi-2.3.jar"/>
- <classpathentry kind="lib" path="ext-package/lib/jCharts-0.6.0.jar"/>
<classpathentry kind="lib" path="ext-package/lib/cglib-full-2.0.2.jar"/>
<classpathentry kind="lib" path="ext-package/lib/easymockclassextension-1.1.jar"/>
<classpathentry kind="lib" path="ext-package/lib/jboss-j2ee-3.2.1.jar"/>
@@ -33,5 +32,6 @@
<classpathentry kind="lib" path="ext-package/lib/hivemind-lib-1.1-alpha-3-snapshot.jar"/>
<classpathentry kind="lib" path="portlet/src/descriptor"/>
<classpathentry kind="lib" path="ext-package/lib/portlet-api-1.0.jar"/>
+ <classpathentry kind="lib" path="ext-package/lib/jcharts-0.6.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1.9 +1 -1 jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.asset.xml
Index: tapestry.asset.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.asset.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tapestry.asset.xml 14 Mar 2005 22:29:47 -0000 1.8
+++ tapestry.asset.xml 15 Mar 2005 16:44:17 -0000 1.9
@@ -62,7 +62,7 @@
<invoke-factory>
<construct class="ContextAssetFactory">
- <set-service property="context" service-id="infrastructure:context"/>
+ <set-service property="context" service-id="tapestry.globals.WebContext"/>
<set-object property="contextPath" value="infrastructure:contextPath"/>
</construct>
</invoke-factory>
1.3 +3 -1 jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.multipart.xml
Index: tapestry.multipart.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.multipart.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tapestry.multipart.xml 8 Mar 2005 15:36:36 -0000 1.2
+++ tapestry.multipart.xml 15 Mar 2005 16:44:17 -0000 1.3
@@ -41,7 +41,9 @@
</service-point>
<contribution configuration-id="tapestry.request.ServletRequestServicerPipeline">
- <filter name="MultipartDecoderFilter" object="service:MultipartDecoderFilter"/>
+ <filter name="MultipartDecoderFilter"
+ object="service:MultipartDecoderFilter"
+ after="tapestry.request.SetupRequestEncoding"/>
</contribution>
</module>
\ No newline at end of file
1.5 +9 -3 jakarta-tapestry/framework/src/java/org/apache/tapestry/form/DatePicker.java
Index: DatePicker.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/form/DatePicker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DatePicker.java 8 Mar 2005 15:36:37 -0000 1.4
+++ DatePicker.java 15 Mar 2005 16:44:17 -0000 1.5
@@ -27,7 +27,6 @@
import org.apache.hivemind.HiveMind;
import org.apache.hivemind.Resource;
import org.apache.tapestry.IAsset;
-import org.apache.tapestry.IEngine;
import org.apache.tapestry.IForm;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
@@ -89,10 +88,17 @@
private static final String SYM_BUTTONNAME = "buttonName";
+ /**
+ * Injected
+ *
+ * @since 3.1
+ */
+
+ public abstract IScriptSource getScriptSource();
+
protected void finishLoad()
{
- IEngine engine = getPage().getEngine();
- IScriptSource source = engine.getScriptSource();
+ IScriptSource source = getScriptSource();
Resource location = getSpecification().getSpecificationLocation().getRelativeResource(
"DatePicker.script");
1.5 +2 -0 jakarta-tapestry/framework/src/java/org/apache/tapestry/form/DatePicker.jwc
Index: DatePicker.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/form/DatePicker.jwc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DatePicker.jwc 5 Jan 2005 23:17:13 -0000 1.4
+++ DatePicker.jwc 15 Mar 2005 16:44:17 -0000 1.5
@@ -33,5 +33,7 @@
<asset name="script" path="DatePicker.js"/>
<asset name="defaultIcon" path="DatePickerIcon.png"/>
+
+ <inject property="scriptSource" object="infrastructure:scriptSource"/>
</component-specification>
1.1 jakarta-tapestry/portlet/src/test/org/apache/tapestry/portlet/TestPortletWebActivator.java
Index: TestPortletWebActivator.java
===================================================================
package org.apache.tapestry.portlet;
import javax.portlet.PortletConfig;
import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.portlet.PortletWebActivator}.
*
* @author Howard M. Lewis Ship
* @since 3.1
*/
public class TestPortletWebActivator extends BasePortletWebTestCase
{
public void testGetActivatorName()
{
MockControl control = newControl(PortletConfig.class);
PortletConfig config = (PortletConfig) control.getMock();
config.getPortletName();
control.setReturnValue("portlet");
replayControls();
PortletWebActivator pwa = new PortletWebActivator(config);
assertEquals("portlet", pwa.getActivatorName());
verifyControls();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org