Author: alexsmirnov Date: 2007-07-05 18:14:58 -0400 (Thu, 05 Jul 2007) New Revision: 1509 Added: trunk/framework/test/src/test/java/org/ajax4jsf/resource/ trunk/framework/test/src/test/java/org/ajax4jsf/resource/AllResourcesTests.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/InternetResourceServiceTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockCacheableResource.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockFilterConfig.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockResourceRequest.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/ParametersEncodingTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java Removed: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ trunk/framework/test/src/test/java/org/ajax4jsf/resource/AllResourcesTests.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/InternetResourceServiceTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockCacheableResource.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockFilterConfig.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockResourceRequest.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/ParametersEncodingTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java Modified: trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.resource.InternetResourceBuilder trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx trunk/ui/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx trunk/ui/gmap/src/main/templates/gmap.jspx trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx trunk/ui/tabPanel/src/main/templates/tabPanel.jspx trunk/ui/togglePanel/src/main/templates/toggleControl.jspx trunk/ui/tree/src/main/templates/htmlTree.jspx Log: refactoring packages and classes in the implementation project Modified: trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.resource.InternetResourceBuilder =================================================================== --- trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.resource.InternetResourceBuilder 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.resource.InternetResourceBuilder 2007-07-05 22:14:58 UTC (rev 1509) @@ -1 +1 @@ -org.ajax4jsf.framework.resource.ResourceBuilderImpl +org.ajax4jsf.resource.ResourceBuilderImpl Copied: trunk/framework/test/src/test/java/org/ajax4jsf/resource (from rev 1507, trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource) Deleted: trunk/framework/test/src/test/java/org/ajax4jsf/resource/AllResourcesTests.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java 2007-07-05 19:11:50 UTC (rev 1507) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/AllResourcesTests.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -1,45 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.framework.resource; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @author shura (latest modification by $Author: ishabalov $) - * @version $Revision: 1.1.2.2 $ $Date: 2007/02/20 20:58:10 $ - * - */ -public class AllResourcesTests { - - public static Test suite() { - TestSuite suite = new TestSuite( - "Test for org.ajax4jsf.resource"); - //$JUnit-BEGIN$ - suite.addTestSuite(ResourceServiceThreadsTestCase.class); - suite.addTestSuite(InternetResourceServiceTestCase.class); - suite.addTestSuite(CSSTemplateTestCase.class); - //$JUnit-END$ - return suite; - } - -} Copied: trunk/framework/test/src/test/java/org/ajax4jsf/resource/AllResourcesTests.java (from rev 1508, trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java) =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/resource/AllResourcesTests.java (rev 0) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/AllResourcesTests.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -0,0 +1,45 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.resource; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * @author shura (latest modification by $Author: ishabalov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/20 20:58:10 $ + * + */ +public class AllResourcesTests { + + public static Test suite() { + TestSuite suite = new TestSuite( + "Test for org.ajax4jsf.resource"); + //$JUnit-BEGIN$ + suite.addTestSuite(ResourceServiceThreadsTestCase.class); + suite.addTestSuite(InternetResourceServiceTestCase.class); + suite.addTestSuite(CSSTemplateTestCase.class); + //$JUnit-END$ + return suite; + } + +} Deleted: trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java 2007-07-05 19:11:50 UTC (rev 1507) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -1,186 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.framework.resource; - -import java.io.IOException; -import java.io.InputStream; - -import org.ajax4jsf.framework.renderer.compiler.TemplateContext; -import org.ajax4jsf.framework.util.config.WebXml; -import org.ajax4jsf.resource.InternetResource; -import org.ajax4jsf.resource.InternetResourceBuilder; -import org.ajax4jsf.resource.ResourceContext; -import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; -import org.apache.shale.test.mock.MockPrintWriter; - -/** - * @author shura (latest modification by $Author: ishabalov $) - * @version $Revision: 1.1.2.4 $ $Date: 2007/02/20 20:58:10 $ - * - */ -public class CSSTemplateTestCase extends AbstractAjax4JsfTestCase { - - private static boolean methodCalled=false; - - private static boolean methodParamOk=false; - - /** - * Constructor for CSSTemplateTestCase. - * @param name - */ - public CSSTemplateTestCase(String name) { - super(name); - } - - /* - * @see VcpJsfTestCase#setUp() - */ - public void setUp() throws Exception { - super.setUp(); - CSSTemplateTestCase.methodCalled=false; - CSSTemplateTestCase.methodParamOk=false; - } - - /* - * @see VcpJsfTestCase#tearDown() - */ - public void tearDown() throws Exception { - super.tearDown(); - } - - public void testCallWithContext() throws Exception { - String templatePath = "org/ajax4jsf/framework/resource/call.xml"; - TemplateCSSResource resource = new TemplateCSSResource(templatePath); - ResourceContext context = new FacesResourceContext(facesContext); - try { - resource.send(context); - } catch (IOException e) { - assertTrue("error send style",false); - } - assertTrue(methodCalled); - } - - public static void contextCallWithParam(TemplateContext context,String param) { - methodCalled = true; - methodParamOk = "Test".equals(param); - } - - public void testCallWithContextAndParam() throws Exception { - String templatePath = "org/ajax4jsf/framework/resource/callWithParam.xml"; - TemplateCSSResource resource = new TemplateCSSResource(templatePath); - ResourceContext context = new FacesResourceContext(facesContext); - try { - resource.send(context); - } catch (IOException e) { - assertTrue("error send style",false); - } - assertTrue(methodCalled); - } - - public static void contextCall(TemplateContext context) { - methodCalled = true; - } - /* - * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.send(ResourceContext)' - */ - public void testSend() throws IOException { - String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; - TemplateCSSResource resource = new TemplateCSSResource(templatePath); - ResourceContext context = new FacesResourceContext(facesContext); - try { - resource.send(context); - } catch (IOException e) { - assertTrue("error send style",false); - } - MockPrintWriter printWriter = (MockPrintWriter) response.getWriter(); - String content = String.valueOf(printWriter.content()); - System.out.println(content); - } - - /* - * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.TemplateCSSResource(String)' - */ - public void testTemplateCSSResource() throws IOException { - String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; - TemplateCSSResource resource = new TemplateCSSResource(templatePath); - assertEquals(templatePath,resource.getKey()); - InternetResource resource2 = InternetResourceBuilder.getInstance().createResource(this,resource.getKey()); - ResourceContext ctx = new FacesResourceContext(this.facesContext); - InputStream stream = resource.getResourceAsStream(ctx); - byte[] resourceContent = new byte[8196]; - int length = stream.read(resourceContent); - InputStream stream2 = resource2.getResourceAsStream(ctx); - byte[] resource2Content = new byte[8196]; - int length2 = stream2.read(resource2Content); - assertEquals(length, length2); - - } - - /* - * Test method for 'org.ajax4jsf.resource.InternetResourceBase.isCacheable()' - */ - public void testIsCacheable() { - - } - - /* - * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getContentType()' - */ - public void testGetContentType() { - - String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; - TemplateCSSResource resource = new TemplateCSSResource(templatePath); - assertEquals("text/css",resource.getContentType(null)); -} - - /* - * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getUri(FacesContext, Object)' - */ - public void testGetUri() { - String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; - TemplateCSSResource resource = new TemplateCSSResource(templatePath); -// System.out.println(resource.getUri(facesContext,null)); - String expextedUri = request.getContextPath()+"/"+WebXml.RESOURCE_URI_PREFIX+resource.getKey(); -// System.out.println(expextedUri); - assertTrue(resource.getUri(facesContext,null).startsWith(expextedUri)); - } - - /* - * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getResourceAsStream(ResourceContext)' - */ - public void testGetResourceAsStream() { - - } - - /* - * Test method for 'org.ajax4jsf.resource.InternetResourceBase.sendHeaders(ResourceContext)' - */ - public void testSendHeaders() { - String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; - TemplateCSSResource resource = new TemplateCSSResource(templatePath); - ResourceContext context = new FacesResourceContext(facesContext); - resource.sendHeaders(context); - String header = response.getContentType(); - assertNotNull(header); - assertTrue(header.startsWith("text/css")); - } -} Copied: trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java (from rev 1508, trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java) =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java (rev 0) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -0,0 +1,188 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.resource; + +import java.io.IOException; +import java.io.InputStream; + +import org.ajax4jsf.framework.renderer.compiler.TemplateContext; +import org.ajax4jsf.framework.util.config.WebXml; +import org.ajax4jsf.resource.FacesResourceContext; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.TemplateCSSResource; +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.apache.shale.test.mock.MockPrintWriter; + +/** + * @author shura (latest modification by $Author: ishabalov $) + * @version $Revision: 1.1.2.4 $ $Date: 2007/02/20 20:58:10 $ + * + */ +public class CSSTemplateTestCase extends AbstractAjax4JsfTestCase { + + private static boolean methodCalled=false; + + private static boolean methodParamOk=false; + + /** + * Constructor for CSSTemplateTestCase. + * @param name + */ + public CSSTemplateTestCase(String name) { + super(name); + } + + /* + * @see VcpJsfTestCase#setUp() + */ + public void setUp() throws Exception { + super.setUp(); + CSSTemplateTestCase.methodCalled=false; + CSSTemplateTestCase.methodParamOk=false; + } + + /* + * @see VcpJsfTestCase#tearDown() + */ + public void tearDown() throws Exception { + super.tearDown(); + } + + public void testCallWithContext() throws Exception { + String templatePath = "org/ajax4jsf/framework/resource/call.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); + ResourceContext context = new FacesResourceContext(facesContext); + try { + resource.send(context); + } catch (IOException e) { + assertTrue("error send style",false); + } + assertTrue(methodCalled); + } + + public static void contextCallWithParam(TemplateContext context,String param) { + methodCalled = true; + methodParamOk = "Test".equals(param); + } + + public void testCallWithContextAndParam() throws Exception { + String templatePath = "org/ajax4jsf/framework/resource/callWithParam.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); + ResourceContext context = new FacesResourceContext(facesContext); + try { + resource.send(context); + } catch (IOException e) { + assertTrue("error send style",false); + } + assertTrue(methodCalled); + } + + public static void contextCall(TemplateContext context) { + methodCalled = true; + } + /* + * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.send(ResourceContext)' + */ + public void testSend() throws IOException { + String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); + ResourceContext context = new FacesResourceContext(facesContext); + try { + resource.send(context); + } catch (IOException e) { + assertTrue("error send style",false); + } + MockPrintWriter printWriter = (MockPrintWriter) response.getWriter(); + String content = String.valueOf(printWriter.content()); + System.out.println(content); + } + + /* + * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.TemplateCSSResource(String)' + */ + public void testTemplateCSSResource() throws IOException { + String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); + assertEquals(templatePath,resource.getKey()); + InternetResource resource2 = InternetResourceBuilder.getInstance().createResource(this,resource.getKey()); + ResourceContext ctx = new FacesResourceContext(this.facesContext); + InputStream stream = resource.getResourceAsStream(ctx); + byte[] resourceContent = new byte[8196]; + int length = stream.read(resourceContent); + InputStream stream2 = resource2.getResourceAsStream(ctx); + byte[] resource2Content = new byte[8196]; + int length2 = stream2.read(resource2Content); + assertEquals(length, length2); + + } + + /* + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.isCacheable()' + */ + public void testIsCacheable() { + + } + + /* + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getContentType()' + */ + public void testGetContentType() { + + String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); + assertEquals("text/css",resource.getContentType(null)); +} + + /* + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getUri(FacesContext, Object)' + */ + public void testGetUri() { + String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); +// System.out.println(resource.getUri(facesContext,null)); + String expextedUri = request.getContextPath()+"/"+WebXml.RESOURCE_URI_PREFIX+resource.getKey(); +// System.out.println(expextedUri); + assertTrue(resource.getUri(facesContext,null).startsWith(expextedUri)); + } + + /* + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getResourceAsStream(ResourceContext)' + */ + public void testGetResourceAsStream() { + + } + + /* + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.sendHeaders(ResourceContext)' + */ + public void testSendHeaders() { + String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); + ResourceContext context = new FacesResourceContext(facesContext); + resource.sendHeaders(context); + String header = response.getContentType(); + assertNotNull(header); + assertTrue(header.startsWith("text/css")); + } +} Deleted: trunk/framework/test/src/test/java/org/ajax4jsf/resource/InternetResourceServiceTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java 2007-07-05 19:11:50 UTC (rev 1507) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/InternetResourceServiceTestCase.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -1,158 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.framework.resource; - -import java.io.IOException; - -import org.ajax4jsf.resource.InternetResource; -import org.ajax4jsf.resource.InternetResourceBuilder; -import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; -import org.apache.shale.test.mock.MockServletOutputStream; - -/** - * @author shura - * - */ -public class InternetResourceServiceTestCase extends AbstractAjax4JsfTestCase { - - /** - * @param name - */ - public InternetResourceServiceTestCase(String name) { - super(name); - } - - /* (non-Javadoc) - * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp() - */ - public void setUp() throws Exception { - super.setUp(); - } - - /* (non-Javadoc) - * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown() - */ - public void tearDown() throws Exception { - super.tearDown(); - InternetResourceBuilder.setInstance(null); - } - - /** - * Test method for {@link org.ajax4jsf.resource.InternetResourceService#init(javax.servlet.FilterConfig)}. - * @throws Exception - */ - public void testInit() throws Exception { - InternetResourceService service = new InternetResourceService(); - MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); - mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); - service.init(mockFilterConfig); - assertSame(servletContext, service.getServletContext()); - } - - /** - * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. - * @throws IOException - * @throws Exception - */ - public void testServiceResource() throws Exception, IOException { - InternetResourceService service = new InternetResourceService(); - MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); - mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); - service.init(mockFilterConfig); - InternetResourceBuilder builder = InternetResourceBuilder.getInstance(); - InternetResource resource = builder.createResource(this, "test.js"); - MockResourceRequest resourceRequest = new MockResourceRequest(request); - String key = resource.getKey(); - service.serviceResource(key,resourceRequest,response); - byte[] content = ((MockServletOutputStream)response.getOutputStream()).content(); - String strContent = new String(content); - assertEquals(strContent, "\nfunction Test(){};"); - response.setOutputStream(null); - response.setWriter(null); - } - - /** - * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. - * @throws IOException - * @throws Exception - */ - public void testCachedServiceResource() throws Exception, IOException { - InternetResourceService service = new InternetResourceService(); - MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); - mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); - service.init(mockFilterConfig); - InternetResourceBuilder builder = InternetResourceBuilder.getInstance(); - InternetResource resource = builder.createResource(this, MockCacheableResource.class.getName()); - MockResourceRequest resourceRequest = new MockResourceRequest(request); - String key = resource.getKey(); - for(int i=1;i<=10;i++){ - service.serviceResource(key,resourceRequest,response); - byte[] content = ((MockServletOutputStream)response.getOutputStream()).content(); - String strContent = new String(content); - assertEquals(strContent, "test"); - assertEquals(((MockCacheableResource) resource).getCounter(), 1); - response.setOutputStream(null); - response.setWriter(null); - } - } - - /** - * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. - * @throws IOException - * @throws Exception - */ - public void testCachedServiceExpiration() throws Exception, IOException { - InternetResourceService service = new InternetResourceService(); - MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); - mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); - service.init(mockFilterConfig); - InternetResourceBuilder builder = InternetResourceBuilder.getInstance(); - InternetResource resource = builder.createResource(this, MockCacheableResource.class.getName()); - MockResourceRequest resourceRequest = new MockResourceRequest(request); - String key = resource.getKey(); - for(int j=1;j<=10;j++){ - for(int i=1;i<=10;i++){ - request.setPathElements(request.getContextPath(), request.getServletPath(), request.getPathInfo(), String.valueOf(i)); - service.serviceResource(key,resourceRequest,response); - byte[] content = ((MockServletOutputStream)response.getOutputStream()).content(); - String strContent = new String(content); - assertEquals(strContent, "test"); - response.setOutputStream(null); - response.setWriter(null); - } - } - int counter = ((MockCacheableResource) resource).getCounter(); - assertTrue("Resource was generated "+counter+" times", counter<= 10); - } - - public void testSendResource() { -// fail("Not yet implemented"); - } - - /** - * Test method for {@link org.ajax4jsf.resource.InternetResourceService#getProperties(java.lang.String)}. - */ - public void testGetProperties() { -// fail("Not yet implemented"); - } - -} Copied: trunk/framework/test/src/test/java/org/ajax4jsf/resource/InternetResourceServiceTestCase.java (from rev 1508, trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java) =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/resource/InternetResourceServiceTestCase.java (rev 0) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/InternetResourceServiceTestCase.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -0,0 +1,159 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.resource; + +import java.io.IOException; + +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.InternetResourceService; +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.apache.shale.test.mock.MockServletOutputStream; + +/** + * @author shura + * + */ +public class InternetResourceServiceTestCase extends AbstractAjax4JsfTestCase { + + /** + * @param name + */ + public InternetResourceServiceTestCase(String name) { + super(name); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp() + */ + public void setUp() throws Exception { + super.setUp(); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown() + */ + public void tearDown() throws Exception { + super.tearDown(); + InternetResourceBuilder.setInstance(null); + } + + /** + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#init(javax.servlet.FilterConfig)}. + * @throws Exception + */ + public void testInit() throws Exception { + InternetResourceService service = new InternetResourceService(); + MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); + mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); + service.init(mockFilterConfig); + assertSame(servletContext, service.getServletContext()); + } + + /** + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. + * @throws IOException + * @throws Exception + */ + public void testServiceResource() throws Exception, IOException { + InternetResourceService service = new InternetResourceService(); + MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); + mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); + service.init(mockFilterConfig); + InternetResourceBuilder builder = InternetResourceBuilder.getInstance(); + InternetResource resource = builder.createResource(this, "test.js"); + MockResourceRequest resourceRequest = new MockResourceRequest(request); + String key = resource.getKey(); + service.serviceResource(key,resourceRequest,response); + byte[] content = ((MockServletOutputStream)response.getOutputStream()).content(); + String strContent = new String(content); + assertEquals(strContent, "\nfunction Test(){};"); + response.setOutputStream(null); + response.setWriter(null); + } + + /** + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. + * @throws IOException + * @throws Exception + */ + public void testCachedServiceResource() throws Exception, IOException { + InternetResourceService service = new InternetResourceService(); + MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); + mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); + service.init(mockFilterConfig); + InternetResourceBuilder builder = InternetResourceBuilder.getInstance(); + InternetResource resource = builder.createResource(this, MockCacheableResource.class.getName()); + MockResourceRequest resourceRequest = new MockResourceRequest(request); + String key = resource.getKey(); + for(int i=1;i<=10;i++){ + service.serviceResource(key,resourceRequest,response); + byte[] content = ((MockServletOutputStream)response.getOutputStream()).content(); + String strContent = new String(content); + assertEquals(strContent, "test"); + assertEquals(((MockCacheableResource) resource).getCounter(), 1); + response.setOutputStream(null); + response.setWriter(null); + } + } + + /** + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. + * @throws IOException + * @throws Exception + */ + public void testCachedServiceExpiration() throws Exception, IOException { + InternetResourceService service = new InternetResourceService(); + MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); + mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); + service.init(mockFilterConfig); + InternetResourceBuilder builder = InternetResourceBuilder.getInstance(); + InternetResource resource = builder.createResource(this, MockCacheableResource.class.getName()); + MockResourceRequest resourceRequest = new MockResourceRequest(request); + String key = resource.getKey(); + for(int j=1;j<=10;j++){ + for(int i=1;i<=10;i++){ + request.setPathElements(request.getContextPath(), request.getServletPath(), request.getPathInfo(), String.valueOf(i)); + service.serviceResource(key,resourceRequest,response); + byte[] content = ((MockServletOutputStream)response.getOutputStream()).content(); + String strContent = new String(content); + assertEquals(strContent, "test"); + response.setOutputStream(null); + response.setWriter(null); + } + } + int counter = ((MockCacheableResource) resource).getCounter(); + assertTrue("Resource was generated "+counter+" times", counter<= 10); + } + + public void testSendResource() { +// fail("Not yet implemented"); + } + + /** + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#getProperties(java.lang.String)}. + */ + public void testGetProperties() { +// fail("Not yet implemented"); + } + +} Deleted: trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockCacheableResource.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java 2007-07-05 19:11:50 UTC (rev 1507) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockCacheableResource.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -1,61 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.framework.resource; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; - -import org.ajax4jsf.resource.ResourceContext; - -/** - * @author shura - * - */ -public class MockCacheableResource extends InternetResourceBase { - - private int counter = 0; - - public int getCounter() { - return counter; - } - - /** - * - */ - public MockCacheableResource() { - super(); - setRenderer(new LogfileRenderer()); - setCacheable(true); - } - - public InputStream getResourceAsStream(ResourceContext context) { - counter++; - try { - Thread.sleep(3000); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return new ByteArrayInputStream("test".getBytes()); - } - -} Copied: trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockCacheableResource.java (from rev 1508, trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java) =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockCacheableResource.java (rev 0) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockCacheableResource.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -0,0 +1,63 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.resource; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; + +import org.ajax4jsf.resource.InternetResourceBase; +import org.ajax4jsf.resource.LogfileRenderer; +import org.ajax4jsf.resource.ResourceContext; + +/** + * @author shura + * + */ +public class MockCacheableResource extends InternetResourceBase { + + private int counter = 0; + + public int getCounter() { + return counter; + } + + /** + * + */ + public MockCacheableResource() { + super(); + setRenderer(new LogfileRenderer()); + setCacheable(true); + } + + public InputStream getResourceAsStream(ResourceContext context) { + counter++; + try { + Thread.sleep(3000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return new ByteArrayInputStream("test".getBytes()); + } + +} Deleted: trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockFilterConfig.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockFilterConfig.java 2007-07-05 19:11:50 UTC (rev 1507) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockFilterConfig.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -1,98 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.framework.resource; - -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; - -/** - * @author shura - * - */ -public class MockFilterConfig implements FilterConfig { - - private ServletContext servletContext; - - private Map initParameters = new HashMap(); - - /** - * @param servletContext - */ - public MockFilterConfig(ServletContext servletContext) { - super(); - this.servletContext = servletContext; - } - - /* (non-Javadoc) - * @see javax.servlet.FilterConfig#getFilterName() - */ - public String getFilterName() { - // TODO Auto-generated method stub - return "A4J"; - } - - /* (non-Javadoc) - * @see javax.servlet.FilterConfig#getInitParameter(java.lang.String) - */ - public String getInitParameter(String arg0) { - // TODO Auto-generated method stub - return (String) initParameters.get(arg0); - } - - public void setInitParameter(String name, String value) { - initParameters.put(name, value); - } - - /* (non-Javadoc) - * @see javax.servlet.FilterConfig#getInitParameterNames() - */ - public Enumeration getInitParameterNames() { - final Iterator parametersIterator = initParameters.keySet().iterator(); - return new Enumeration(){ - - public boolean hasMoreElements() { - // TODO Auto-generated method stub - return parametersIterator.hasNext(); - } - - public Object nextElement() { - // TODO Auto-generated method stub - return parametersIterator.next(); - } - - }; - } - - /* (non-Javadoc) - * @see javax.servlet.FilterConfig#getServletContext() - */ - public ServletContext getServletContext() { - // TODO Auto-generated method stub - return servletContext; - } - -} Copied: trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockFilterConfig.java (from rev 1508, trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockFilterConfig.java) =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockFilterConfig.java (rev 0) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockFilterConfig.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -0,0 +1,98 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.resource; + +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; + +/** + * @author shura + * + */ +public class MockFilterConfig implements FilterConfig { + + private ServletContext servletContext; + + private Map initParameters = new HashMap(); + + /** + * @param servletContext + */ + public MockFilterConfig(ServletContext servletContext) { + super(); + this.servletContext = servletContext; + } + + /* (non-Javadoc) + * @see javax.servlet.FilterConfig#getFilterName() + */ + public String getFilterName() { + // TODO Auto-generated method stub + return "A4J"; + } + + /* (non-Javadoc) + * @see javax.servlet.FilterConfig#getInitParameter(java.lang.String) + */ + public String getInitParameter(String arg0) { + // TODO Auto-generated method stub + return (String) initParameters.get(arg0); + } + + public void setInitParameter(String name, String value) { + initParameters.put(name, value); + } + + /* (non-Javadoc) + * @see javax.servlet.FilterConfig#getInitParameterNames() + */ + public Enumeration getInitParameterNames() { + final Iterator parametersIterator = initParameters.keySet().iterator(); + return new Enumeration(){ + + public boolean hasMoreElements() { + // TODO Auto-generated method stub + return parametersIterator.hasNext(); + } + + public Object nextElement() { + // TODO Auto-generated method stub + return parametersIterator.next(); + } + + }; + } + + /* (non-Javadoc) + * @see javax.servlet.FilterConfig#getServletContext() + */ + public ServletContext getServletContext() { + // TODO Auto-generated method stub + return servletContext; + } + +} Deleted: trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockResourceRequest.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java 2007-07-05 19:11:50 UTC (rev 1507) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockResourceRequest.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -1,48 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.framework.resource; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; - -/** - * @author shura - * - */ -public class MockResourceRequest extends HttpServletRequestWrapper { - - private String method; - - public MockResourceRequest(HttpServletRequest mockRequest) { - super(mockRequest); - method = "GET"; - } - - public String getMethod() { - return method; - } - - public void setMethod(String method) { - this.method = method; - } - -} Copied: trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockResourceRequest.java (from rev 1508, trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java) =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockResourceRequest.java (rev 0) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/MockResourceRequest.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -0,0 +1,48 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.resource; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; + +/** + * @author shura + * + */ +public class MockResourceRequest extends HttpServletRequestWrapper { + + private String method; + + public MockResourceRequest(HttpServletRequest mockRequest) { + super(mockRequest); + method = "GET"; + } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } + +} Deleted: trunk/framework/test/src/test/java/org/ajax4jsf/resource/ParametersEncodingTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ParametersEncodingTestCase.java 2007-07-05 19:11:50 UTC (rev 1507) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/ParametersEncodingTestCase.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -1,47 +0,0 @@ -package org.ajax4jsf.framework.resource; - -import java.util.Arrays; - -import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; - -public class ParametersEncodingTestCase extends AbstractAjax4JsfTestCase { - - private ResourceBuilderImpl builder; - - private byte[] data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 }; - - public ParametersEncodingTestCase(String arg0) { - super(arg0); - } - - public void setUp() throws Exception { - super.setUp(); - builder = new ResourceBuilderImpl(); - } - - public void tearDown() throws Exception { - builder = null; - super.tearDown(); - } - - public final void testEncrypt() { - byte[] bs = builder.encrypt(data); - byte[] bs2 = builder.decrypt(bs); - assertTrue(Arrays.equals(data, bs2)); - } - - public final void testDecryptLeak() { - byte[] bs = {}; - for (int i = 0; i < 10000; i++) { - bs = builder.encrypt(data); - - } - byte[] bs2={}; - for (int i = 0; i < 10000; i++) { - bs2 = builder.decrypt(bs); - - } - assertTrue(Arrays.equals(data, bs2)); - } - -} Copied: trunk/framework/test/src/test/java/org/ajax4jsf/resource/ParametersEncodingTestCase.java (from rev 1508, trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ParametersEncodingTestCase.java) =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/resource/ParametersEncodingTestCase.java (rev 0) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/ParametersEncodingTestCase.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -0,0 +1,48 @@ +package org.ajax4jsf.resource; + +import java.util.Arrays; + +import org.ajax4jsf.resource.ResourceBuilderImpl; +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; + +public class ParametersEncodingTestCase extends AbstractAjax4JsfTestCase { + + private ResourceBuilderImpl builder; + + private byte[] data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 }; + + public ParametersEncodingTestCase(String arg0) { + super(arg0); + } + + public void setUp() throws Exception { + super.setUp(); + builder = new ResourceBuilderImpl(); + } + + public void tearDown() throws Exception { + builder = null; + super.tearDown(); + } + + public final void testEncrypt() { + byte[] bs = builder.encrypt(data); + byte[] bs2 = builder.decrypt(bs); + assertTrue(Arrays.equals(data, bs2)); + } + + public final void testDecryptLeak() { + byte[] bs = {}; + for (int i = 0; i < 10000; i++) { + bs = builder.encrypt(data); + + } + byte[] bs2={}; + for (int i = 0; i < 10000; i++) { + bs2 = builder.decrypt(bs); + + } + assertTrue(Arrays.equals(data, bs2)); + } + +} Deleted: trunk/framework/test/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java 2007-07-05 19:11:50 UTC (rev 1507) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -1,110 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.framework.resource; - -import javax.faces.context.FacesContext; - -import org.ajax4jsf.resource.InternetResource; -import org.ajax4jsf.resource.InternetResourceBuilder; -import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase; -import org.apache.shale.test.mock.MockHttpServletRequest; -import org.apache.shale.test.mock.MockHttpServletResponse; -import org.apache.shale.test.mock.MockServletOutputStream; - -/** - * @author shura - * - */ -public class ResourceServiceThreadsTestCase extends AbstractThreadedAjax4JsfTestCase { - - /** - * @param s - */ - public ResourceServiceThreadsTestCase(String s) { - super(s); - // TODO Auto-generated constructor stub - } - - InternetResourceService service; - String key; - InternetResource resource; - - public void setUp() throws Exception { - super.setUp(); - service = new InternetResourceService(); - MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); - mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); - service.init(mockFilterConfig); - InternetResourceBuilder builder = InternetResourceBuilder.getInstance(); - resource = builder.createResource(this, MockCacheableResource.class.getName()); - key = resource.getKey(); - } - - public void tearDown() throws Exception { - super.tearDown(); - InternetResourceBuilder.setInstance(null); - resource = null; - service = null; - key=null; - } - - public class ResourceRunner extends TestCaseRunnable { - - private String data; - - - /** - * @param data - */ - public ResourceRunner(String data) { - super(); - this.data = data; - } - - - public void runTestCase(FacesContext context) throws Throwable { - MockHttpServletResponse response = new MockHttpServletResponse(); - MockHttpServletRequest req = new MockHttpServletRequest(session); - req.setServletContext(servletContext); - req.setPathElements(request.getContextPath(), request.getServletPath(), request.getPathInfo(), data); - MockResourceRequest resourceRequest = new MockResourceRequest(req); - service.serviceResource(key,resourceRequest,response); - byte[] content = ((MockServletOutputStream)response.getOutputStream()).content(); - String strContent = new String(content); - assertEquals(strContent, "test"); - - } - - } - - public void testTreadServiceResource() { - TestCaseRunnable[] runnables = new TestCaseRunnable[1000]; - for (int i = 0; i < runnables.length; i++) { - runnables[i] = new ResourceRunner(String.valueOf(i%10)); - - } - this.runTestCaseRunnables(runnables); - int counter = ((MockCacheableResource) resource).getCounter(); - assertTrue("Resource was generated "+counter+" times", counter<= 10); - - } -} Copied: trunk/framework/test/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java (from rev 1508, trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java) =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java (rev 0) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -0,0 +1,111 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.resource; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.InternetResourceService; +import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase; +import org.apache.shale.test.mock.MockHttpServletRequest; +import org.apache.shale.test.mock.MockHttpServletResponse; +import org.apache.shale.test.mock.MockServletOutputStream; + +/** + * @author shura + * + */ +public class ResourceServiceThreadsTestCase extends AbstractThreadedAjax4JsfTestCase { + + /** + * @param s + */ + public ResourceServiceThreadsTestCase(String s) { + super(s); + // TODO Auto-generated constructor stub + } + + InternetResourceService service; + String key; + InternetResource resource; + + public void setUp() throws Exception { + super.setUp(); + service = new InternetResourceService(); + MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); + mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); + service.init(mockFilterConfig); + InternetResourceBuilder builder = InternetResourceBuilder.getInstance(); + resource = builder.createResource(this, MockCacheableResource.class.getName()); + key = resource.getKey(); + } + + public void tearDown() throws Exception { + super.tearDown(); + InternetResourceBuilder.setInstance(null); + resource = null; + service = null; + key=null; + } + + public class ResourceRunner extends TestCaseRunnable { + + private String data; + + + /** + * @param data + */ + public ResourceRunner(String data) { + super(); + this.data = data; + } + + + public void runTestCase(FacesContext context) throws Throwable { + MockHttpServletResponse response = new MockHttpServletResponse(); + MockHttpServletRequest req = new MockHttpServletRequest(session); + req.setServletContext(servletContext); + req.setPathElements(request.getContextPath(), request.getServletPath(), request.getPathInfo(), data); + MockResourceRequest resourceRequest = new MockResourceRequest(req); + service.serviceResource(key,resourceRequest,response); + byte[] content = ((MockServletOutputStream)response.getOutputStream()).content(); + String strContent = new String(content); + assertEquals(strContent, "test"); + + } + + } + + public void testTreadServiceResource() { + TestCaseRunnable[] runnables = new TestCaseRunnable[1000]; + for (int i = 0; i < runnables.length; i++) { + runnables[i] = new ResourceRunner(String.valueOf(i%10)); + + } + this.runTestCaseRunnables(runnables); + int counter = ((MockCacheableResource) resource).getCounter(); + assertTrue("Resource was generated "+counter+" times", counter<= 10); + + } +} Modified: trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx =================================================================== --- trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -12,7 +12,7 @@ component="org.richfaces.component.UIDataFltrSlider"> <h:styles>css/dataFilterSlider.xcss</h:styles> - <h:scripts>new org.ajax4jsf.framework.resource.PrototypeScript(),scripts/scriptaculous-js-1.6.5/src/slider.js</h:scripts> + <h:scripts>new org.ajax4jsf.resource.PrototypeScript(),scripts/scriptaculous-js-1.6.5/src/slider.js</h:scripts> <f:clientid var="clientId"/> <f:resource name="org.richfaces.renderkit.html.images.SliderArrowImage" var="arrow" /> Modified: trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx =================================================================== --- trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -12,7 +12,7 @@ <h:styles>css/datascroller.xcss</h:styles> <h:scripts> - new org.ajax4jsf.framework.resource.PrototypeScript(), + new org.ajax4jsf.resource.PrototypeScript(), new org.ajax4jsf.framework.ajax.AjaxScript(), </h:scripts> Modified: trunk/ui/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx =================================================================== --- trunk/ui/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -12,7 +12,7 @@ xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"> <h:scripts> - new org.ajax4jsf.framework.resource.PrototypeScript(), + new org.ajax4jsf.resource.PrototypeScript(), new org.ajax4jsf.framework.ajax.AjaxScript(), new org.ajax4jsf.dnd.DnDScript(), /org/richfaces/renderkit/html/scripts/utils.js, Modified: trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx =================================================================== --- trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -12,7 +12,7 @@ <h:styles>css/dropdownmenu.xcss</h:styles> <h:scripts> - new org.ajax4jsf.framework.resource.PrototypeScript(), + new org.ajax4jsf.resource.PrototypeScript(), new org.ajax4jsf.framework.ajax.AjaxScript(), scripts/menu.js </h:scripts> Modified: trunk/ui/gmap/src/main/templates/gmap.jspx =================================================================== --- trunk/ui/gmap/src/main/templates/gmap.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/gmap/src/main/templates/gmap.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -27,7 +27,7 @@ <c:set var="enableDoubleClickZoom" value="#{component.attributes['enableDoubleClickZoom']}"/> <c:set var="enableContinuousZoom" value="#{component.attributes['enableContinuousZoom']}"/> <h:styles>css/gmap.xcss</h:styles> - <h:scripts>new org.ajax4jsf.framework.resource.PrototypeScript(),script/gmap.js</h:scripts> + <h:scripts>new org.ajax4jsf.resource.PrototypeScript(),script/gmap.js</h:scripts> <div id="#{clientId}" class="dr-gmap rich-gmap #{component.attributes['styleClass']}" x:passThruWithExclusions="id, styleClass" Modified: trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx =================================================================== --- trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -10,7 +10,7 @@ component="org.richfaces.component.UIInputNumberSlider" <h:styles>css/slider.xcss</h:styles> - <h:scripts>new org.ajax4jsf.framework.resource.PrototypeScript(),script/SliderScript.js,/org/richfaces/renderkit/html/scripts/browser_info.js,/org/richfaces/renderkit/html/scripts/events.js</h:scripts> + <h:scripts>new org.ajax4jsf.resource.PrototypeScript(),script/SliderScript.js,/org/richfaces/renderkit/html/scripts/browser_info.js,/org/richfaces/renderkit/html/scripts/events.js</h:scripts> <f:clientid var="clientId"/> <f:resource name="/org/richfaces/renderkit/html/images/spacer.gif" var="spacer" /> Modified: trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx =================================================================== --- trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -17,7 +17,7 @@ <f:resource name="org.richfaces.renderkit.html.images.buttons.SpinnerButtonDown" var="down_arrow" /> - <h:scripts>new org.ajax4jsf.framework.resource.PrototypeScript(),script/SpinnerScript.js,/org/richfaces/renderkit/html/scripts/browser_info.js</h:scripts> + <h:scripts>new org.ajax4jsf.resource.PrototypeScript(),script/SpinnerScript.js,/org/richfaces/renderkit/html/scripts/browser_info.js</h:scripts> <h:styles>css/spinner.xcss</h:styles> <table width="2%" class="dr-spnr-c rich-spinner-c #{component.attributes['styleClass']}" id="#{clientId}" cellspacing="0" cellpadding="0" border="0" style="#{component.attributes['style']}"> Modified: trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx =================================================================== --- trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -13,7 +13,7 @@ <h:styles>css/menucomponents.xcss</h:styles> <h:scripts> - new org.ajax4jsf.framework.resource.PrototypeScript(), + new org.ajax4jsf.resource.PrototypeScript(), new org.ajax4jsf.framework.ajax.AjaxScript() </h:scripts> Modified: trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx =================================================================== --- trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -12,7 +12,7 @@ <h:styles>css/menucomponents.xcss</h:styles> <h:scripts> - new org.ajax4jsf.framework.resource.PrototypeScript(), + new org.ajax4jsf.resource.PrototypeScript(), new org.ajax4jsf.framework.ajax.AjaxScript(), /org/richfaces/renderkit/html/scripts/utils.js, /org/ajax4jsf/renderkit/html/scripts/form.js, Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx =================================================================== --- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -16,7 +16,7 @@ /org/richfaces/renderkit/html/css/modalPanel.xcss </h:styles> <h:scripts> - new org.ajax4jsf.framework.resource.PrototypeScript(), + new org.ajax4jsf.resource.PrototypeScript(), /org/richfaces/renderkit/html/scripts/utils.js, /org/richfaces/renderkit/html/scripts/modalPanel.js, /org/richfaces/renderkit/html/scripts/modalPanelBorders.js, Modified: trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java =================================================================== --- trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -33,8 +33,8 @@ import org.ajax4jsf.framework.ajax.AjaxScript; import org.ajax4jsf.framework.ajax.ImageCacheScript; import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase; -import org.ajax4jsf.framework.resource.PrototypeScript; import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.PrototypeScript; import org.richfaces.component.UIPanelBar; import org.richfaces.component.UIPanelBarItem; import org.richfaces.event.SwitchablePanelSwitchEvent; Modified: trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java =================================================================== --- trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2007-07-05 22:14:58 UTC (rev 1509) @@ -37,7 +37,7 @@ import org.ajax4jsf.framework.ajax.AjaxScript; import org.ajax4jsf.framework.ajax.ImageCacheScript; -import org.ajax4jsf.framework.resource.PrototypeScript; +import org.ajax4jsf.resource.PrototypeScript; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.ajax4jsf.tests.MockViewRoot; import org.apache.commons.collections.Buffer; Modified: trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx =================================================================== --- trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -12,7 +12,7 @@ <f:clientid var="clientId"/> <h:styles>css/simpleTogglePanel.xcss</h:styles> <h:scripts> -new org.ajax4jsf.framework.resource.PrototypeScript(), +new org.ajax4jsf.resource.PrototypeScript(), new org.ajax4jsf.framework.ajax.AjaxScript(), new org.ajax4jsf.framework.ajax.ImageCacheScript(), /org/ajax4jsf/renderkit/html/scripts/form.js, Modified: trunk/ui/tabPanel/src/main/templates/tabPanel.jspx =================================================================== --- trunk/ui/tabPanel/src/main/templates/tabPanel.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/tabPanel/src/main/templates/tabPanel.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -12,7 +12,7 @@ <h:styles>css/tabPanel.xcss</h:styles> <h:scripts> - new org.ajax4jsf.framework.resource.PrototypeScript(), + new org.ajax4jsf.resource.PrototypeScript(), new org.ajax4jsf.framework.ajax.AjaxScript(), new org.ajax4jsf.framework.ajax.ImageCacheScript(), /org/richfaces/renderkit/html/scripts/browser_info.js, Modified: trunk/ui/togglePanel/src/main/templates/toggleControl.jspx =================================================================== --- trunk/ui/togglePanel/src/main/templates/toggleControl.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/togglePanel/src/main/templates/toggleControl.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -11,7 +11,7 @@ component="org.richfaces.component.UIToggleControl"> <h:styles>css/toggleControl.xcss</h:styles> <h:scripts> - new org.ajax4jsf.framework.resource.PrototypeScript(), + new org.ajax4jsf.resource.PrototypeScript(), new org.ajax4jsf.framework.ajax.AjaxScript(), scripts/togglePanel.js </h:scripts> <f:clientid var="clientId"/> Modified: trunk/ui/tree/src/main/templates/htmlTree.jspx =================================================================== --- trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-07-05 20:50:37 UTC (rev 1508) +++ trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-07-05 22:14:58 UTC (rev 1509) @@ -14,7 +14,7 @@ <h:styles>css/tree.xcss</h:styles> <h:scripts> - new org.ajax4jsf.framework.resource.PrototypeScript(), + new org.ajax4jsf.resource.PrototypeScript(), /org/ajax4jsf/framework/ajax/scripts/AJAX.js, /org/richfaces/renderkit/html/scripts/utils.js, /org/ajax4jsf/renderkit/html/scripts/form.js,