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 2008/09/16 11:39:49 UTC
svn commit: r695790 - in
/portals/jetspeed-2/portal/branches/security-refactoring:
components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/
components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/
components/jetspeed-portal...
Author: ate
Date: Tue Sep 16 02:39:47 2008
New Revision: 695790
URL: http://svn.apache.org/viewvc?rev=695790&view=rev
Log:
one more time (hopefully the last): bye bye Java Preferences
Removed:
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-commons/src/main/java/org/apache/jetspeed/util/PreferencesRootWrapper.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/prefs.xml
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/TestSpringEngine.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PersistenceBrokerPortletPreferencesProvider.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/CommonPortletServices.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/engine/JetspeedEngineConstants.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/MutablePortletApplication.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionComposite.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
portals/jetspeed-2/portal/branches/security-refactoring/maven/src/site/xdoc/jetspeed-unpack-plugin.xml
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java Tue Sep 16 02:39:47 2008
@@ -23,7 +23,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.prefs.BackingStoreException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -292,9 +291,8 @@
* @param username Name of the user of request
* @return Map containing the user information keyed by the name of the attribute.
* @throws SecurityException
- * @throws BackingStoreException
*/
- private Map<String, String> getUserInfo(String username) throws SecurityException, BackingStoreException
+ private Map<String, String> getUserInfo(String username) throws SecurityException
{
User user = userManager.getUser(username);
if(user != null)
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/TestSpringEngine.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/TestSpringEngine.java?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/TestSpringEngine.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/TestSpringEngine.java Tue Sep 16 02:39:47 2008
@@ -35,7 +35,6 @@
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.page.PageManager;
-import org.apache.jetspeed.prefs.PreferencesProvider;
import org.apache.jetspeed.profiler.Profiler;
import org.apache.jetspeed.request.RequestContextComponent;
import org.apache.jetspeed.security.GroupManager;
@@ -64,7 +63,7 @@
{
keysToCheck = new Object[] {"IdGenerator", "DecorationLocator", "TemplateLocator", "IdGenerator", "PageFileCache", PageManager.class,
PortletRegistry.class, PortletEntityAccessComponent.class, "PortalServices",
- Profiler.class, Capabilities.class, PreferencesProvider.class, UserManager.class,
+ Profiler.class, Capabilities.class, UserManager.class,
GroupManager.class, RoleManager.class, PermissionManager.class, RdbmsPolicy.class,
UserInfoManager.class, RequestContextComponent.class, PortletWindowAccessor.class,
PortletRenderer.class, PageAggregator.class, PortletAggregator.class, "PAM",
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java Tue Sep 16 02:39:47 2008
@@ -21,8 +21,6 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
-import java.util.prefs.Preferences;
import javax.portlet.PortletRequest;
@@ -34,10 +32,8 @@
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.security.JetspeedSubjectFactory;
-import org.apache.jetspeed.security.SecurityAttribute;
import org.apache.jetspeed.security.SecurityAttributeType;
import org.apache.jetspeed.security.SecurityException;
-import org.apache.jetspeed.security.SecurityHelper;
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.SecurityAttributes;
import org.apache.jetspeed.security.impl.UserImpl;
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java Tue Sep 16 02:39:47 2008
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.profiler;
-import java.security.Principal;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
@@ -38,11 +37,8 @@
import org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule;
import org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.jetspeed.security.AuthenticatedUser;
-import org.apache.jetspeed.security.AuthenticatedUserImpl;
import org.apache.jetspeed.security.JetspeedSubjectFactory;
import org.apache.jetspeed.security.PrincipalsSet;
-import org.apache.jetspeed.security.SecurityHelper;
import org.apache.jetspeed.security.impl.RoleImpl;
import org.apache.jetspeed.security.impl.UserImpl;
import org.apache.jetspeed.serializer.JetspeedSerializer;
@@ -527,7 +523,7 @@
protected String[] getConfigurations()
{
- return new String[] { "profiler.xml", "transaction.xml", "serializer.xml", "security-providers.xml", "prefs.xml", "cache.xml",
+ return new String[] { "profiler.xml", "transaction.xml", "serializer.xml", "security-providers.xml", "cache.xml",
"security-managers.xml", "security-spi.xml", "security-spi-atn.xml", "security-spi-atz.xml", "security-atz.xml" };
}
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml Tue Sep 16 02:39:47 2008
@@ -152,7 +152,7 @@
<resources>
<resource>
<path>assembly</path>
- <include>prefs.xml,transaction.xml,cache.xml,boot/datasource.xml</include>
+ <include>transaction.xml,cache.xml,boot/datasource.xml</include>
</resource>
<resource>
<path>db-ojb</path>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PersistenceBrokerPortletPreferencesProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PersistenceBrokerPortletPreferencesProvider.java?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PersistenceBrokerPortletPreferencesProvider.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PersistenceBrokerPortletPreferencesProvider.java Tue Sep 16 02:39:47 2008
@@ -31,7 +31,6 @@
import org.apache.jetspeed.om.preference.impl.PreferenceImpl;
import org.apache.jetspeed.om.preference.impl.PreferenceSetImpl;
import org.apache.jetspeed.om.preference.impl.PreferenceValueImpl;
-import org.apache.jetspeed.prefs.NodeDoesNotExistException;
import org.apache.ojb.broker.query.Criteria;
import org.apache.ojb.broker.query.QueryByCriteria;
import org.apache.ojb.broker.query.QueryFactory;
@@ -344,7 +343,7 @@
{
}
- public void preloadAllEntities() throws NodeDoesNotExistException
+ public void preloadAllEntities()
{
}
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java Tue Sep 16 02:39:47 2008
@@ -17,7 +17,6 @@
package org.apache.jetspeed.security.util.test;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -41,7 +40,7 @@
* @version $Id$
*
*/
-public class AbstractSecurityTestcase extends DatasourceEnabledSpringTestCase //AbstractPrefsSupportedTestCase
+public class AbstractSecurityTestcase extends DatasourceEnabledSpringTestCase
{
/** The user manager. */
protected UserManager ums;
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/CommonPortletServices.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/CommonPortletServices.java?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/CommonPortletServices.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/CommonPortletServices.java Tue Sep 16 02:39:47 2008
@@ -43,7 +43,6 @@
public final static String CPS_PERMISSION_MANAGER = "cps:PermissionManager";
public final static String CPS_PORTAL_STATISTICS = "cps:PortalStatistics";
public final static String CPS_PORTAL_ADMINISTRATION = "cps:PortalAdministration";
- public final static String CPS_PREFERENCES_PROVIDER = "cps:PreferencesProvider";
public final static String CPS_DECORATION_FACTORY = "cps:DecorationFactory";
public final static String CPS_DESKTOP = "cps:Desktop";
public final static String CPS_PASSWORD_ENCODER_COMPONENT = "cps:PasswordEncodingService";
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/engine/JetspeedEngineConstants.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/engine/JetspeedEngineConstants.java?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/engine/JetspeedEngineConstants.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/engine/JetspeedEngineConstants.java Tue Sep 16 02:39:47 2008
@@ -92,12 +92,4 @@
public static final String PIPELINE_CLASS = "pipeline.class";
public static final String PIPELINE_DEFAULT = "pipeline.default";
public static final String PIPELINE_DIRECTORY = "pipeline.directory";
-
- /**
- * This specifies the factory to use the Jetspeed Prefernces implementation
- */
- public static final String PREFERENCES_FACTORY = "preferences.factory";
- public static final String PREFERENCES_FACTORY_DEFAULT =
- "org.apache.jetspeed.spi.services.prefs.impl.PreferencesFactoryImpl";
-
}
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/MutablePortletApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/MutablePortletApplication.java?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/MutablePortletApplication.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/MutablePortletApplication.java Tue Sep 16 02:39:47 2008
@@ -41,8 +41,6 @@
*/
public interface MutablePortletApplication extends PortletApplication, Serializable
{
- public static final String PREFS_ROOT ="portlet_application";
-
/**
* Sets the metadata from the extended jetspeed-portlet.xml
*
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionComposite.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionComposite.java?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionComposite.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionComposite.java Tue Sep 16 02:39:47 2008
@@ -49,8 +49,6 @@
*/
public interface PortletDefinitionComposite extends PortletDefinition, PortletDefinitionCtrl, Serializable
{
- public static final String PORTLETS_PREFS_ROOT = "portlets";
-
GenericMetadata getMetadata();
void setMetadata(GenericMetadata metadata);
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml Tue Sep 16 02:39:47 2008
@@ -91,9 +91,6 @@
<entry key="PortalAdministration">
<ref bean="PortalAdministration" />
</entry>
- <entry key="PreferencesProvider">
- <ref bean="org.apache.jetspeed.prefs.PreferencesProvider" />
- </entry>
<entry key="org.apache.jetspeed.container.session.PortalSessionsManager">
<ref bean="org.apache.jetspeed.container.session.PortalSessionsManager" />
</entry>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml Tue Sep 16 02:39:47 2008
@@ -96,9 +96,6 @@
<entry key="PortalAdministration">
<ref bean="PortalAdministration" />
</entry>
- <entry key="PreferencesProvider">
- <ref bean="org.apache.jetspeed.prefs.PreferencesProvider" />
- </entry>
<entry key="org.apache.jetspeed.container.session.PortalSessionsManager">
<ref bean="org.apache.jetspeed.container.session.PortalSessionsManager" />
</entry>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/maven/src/site/xdoc/jetspeed-unpack-plugin.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/maven/src/site/xdoc/jetspeed-unpack-plugin.xml?rev=695790&r1=695789&r2=695790&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/maven/src/site/xdoc/jetspeed-unpack-plugin.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/maven/src/site/xdoc/jetspeed-unpack-plugin.xml Tue Sep 16 02:39:47 2008
@@ -355,7 +355,7 @@
<resources>
<resource>
<path>assembly</path>
- <include>profiler.xml,transaction.xml,prefs.xml,cache.xml,security-*.xml,boot/datasource.xml</include>
+ <include>profiler.xml,transaction.xml,cache.xml,security-*.xml,boot/datasource.xml</include>
</resource>
<resource>
<path>db-ojb</path>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org