Author: alexsmirnov Date: 2007-10-31 21:04:03 -0400 (Wed, 31 Oct 2007) New Revision: 3662 Added: trunk/sandbox/ui/calendar/ Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/faces-config.xml trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/web.xml trunk/ui/core/src/main/java/org/ajax4jsf/component/UIPortlet.java trunk/ui/paint2D/pom.xml Log: Continue to implement JSR-301 bridge. Finish requrements from PLT 6. Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2007-11-01 01:00:43 UTC (rev 3661) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2007-11-01 01:04:03 UTC (rev 3662) @@ -100,7 +100,7 @@ // This method MUST BE OVERRIDEN in any subclasses - since Junit see for it in class for call super.setUp(); - // Setup FacesContext with nessesary init parameters. + // Setup FacesContext with necessary init parameters. this.servletContext.addInitParameter(SkinFactory.SKIN_PARAMETER, getSkinName()); // setup VCP renderKit, create renderers. RenderKitFactory vcpRenderKitFactory = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY); Modified: trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/faces-config.xml 2007-11-01 01:00:43 UTC (rev 3661) +++ trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/faces-config.xml 2007-11-01 01:04:03 UTC (rev 3662) @@ -81,17 +81,7 @@ <faces-context-factory> org.ajax4jsf.portlet.context.FacesContextFactoryImpl </faces-context-factory> - <lifecycle-factory> - org.ajax4jsf.portlet.lifecycle.PortletLifecycleFactory - </lifecycle-factory> </factory> - <managed-bean> - <managed-bean-name>ajaxContext</managed-bean-name> - <managed-bean-class> - org.ajax4jsf.portlet.PortletAjaxContext - </managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> </faces-config> Modified: trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/web.xml 2007-11-01 01:00:43 UTC (rev 3661) +++ trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/web.xml 2007-11-01 01:04:03 UTC (rev 3662) @@ -66,10 +66,6 @@ </context-param> --> <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - <context-param> <param-name>javax.faces.STATE_SAVING_METHOD</param-name> <param-value>server</param-value> </context-param> Modified: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIPortlet.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/component/UIPortlet.java 2007-11-01 01:00:43 UTC (rev 3661) +++ trunk/ui/core/src/main/java/org/ajax4jsf/component/UIPortlet.java 2007-11-01 01:04:03 UTC (rev 3662) @@ -40,25 +40,16 @@ private String portletId = null; + @Override + public void setId(String id) { + portletId = null; + super.setId(id); + } + // ----------------------------------------------------- UIComponent Methods public String getClientId(FacesContext context) { if (portletId == null) { - Object response = context.getExternalContext().getResponse(); - Class portletResponseClass = response.getClass(); - // Class.forName is used instead of instanceof to account for the case - // where the porletPage tag is used in a webapp and portlet.jar is not - // in classpath. In that scenario it will prevent ClassNotFoundException. - try { - Method method = portletResponseClass.getMethod("getNamespace", new Class[]{}); - portletId = (String) method.invoke(response, new Object[]{}); - } catch (Exception e) { - if(_log.isDebugEnabled()){ - _log.debug("Response is not a portlet RenderResponse"); - } - } - if(null == portletId){ - return super.getClientId(context); - } + portletId = context.getExternalContext().encodeNamespace(super.getClientId(context)); } return portletId; } Modified: trunk/ui/paint2D/pom.xml =================================================================== --- trunk/ui/paint2D/pom.xml 2007-11-01 01:00:43 UTC (rev 3661) +++ trunk/ui/paint2D/pom.xml 2007-11-01 01:04:03 UTC (rev 3662) @@ -1,51 +1,55 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.2.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>paint2D</artifactId> - <name>Paint java 2D</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.2.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>paint2D</shortName> - </taglib> - </library> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - </plugins> - </build> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.2.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>paint2D</artifactId> + <name>Paint java 2D</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.2.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>paint2D</shortName> + </taglib> + </library> + </configuration> + </plugin> + <!-- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + --> + </plugins> + </build> </project> \ No newline at end of file