Author: nbelaevski Date: 2007-07-06 08:09:05 -0400 (Fri, 06 Jul 2007) New Revision: 1516 Added: trunk/framework/test/src/test/resources/org/ajax4jsf/resource/ Removed: trunk/framework/test/src/test/resources/org/ajax4jsf/framework/ Modified: trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/AjaxRenderer.java trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/HeaderResourceProducer.java trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceComponent.java trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceContext.java trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceNotFoundException.java trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceProduser.java trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceRenderer.java trunk/framework/test/ trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java Log: Tests fixed Modified: trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/AjaxRenderer.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/AjaxRenderer.java 2007-07-06 12:08:29 UTC (rev 1515) +++ trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/AjaxRenderer.java 2007-07-06 12:09:05 UTC (rev 1516) @@ -1,4 +1,4 @@ -package org.ajax4jsf.framework.renderer; +package org.ajax4jsf.renderkit; import java.io.IOException; import java.util.Set; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/HeaderResourceProducer.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/HeaderResourceProducer.java 2007-07-06 12:08:29 UTC (rev 1515) +++ trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/HeaderResourceProducer.java 2007-07-06 12:09:05 UTC (rev 1516) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.renderer; +package org.ajax4jsf.renderkit; import java.util.LinkedHashSet; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceComponent.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceComponent.java 2007-07-06 12:08:29 UTC (rev 1515) +++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceComponent.java 2007-07-06 12:09:05 UTC (rev 1516) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.resource; +package org.ajax4jsf.resource; import java.util.Date; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceContext.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceContext.java 2007-07-06 12:08:29 UTC (rev 1515) +++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceContext.java 2007-07-06 12:09:05 UTC (rev 1516) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.resource; +package org.ajax4jsf.resource; import java.io.IOException; import java.io.InputStream; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceNotFoundException.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceNotFoundException.java 2007-07-06 12:08:29 UTC (rev 1515) +++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceNotFoundException.java 2007-07-06 12:09:05 UTC (rev 1516) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.resource; +package org.ajax4jsf.resource; import javax.faces.FacesException; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceProduser.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceProduser.java 2007-07-06 12:08:29 UTC (rev 1515) +++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceProduser.java 2007-07-06 12:09:05 UTC (rev 1516) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.resource; +package org.ajax4jsf.resource; /** Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceRenderer.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceRenderer.java 2007-07-06 12:08:29 UTC (rev 1515) +++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceRenderer.java 2007-07-06 12:09:05 UTC (rev 1516) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.resource; +package org.ajax4jsf.resource; import java.io.IOException; import java.util.Map; Property changes on: trunk/framework/test ___________________________________________________________________ Name: svn:ignore - target + target .settings .classpath .project Modified: trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java 2007-07-06 12:08:29 UTC (rev 1515) +++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java 2007-07-06 12:09:05 UTC (rev 1516) @@ -70,7 +70,7 @@ } public void testCallWithContext() throws Exception { - String templatePath = "org/ajax4jsf/framework/resource/call.xml"; + String templatePath = "org/ajax4jsf/resource/call.xml"; TemplateCSSResource resource = new TemplateCSSResource(templatePath); ResourceContext context = new FacesResourceContext(facesContext); try { @@ -87,7 +87,7 @@ } public void testCallWithContextAndParam() throws Exception { - String templatePath = "org/ajax4jsf/framework/resource/callWithParam.xml"; + String templatePath = "org/ajax4jsf/resource/callWithParam.xml"; TemplateCSSResource resource = new TemplateCSSResource(templatePath); ResourceContext context = new FacesResourceContext(facesContext); try { @@ -105,7 +105,7 @@ * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.send(ResourceContext)' */ public void testSend() throws IOException { - String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + String templatePath = "org/ajax4jsf/resource/styles.xml"; TemplateCSSResource resource = new TemplateCSSResource(templatePath); ResourceContext context = new FacesResourceContext(facesContext); try { @@ -122,7 +122,7 @@ * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.TemplateCSSResource(String)' */ public void testTemplateCSSResource() throws IOException { - String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + String templatePath = "org/ajax4jsf/resource/styles.xml"; TemplateCSSResource resource = new TemplateCSSResource(templatePath); assertEquals(templatePath,resource.getKey()); InternetResource resource2 = InternetResourceBuilder.getInstance().createResource(this,resource.getKey()); @@ -149,7 +149,7 @@ */ public void testGetContentType() { - String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + String templatePath = "org/ajax4jsf/resource/styles.xml"; TemplateCSSResource resource = new TemplateCSSResource(templatePath); assertEquals("text/css",resource.getContentType(null)); } @@ -158,7 +158,7 @@ * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getUri(FacesContext, Object)' */ public void testGetUri() { - String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + String templatePath = "org/ajax4jsf/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(); @@ -177,7 +177,7 @@ * Test method for 'org.ajax4jsf.resource.InternetResourceBase.sendHeaders(ResourceContext)' */ public void testSendHeaders() { - String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + String templatePath = "org/ajax4jsf/resource/styles.xml"; TemplateCSSResource resource = new TemplateCSSResource(templatePath); ResourceContext context = new FacesResourceContext(facesContext); resource.sendHeaders(context); Copied: trunk/framework/test/src/test/resources/org/ajax4jsf/resource (from rev 1512, trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource)