Author: taylor
Date: Tue Apr 28 05:54:14 2009
New Revision: 769254
URL: http://svn.apache.org/viewvc?rev=769254&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-981
Tests broken. Man we need to rethink the spring configs for the tests. Im
changing production assemblies, and it breaks tests outside my component
Added:
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPreferencesOverride.xml
(with props)
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java
Added:
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPreferencesOverride.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPreferencesOverride.xml?rev=769254&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPreferencesOverride.xml
(added)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPreferencesOverride.xml
Tue Apr 28 05:54:14 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd";>
+
+ <!-- Portlet Preferences Implementation -->
+ <bean id="org.apache.pluto.services.PreferencesService"
name="PortletPreferencesProviderImpl"
+
class="org.apache.jetspeed.components.portletpreferences.PortletPreferencesServiceImpl"
+ init-method="init" destroy-method="destroy">
+ <constructor-arg index="0">
+ <ref bean="portletFactory" />
+ </constructor-arg>
+ <constructor-arg index="1">
+ <ref bean="preferencesCache" />
+ </constructor-arg>
+ <property name="useEntityPreferences" ><value>true</value></property>
+ </bean>
+
+</beans>
Propchange:
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPreferencesOverride.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPreferencesOverride.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java?rev=769254&r1=769253&r2=769254&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java
Tue Apr 28 05:54:14 2009
@@ -559,7 +559,8 @@
protected String[] getConfigurations()
{
return new String[] { "profiler.xml", "transaction.xml",
"serializer.xml", "security-providers.xml", "cache-test.xml",
"capabilities.xml", "registry.xml", "search.xml", "jetspeed-spring.xml",
- "security-managers.xml", "security-spi.xml",
"security-spi-atn.xml", "security-atz.xml", "static-bean-references.xml",
"JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml" };
+ "security-managers.xml", "security-spi.xml",
"security-spi-atn.xml", "security-atz.xml", "static-bean-references.xml",
"JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml",
+ "JETSPEED-INF/spring/JetspeedPreferencesOverride.xml"};
}
protected String getBeanDefinitionFilterCategories()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
