You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cz...@apache.org on 2007/03/08 19:33:33 UTC
svn commit: r516135 - in /portals/pluto/branches/pluto-1.1.x:
pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/
pluto-taglib/src/main/java/org/apache/pluto/tags/el/
Author: cziegeler
Date: Thu Mar 8 10:33:32 2007
New Revision: 516135
URL: http://svn.apache.org/viewvc?view=rev&rev=516135
Log:
Code cleanup - no functional changes
Modified:
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java
portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ExpressionEvaluatorProxy.java
portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP21ExpressionEvaluatorProxy.java
portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ParamTag.java
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java?view=diff&rev=516135&r1=516134&r2=516135
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java Thu Mar 8 10:33:32 2007
@@ -16,18 +16,17 @@
*/
package org.apache.pluto.descriptors.services.castor;
-import junit.framework.TestCase;
-
import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
+
+import junit.framework.TestCase;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.SecurityConstraintDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.descriptors.common.DisplayNameDD;
-import org.apache.pluto.descriptors.common.DescriptionDD;
import org.apache.pluto.descriptors.common.InitParamDD;
+import org.apache.pluto.descriptors.portlet.PortletAppDD;
+import org.apache.pluto.descriptors.portlet.PortletDD;
+import org.apache.pluto.descriptors.portlet.SecurityConstraintDD;
/**
*
@@ -78,12 +77,12 @@
assertNotNull(sc.getUserDataConstraint());
assertEquals(1, sc.getUserDataConstraint().getDescriptions().size());
assertEquals("NONE", sc.getUserDataConstraint().getTransportGuarantee());
-
+
}
- private String xml = "<portlet-app\n" +
+ private final String xml = "<portlet-app\n" +
" xmlns=\"http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd\"\n" +
" version=\"1.0\"\n" +
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
Modified: portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ExpressionEvaluatorProxy.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ExpressionEvaluatorProxy.java?view=diff&rev=516135&r1=516134&r2=516135
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ExpressionEvaluatorProxy.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ExpressionEvaluatorProxy.java Thu Mar 8 10:33:32 2007
@@ -16,17 +16,17 @@
*/
package org.apache.pluto.tags.el;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.JspException;
import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import java.util.TreeMap;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
public abstract class ExpressionEvaluatorProxy {
@@ -60,7 +60,7 @@
if(proxy != null) {
break;
}
-
+
} catch (ClassNotFoundException e) {
throw new RuntimeException("Unable to find ExpressionEvaluatorProxy '"+entry.getValue()+"'");
} catch (IllegalAccessException e) {
Modified: portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP21ExpressionEvaluatorProxy.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP21ExpressionEvaluatorProxy.java?view=diff&rev=516135&r1=516134&r2=516135
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP21ExpressionEvaluatorProxy.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP21ExpressionEvaluatorProxy.java Thu Mar 8 10:33:32 2007
@@ -16,10 +16,8 @@
*/
package org.apache.pluto.tags.el;
-import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.el.ExpressionEvaluator;
-import javax.servlet.jsp.el.ELException;
+import javax.servlet.jsp.PageContext;
class JSP21ExpressionEvaluatorProxy extends ExpressionEvaluatorProxy {
Modified: portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ParamTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ParamTag.java?view=diff&rev=516135&r1=516134&r2=516135
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ParamTag.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ParamTag.java Thu Mar 8 10:33:32 2007
@@ -16,8 +16,6 @@
*/
package org.apache.pluto.tags.el;
-import javax.servlet.jsp.el.ExpressionEvaluator;
-import javax.servlet.jsp.el.ELException;
import javax.servlet.jsp.JspException;