You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2007/03/12 08:45:56 UTC

svn commit: r517121 [3/3] - in /portals/jetspeed-2/trunk: ant-tasks/src/java/org/apache/jetspeed/anttasks/ applications/demo/src/java/org/apache/jetspeed/demo/servlet/ applications/demo/src/java/org/apache/taglibs/velocity/ applications/gems/src/java/o...

Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElement.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElement.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElement.java Mon Mar 12 00:45:49 2007
@@ -17,23 +17,10 @@
 
 package org.apache.jetspeed.serializer.objects;
 
-/**
- * Serialized Name Value Pairs <info> <name>user.first.name</name> <value>Paul</value>
- * </info>
- * 
- * @author <a href="mailto:hajo@bluesunrsie.com">Hajo Birthelmer</a>
- * @version $Id: $
- */
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.prefs.Preferences;
-
 import javolution.xml.XMLFormat;
-import javolution.xml.sax.Attributes;
 import javolution.xml.stream.XMLStreamException;
 
 import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.pluto.om.common.Preference;
 
 public class JSNVPElement
 {

Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElements.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElements.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElements.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElements.java Mon Mar 12 00:45:49 2007
@@ -29,12 +29,8 @@
 import java.util.prefs.Preferences;
 
 import javolution.xml.XMLFormat;
-import javolution.xml.sax.Attributes;
 import javolution.xml.stream.XMLStreamException;
 
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.pluto.om.common.Preference;
-
 public class JSNVPElements
 {
 
@@ -112,10 +108,7 @@
             try
             {
                 JSNVPElements g = (JSNVPElements) o;
-                Object o1 = null;
-                
-
-				while (xml.hasNext())
+                while (xml.hasNext())
 				{
 					JSNVPElement elem = (JSNVPElement)xml.get("preference",JSNVPElement.class);
                     g.myMap.put(elem.getKey(), elem.getValue());

Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNameValuePairs.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNameValuePairs.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNameValuePairs.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNameValuePairs.java Mon Mar 12 00:45:49 2007
@@ -33,7 +33,6 @@
 import javolution.xml.stream.XMLStreamException;
 
 import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.pluto.om.common.Preference;
 
 public class JSNameValuePairs
 {

Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPWAttributes.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPWAttributes.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPWAttributes.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPWAttributes.java Mon Mar 12 00:45:49 2007
@@ -17,20 +17,6 @@
 
 package org.apache.jetspeed.serializer.objects;
 
-/**
- * Serialized Name Value Pairs
- * <info>
- *   <name>user.first.name</name>
- *   <value>Paul</value>
- * </info>
- * 
- * @author <a href="mailto:hajo@bluesunrsie.com">Hajo Birthelmer</a>
- * @version $Id: $
- */
-import java.util.HashMap;
-import java.util.Map;
-import java.util.prefs.*;
-
 public class JSPWAttributes extends JSNameValuePairs
 {
 

Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPortlet.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPortlet.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPortlet.java Mon Mar 12 00:45:49 2007
@@ -16,12 +16,6 @@
  */
 package org.apache.jetspeed.serializer.objects;
 
-import java.security.Principal;
-import java.util.ArrayList;
-import java.sql.Date;
-import java.util.Iterator;
-import java.util.prefs.Preferences;
-
 import javolution.xml.XMLFormat;
 import javolution.xml.stream.XMLStreamException;
 

Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSProcessOrder.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSProcessOrder.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSProcessOrder.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSProcessOrder.java Mon Mar 12 00:45:49 2007
@@ -17,11 +17,6 @@
 
 package org.apache.jetspeed.serializer.objects;
 
-import java.util.ArrayList;
-
-import org.apache.commons.lang.StringEscapeUtils;
-
-import javolution.xml.XMLBinding;
 import javolution.xml.XMLFormat;
 import javolution.xml.stream.XMLStreamException;
 

Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRole.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRole.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRole.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRole.java Mon Mar 12 00:45:49 2007
@@ -16,14 +16,6 @@
  */
 package org.apache.jetspeed.serializer.objects;
 
-import javolution.xml.XMLFormat;
-import javolution.xml.stream.XMLStreamException;
-
-import java.util.prefs.Preferences;
-import java.util.*;
-
-import org.apache.jetspeed.security.Role;
-
 public class JSRole extends JSGroup
 {
 }

Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSecondaryData.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSecondaryData.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSecondaryData.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSecondaryData.java Mon Mar 12 00:45:49 2007
@@ -20,8 +20,6 @@
 import javolution.xml.XMLFormat;
 import javolution.xml.stream.XMLStreamException;
 
-import org.apache.commons.lang.StringEscapeUtils;
-
 public class JSSecondaryData extends JSSnapshot
 {
 

Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSeedData.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSeedData.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSeedData.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSeedData.java Mon Mar 12 00:45:49 2007
@@ -17,11 +17,8 @@
 
 package org.apache.jetspeed.serializer.objects;
 
-import java.util.ArrayList;
-
 import org.apache.commons.lang.StringEscapeUtils;
 
-import javolution.xml.XMLBinding;
 import javolution.xml.XMLFormat;
 import javolution.xml.stream.XMLStreamException;
 

Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSnapshot.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSnapshot.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSnapshot.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSnapshot.java Mon Mar 12 00:45:49 2007
@@ -17,11 +17,8 @@
 
 package org.apache.jetspeed.serializer.objects;
 
-import java.util.ArrayList;
-
 import org.apache.commons.lang.StringEscapeUtils;
 
-import javolution.xml.XMLBinding;
 import javolution.xml.XMLFormat;
 import javolution.xml.stream.XMLStreamException;
 

Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUserAttributes.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUserAttributes.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUserAttributes.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUserAttributes.java Mon Mar 12 00:45:49 2007
@@ -17,18 +17,6 @@
 
 package org.apache.jetspeed.serializer.objects;
 
-/**
- * Serialized Name Value Pairs
- * <info>
- *   <name>user.first.name</name>
- *   <value>Paul</value>
- * </info>
- * 
- * @author <a href="mailto:hajo@bluesunrsie.com">Hajo Birthelmer</a>
- * @version $Id: $
- */
-import java.util.HashMap;
-import java.util.Map;
 import java.util.prefs.*;
 
 public class JSUserAttributes extends JSNVPElements

Modified: portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java (original)
+++ portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java Mon Mar 12 00:45:49 2007
@@ -107,8 +107,6 @@
 		BasePrincipal principal = (BasePrincipal)SecurityHelper.getBestPrincipal(subject, UserPrincipal.class);
 		String fullPath = principal.getFullPath();
 		
-    	String content = null;
-    	
     	/* ProxyID is used for the cache. The http client object will be cached for a
     	 * given user site url combination
     	 */
@@ -140,8 +138,7 @@
      */
     public String useSSO(Subject subject, String url, boolean bRefresh) throws SSOException
     {
-    	String content = null;
-       	// Get the principal from the subject
+    	// Get the principal from the subject
 		BasePrincipal principal = (BasePrincipal)SecurityHelper.getBestPrincipal(subject, UserPrincipal.class);
 		String fullPath = principal.getFullPath();
 
@@ -575,8 +572,6 @@
 		
 		// Initailization
 		InternalUserPrincipal remotePrincipal = null;
-		SSOPrincipal principal = null;
-		
 		//Get the site
 		SSOSite ssoSite = getSSOSiteObject(site);
 		if (ssoSite == null)
@@ -773,9 +768,6 @@
 	{
 		InternalCredential credential = null;
 		InternalUserPrincipal remotePrincipal = null;
-		String remoteUser = null;
-		String remoteFullPath = null;
-		
 		//	Get remotePrincipals for Site and match them with the Remote Principal for the Principal attached to site
 		Collection principalsForSite = ssoSite.getPrincipals();
 		Collection remoteForSite = ssoSite.getRemotePrincipals();

Modified: portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOCookieImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOCookieImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOCookieImpl.java (original)
+++ portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOCookieImpl.java Mon Mar 12 00:45:49 2007
@@ -19,8 +19,6 @@
 
 package org.apache.jetspeed.sso.impl;
 
-import java.sql.Blob;
-import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.Collection;
 import java.util.Vector;

Modified: portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOPrincipalImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOPrincipalImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOPrincipalImpl.java (original)
+++ portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOPrincipalImpl.java Mon Mar 12 00:45:49 2007
@@ -18,7 +18,6 @@
 package org.apache.jetspeed.sso.impl;
 
 import java.sql.Timestamp;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Vector;
 

Modified: portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java Mon Mar 12 00:45:49 2007
@@ -33,7 +33,6 @@
 import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
 import org.apache.jetspeed.request.RequestContext;
 import org.apache.jetspeed.security.impl.UserPrincipalImpl;
-import org.apache.jetspeed.statistics.impl.PortalStatisticsImpl;
 import org.apache.jetspeed.statistics.impl.StatisticsQueryCriteriaImpl;
 
 import com.mockrunner.mock.web.MockHttpServletRequest;

Modified: portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/sso/SSOProxyPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/sso/SSOProxyPortlet.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/sso/SSOProxyPortlet.java (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/sso/SSOProxyPortlet.java Mon Mar 12 00:45:49 2007
@@ -19,7 +19,6 @@
 
 package org.apache.jetspeed.portlet.sso;
 
-import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.AccessControlContext;
@@ -142,8 +141,6 @@
          * Call into the SSO Proxy and process the result page
          */
         boolean doRefresh = false;
-        BufferedInputStream bis = null;
-        
         if ( (forceRefresh.compareToIgnoreCase("TRUE") == 0) || this.isAuthenticated == false)
         	doRefresh = true;
        

Modified: portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryPage.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryPage.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryPage.java (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryPage.java Mon Mar 12 00:45:49 2007
@@ -77,7 +77,7 @@
         while ( iter.hasNext() )
         {
             Map.Entry entry = (Map.Entry)iter.next();
-            buff.append("(").append(entry.getKey()).append(" . ").append(ArrayUtils.toString((String[])entry.getKey())).append(")");
+            buff.append("(").append(entry.getKey()).append(" . ").append(ArrayUtils.toString(entry.getKey())).append(")");
         }
         buff.append("}]");
         return buff.toString();

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAdministration.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAdministration.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAdministration.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAdministration.java Mon Mar 12 00:45:49 2007
@@ -16,15 +16,12 @@
  */
 package org.apache.jetspeed.administration;
 
-import java.security.Principal;
 import java.util.List;
 import java.util.Map;
 
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;
-import javax.security.auth.Subject;
-
 import org.apache.jetspeed.security.User;
 
 /**

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java Mon Mar 12 00:45:49 2007
@@ -16,8 +16,6 @@
  */
 package org.apache.jetspeed.aggregator;
 
-import java.util.List;
-
 import org.apache.jetspeed.util.Queue;
 
 /**

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/capabilities/MediaType.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/capabilities/MediaType.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/capabilities/MediaType.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/capabilities/MediaType.java Mon Mar 12 00:45:49 2007
@@ -16,7 +16,6 @@
  */
 package org.apache.jetspeed.capabilities;
 
-import java.util.Vector;
 import java.util.Collection;
 
 /**

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/preference/FragmentPreference.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/preference/FragmentPreference.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/preference/FragmentPreference.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/preference/FragmentPreference.java Mon Mar 12 00:45:49 2007
@@ -16,7 +16,6 @@
  */
 package org.apache.jetspeed.om.preference;
 
-import java.util.Iterator;
 import java.util.List;
 
 /**

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/GroupSecurityHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/GroupSecurityHandler.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/GroupSecurityHandler.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/GroupSecurityHandler.java Mon Mar 12 00:45:49 2007
@@ -16,7 +16,6 @@
  */
 package org.apache.jetspeed.security.spi;
 
-import java.security.Principal;
 import java.util.List;
 
 import org.apache.jetspeed.security.GroupPrincipal;

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/RoleSecurityHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/RoleSecurityHandler.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/RoleSecurityHandler.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/RoleSecurityHandler.java Mon Mar 12 00:45:49 2007
@@ -16,7 +16,6 @@
  */
 package org.apache.jetspeed.security.spi;
 
-import java.security.Principal;
 import java.util.List;
 
 import org.apache.jetspeed.security.RolePrincipal;

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/sso/SSOProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/sso/SSOProvider.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/sso/SSOProvider.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/sso/SSOProvider.java Mon Mar 12 00:45:49 2007
@@ -16,7 +16,6 @@
 */
 package org.apache.jetspeed.sso;
 
-import java.io.BufferedInputStream;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/statistics/AggregateStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/statistics/AggregateStatistics.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/statistics/AggregateStatistics.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/statistics/AggregateStatistics.java Mon Mar 12 00:45:49 2007
@@ -17,7 +17,6 @@
 package org.apache.jetspeed.statistics;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

Modified: portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java (original)
+++ portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java Mon Mar 12 00:45:49 2007
@@ -415,7 +415,7 @@
     {
         try
         {
-            return Collections.unmodifiableCollection((Collection) getColumnMap(numberOfColumns - 1).values());
+            return Collections.unmodifiableCollection(getColumnMap(numberOfColumns - 1).values());
         }
         catch (InvalidLayoutLocationException e)
         {
@@ -433,7 +433,7 @@
     {
         try
         {
-            return Collections.unmodifiableCollection((Collection) getColumnMap(0).values());
+            return Collections.unmodifiableCollection(getColumnMap(0).values());
         }
         catch (InvalidLayoutLocationException e)
         {

Modified: portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/PageManagerLayoutEventListener.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/PageManagerLayoutEventListener.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/PageManagerLayoutEventListener.java (original)
+++ portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/PageManagerLayoutEventListener.java Mon Mar 12 00:45:49 2007
@@ -16,11 +16,9 @@
 */
 package org.apache.jetspeed.portlets.layout;
 
-import org.apache.jetspeed.exception.JetspeedException;
 import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.om.page.Page;
 import org.apache.jetspeed.page.PageManager;
-import org.apache.jetspeed.page.PageNotUpdatedException;
 
 public class PageManagerLayoutEventListener implements LayoutEventListener
 {



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org