Author: woonsan
Date: Fri Apr 24 11:29:52 2009
New Revision: 768261
URL: http://svn.apache.org/viewvc?rev=768261&view=rev
Log:
JS2-976: Fixing unit tests of jetspeed-portal components.
Also, adds containsComponent() methods in ComponentManagement interface because
internal spring app context can throw unexpected exceptions when the bean does
not exist. (JetspeedEngine seems to be assuming the return from
componentManager.getComponent() can be null.)
Added:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/castor.properties
(with props)
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/SpringComponentManager.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedEngine.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/cache-test.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/MockRequestContext.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/TestNavigationalState.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/MockPortletRegistryFactory.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/window/MockPortletWindow.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc2.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc3.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/testdata/pages/pages/page.security
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/ComponentManagement.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/SpringComponentManager.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/SpringComponentManager.java?rev=768261&r1=768260&r2=768261&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/SpringComponentManager.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/SpringComponentManager.java
Fri Apr 24 11:29:52 2009
@@ -143,6 +143,27 @@
/**
* <p>
+ * containsComponent
+ * </p>
+ *
+ * @see
org.apache.jetspeed.components.ComponentManagement#containsComponent(java.lang.Object)
+ * @param componentName
+ * @return
+ */
+ public boolean containsComponent(Object componentName)
+ {
+ if (componentName instanceof Class)
+ {
+ return appContext.containsBean(((Class) componentName).getName());
+ }
+ else
+ {
+ return appContext.containsBean(componentName.toString());
+ }
+ }
+
+ /**
+ * <p>
* getComponent
* </p>
*
@@ -164,6 +185,22 @@
/**
* <p>
+ * containsComponent
+ * </p>
+ *
+ * @see
org.apache.jetspeed.components.ComponentManagement#containsComponent(java.lang.Object,
+ * java.lang.Object)
+ * @param containerName
+ * @param componentName
+ * @return
+ */
+ public boolean containsComponent(Object containerName, Object
componentName)
+ {
+ return containsComponent(componentName);
+ }
+
+ /**
+ * <p>
* getComponent
* </p>
*
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedEngine.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedEngine.java?rev=768261&r1=768260&r2=768261&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedEngine.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedEngine.java
Fri Apr 24 11:29:52 2009
@@ -168,8 +168,13 @@
try
{
- PortletContainer container = (PortletContainer) componentManager
- .getComponent(PortletContainer.class);
+ PortletContainer container = null;
+
+ if (componentManager.containsComponent(PortletContainer.class))
+ {
+ container = (PortletContainer)
componentManager.getComponent(PortletContainer.class);
+ }
+
if (container != null)
{
container.destroy();
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/cache-test.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/cache-test.xml?rev=768261&r1=768260&r2=768261&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/cache-test.xml
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/cache-test.xml
Fri Apr 24 11:29:52 2009
@@ -233,21 +233,6 @@
</constructor-arg>
</bean>
- <bean id="ehPortletWindowCache"
class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default or cache" />
- <property name="cacheManager">
- <ref local="cacheManager" />
- </property>
- <property name="cacheName" value="portletWindowCache" />
- </bean>
-
- <bean id="portletWindowCache"
class="org.apache.jetspeed.cache.impl.EhPortletWindowCache">
- <meta key="j2:cat" value="default or cache" />
- <constructor-arg index="0">
- <ref bean="ehPortletWindowCache" />
- </constructor-arg>
- </bean>
-
<bean id="ehInternalPageFileCache"
class="org.springframework.cache.ehcache.EhCacheFactoryBean">
<meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/MockRequestContext.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/MockRequestContext.java?rev=768261&r1=768260&r2=768261&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/MockRequestContext.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/MockRequestContext.java
Fri Apr 24 11:29:52 2009
@@ -18,6 +18,7 @@
package org.apache.jetspeed.container.state;
import java.security.Principal;
+import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -44,6 +45,15 @@
*/
public class MockRequestContext implements RequestContext
{
+
+ private HttpServletRequest request;
+ private final Map<String, PortletWindow> portletWindows = new
HashMap<String, PortletWindow>();
+
+ public void addPortletWindow(PortletWindow window)
+ {
+ portletWindows.put(window.getId().getStringId(), window);
+ }
+
/* (non-Javadoc)
* @see org.apache.jetspeed.request.RequestContext#getActionWindow()
*/
@@ -228,10 +238,9 @@
*/
public HttpServletRequest getRequest()
{
- // TODO Auto-generated method stub
- return null;
+ return request;
}
-
+
/* (non-Javadoc)
* @see
org.apache.jetspeed.request.RequestContext#getRequestForWindow(org.apache.jetspeed.container.PortletWindow)
*/
@@ -431,7 +440,7 @@
*/
public void setRequest(HttpServletRequest request)
{
- // TODO Auto-generated method stub
+ this.request = request;
}
/* (non-Javadoc)
@@ -472,8 +481,7 @@
*/
public PortletWindow resolvePortletWindow(String windowId)
{
- // TODO Auto-generated method stub
- return null;
+ return portletWindows.get(windowId);
}
/* (non-Javadoc)
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/TestNavigationalState.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/TestNavigationalState.java?rev=768261&r1=768260&r2=768261&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/TestNavigationalState.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/TestNavigationalState.java
Fri Apr 24 11:29:52 2009
@@ -28,6 +28,7 @@
import org.apache.jetspeed.PortalContext;
import org.apache.jetspeed.cache.JetspeedContentCache;
+import org.apache.jetspeed.container.PortletWindow;
import org.apache.jetspeed.container.state.impl.NavigationalStateCodec;
import org.apache.jetspeed.container.state.impl.PathNavigationalState;
import org.apache.jetspeed.container.state.impl.SessionFullNavigationalState;
@@ -40,11 +41,12 @@
import org.apache.jetspeed.test.JetspeedTestCase;
import org.apache.jetspeed.testhelpers.SpringEngineHelper;
import org.apache.jetspeed.window.MockPortletWindow;
-import org.apache.jetspeed.container.PortletWindow;
import com.mockrunner.mock.web.MockHttpServletRequest;
import com.mockrunner.mock.web.MockHttpSession;
+import edu.emory.mathcs.backport.java.util.Collections;
+
/**
* TestPortletContainer
*
@@ -99,7 +101,6 @@
return new TestSuite(TestNavigationalState.class);
}
-
public void testSessionFullStateAndQuery()
{
SessionFullNavigationalState navState = new
SessionFullNavigationalState(codec, cache);
@@ -147,14 +148,22 @@
portalURL.setRequest(request);
portalURL.setCharacterEncoding("UTF-8");
- portalURL.getNavigationalState().sync(new MockRequestContext());
+ MockRequestContext requestContext = new MockRequestContext();
+ requestContext.setRequest(request);
+ portalURL.getNavigationalState().sync(requestContext);
PortletWindow window = new MockPortletWindow("111");
HashMap<String,String[]> parameters = new HashMap<String, String[]>();
parameters.put("test",new String[]{"one","two","three"});
- String portletURL =
portalURL.createPortletURL(window,parameters,PortletMode.EDIT,WindowState.MAXIMIZED,PortalURL.URLType.ACTION,false);
+ Map<String, String[]> privateRenderParameters = Collections.emptyMap();
+ Map<String, String[]> publicRenderParameters = Collections.emptyMap();
+
+ String portletURL = portalURL.createPortletURL( window, parameters,
null, false,
+ "PAGE", null,
privateRenderParameters, publicRenderParameters,
+ PortletMode.EDIT,
WindowState.MAXIMIZED,
+
PortalURL.URLType.ACTION, false );
String navStateParameterName =
engine.getContext().getConfigurationProperty("portalurl.navigationalstate.parameter.name",
AbstractPortalURL.DEFAULT_NAV_STATE_PARAMETER);
@@ -171,32 +180,36 @@
}
protected void doTestUrl(PortalURL portalURL, HttpServletRequest request)
- {
- portalURL.setRequest(request);
- portalURL.setCharacterEncoding("UTF-8");
-
- PortletWindow window = new MockPortletWindow("111");
- NavigationalState nav = portalURL.getNavigationalState();
-
- // Check that they come out correctly
- assertTrue("window mode is not set",
nav.getMode(window).equals(PortletMode.EDIT));
- assertTrue("window state is not set",
nav.getState(window).equals(WindowState.MAXIMIZED));
- PortletWindow target = nav.getPortletWindowOfAction();
- assertNotNull("target window is null", target);
- assertEquals("target window should equal window 111",
target.getId().getStringId(), "111");
-
- PortletWindow maximizedWindow = nav.getMaximizedWindow();
- assertNotNull("maximized window is null", maximizedWindow);
- assertEquals("maximized window should equal window 111",
maximizedWindow.getId().getStringId(), "111");
-
- Map<String,String[]> parameters = nav.getParameterMap(target);
- assertTrue("There should be one parameter",parameters.size()==1);
- String[] values = parameters.get("test");
- assertNotNull("parameter name has no values", values);
- assertEquals("parameter test should have 3 values", values.length, 3);
- assertEquals("parameter test[0] should be \"one\"", values[0], "one");
- assertEquals("parameter test[1] should be \"two\"", values[1], "two");
- assertEquals("parameter test[2] should be \"three\"", values[2],
"three");
+ {
+ portalURL.setRequest(request);
+ portalURL.setCharacterEncoding("UTF-8");
+
+ PortletWindow window = new MockPortletWindow("111");
+ NavigationalState nav = portalURL.getNavigationalState();
+ MockRequestContext requestContext = new MockRequestContext();
+ requestContext.addPortletWindow(window);
+ requestContext.setRequest(request);
+ nav.sync(requestContext);
+
+ // Check that they come out correctly
+ assertTrue("window mode is not set",
nav.getMode(window).equals(PortletMode.EDIT));
+ assertTrue("window state is not set",
nav.getState(window).equals(WindowState.MAXIMIZED));
+ PortletWindow target = nav.getPortletWindowOfAction();
+ assertNotNull("target window is null", target);
+ assertEquals("target window should equal window 111",
target.getId().getStringId(), "111");
+
+ PortletWindow maximizedWindow = nav.getMaximizedWindow();
+ assertNotNull("maximized window is null", maximizedWindow);
+ assertEquals("maximized window should equal window 111",
maximizedWindow.getId().getStringId(), "111");
+
+ Map<String,String[]> parameters = nav.getParameterMap(target);
+ assertTrue("There should be one parameter",parameters.size()==1);
+ String[] values = parameters.get("test");
+ assertNotNull("parameter name has no values", values);
+ assertEquals("parameter test should have 3 values", values.length, 3);
+ assertEquals("parameter test[0] should be \"one\"", values[0], "one");
+ assertEquals("parameter test[1] should be \"two\"", values[1], "two");
+ assertEquals("parameter test[2] should be \"three\"", values[2],
"three");
}
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/MockPortletRegistryFactory.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/MockPortletRegistryFactory.java?rev=768261&r1=768260&r2=768261&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/MockPortletRegistryFactory.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/MockPortletRegistryFactory.java
Fri Apr 24 11:29:52 2009
@@ -16,8 +16,6 @@
*/
package org.apache.jetspeed.layout;
-import java.util.List;
-
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.om.portlet.InitParam;
import org.apache.jetspeed.om.portlet.PortletDefinition;
@@ -25,6 +23,7 @@
import org.jmock.core.Constraint;
import org.jmock.core.InvocationMatcher;
import org.jmock.core.constraint.IsEqual;
+import org.jmock.core.constraint.IsInstanceOf;
import org.jmock.core.matcher.InvokeAtLeastOnceMatcher;
import org.jmock.core.stub.ReturnStub;
@@ -55,9 +54,9 @@
expectAndReturn(new InvokeAtLeastOnceMatcher(), portletSizesParamMock,
"getParamValue", "33%,66%");
expectAndReturn(new InvokeAtLeastOnceMatcher(), portletRegistryMock,
"getPortletDefinitionByUniqueName",new Constraint[] {new IsEqual("layout")},
portletDef);
+ expectAndReturn(new InvokeAtLeastOnceMatcher(), portletRegistryMock,
"getPortletDefinitionByUniqueName",new Constraint[] {new IsEqual("layout"), new
IsInstanceOf(Boolean.class)}, portletDef);
expectAndReturn(new InvokeAtLeastOnceMatcher(), portletDefMock,
"getInitParam", new Constraint[] {new IsEqual("sizes")}, portletSizesParam);
-
return portletRegistry;
}
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java?rev=768261&r1=768260&r2=768261&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
Fri Apr 24 11:29:52 2009
@@ -16,6 +16,7 @@
*/
package org.apache.jetspeed.userinfo;
+import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.ArrayList;
@@ -39,6 +40,7 @@
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserManager;
import org.apache.jetspeed.security.impl.UserImpl;
+import org.apache.jetspeed.util.MultiFileChecksumHelper;
import org.apache.pluto.container.impl.PortletAppDescriptorServiceImpl;
/**
@@ -88,12 +90,25 @@
private void innerTestSetUserInfoMap(UserInfoManager uim) throws Exception
{
+ File webXmlFile = new
File(getBaseDir()+"src/test/testdata/deploy/web.xml");
+ File portletXmlFile = new
File(getBaseDir()+"src/test/testdata/deploy/portlet.xml");
+ File jetspeedPortletXmlFile = new
File(getBaseDir()+"src/test/testdata/deploy/jetspeed-portlet.xml");
+
JetspeedDescriptorService descriptorService = new
JetspeedDescriptorServiceImpl(new PortletAppDescriptorServiceImpl());
- InputStream webDescriptor = new
FileInputStream(getBaseDir()+"src/test/testdata/deploy/web.xml");
- InputStream portletDescriptor = new
FileInputStream(getBaseDir()+"src/test/testdata/deploy/portlet.xml");
- InputStream jetspeedPortletDescriptor = new
FileInputStream(getBaseDir()+"src/test/testdata/deploy/jetspeed-portlet.xml");
+ InputStream webDescriptor = new FileInputStream(webXmlFile);
+ InputStream portletDescriptor = new FileInputStream(portletXmlFile);
+ InputStream jetspeedPortletDescriptor = new
FileInputStream(jetspeedPortletXmlFile);
ClassLoader paClassLoader =
Thread.currentThread().getContextClassLoader();
- portletApp = descriptorService.read("TestRegistry", "/TestRegistry",
webDescriptor, portletDescriptor, jetspeedPortletDescriptor, paClassLoader);
+
+ String appName = "TestRegistry";
+ String contextPath = "/TestRegistry";
+ long paChecksum = MultiFileChecksumHelper.getChecksum(new File[]
{webXmlFile, portletXmlFile, jetspeedPortletXmlFile});
+
+ portletApp = descriptorService.read(appName, contextPath,
webDescriptor, portletDescriptor, jetspeedPortletDescriptor, paClassLoader);
+ portletApp.setName(appName);
+ portletApp.setContextPath(contextPath);
+ portletApp.setChecksum(paChecksum);
+
assertNotNull("App is null", portletApp);
// persist the app
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/window/MockPortletWindow.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/window/MockPortletWindow.java?rev=768261&r1=768260&r2=768261&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/window/MockPortletWindow.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/window/MockPortletWindow.java
Fri Apr 24 11:29:52 2009
@@ -45,11 +45,24 @@
{
private static final long serialVersionUID = 6391120828720160018L;
- private String id;
+ private PortletWindowID windowId;
- public MockPortletWindow(String id)
+ public MockPortletWindow(final String id)
{
- this.id = id;
+ this.windowId = new PortletWindowID()
+ {
+ private static final long serialVersionUID = 1L;
+
+ public String getStringId()
+ {
+ return id;
+ }
+
+ public String toString()
+ {
+ return getStringId();
+ }
+ };
}
/* (non-Javadoc)
@@ -102,8 +115,7 @@
*/
public PortletWindowID getId()
{
- // TODO Auto-generated method stub
- return null;
+ return windowId;
}
/* (non-Javadoc)
@@ -129,8 +141,7 @@
*/
public String getWindowId()
{
- // TODO Auto-generated method stub
- return id;
+ return windowId.getStringId();
}
/* (non-Javadoc)
@@ -234,8 +245,8 @@
public boolean isValid()
{
- // TODO Auto-generated method stub
- return false;
+ // always return true
+ return true;
}
public List<KeyValue<String, Element>> getHeadElements()
Added:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/castor.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/castor.properties?rev=768261&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/castor.properties
(added)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/castor.properties
Fri Apr 24 11:29:52 2009
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Defines the XML parser to be used by Castor.
+# The parser must implement org.xml.sax.Parser.
+org.exolab.castor.parser=org.xml.sax.helpers.XMLReaderAdapter
+
Propchange:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/castor.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/castor.properties
------------------------------------------------------------------------------
svn:keywords = Id
Propchange:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/castor.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc2.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc2.xml?rev=768261&r1=768260&r2=768261&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc2.xml
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc2.xml
Fri Apr 24 11:29:52 2009
@@ -27,10 +27,10 @@
<!-- Request Context -->
<bean id="org.apache.jetspeed.request.RequestContextComponent"
class="org.apache.jetspeed.request.JetspeedRequestContextComponent">
- <constructor-arg index='0'><ref bean="ServletRequestFactory"
/></constructor-arg>
- <constructor-arg index='1'><ref bean="ServletResponseFactory"
/></constructor-arg>
- <constructor-arg index='2'><ref
bean="org.apache.jetspeed.userinfo.UserInfoManager" /></constructor-arg>
- <constructor-arg index='3'><ref bean="RequestContextObjects"
/></constructor-arg>
+ <meta key="j2:cat" value="default or registry" />
+ <constructor-arg index='0'><ref
bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"
/></constructor-arg>
+ <constructor-arg index='1'><ref
bean="org.apache.jetspeed.userinfo.UserInfoManager" /></constructor-arg>
+ <constructor-arg index='2'><ref bean="RequestContextObjects"
/></constructor-arg>
</bean>
<bean id="RequestContextObjects" class="java.util.HashMap">
@@ -45,14 +45,6 @@
</constructor-arg>
</bean>
- <bean id="ServletRequestFactory" name="javax.servlet.http.HttpServletRequest"
- class="org.apache.jetspeed.engine.servlet.ServletRequestFactoryImpl">
- <constructor-arg><ref
bean="org.apache.pluto.services.NamespaceMapper"/></constructor-arg> </bean>
-
- <bean id="ServletResponseFactory"
name="javax.servlet.http.HttpServletResponse"
- class="org.apache.jetspeed.engine.servlet.ServletResponseFactoryImpl">
- </bean>
-
<bean id="org.apache.pluto.services.NamespaceMapper"
class="org.apache.jetspeed.container.namespace.JetspeedNamespaceMapperImpl">
<constructor-arg index="0"><value>js_</value></constructor-arg>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc3.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc3.xml?rev=768261&r1=768260&r2=768261&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc3.xml
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc3.xml
Fri Apr 24 11:29:52 2009
@@ -22,10 +22,10 @@
<!-- Request Context -->
<bean id="org.apache.jetspeed.request.RequestContextComponent"
class="org.apache.jetspeed.request.JetspeedRequestContextComponent">
- <constructor-arg index='0'><ref bean="ServletRequestFactory"
/></constructor-arg>
- <constructor-arg index='1'><ref bean="ServletResponseFactory"
/></constructor-arg>
- <constructor-arg index='2'><ref
bean="org.apache.jetspeed.userinfo.UserInfoManager" /></constructor-arg>
- <constructor-arg index='3'><ref bean="RequestContextObjects"
/></constructor-arg>
+ <meta key="j2:cat" value="default or registry" />
+ <constructor-arg index='0'><ref
bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"
/></constructor-arg>
+ <constructor-arg index='1'><ref
bean="org.apache.jetspeed.userinfo.UserInfoManager" /></constructor-arg>
+ <constructor-arg index='2'><ref bean="RequestContextObjects"
/></constructor-arg>
</bean>
<bean id="RequestContextObjects" class="java.util.HashMap">
@@ -40,14 +40,6 @@
</constructor-arg>
</bean>
- <bean id="ServletRequestFactory" name="javax.servlet.http.HttpServletRequest"
- class="org.apache.jetspeed.engine.servlet.ServletRequestFactoryImpl">
- <constructor-arg><ref
bean="org.apache.pluto.services.NamespaceMapper"/></constructor-arg> </bean>
-
- <bean id="ServletResponseFactory"
name="javax.servlet.http.HttpServletResponse"
- class="org.apache.jetspeed.engine.servlet.ServletResponseFactoryImpl">
- </bean>
-
<bean id="org.apache.pluto.services.NamespaceMapper"
class="org.apache.jetspeed.container.namespace.JetspeedNamespaceMapperImpl">
<constructor-arg index="0"><value>js_</value></constructor-arg>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/testdata/pages/pages/page.security
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/testdata/pages/pages/page.security?rev=768261&r1=768260&r2=768261&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/testdata/pages/pages/page.security
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/testdata/pages/pages/page.security
Fri Apr 24 11:29:52 2009
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<page-security>
<security-constraints-def name="admin">
<security-constraint>
@@ -56,4 +57,4 @@
</security-constraints-def>
<global-security-constraints-ref>admin</global-security-constraints-ref>
<global-security-constraints-ref>manager</global-security-constraints-ref>
-</page-security>
+</page-security>
\ No newline at end of file
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/ComponentManagement.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/ComponentManagement.java?rev=768261&r1=768260&r2=768261&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/ComponentManagement.java
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/ComponentManagement.java
Fri Apr 24 11:29:52 2009
@@ -24,8 +24,12 @@
*/
public interface ComponentManagement
{
+ boolean containsComponent(Object componentName);
+
Object getComponent(Object componentName);
+ boolean containsComponent(Object containerName, Object componentName);
+
Object getComponent(Object containerName, Object componentName);
void addComponent(String name, Object bean);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
