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 wo...@apache.org on 2007/11/09 16:15:35 UTC
svn commit: r593555 - in /portals/jetspeed-2/branches/JETSPEED-2.1.3:
installer/etc/database/build.xml
src/webapp/WEB-INF/assembly/alternate/seed-registry.xml
Author: woonsan
Date: Fri Nov 9 07:15:34 2007
New Revision: 593555
URL: http://svn.apache.org/viewvc?rev=593555&view=rev
Log:
[JS2-791] configure the security constraint on a particular portlet fragment.
Fixed the problem: failing to seed data because PropertyPlaceholderConfigurer fails to load property variable defined in registry.xml.
This problem was a side-effect of my previous patch (http://svn.apache.org/viewvc?rev=593513&view=rev).
The seed-registry.xml is now used for seeding data and it does not use PropertyPlaceholderConfigurer.
Added:
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/alternate/seed-registry.xml
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/database/build.xml
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/database/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/database/build.xml?rev=593555&r1=593554&r2=593555&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/database/build.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/database/build.xml Fri Nov 9 07:15:34 2007
@@ -185,7 +185,6 @@
<include name="capabilities.xml" />
<include name="prefs.xml" />
<include name="profiler.xml" />
- <include name="registry.xml" />
<include name="transaction.xml" />
<include name="cache.xml" />
</fileset>
@@ -197,6 +196,7 @@
<include name="request-context.xml" />
<include name="db-page-manager.xml" />
<include name="interceptors.xml" />
+ <include name="seed-registry.xml" />
</fileset>
</copy>
Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/alternate/seed-registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/alternate/seed-registry.xml?rev=593555&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/alternate/seed-registry.xml (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/alternate/seed-registry.xml Fri Nov 9 07:15:34 2007
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+ 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>
+
+ <!-- Portlet Factory -->
+ <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory">
+ <!-- If the following constructor-arg is set to true,
+ proxy instances will switch config mode to built-in custom config mode portlet. -->
+ <constructor-arg index="0">
+ <value>false</value>
+ </constructor-arg>
+ <!-- If the following constructor-arg is set to true,
+ proxy instances will switch edit_defaults mode to edit mode automatically for portlets not supporting edit_defaults mode. -->
+ <constructor-arg index="1">
+ <value>false</value>
+ </constructor-arg>
+ <!-- Surrogate portlet for config modes. -->
+ <property name="customConfigModePortletUniqueName">
+ <value>j2-admin::CustomConfigModePortlet</value>
+ </property>
+ </bean>
+
+ <!-- Portlet Registry DAO-->
+ <bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry" init-method="init">
+
+ <constructor-arg index="0">
+ <value>JETSPEED-INF/ojb/registry_repository.xml</value>
+ </constructor-arg>
+ <constructor-arg index="1">
+ <ref bean="portletFactory" />
+ </constructor-arg>
+ <constructor-arg index="2">
+ <ref bean="portletApplicationOidCache" />
+ </constructor-arg>
+ <constructor-arg index="3">
+ <ref bean="portletDefinitionOidCache" />
+ </constructor-arg>
+ <constructor-arg index="4">
+ <ref bean="portletApplicationNameCache" />
+ </constructor-arg>
+ <constructor-arg index="5">
+ <ref bean="portletDefinitionNameCache" />
+ </constructor-arg>
+ </bean>
+
+ <bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry" name="portletRegistry" parent="baseTransactionProxy">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
+ </property>
+
+ <property name="target">
+ <ref bean="portletRegistryImpl" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="save*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
+
+ <!--
+ - PortletEntity business object: OJB implementation, as an inner bean wrapped
+ - by an outer transactional proxy. The two bean definitions could have been separate,
+ - but this is cleaner as there is no need to ever access the unwrapped object.
+ -->
+
+ <bean id="portletEntityAccessImpl" class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
+ <constructor-arg>
+ <ref bean="portletRegistry" />
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="org.apache.jetspeed.request.RequestContextComponent" />
+ </constructor-arg>
+ <!--
+ All preferences were shared. With JS2-449, preferences are now
+ stored 'per user'. The username is stored in the preferences FULL_PATH
+ To turn on mergeSharedPreferences configure this property to true
+ This will NOT turn off per user prefs,
+ but instead merge with them, where user prefs override.
+ boolean
+ -->
+ <constructor-arg>
+ <ref bean="org.apache.jetspeed.page.PageManager" />
+ </constructor-arg>
+ <constructor-arg type="boolean">
+ <value>false</value>
+ </constructor-arg>
+ </bean>
+
+ <bean id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" parent="baseTransactionProxy" name="portletEntityAccess">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
+ </property>
+ <property name="target">
+ <ref bean="portletEntityAccessImpl" />
+ </property>
+ <!--
+ <property name="preInterceptors">
+ <list>
+ <ref bean="portletEntityCachingAdvisor"/>
+ <ref bean="portletEntityRemoveFromCacheAdvisor"/>
+ </list>
+ </property>
+ -->
+ <property name="transactionAttributes">
+ <props>
+ <prop key="remove*">PROPAGATION_REQUIRED</prop>
+ <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
+
+ <!-- Inject Portlet Entity Proxy into Portlet Entity impl -->
+ <bean id="injectEntityAccessProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <property name="targetObject"><ref bean="portletEntityAccessImpl"/></property>
+ <property name="targetMethod"><value>setEntityAccessProxy</value></property>
+ <property name="arguments">
+ <list>
+ <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"/>
+ </list>
+ </property>
+ </bean>
+
+</beans>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org