remove package name of classes while creating archive

jakartaee · Nov 7, 2023 · 31b3665 · 31b3665
1 parent d516413
commit 31b3665
Show file tree

Hide file tree

Showing 64 changed files with 252 additions and 143 deletions.
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/URLClientIT.java
@@ -23,6 +23,9 @@
 import java.io.IOException;
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil; 
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest; 
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit5.ArquillianExtension;
@@ -47,9 +50,9 @@ public static WebArchive createDeployment() throws IOException {
 
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_arrayelresolver_web.war");
-    archive.addClasses(ArrayELResolverTag.class, com.sun.ts.tests.jsp.common.util.JspTestUtil.class, 
-            com.sun.ts.tests.common.el.api.resolver.ResolverTest.class, 
-            com.sun.ts.tests.common.el.api.resolver.BarELResolver.class);
+    archive.addClasses(ArrayELResolverTag.class, JspTestUtil.class, 
+            ResolverTest.class, 
+            BarELResolver.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_arrayelresolver_web.xml"));
     archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/arrayelresolver.tld", "arrayelresolver.tld");    
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ArrayELResolverTest.jsp")), "ArrayELResolverTest.jsp");

diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/URLClientIT.java
@@ -24,6 +24,10 @@
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit5.ArquillianExtension;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -47,9 +51,9 @@ public static WebArchive createDeployment() throws IOException {
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_beanelresolver_web.war");
     archive.addClasses(BeanELResolverTag.class, SimpleBean.class,
-            com.sun.ts.tests.jsp.common.util.JspTestUtil.class, 
-            com.sun.ts.tests.common.el.api.resolver.ResolverTest.class, 
-            com.sun.ts.tests.common.el.api.resolver.BarELResolver.class);
+            JspTestUtil.class, 
+            ResolverTest.class, 
+            BarELResolver.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_beanelresolver_web.xml"));
     archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/beanelresolver.tld", "beanelresolver.tld");    
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/BeanELResolverTest.jsp")), "BeanELResolverTest.jsp");

diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/URLClientIT.java
@@ -23,6 +23,10 @@
 import java.io.IOException;
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.InstallCompositeELResolverListener;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit5.ArquillianExtension;
@@ -50,10 +54,10 @@ public static WebArchive createDeployment() throws IOException {
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_compelresolver_web.war");
     archive.addClasses(CompositeELResolverTag.class,
-            com.sun.ts.tests.jsp.common.util.JspTestUtil.class, 
-            com.sun.ts.tests.jsp.common.util.InstallCompositeELResolverListener.class,
-            com.sun.ts.tests.common.el.api.resolver.ResolverTest.class, 
-            com.sun.ts.tests.common.el.api.resolver.BarELResolver.class);
+            JspTestUtil.class, 
+            InstallCompositeELResolverListener.class,
+            ResolverTest.class, 
+            BarELResolver.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_compelresolver_web.xml"));
     archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/compelresolver.tld", "compelresolver.tld");    
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/CompositeELResolverTest.jsp")), "CompositeELResolverTest.jsp");

diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/URLClientIT.java
@@ -23,6 +23,7 @@
 import java.io.IOException;
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit5.ArquillianExtension;
@@ -49,7 +50,7 @@ public static WebArchive createDeployment() throws IOException {
 
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_createmethexpr_web.war");
-    archive.addClasses(com.sun.ts.tests.jsp.common.util.JspTestUtil.class);
+    archive.addClasses(JspTestUtil.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_createmethexpr_web.xml"));
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/CreateMethodExpressionTest.jsp")), "CreateMethodExpressionTest.jsp");
 

diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/URLClientIT.java
@@ -21,6 +21,7 @@
 package com.sun.ts.tests.jsp.api.jakarta_el.createvalexpr;
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
 import java.io.IOException;
 
@@ -49,7 +50,7 @@ public static WebArchive createDeployment() throws IOException {
 
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_createvalexpr_web.war");
-    archive.addClasses(com.sun.ts.tests.jsp.common.util.JspTestUtil.class);
+    archive.addClasses(JspTestUtil.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_createvalexpr_web.xml"));
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/CreateValueExpressionTest.jsp")), "CreateValueExpressionTest.jsp");
 

diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/URLClientIT.java
@@ -21,6 +21,9 @@
 package com.sun.ts.tests.jsp.api.jakarta_el.elresolver;
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
 
 import java.io.IOException;
 
@@ -51,9 +54,9 @@ public static WebArchive createDeployment() throws IOException {
 
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_elresolver_web.war");
-    archive.addClasses(com.sun.ts.tests.jsp.common.util.JspTestUtil.class,
-            com.sun.ts.tests.common.el.api.resolver.ResolverTest.class, 
-            com.sun.ts.tests.common.el.api.resolver.BarELResolver.class);
+    archive.addClasses(JspTestUtil.class,
+            ResolverTest.class, 
+            BarELResolver.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_elresolver_web.xml"));
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELResolverTest.jsp")), "ELResolverTest.jsp");
 

diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/URLClientIT.java
@@ -21,6 +21,9 @@
 package com.sun.ts.tests.jsp.api.jakarta_el.listelresolver;
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
 
 import java.io.IOException;
 
@@ -50,9 +53,9 @@ public static WebArchive createDeployment() throws IOException {
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_listelresolver_web.war");
     archive.addClasses(ListELResolverTag.class,
-            com.sun.ts.tests.jsp.common.util.JspTestUtil.class,
-            com.sun.ts.tests.common.el.api.resolver.ResolverTest.class, 
-            com.sun.ts.tests.common.el.api.resolver.BarELResolver.class);
+            JspTestUtil.class,
+            ResolverTest.class, 
+            BarELResolver.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_listelresolver_web.xml"));
     archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/listelresolver.tld", "listelresolver.tld");    
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ListELResolverTest.jsp")), "ListELResolverTest.jsp");

diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/URLClientIT.java
@@ -21,6 +21,9 @@
 package com.sun.ts.tests.jsp.api.jakarta_el.mapelresolver;
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
 
 import java.io.IOException;
 
@@ -50,9 +53,9 @@ public static WebArchive createDeployment() throws IOException {
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_mapelresolver_web.war");
     archive.addClasses(MapELResolverTag.class,
-            com.sun.ts.tests.jsp.common.util.JspTestUtil.class,
-            com.sun.ts.tests.common.el.api.resolver.ResolverTest.class, 
-            com.sun.ts.tests.common.el.api.resolver.BarELResolver.class);
+            JspTestUtil.class,
+            ResolverTest.class, 
+            BarELResolver.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_mapelresolver_web.xml"));
     archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/mapelresolver.tld", "mapelresolver.tld");    
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/MapELResolverTest.jsp")), "MapELResolverTest.jsp");

diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/URLClientIT.java
@@ -21,6 +21,9 @@
 package com.sun.ts.tests.jsp.api.jakarta_el.methodinfo;
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SetTag;
+import com.sun.ts.tests.common.el.api.expression.ExpressionTest;
 
 import java.io.IOException;
 
@@ -50,9 +53,9 @@ public static WebArchive createDeployment() throws IOException {
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_methodinfo_web.war");
     archive.addClasses(MethodInfoTag.class,
-              com.sun.ts.tests.jsp.common.util.JspTestUtil.class,
-              com.sun.ts.tests.jsp.common.tags.tck.SetTag.class,
-              com.sun.ts.tests.common.el.api.expression.ExpressionTest.class);
+              JspTestUtil.class,
+              SetTag.class,
+              ExpressionTest.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_methodinfo_web.xml"));
     archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/methodinfo.tld", "methodinfo.tld");    
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/MethodInfoTest.jsp")), "MethodInfoTest.jsp");

diff --git a/...c/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/URLClientIT.java b/...c/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/URLClientIT.java
@@ -21,6 +21,9 @@
 package com.sun.ts.tests.jsp.api.jakarta_el.resourcebundleelresolver;
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
 
 import java.io.IOException;
 
@@ -50,9 +53,9 @@ public static WebArchive createDeployment() throws IOException {
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_resourcebundleelresolver_web.war");
     archive.addClasses(ResourceBundleELResolverTag.class,
-              com.sun.ts.tests.jsp.common.util.JspTestUtil.class,
-              com.sun.ts.tests.common.el.api.resolver.ResolverTest.class, 
-              com.sun.ts.tests.common.el.api.resolver.BarELResolver.class);
+              JspTestUtil.class,
+              ResolverTest.class, 
+              BarELResolver.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_resourcebundleelresolver_web.xml"));
     archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/resourcebundleelresolver.tld", "resourcebundleelresolver.tld");    
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ResourceBundleELResolverTest.jsp")), "ResourceBundleELResolverTest.jsp");

diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/URLClientIT.java
@@ -21,6 +21,9 @@
 package com.sun.ts.tests.jsp.api.jakarta_el.valexpression;
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SetTag;
+import com.sun.ts.tests.common.el.api.expression.ExpressionTest;
 
 import java.io.IOException;
 
@@ -50,9 +53,9 @@ public static WebArchive createDeployment() throws IOException {
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_valexpr_web.war");
     archive.addClasses(ValueExpressionTag.class,
-            com.sun.ts.tests.jsp.common.util.JspTestUtil.class,
-            com.sun.ts.tests.jsp.common.tags.tck.SetTag.class,
-            com.sun.ts.tests.common.el.api.expression.ExpressionTest.class);
+            JspTestUtil.class,
+            SetTag.class,
+            ExpressionTest.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_valexpr_web.xml"));
     archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/valexpression.tld", "valexpression.tld");    
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ValueExpressionTest.jsp")), "ValueExpressionTest.jsp");

diff --git a/...rc/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClientIT.java b/...rc/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClientIT.java
@@ -22,7 +22,7 @@
 
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -53,8 +53,7 @@ public static WebArchive createDeployment() throws IOException {
 
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_elexc_web.war");
-    archive.addClasses(
-            com.sun.ts.tests.jsp.common.util.JspTestUtil.class);
+    archive.addClasses(JspTestUtil.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_elexc_web.xml"));
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELExceptionTest.jsp")), "ELExceptionTest.jsp");
 

diff --git a/...in/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClientIT.java b/...in/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClientIT.java
@@ -22,6 +22,9 @@
 
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SetTag;
+import com.sun.ts.tests.common.el.api.expression.ExpressionTest;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -54,9 +57,9 @@ public static WebArchive createDeployment() throws IOException {
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_elparseexc_web.war");
     archive.addClasses(
-            com.sun.ts.tests.jsp.common.util.JspTestUtil.class,
-            com.sun.ts.tests.jsp.common.tags.tck.SetTag.class,
-            com.sun.ts.tests.common.el.api.expression.ExpressionTest.class);
+            JspTestUtil.class,
+            SetTag.class,
+            ExpressionTest.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_elparseexc_web.xml"));
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELParseExceptionTest.jsp")), "ELParseExceptionTest.jsp");
 

diff --git a/...src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClientIT.java b/...src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClientIT.java
@@ -22,6 +22,9 @@
 
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.TSFunctionMapper;
+import com.sun.ts.tests.jsp.common.util.JspFunctions;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -54,9 +57,9 @@ public static WebArchive createDeployment() throws IOException {
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_expr_web.war");
     archive.addClasses(
-            com.sun.ts.tests.jsp.common.util.JspTestUtil.class,
-            com.sun.ts.tests.jsp.common.util.TSFunctionMapper.class,
-            com.sun.ts.tests.jsp.common.util.JspFunctions.class);
+            JspTestUtil.class,
+            TSFunctionMapper.class,
+            JspFunctions.class);
 archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_expr_web.xml"));
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ExpressionTest.jsp")), "ExpressionTest.jsp");
 

diff --git a/...java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClientIT.java b/...java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClientIT.java
@@ -22,6 +22,9 @@
 
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.TSFunctionMapper;
+import com.sun.ts.tests.jsp.common.util.JspFunctions;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -39,8 +42,6 @@
 public class URLClientIT extends AbstractUrlClient {
 
 
-
-
   public URLClientIT() throws Exception {
     setup();
     setContextRoot("/jsp_expreval_web");
@@ -54,9 +55,9 @@ public static WebArchive createDeployment() throws IOException {
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_expreval_web.war");
     archive.addClasses(
-            com.sun.ts.tests.jsp.common.util.JspTestUtil.class,
-            com.sun.ts.tests.jsp.common.util.TSFunctionMapper.class,
-            com.sun.ts.tests.jsp.common.util.JspFunctions.class);
+            JspTestUtil.class,
+            TSFunctionMapper.class,
+            JspFunctions.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_expreval_web.xml"));
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ExpressionEvaluatorTest.jsp")), "ExpressionEvaluatorTest.jsp");
 

diff --git a/...va/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/URLClientIT.java b/...va/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/URLClientIT.java
@@ -22,6 +22,10 @@
 
 
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.JspResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -54,10 +58,10 @@ public static WebArchive createDeployment() throws IOException {
     String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_implicitobjelresolver_web.war");
     archive.addClasses(ImplicitObjELResolverTag.class,
-            com.sun.ts.tests.jsp.common.util.JspTestUtil.class,
-            com.sun.ts.tests.jsp.common.util.JspResolverTest.class,
-            com.sun.ts.tests.common.el.api.resolver.BarELResolver.class,
-            com.sun.ts.tests.common.el.api.resolver.ResolverTest.class);
+            JspTestUtil.class,
+            JspResolverTest.class,
+            BarELResolver.class,
+            ResolverTest.class);
     archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_implicitobjelresolver_web.xml"));
     archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/implicitobjelresolver.tld", "implicitobjelresolver.tld");    
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ImplicitObjELResolverTest.jsp")), "ImplicitObjELResolverTest.jsp");