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/11/27 01:37:17 UTC
svn commit: r598474 - in
/portals/jetspeed-2/branches/JETSPEED-2.1.3/components:
cm/src/java/org/apache/jetspeed/components/test/
portal/src/test/org/apache/jetspeed/userinfo/
registry/src/java/org/apache/jetspeed/components/util/
Author: ate
Date: Mon Nov 26 16:37:16 2007
New Revision: 598474
URL: http://svn.apache.org/viewvc?rev=598474&view=rev
Log:
Fixing some registry related testcases: the registry.xml assembly now requires a PropertyPlaceholderConfigurer to provide values for the supported.portletmode.autoswitch.* feature properties.
As the AbstractSpringTestCase already dynamically provides a PropertyPlaceHolderConfigurer, adding one through a (test only) assembly configuration doesn't work, that one needs to setup these properties.
The AbstractSpringTestCase now has a protected getPostProcessProperties() method which can be used to add additional required property values for this purpose.
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/cm/src/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/registry/src/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/cm/src/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/cm/src/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java?rev=598474&r1=598473&r2=598474&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/cm/src/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/cm/src/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java Mon Nov 26 16:37:16 2007
@@ -63,7 +63,7 @@
ctx = new ClassPathXmlApplicationContext(getConfigurations(), false);
}
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
- Properties p = new Properties();
+ Properties p = getPostProcessProperties();
p.setProperty(JetspeedEngineConstants.APPLICATION_ROOT_KEY, "../../src/webapp");
ppc.setProperties(p);
ctx.addBeanFactoryPostProcessor(ppc);
@@ -94,5 +94,10 @@
protected String[] getBootConfigurations()
{
return null;
+ }
+
+ protected Properties getPostProcessProperties()
+ {
+ return new Properties();
}
}
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java?rev=598474&r1=598473&r2=598474&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java Mon Nov 26 16:37:16 2007
@@ -21,6 +21,7 @@
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;
@@ -248,5 +249,14 @@
confList.add("prefs.xml");
confList.add("cache.xml");
return (String[]) confList.toArray(new String[1]);
+ }
+
+ protected Properties getPostProcessProperties()
+ {
+ Properties p = super.getPostProcessProperties();
+ p.setProperty("supported.portletmode.autoswitch.config", "false");
+ p.setProperty("supported.portletmode.autoswitch.edit_defaults", "false");
+ p.setProperty("supported.portletmode.autoswitch.config.surrogate.portlet", "j2-admin::CustomConfigModePortlet");
+ return p;
}
}
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/registry/src/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/registry/src/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java?rev=598474&r1=598473&r2=598474&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/registry/src/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/registry/src/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java Mon Nov 26 16:37:16 2007
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Properties;
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
@@ -58,5 +59,14 @@
confList.add("page-manager.xml");
confList.add("registry.xml");
return (String[]) confList.toArray(new String[1]);
+ }
+
+ protected Properties getPostProcessProperties()
+ {
+ Properties p = super.getPostProcessProperties();
+ p.setProperty("supported.portletmode.autoswitch.config", "false");
+ p.setProperty("supported.portletmode.autoswitch.edit_defaults", "false");
+ p.setProperty("supported.portletmode.autoswitch.config.surrogate.portlet", "j2-admin::CustomConfigModePortlet");
+ return p;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org