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/03/27 01:55:41 UTC
svn commit: r522665 [4/29] - in /portals/jetspeed-2/branches/J2-M2-REDUX: ./
components/ components/jetspeed-cm/
components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/
components/jetspeed-cm/src/test/resources/ components/jetspeed-cm/s...
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/extended-pipelines.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/extended-pipelines.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/extended-pipelines.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/extended-pipelines.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,53 @@
+<?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.
+-->
+
+<!-- the three beans below are examples only -->
+<beans>
+ <bean id="propertyLoaderValve_1"
+ class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
+ init-method="initialize">
+ <constructor-arg index="0">
+ <value>php-properties</value>
+ </constructor-arg>
+ <constructor-arg index="1"
+ type="org.apache.commons.configuration.PropertiesConfiguration">
+ <ref bean="ProductionConfiguration"/>
+ </constructor-arg>
+ </bean>
+
+ <bean id="propertyLoaderValve_2"
+ class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
+ init-method="initialize">
+ <constructor-arg index="0">
+ <value>php-properties</value>
+ </constructor-arg>
+ <constructor-arg index="1">
+ <value>/apps/jetspeed/etc/jetspeed-production.properties</value>
+ </constructor-arg>
+ </bean>
+
+ <bean id="propertyLoaderValve_3"
+ class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
+ init-method="initialize">
+ <constructor-arg index="0">
+ <value>app.props</value>
+ </constructor-arg>
+ </bean>
+
+</beans>
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/extended-pipelines.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/interceptors.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/interceptors.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/interceptors.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/interceptors.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,83 @@
+<?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.
+-->
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+ Database PSML Manager Interception for handling Cache Rollback
+ We also have examples here of replay interception for failover to
+ a second database on update failures
+ -->
+<beans>
+
+ <bean id="pageManagerInterceptor" class="org.apache.jetspeed.util.interceptors.PageManagerInterceptor">
+ </bean>
+
+
+ <bean id="PageManagerTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
+ abstract="true">
+ <property name="transactionManager"><ref bean="transactionManager"/></property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="*">PROPAGATION_REQUIRED</prop>
+ </props>
+ </property>
+ <property name="preInterceptors">
+ <list>
+ <ref local="pageManagerInterceptor" />
+ </list>
+ </property>
+ </bean>
+
+ <!--
+ Replay support:
+
+ <bean id="replayTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
+ abstract="true">
+ <property name="transactionManager"><ref bean="transactionManager"/></property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="*">PROPAGATION_REQUIRED</prop>
+ </props>
+ </property>
+ <property name="preInterceptors">
+ <list>
+ <ref local="methodReplayInterceptor" />
+ </list>
+ </property>
+ </bean>
+
+ <bean id="replayDecisionMakerBean"
+ class="org.apache.jetspeed.util.interceptors.TransactionalMethodReplayDecisionMaker">
+ <property name="sqlErrorCodes">
+ <value>9999, 400, -80</value>
+ <value>9999</value>
+ </property>
+ </bean>
+
+ <bean id="methodReplayInterceptor" class="org.apache.jetspeed.util.interceptors.MethodReplayInterceptor">
+ <property name="retryCount">
+ <value>3</value>
+ </property>
+ <property name="retryInterval">
+ <value>500</value></property> retry every 500 milliseconds
+ <property name="replayDecisionMaker">
+ <ref bean="replayDecisionMakerBean"/>
+ </property>
+ </bean>
+ -->
+
+</beans>
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/interceptors.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/request-context.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/request-context.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/request-context.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/request-context.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,39 @@
+<?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>
+
+ <!-- Request Context -->
+ <bean id="org.apache.jetspeed.request.RequestContextComponent" class="org.apache.jetspeed.request.JetspeedRequestContextComponent">
+ <constructor-arg>
+ <value>org.apache.jetspeed.request.JetspeedRequestContext</value>
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="org.apache.jetspeed.userinfo.UserInfoManager" />
+ </constructor-arg>
+ </bean>
+ <!-- Single Source User Info -->
+ <bean id="org.apache.jetspeed.userinfo.UserInfoManager"
+ class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl"
+ >
+ <constructor-arg index="0"><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>
+ <constructor-arg index="1"><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
+ </bean>
+
+
+</beans>
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/request-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/request-context.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/boot/README
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/boot/README?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/boot/README (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/boot/README Mon Mar 26 16:53:34 2007
@@ -0,0 +1,3 @@
+Any configurations in this driedtory will be used to create a "boot" application context that
+will be used as a parent Application context for the primary application context
+that is configured via the configurations under WEB-INF/assembly.
\ No newline at end of file
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/boot/README
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/boot/README
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/boot/datasource.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/boot/datasource.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/boot/datasource.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,100 @@
+<?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.
+-->
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+ <!--
+ Simply use the JNDI data source provided via Spring
+ -->
+ <bean id="JetspeedDS" class="org.springframework.jndi.JndiObjectFactoryBean">
+ <property name="resourceRef"><value>false</value></property>
+ <property name="jndiName">
+ <value>java:comp/env/jdbc/jetspeed</value>
+ </property>
+ </bean>
+
+ <bean id="ojbConfigurer" class="org.springmodules.orm.ojb.support.LocalOjbConfigurer"/>
+
+ <!--
+ Dynamically configures Database Platform for OJB by looking at the connection string
+ and figuring out the OJB platform using an OJB metadata utility
+ Its important to get this right otherwise you will be sending the wrong (most likely HSQL)
+ flavor of SQL statements to the backend database.
+ -->
+ <bean id="PlatformConfigurator"
+ class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator"
+ init-method="init"
+ >
+ <constructor-arg index='0'>
+ <ref bean="JetspeedDS"/>
+ </constructor-arg>
+ <!-- JNDI Name -->
+ <constructor-arg index='1'>
+ <value>JetspeedDS</value>
+ </constructor-arg>
+ </bean>
+
+ <!--
+ Creates a JNDI-based datasource bean name "JetspeedDS". The information
+ provided here is merged with the basic configuration for the
+ jdbc-connection-descriptor with the matching jcd-alias property
+ ("JetspeedDS") located under /etc/db-ojb/repository_database.xml in the
+ source tree.
+
+ Another requirement for this to work is to have the
+ ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl
+ or to have
+ ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl.
+ (either will do, both are recommended, see comments in configuration file).
+ These properties are located in /etc/db-ojb/OJB.properties in the source tree.
+
+ FYI: The two OJB configuration files mentioned above are currently already setup this way
+ in the default Jetspeed implementation.
+
+ However, if you need to locate/modify these files in a running instance of jetspeed,
+ they will be located under /WEB-INF/classes.
+ -->
+ <!--
+ <bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry">
+ <property name="jndiName">
+ <value>java:comp/env/jdbc/jetspeed</value>
+ </property>
+ </bean>
+ -->
+
+ <!-- If would like use a commons DBCP Pooled datasource as opposed to the default
+ JNDI one above you can uncomment the configuration below and fill in
+ the datasource information as it relates to your environment.
+
+ A requirement for this to work is to have the
+ ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl
+ or to have
+ ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl
+ This property is located in /etc/db-ojb/OJB.properties in the source tree.
+ -->
+
+<!--
+ <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource"
+ destroy-method="close"
+ >
+ <property name="driverClassName"><value>com.mysql.jdbc.Driver</value></property>
+ <property name="url"><value>jdbc:mysql://localhost/j2test</value></property>
+ <property name="username"><value>j2</value></property>
+ <property name="password"><value>XXX</value></property>
+ </bean>
+ -->
+</beans>
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/boot/datasource.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/boot/datasource.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/cache.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/cache.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/cache.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/cache.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,124 @@
+<?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>
+
+ <bean id="cacheManager"
+ class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+ <!-- get it through the class path
+ <property name="configLocation" value="${applicationRoot}/WEB-INF/conf/ehcache.xml"/>
+ -->
+ </bean>
+
+ <!-- Factory bean used to instantiate a EHCache with the specified name (and corresponding
+ configuration in cacheManager.xml -->
+ <bean id="ehPortletContentCache"
+ class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+ <property name="cacheManager">
+ <ref local="cacheManager" />
+ </property>
+ <property name="cacheName" value="portletContentCache" />
+ </bean>
+
+ <bean id="portletContentCache"
+ class="org.apache.jetspeed.cache.impl.EhPortletContentCacheImpl">
+ <constructor-arg index="0">
+ <ref bean="ehPortletContentCache" />
+ </constructor-arg>
+ <constructor-arg index="1">
+ <ref bean="preferencesCache" />
+ </constructor-arg>
+ </bean>
+
+ <bean id="ehPreferencesCache"
+ class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+ <property name="cacheManager">
+ <ref local="cacheManager" />
+ </property>
+ <property name="cacheName" value="preferencesCache" />
+ </bean>
+
+ <bean id="preferencesCache"
+ class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
+ <constructor-arg>
+ <ref bean="ehPreferencesCache" />
+ </constructor-arg>
+ </bean>
+
+ <bean id="ehPortletApplicationOidCache"
+ class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+ <property name="cacheManager">
+ <ref local="cacheManager" />
+ </property>
+ <property name="cacheName" value="portletApplicationOidCache" />
+ </bean>
+
+ <bean id="ehPortletApplicationNameCache"
+ class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+ <property name="cacheManager">
+ <ref local="cacheManager" />
+ </property>
+ <property name="cacheName" value="portletApplicationNameCache" />
+ </bean>
+
+ <bean id="portletApplicationOidCache"
+ class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+ <constructor-arg>
+ <ref bean="ehPortletApplicationOidCache" />
+ </constructor-arg>
+ </bean>
+
+ <bean id="portletApplicationNameCache"
+ class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
+ <constructor-arg>
+ <ref bean="ehPortletApplicationNameCache" />
+ </constructor-arg>
+ </bean>
+
+ <bean id="ehPortletDefinitionOidCache"
+ class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+ <property name="cacheManager">
+ <ref local="cacheManager" />
+ </property>
+ <property name="cacheName" value="portletDefinitionOidCache" />
+ </bean>
+
+ <bean id="ehPortletDefinitionNameCache"
+ class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+ <property name="cacheManager">
+ <ref local="cacheManager" />
+ </property>
+ <property name="cacheName" value="portletDefinitionNameCache" />
+ </bean>
+
+
+ <bean id="portletDefinitionOidCache"
+ class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+ <constructor-arg>
+ <ref bean="ehPortletDefinitionOidCache" />
+ </constructor-arg>
+ </bean>
+
+ <bean id="portletDefinitionNameCache"
+ class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
+ <constructor-arg>
+ <ref bean="ehPortletDefinitionNameCache" />
+ </constructor-arg>
+ </bean>
+
+</beans>
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/cache.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/cache.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/capabilities.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/capabilities.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/capabilities.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/capabilities.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,72 @@
+<?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>
+
+ <!-- Capabilities DAO-->
+ <bean id="capabilitiesImpl" class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities" init-method="init">
+ <constructor-arg index="0">
+ <value>JETSPEED-INF/ojb/capabilities_repository.xml</value>
+ </constructor-arg>
+ <constructor-arg index="1">
+ <value>Client</value>
+ </constructor-arg>
+ <constructor-arg index="2">
+ <value>MediaType</value>
+ </constructor-arg>
+ <constructor-arg index="3">
+ <value>MimeType</value>
+ </constructor-arg>
+ <constructor-arg index="4">
+ <value>Capability</value>
+ </constructor-arg>
+ </bean>
+
+ <!-- Capabilities -->
+ <bean id="org.apache.jetspeed.capabilities.Capabilities" name="capabilities" parent="baseTransactionProxy">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.capabilities.Capabilities</value>
+ </property>
+ <property name="target">
+ <ref bean="capabilitiesImpl" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.capabilities.CapabilitiesException</prop>
+ <prop key="delete*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.capabilities.CapabilitiesException</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
+
+
+ <!-- Capability related content -->
+
+ <!-- Client -->
+ <bean id="Client" class="org.apache.jetspeed.capabilities.impl.ClientImpl" singleton="false"></bean>
+
+ <!-- MediaType -->
+ <bean id="MediaType" class="org.apache.jetspeed.capabilities.impl.MediaTypeImpl" singleton="false"></bean>
+
+ <!-- MimeType -->
+ <bean id="MimeType" class="org.apache.jetspeed.capabilities.impl.MimeTypeImpl" singleton="false"></bean>
+
+ <!-- Capability -->
+ <bean id="Capability" class="org.apache.jetspeed.capabilities.impl.CapabilityImpl" singleton="false"></bean>
+
+</beans>
\ No newline at end of file
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/capabilities.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/capabilities.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/cluster-node.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/cluster-node.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/cluster-node.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/cluster-node.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,39 @@
+<?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>
+
+ <!--CLUSTER NODE COMPONENT-->
+ <bean id="org.apache.jetspeed.cluster.NodeManager"
+ class="org.apache.jetspeed.cluster.NodeManagerImpl"
+ >
+ <constructor-arg index="0">
+ <value>${applicationRoot}/WEB-INF/cluster_node</value>
+<!-- <value>target/jetspeed/WEB-INF/cluster_node</value> -->
+ </constructor-arg>
+ <!-- pass reference to NodeInformation -->
+ <constructor-arg index="1">
+ <value>NodeInformation</value>
+ </constructor-arg>
+
+ </bean>
+
+ <!-- Rule Criterion -->
+ <bean id="NodeInformation" class="org.apache.jetspeed.cluster.NodeInformationImpl" singleton="false"></bean>
+
+</beans>
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/cluster-node.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/deployment.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/deployment.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/deployment.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,105 @@
+<?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>
+
+ <!-- Application Server Manager for Tomcat. Comment out for others like JBoss
+ Provides hooks into the application server to help us deploy portlet applications
+ as web application into that server. This manager is for Tomcat 5
+ -->
+
+ <bean id="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager"
+ class="org.apache.jetspeed.tools.pamanager.servletcontainer.TomcatManager"
+ init-method="start" destroy-method="stop"
+ >
+ <constructor-arg index="0"><value>${autodeployment.catalina.base}</value></constructor-arg>
+ <constructor-arg index="1"><value>${autodeployment.catalina.engine}</value></constructor-arg>
+ <constructor-arg index="2"><value>${autodeployment.server}</value></constructor-arg>
+ <constructor-arg index="3"><value>${autodeployment.port}</value></constructor-arg>
+ <constructor-arg index="4"><value>${autodeployment.user}</value></constructor-arg>
+ <constructor-arg index="5"><value>${autodeployment.password}</value></constructor-arg>
+ </bean>
+
+ <bean id="deployFactory" class="org.apache.jetspeed.tools.deploy.JetspeedDeployFactory"/>
+ <bean id="PAM"
+ class="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" init-method="start" destroy-method="stop"
+ >
+ <constructor-arg><ref bean="portletFactory"/></constructor-arg>
+ <constructor-arg><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
+ <constructor-arg><ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"/></constructor-arg>
+ <constructor-arg><ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor"/></constructor-arg>
+ <constructor-arg><ref bean="org.apache.jetspeed.security.PermissionManager"/></constructor-arg>
+ <constructor-arg><ref bean="org.apache.jetspeed.search.SearchEngine"/></constructor-arg>
+ <constructor-arg><ref bean="org.apache.jetspeed.security.RoleManager"/></constructor-arg>
+ <!-- role principals to assign a default permission(s) during deployment of a Portlet Application -->
+ <constructor-arg >
+ <list>
+ <value>user</value>
+ </list>
+ </constructor-arg>
+ <constructor-arg><ref bean="org.apache.jetspeed.cluster.NodeManager"/></constructor-arg>
+
+ <!-- optional configuration for automatic creation of not yet existing roles as defined in the deployed web.xml:
+ <property name="autoCreateRoles"><value>true</value></property>
+ -->
+ <!-- optional descriptor change monitor check interval in seconds (0: disabled, default: 10):
+ <property name="descriptorChangeMonitorInterval"><value>10</value></property>
+ -->
+ </bean>
+
+ <!-- Portlet Application and Decorator deployment event listeners -->
+ <bean id="portletAppDeploymentListener"
+ class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener"
+ >
+ <constructor-arg index="0"><ref bean="PAM"/></constructor-arg>
+ <constructor-arg index="1"><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
+ <constructor-arg index="2"><value>${autodeployment.target.dir}</value></constructor-arg>
+ <constructor-arg index="3"><value>${applicationRoot}/WEB-INF/apps</value></constructor-arg>
+ <constructor-arg index="4"><value>${autodeployment.staging.dir}/local</value></constructor-arg>
+ <!-- strip commons-logging and/or log4j jars from war files: for JBoss set this to true -->
+ <constructor-arg index="5"><value>false</value></constructor-arg>
+ </bean>
+ <bean id="decoratorDeploymentRegistry"
+ class="org.apache.jetspeed.deployment.simpleregistry.impl.InMemoryRegistryImpl"
+ >
+ </bean>
+ <bean id="decoratorDeploymentListener"
+ class="org.apache.jetspeed.deployment.impl.DeployDecoratorEventListener"
+ >
+ <constructor-arg ><value>${applicationRoot}/decorations</value></constructor-arg>
+ </bean>
+
+ <!-- The deployment manager watches a specific staging directory for
+ deploying components. What components get deployed depend of
+ DeploymentEventListeners registered to it.
+ -->
+ <bean id="deploymentManager"
+ class="org.apache.jetspeed.deployment.impl.StandardDeploymentManager"
+ init-method="start" destroy-method="stop"
+ >
+ <constructor-arg ><value>${autodeployment.staging.dir},${autodeployment.staging.dir}/local</value></constructor-arg>
+ <constructor-arg type="long" ><value>${autodeployment.delay}</value></constructor-arg>
+ <constructor-arg >
+ <list>
+ <ref bean="portletAppDeploymentListener"/>
+ <ref bean="decoratorDeploymentListener"/>
+ </list>
+ </constructor-arg>
+ </bean>
+
+</beans>
\ No newline at end of file
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/deployment.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/deployment.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/desktop.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/desktop.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/desktop.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/desktop.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,53 @@
+<?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>
+
+ <!-- Application Server Manager for Tomcat. Comment out for others like JBoss
+ Provides hooks into the application server to help us deploy portlet applications
+ as web application into that server. This manager is for Tomcat 5
+ -->
+
+ <bean id="JetspeedDesktop" class="org.apache.jetspeed.desktop.impl.JetspeedDesktopImpl">
+ <!-- Location of the desktop themes -->
+ <constructor-arg index='0'>
+ <ref bean="DecorationFactory"/>
+ </constructor-arg>
+ <constructor-arg index="1">
+ <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
+ </constructor-arg>
+ <constructor-arg index="2"> <!-- desktop servlet path -->
+ <value>/desktop</value>
+ </constructor-arg>
+ <constructor-arg index="3"> <!-- default desktop layout extension -->
+ <value>.jsp</value>
+ </constructor-arg>
+ <!-- Optional decoration defaults for desktop - bean id 'DesktopConfiguration' (in headtag.xml)
+ supports the settings 'desktop.decoration.layout' and 'desktop.decoration.portlet', which if
+ specified, override the values set here -->
+ <constructor-arg index="4"> <!-- default desktop layout decoration -->
+ <value>tigris</value>
+ </constructor-arg>
+ <constructor-arg index="5"> <!-- default desktop portlet decoration -->
+ <value>tigris</value>
+ </constructor-arg>
+
+ <!-- Uncomment this to HARD CODE your portal URL -->
+ <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg> -->
+ </bean>
+</beans>
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/desktop.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/headtag.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/headtag.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/headtag.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/headtag.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,451 @@
+<?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>
+ <!-- header (html <head>) configuration -->
+
+ <!-- ***** -->
+ <!-- /desktop header configuration -->
+ <!-- ***** -->
+ <bean id="HeaderResourceConfigurationDesktop" class="java.util.HashMap">
+ <constructor-arg index="0">
+ <map>
+ <entry key="dojo">
+ <ref bean="DojoConfigurationDesktop" />
+ </entry>
+ <entry key="desktop">
+ <ref bean="DesktopConfiguration" />
+ </entry>
+ <entry key="header.order">
+ <list>
+ <value>header.dojo.parameters</value> <!-- djConfig definition -->
+ <value>header.dojo.preinit</value> <!-- generated djConfig.baseScriptUri definition -->
+ <value>header.dojo.config</value> <!-- for adding statements prior to dojo.js load -->
+ <value>header.dojo.init</value> <!-- <script src=".../dojo.js"> -->
+ <value>header.dojo.requires.core</value> <!-- dojo.require statements for dojo core modules -->
+ <value>header.dojo.modules.path</value> <!-- dojo.registerModulePath statements -->
+ <value>header.dojo.requires.modules</value> <!-- dojo.require statements for dojo add-on modules -->
+ <value>header.dojo.writeincludes</value> <!-- generated dojo.hostenv.writeIncludes() statement -->
+ <value>header.dojo.modules.namespace</value> <!-- dojo.registerNamespace statements -->
+ <value>header.dojo.style.bodyexpand</value> <!-- css for body 100% height/width (for some dojo widgets) -->
+ <value>header.basetag</value> <!-- generated <base href=".../jetspeed/"> -->
+ <value>header.desktop.style.layout</value> <!-- generated <link href=".../styles.css"> for layout decoration -->
+ <value>header.desktop.init</value> <!-- generated desktop startup javascript -->
+ </list>
+ </entry>
+ <entry key="header.types">
+ <ref bean="HeaderTypes" />
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="DesktopConfiguration" class="java.util.HashMap">
+ <constructor-arg index="0">
+ <map>
+ <!-- layout and portlet decorations -->
+ <entry key="desktop.decoration.layout">
+ <!-- default layout decoration for desktop
+ this is used when a selected layout decoration does not support desktop -->
+ <value>tigris</value>
+ </entry>
+
+ <entry key="desktop.decoration.portlet">
+ <!-- default portlet decoration for desktop
+ this is used when a selected portlet decoration does not support desktop -->
+ <value>tigris</value>
+ </entry>
+
+ <!-- window modes -->
+ <entry key="desktop.window.tiling">
+ <!-- enable window tiling mode - default is true -->
+ <value>true</value>
+ </entry>
+ <entry key="desktop.window.heightexpand">
+ <!-- default tiled windows to expand in height to fit content - default is false -->
+ <value>true</value>
+ </entry>
+
+ <!-- window dimensions -->
+ <entry key="desktop.window.height">
+ <!-- default window height -->
+ <value>200</value>
+ </entry>
+ <entry key="desktop.window.width">
+ <!-- default window width -->
+ <value>280</value>
+ </entry>
+
+ <!-- window actions -->
+ <!-- NOTE: each window theme may override any of these properties in its windowtheme.js file -->
+ <entry key="desktop.window.action.button.order">
+ <!-- order, left to right, that action buttons should be rendered -->
+ <!-- all listed actions are expected to have associated images at derived path {windowtheme}/images/{action}.gif -->
+ <!-- no image mapping is offered because if it is to be supported, it should be from DecoratorAction -->
+ <!-- any listed action not supported by portlet is omitted -->
+ <!-- some actions, such as "menu" and "restore" have special behaviors (e.g. restore replaces minimize when window is minimized) -->
+ <list>
+ <value>menu</value>
+ <value>edit</value>
+ <value>view</value>
+ <value>print</value>
+ <value>help</value>
+ <value>minimized</value>
+ <value>normal</value>
+ <value>maximized</value>
+ <value>removeportlet</value> <!-- activated only when in page edit mode -->
+ </list>
+ </entry>
+ <entry key="desktop.window.action.button.maximum">
+ <!-- maximum number of action buttons allowed - overflow items will be displayed at top of action menu -->
+ <value>10</value>
+ </entry>
+ <entry key="desktop.window.action.button.hide">
+ <!-- hide action buttons unless mouse is over window title bar -->
+ <value>false</value>
+ </entry>
+ <entry key="desktop.window.action.noimage">
+ <!-- list of actions that do no have images -->
+ <list>
+ <value>tile</value>
+ <value>untile</value>
+ <value>heightexpand</value>
+ <value>heightnormal</value>
+ </list>
+ </entry>
+ <entry key="desktop.window.action.menu.order">
+ <!-- order, top to bottom, the actions should appear in action menu -->
+ <list>
+ <value>tile</value>
+ <value>untile</value>
+ <value>heightexpand</value>
+ <value>heightnormal</value>
+ </list>
+ </entry>
+ <entry key="desktop.window.action.button.tooltip">
+ <!-- display tooltips for window action buttons -->
+ <value>true</value>
+ </entry>
+
+ <!-- window icons -->
+ <!-- NOTE: each window theme may override any of these properties in its windowtheme.js file -->
+ <entry key="desktop.window.icon.enabled">
+ <!-- display icon for each window -->
+ <value>true</value>
+ </entry>
+ <entry key="desktop.window.icon.path">
+ <!-- path to window icons -->
+ <value>/images/portlets/small/</value> <!-- /javascript/jetspeed/windowicons/ -->
+ </entry>
+
+ <!-- page actions -->
+ <entry key="desktop.page.action.button.tooltip">
+ <!-- display tooltips for page action buttons -->
+ <value>true</value>
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="DojoConfigurationDesktop" class="java.util.HashMap">
+ <constructor-arg index="0">
+ <map>
+ <entry key="dojo.enable">
+ <!-- dojo headers only included if dojo.enable is true -->
+ <value>true</value>
+ </entry>
+ <entry key="dojo.path">
+ <!-- path to dojo root from portal context path -->
+ <!-- used in constructing <script src=".../dojo.js"> and djConfig.baseScriptUri -->
+ <value>/javascript/dojo/</value>
+ </entry>
+ <entry key="dojo.parameter.isDebug">
+ <!-- value for djConfig variable isDebug -->
+ <value>false</value>
+ </entry>
+ <entry key="dojo.parameter.debugAtAllCosts">
+ <!-- value for djConfig variable debugAtAllCosts -->
+ <value>false</value>
+ </entry>
+ <entry key="dojo.parameters">
+ <!-- additional djConfig variables expressed as a json object fragment: -->
+ <!-- key: value[, key: value]* -->
+ <!-- if an entry "dojo.parameters" is defined in HeaderResourceRegistry, its value replaces value -->
+ <!-- built from the value here as well as dojo.parameter.isDebug and dojo.parameter.debugAtAllCosts -->
+ <!-- template: var djConfig = { ${value} }; -->
+ <!-- header section: header.dojo.parameters -->
+ <value></value>
+ </entry>
+ <entry key="dojo.requires.core">
+ <!-- list of dojo core modules -->
+ <!-- template: dojo.require( "${value}" ); -->
+ <!-- header section: header.dojo.requires.core -->
+ <ref bean="DojoRequiresDesktop" />
+ </entry>
+ <entry key="dojo.modules.path">
+ <!-- list of statements intended to be dojo.registerModulePath calls -->
+ <!-- template: none -->
+ <!-- values can reference entries in HeaderResourceRegistry -->
+ <!-- header section: header.dojo.modules.path -->
+ <!-- note: each entry below refers to a HeaderResourceRegistry entry which is currently an -->
+ <!-- empty value due to dojo 0.4.0 improvements which make this step unnecessary for these modules -->
+ <list>
+ <value>dojo.module.jetspeed.ui.widget</value>
+ <value>dojo.module.jetspeed.desktop</value>
+ </list>
+ </entry>
+ <entry key="dojo.requires.modules">
+ <!-- list of dojo add-on modules -->
+ <!-- template: dojo.require( "${value}" ); -->
+ <!-- header section: header.dojo.requires.modules -->
+ <ref bean="DojoRequiresModulesDesktop" />
+ </entry>
+ <entry key="dojo.modules.namespace">
+ <!-- list of statements intended to be dojo.registerNamespace calls -->
+ <!-- template: none -->
+ <!-- values can reference entries in HeaderResourceRegistry -->
+ <!-- header section: header.dojo.modules.namespace -->
+ <!-- note: the entry below refers to a HeaderResourceRegistry entry which is currently an -->
+ <!-- empty value due to dojo 0.4.0 improvements which make this step unnecessary for this module -->
+ <list>
+ <value>dojo.module.widget.jetspeed.ui.widget</value>
+ </list>
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="DojoRequiresDesktop" class="java.util.ArrayList">
+ <constructor-arg index="0">
+ <list>
+ <value>dojo.lang.*</value>
+ <value>dojo.event.*</value>
+ <value>dojo.io.*</value>
+ <value>dojo.dnd.HtmlDragManager</value>
+ <value>dojo.dnd.DragAndDrop</value>
+ <value>dojo.dnd.HtmlDragAndDrop</value>
+ <value>dojo.dnd.HtmlDragMove</value>
+ <value>dojo.widget.*</value>
+ <value>dojo.collections.ArrayList</value>
+ <value>dojo.collections.Set</value>
+ <value>dojo.widget.TaskBar</value>
+ <value>dojo.widget.FloatingPane</value>
+ <value>dojo.widget.TabContainer</value>
+ <value>dojo.widget.AccordionContainer</value>
+ <value>dojo.widget.Menu2</value>
+ <value>dojo.widget.Checkbox</value>
+ <value>dojo.widget.Dialog</value>
+ <value>dojo.widget.Button</value>
+ <value>dojo.widget.Select</value>
+ <value>dojo.widget.LayoutContainer</value>
+ <value>dojo.widget.ContentPane</value>
+ <value>dojo.widget.LinkPane</value>
+ <value>dojo.widget.SplitContainer</value>
+ <value>dojo.widget.Tree</value>
+ <value>dojo.widget.Tooltip</value>
+ <value>dojo.lfx.html</value>
+ </list>
+ </constructor-arg>
+ </bean>
+
+ <bean id="DojoRequiresModulesDesktop" class="java.util.ArrayList">
+ <constructor-arg index="0">
+ <list>
+ <value>jetspeed.desktop.core</value>
+ <value>jetspeed.widget.PortalTaskBar</value>
+ <value>jetspeed.widget.PortletWindow</value>
+ <value>jetspeed.widget.PortalTabContainer</value>
+ <value>jetspeed.widget.PortalAccordionContainer</value>
+ <value>jetspeed.widget.PortalBreadcrumbContainer</value>
+ <value>jetspeed.widget.PortletDefContainer</value>
+ </list>
+ </constructor-arg>
+ </bean>
+
+
+ <!-- ***** -->
+ <!-- /portal header configuration -->
+ <!-- ***** -->
+ <bean id="HeaderResourceConfigurationPortal" class="java.util.HashMap">
+ <constructor-arg index="0">
+ <map>
+ <entry key="dojo">
+ <ref bean="DojoConfigurationPortal" />
+ </entry>
+ <entry key="header.order">
+ <list> <!-- note: these are only included if dojo.enable is set to true (below or at runtime) -->
+ <value>header.dojo.parameters</value> <!-- djConfig definition -->
+ <value>header.dojo.preinit</value> <!-- generated djConfig.baseScriptUri definition -->
+ <value>header.dojo.config</value> <!-- for adding statements prior to dojo.js load -->
+ <value>header.dojo.init</value> <!-- <script src=".../dojo.js"> -->
+ <value>header.dojo.requires.core</value> <!-- dojo.require statements for dojo core modules -->
+ <value>header.dojo.modules.path</value> <!-- dojo.registerModulePath statements -->
+ <value>header.dojo.requires.modules</value> <!-- dojo.require statements for dojo add-on modules -->
+ <value>header.dojo.writeincludes</value> <!-- generated dojo.hostenv.writeIncludes() statement -->
+ <value>header.dojo.modules.namespace</value> <!-- dojo.registerNamespace statements -->
+ <value>header.dojo.style.bodyexpand</value> <!-- css for body 100% height/width (for some dojo widgets) -->
+ </list>
+ </entry>
+ <entry key="header.types">
+ <ref bean="HeaderTypes" />
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+ <bean id="DojoConfigurationPortal" class="java.util.HashMap">
+ <constructor-arg index="0">
+ <map>
+ <entry key="dojo.enable">
+ <!-- dojo headers only included if dojo.enable is true; leaving it up to one or more portlets to set this -->
+ <value>false</value>
+ </entry>
+ <entry key="dojo.path">
+ <!-- path to dojo root from portal context path -->
+ <!-- used in constructing <script src=".../dojo.js"> and djConfig.baseScriptUri -->
+ <value>/javascript/dojo/</value>
+ </entry>
+ <entry key="dojo.parameter.isDebug">
+ <!-- value for djConfig variable isDebug -->
+ <value>false</value>
+ </entry>
+ <entry key="dojo.parameter.debugAtAllCosts">
+ <!-- value for djConfig variable debugAtAllCosts -->
+ <value>false</value>
+ </entry>
+ <entry key="dojo.parameters">
+ <!-- additional djConfig variables expressed as a json object fragment: -->
+ <!-- key: value[, key: value]* -->
+ <!-- if an entry "dojo.parameters" is defined in HeaderResourceRegistry, its value replaces value -->
+ <!-- built from the value here as well as dojo.parameter.isDebug and dojo.parameter.debugAtAllCosts -->
+ <!-- template: var djConfig = { ${value} }; -->
+ <!-- header section: header.dojo.parameters -->
+ <value></value>
+ </entry>
+ <entry key="dojo.requires.core">
+ <!-- list of dojo core modules -->
+ <!-- template: dojo.require( "${value}" ); -->
+ <!-- header section: header.dojo.requires.core -->
+ <list>
+ <value>dojo.lang.*</value>
+ <value>dojo.event.*</value>
+ <value>dojo.io.*</value>
+ <value>dojo.widget.*</value>
+ </list>
+ </entry>
+ <entry key="dojo.modules.path">
+ <!-- list of statements intended to be dojo.registerModulePath calls -->
+ <!-- template: none -->
+ <!-- values can reference entries in HeaderResourceRegistry -->
+ <!-- header section: header.dojo.modules.path -->
+ <!-- note: each entry below refers to a HeaderResourceRegistry entry which is currently an -->
+ <!-- empty value due to dojo 0.4.0 improvements which make this step unnecessary for these modules -->
+ <list>
+ <value>dojo.module.jetspeed.ui.widget</value>
+ <value>dojo.module.jetspeed.desktop</value>
+ </list>
+ </entry>
+ <entry key="dojo.requires.modules">
+ <!-- list of dojo add-on modules -->
+ <!-- template: dojo.require( "${value}" ); -->
+ <!-- header section: header.dojo.requires.modules -->
+ <list>
+ <value>jetspeed.common</value>
+ </list>
+ </entry>
+ <entry key="dojo.modules.namespace">
+ <!-- list of statements intended to be dojo.registerNamespace calls -->
+ <!-- template: none -->
+ <!-- values can reference entries in HeaderResourceRegistry -->
+ <!-- header section: header.dojo.modules.namespace -->
+ <!-- note: the entry below refers to a HeaderResourceRegistry entry which is currently an -->
+ <!-- empty value due to dojo 0.4.0 improvements which make this step unnecessary for this module -->
+ <list>
+ <value>dojo.module.widget.jetspeed.ui.widget</value>
+ </list>
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+
+ <!-- ***** -->
+ <!-- shared /portal and /desktop header configuration -->
+ <!-- ***** -->
+ <bean id="HeaderResourceRegistry" class="java.util.HashMap">
+ <constructor-arg index="0">
+ <map>
+ <!-- override of content for header fragments added with specified key -->
+ <!-- also acts as way to refer to a shared value within these header configuration settings -->
+ <!-- also, when generating final content, if a header section is included in header.order -->
+ <!-- and it has empty content, then an entry here matching the header section name will -->
+ <!-- be used for content -->
+ <entry key="dojo.module.jetspeed.ui.widget">
+ <!-- <value>dojo.hostenv.setModulePrefix('jetspeed.ui.widget', '../desktop/widget');</value> --> <!-- dojo 0.3.1 -->
+ <!-- <value>dojo.registerModulePath("jetspeed.widget", "../desktop/widget");</value> --> <!-- dojo 0.4.0 -->
+ <!-- note: current value is empty due to dojo 0.4.0 improvements which make this step unnecessary for this module -->
+ <value></value>
+ </entry>
+ <entry key="dojo.module.jetspeed.desktop">
+ <!-- <value>dojo.hostenv.setModulePrefix('jetspeed.desktop', '../desktop/core');</value> --> <!-- dojo 0.3.1 -->
+ <!-- <value>dojo.registerModulePath("jetspeed.desktop", "../desktop/core");</value> --> <!-- dojo 0.4.0 -->
+ <!-- note: current value is empty due to dojo 0.4.0 improvements which make this step unnecessary for this module -->
+ <value></value>
+ </entry>
+ <entry key="dojo.module.widget.jetspeed.ui.widget">
+ <!-- <value>dojo.widget.manager.registerWidgetPackage('jetspeed.ui.widget');</value> --> <!-- dojo 0.3.1 -->
+ <!-- <value>dojo.registerNamespace("jetspeed", 'jetspeed.widget', function(name){ return "jetspeed.widget."+dojo.string.capitalize(name);});</value> --> <!-- dojo 0.4.0 -->
+ <!-- note: current value is empty due to dojo 0.4.0 improvements which make this step unnecessary for this module -->
+ <value></value>
+ </entry>
+ <entry key="header.dojo.style.bodyexpand"> <!-- dojo.style.bodyexpand.noscroll -->
+ <!-- make the body expand to fill the visible window -->
+ <value>html, body { width: 100%; height: 100%; padding: 0 0 0 0; margin: 0 0 0 0; }</value>
+ </entry>
+ <entry key="header.dojo.style.bodyexpand.noscroll"> <!-- dojo.style.bodyexpand.noscroll -->
+ <!-- make the body expand to fill the visible window - erase window level scrollbars -->
+ <value>html, body { width: 100%; height: 100%; overflow: hidden; padding: 0 0 0 0; margin: 0 0 0 0; }</value>
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <!-- this example HeaderTypes definition can be removed -->
+ <!-- types for all predefined header section names are set automatically -->
+ <!-- supported header types:
+ script-start
+ script
+ script-end
+ script-tag
+ style
+ link-tag
+ base-tag
+ -->
+ <bean id="HeaderTypes" class="java.util.HashMap">
+ <constructor-arg index="0">
+ <map>
+ <entry key="header.dojo.style.bodyexpand">
+ <value>style</value>
+ </entry>
+ <entry key="header.dojo.style.bodyexpand.noscroll">
+ <value>style</value>
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+</beans>
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/headtag.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/hierarchical-principal-names.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/hierarchical-principal-names.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/hierarchical-principal-names.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/hierarchical-principal-names.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,60 @@
+<?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.
+-->
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+ <!-- http://issues.apache.org/jira/browse/JS2-527
+
+ By default, Jetspeed supports hierarchical names for role, group and user principal names.
+ To make use of that, separate the elements using a dot '.'.
+ Internally, Jetspeed will translate these '.' to '/' to be able to map it on its preference store structure.
+ But, sometimes this isn't wanted, especially with user principal names, as it prohibits using email adresses for instance.
+
+ If you don't want hierarchical names support for role, group and/or user principal names, you can disable the default
+ by moving the related MethodInvokatingFactoryBean definition below outside this comment.
+
+ <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <property name="staticMethod">
+ <value>org.apache.jetspeed.security.impl.UserPrincipalImpl.useHierarchicalNames</value>
+ </property>
+ <property name="arguments">
+ <value>false</value>
+ </property>
+ </bean>
+
+ <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <property name="staticMethod">
+ <value>org.apache.jetspeed.security.impl.RolePrincipalImpl.useHierarchicalNames</value>
+ </property>
+ <property name="arguments">
+ <value>false</value>
+ </property>
+ </bean>
+
+ <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <property name="staticMethod">
+ <value>org.apache.jetspeed.security.impl.GroupPrincipalImpl.useHierarchicalNames</value>
+ </property>
+ <property name="arguments">
+ <value>false</value>
+ </property>
+ </bean>
+
+ -->
+
+</beans>
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/hierarchical-principal-names.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-production.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-production.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-production.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-production.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,27 @@
+<?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>
+ <!-- Production configuration holds properties that can be configured at runtime by system administrator -->
+ <!-- NOTE: you will probably want to put the property file OUTSIDE the web application -->
+ <bean id="ProductionConfiguration" class="org.apache.commons.configuration.PropertiesConfiguration">
+ <constructor-arg>
+ <value>${applicationRoot}/WEB-INF/conf/jetspeed-production.properties</value>
+ </constructor-arg>
+ </bean>
+</beans>
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-production.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-services.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-services.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-services.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,120 @@
+<?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 Services -->
+ <bean id="PortalServices"
+ class="org.apache.jetspeed.services.JetspeedPortletServices" >
+ <constructor-arg>
+ <map>
+ <entry key="PortletRegistryComponent">
+ <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+ </entry>
+ <entry key="SearchComponent">
+ <ref bean="org.apache.jetspeed.search.SearchEngine"/>
+ </entry>
+ <entry key="PAM">
+ <ref bean="PAM" />
+ </entry>
+ <entry key="UserManager">
+ <ref bean="org.apache.jetspeed.security.UserManager"/>
+ </entry>
+ <entry key="PageManager">
+ <ref bean="org.apache.jetspeed.page.PageManager"/>
+ </entry>
+ <entry key="RoleManager">
+ <ref bean="org.apache.jetspeed.security.RoleManager"/>
+ </entry>
+ <entry key="GroupManager">
+ <ref bean="org.apache.jetspeed.security.GroupManager"/>
+ </entry>
+ <entry key="Profiler">
+ <ref bean="org.apache.jetspeed.profiler.Profiler"/>
+ </entry>
+ <entry key="SSO">
+ <ref bean="org.apache.jetspeed.sso.SSOProvider"/>
+ </entry>
+ <entry key="EntityAccessor">
+ <ref bean='org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent'/>
+ </entry>
+ <entry key="WindowAccessor">
+ <ref bean='org.apache.jetspeed.container.window.PortletWindowAccessor'/>
+ </entry>
+ <!-- ApplicationServerManager currently only supported for Tomcat. Comment out for others like JBoss -->
+ <entry key="ApplicationServerManager">
+ <ref bean="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager"/>
+ </entry>
+ <entry key="PortletFactory">
+ <ref bean="portletFactory"/>
+ </entry>
+ <entry key="DeploymentManager">
+ <ref bean="deploymentManager"/>
+ </entry>
+ <entry key='IdGenerator'>
+ <ref bean='IdGenerator'/>
+ </entry>
+ <entry key='Powertools'>
+ <ref bean='Powertools'/>
+ </entry>
+ <entry key="HeaderResource">
+ <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory"/>
+ </entry>
+ <entry key="TemplateLocator">
+ <ref bean="TemplateLocator"/>
+ </entry>
+ <entry key="DecorationLocator">
+ <ref bean="DecorationLocator"/>
+ </entry>
+ <entry key="DecorationFactory">
+ <ref bean="DecorationFactory"/>
+ </entry>
+ <entry key="Desktop">
+ <ref bean="JetspeedDesktop"/>
+ </entry>
+ <entry key="PermissionManager">
+ <ref bean="org.apache.jetspeed.security.PermissionManager"/>
+ </entry>
+ <entry key="PortalStatistics">
+ <ref bean="PortalStatistics"/>
+ </entry>
+ <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">
+ <bean class="org.apache.jetspeed.container.session.PortalSessionsManagerImpl"/>
+ </entry>
+ <entry key="SecurityAccessController">
+ <ref bean="org.apache.jetspeed.security.SecurityAccessController"/>
+ </entry>
+ <entry key="PortletTrackingManager">
+ <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager"/>
+ </entry>
+
+<!-- first uncomment the below service bean in security-spi-atn.xml
+ <entry key="PasswordEncodingService">
+ <ref bean="org.apache.jetspeed.security.PasswordEncodingService" />
+ </entry>
+-->
+ </map>
+ </constructor-arg>
+ </bean>
+</beans>
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-services.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-services.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-spring.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-spring.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-spring.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,192 @@
+<?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>
+
+ <!-- Commons configuration object generated from jetspeed.properties -->
+ <bean id="portal_configuration" class="org.apache.commons.configuration.PropertiesConfiguration">
+ <constructor-arg>
+ <value>${applicationRoot}/WEB-INF/conf/jetspeed.properties</value>
+ </constructor-arg>
+ </bean>
+
+ <!-- ServletConfig -->
+ <bean id="javax.servlet.ServletConfig" name="ServletConfig" class="org.apache.jetspeed.components.factorybeans.ServletConfigFactoryBean" />
+
+ <!-- Template Locators -->
+ <bean id="TemplateLocator" class="org.apache.jetspeed.locator.JetspeedTemplateLocator" init-method="start" destroy-method="stop">
+ <constructor-arg>
+ <list>
+ <value>${applicationRoot}/WEB-INF/templates</value>
+ </list>
+ </constructor-arg>
+ <constructor-arg>
+ <value>${applicationRoot}</value>
+ </constructor-arg>
+ </bean>
+
+ <bean id="DecorationLocator" class="org.apache.jetspeed.locator.JetspeedTemplateLocator" init-method="start" destroy-method="stop">
+ <constructor-arg>
+ <list>
+ <value>${applicationRoot}/decorations</value>
+ </list>
+ </constructor-arg>
+ <constructor-arg>
+ <value>${applicationRoot}</value>
+ </constructor-arg>
+ </bean>
+
+ <bean id="Powertools" class="org.apache.jetspeed.velocity.JetspeedPowerToolFactory">
+ <constructor-arg index="0">
+ <value>org.apache.jetspeed.velocity.JetspeedPowerToolImpl</value>
+ </constructor-arg>
+ <constructor-arg index="1">
+ <ref bean="DynamicTitleService" />
+ </constructor-arg>
+ <!-- Added so we can render portlets in JPT -->
+ <constructor-arg index="2">
+ <ref bean="org.apache.jetspeed.aggregator.PortletRenderer" />
+ </constructor-arg>
+ </bean>
+
+ <!-- ID Generator -->
+ <bean id="IdGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start" destroy-method="stop">
+ <!-- ID Start value -->
+ <constructor-arg index="0">
+ <value>65536</value>
+ </constructor-arg>
+ <!-- ID Prefix -->
+ <constructor-arg index="1">
+ <value>P-</value>
+ </constructor-arg>
+ <!-- ID Suffix -->
+ <constructor-arg index="2">
+ <value></value>
+ </constructor-arg>
+ </bean>
+
+ <!-- Page File Cache -->
+ <bean id="PageFileCache" class="org.apache.jetspeed.cache.file.FileCache" init-method="startFileScanner" destroy-method="stopFileScanner">
+ <!-- Scan rate for changes in cached files on the file system -->
+ <constructor-arg index="0">
+ <value>10</value>
+ </constructor-arg>
+ <!-- Cache size -->
+ <constructor-arg index="1">
+ <value>100</value>
+ </constructor-arg>
+ </bean>
+
+ <!-- Request Context -->
+ <bean id="org.apache.jetspeed.request.RequestContextComponent" class="org.apache.jetspeed.request.JetspeedRequestContextComponent">
+ <constructor-arg>
+ <value>org.apache.jetspeed.request.JetspeedRequestContext</value>
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="org.apache.jetspeed.userinfo.UserInfoManager" />
+ </constructor-arg>
+ </bean>
+
+ <!-- Portlet Window Component -->
+ <bean id="PortletWindowAccessor" class="org.apache.jetspeed.container.window.impl.PortletWindowAccessorImpl"
+ name="org.apache.jetspeed.container.window.PortletWindowAccessor">
+ <constructor-arg index='0'>
+ <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" />
+ </constructor-arg>
+ <constructor-arg index='1'>
+ <ref bean="portletFactory" />
+ </constructor-arg>
+ <constructor-arg index='2'>
+ <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+ </constructor-arg>
+ <!-- enable window validation -->
+ <constructor-arg type="boolean" index='3'>
+ <value>false</value>
+ </constructor-arg>
+ </bean>
+
+ <!-- Pluto Portlet Container -->
+ <bean id="Pluto" class="org.apache.pluto.PortletContainerImpl" />
+
+ <!-- Desktop Pluto Portlet Container -->
+ <bean id="DesktopPluto" class="org.apache.jetspeed.container.DesktopPortletContainerImpl" />
+
+ <!-- Jetspeed 2's wrapper around Pluto -->
+ <!-- settings for this bean will start the underlying pluto portlet container -->
+ <bean id="org.apache.pluto.PortletContainer" class="org.apache.jetspeed.container.JetspeedPortletContainerWrapper" init-method="start"
+ destroy-method="shutdown">
+ <constructor-arg>
+ <ref bean="Pluto" />
+ </constructor-arg>
+ <constructor-arg>
+ <value>${portal.name}</value>
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="ServletConfig" />
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="Engine" />
+ </constructor-arg>
+ <property name="requestFactory">
+ <ref bean="ServletRequestFactory" />
+ </property>
+ <property name="responseFactory">
+ <ref bean="ServletResponseFactory" />
+ </property>
+ </bean>
+
+ <!-- Jetspeed 2's wrapper around Desktop Pluto container -->
+ <!-- settings for this bean will start the underlying pluto portlet container -->
+ <bean id="org.apache.pluto.DesktopPortletContainer" class="org.apache.jetspeed.container.JetspeedPortletContainerWrapper" init-method="start"
+ destroy-method="shutdown">
+ <constructor-arg>
+ <ref bean="DesktopPluto" />
+ </constructor-arg>
+ <constructor-arg>
+ <value>${portal.name}Desktop</value>
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="ServletConfig" />
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="Engine" />
+ </constructor-arg>
+ <property name="requestFactory">
+ <ref bean="ServletRequestFactory" />
+ </property>
+ <property name="responseFactory">
+ <ref bean="ServletResponseFactory" />
+ </property>
+ </bean>
+
+ <!-- Adds jetspeed.properties as our configuration object to support ${...} vars -->
+ <!-- ${applicationRoot} is acutally set as a system property via the SpringEngine -->
+
+ <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="locations">
+ <list>
+ <value>file:///${applicationRoot}/WEB-INF/conf/jetspeed.properties</value>
+ <value>file:///${applicationRoot}/WEB-INF/conf/override.properties</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- HeaderResource Factory -->
+ <bean id="org.apache.jetspeed.headerresource.HeaderResourceFactory" class="org.apache.jetspeed.headerresource.impl.HeaderResourceFactoryImpl"></bean>
+
+</beans>
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-spring.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/jetspeed-spring.xml
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org