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 [6/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/security-spi-atz.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi-atz.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi-atz.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi-atz.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,44 @@
+<?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>
+
+  <!-- ************** Security SPI Handlers ************** -->  
+  <!-- Security SPI: RoleSecurityHandler -->
+  <bean id="org.apache.jetspeed.security.spi.RoleSecurityHandler" 
+  	   class="org.apache.jetspeed.security.spi.impl.DefaultRoleSecurityHandler"
+  >  	   
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.SecurityAccess"/></constructor-arg>
+  </bean>
+  
+  <!-- Security SPI: GroupSecurityHandler -->
+  <bean id="org.apache.jetspeed.security.spi.GroupSecurityHandler" 
+  	   class="org.apache.jetspeed.security.spi.impl.DefaultGroupSecurityHandler"
+  >  	   
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.SecurityAccess"/></constructor-arg>
+  </bean>
+  
+  <!-- Security SPI: SecurityMappingHandler -->
+  <bean id="org.apache.jetspeed.security.spi.SecurityMappingHandler" 
+  	   class="org.apache.jetspeed.security.spi.impl.DefaultSecurityMappingHandler"
+  >  	   
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.SecurityAccess"/></constructor-arg>
+  	   <!-- Default role hierarchy strategy is by generalization.  Add contructor-arg to change the strategy. -->
+  	   <!-- Default group hierarchy strategy is by generalization.  Add contructor-arg to change the strategy. -->
+  </bean>
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi-atz.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi-atz.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,47 @@
+<?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>
+
+  <!-- ************** Security SPI Handlers ************** -->
+  <!-- Security SPI: CommonQueries -->
+  <bean id="org.apache.jetspeed.security.spi.impl.SecurityAccessImpl" 
+  	   class="org.apache.jetspeed.security.spi.impl.SecurityAccessImpl"
+  	   init-method="init"
+  >  	   
+  	   <constructor-arg ><value>JETSPEED-INF/ojb/security_repository.xml</value></constructor-arg>  	   
+  </bean>
+  
+  <bean id="org.apache.jetspeed.security.spi.SecurityAccess" parent="baseTransactionProxy" 
+		name="SecurityCommonQueries" >
+		<property name="proxyInterfaces">
+			<value>org.apache.jetspeed.security.spi.SecurityAccess</value>
+		</property>
+		<property name="target">
+			<ref bean="org.apache.jetspeed.security.spi.impl.SecurityAccessImpl"/>
+		</property>
+		<property name="transactionAttributes">
+			<props>				
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="set*">PROPAGATION_REQUIRED</prop>
+				<prop key="*">PROPAGATION_SUPPORTS</prop>
+			</props>
+		</property>
+   </bean>
+
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/sso.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/sso.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/sso.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/sso.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,49 @@
+<?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>
+    <!-- SSO Implementation -->
+    <bean id="PersistenceBrokerSSOProvider" class="org.apache.jetspeed.sso.impl.PersistenceBrokerSSOProvider" init-method="init">
+        <constructor-arg index="0">
+            <value>JETSPEED-INF/ojb/sso_repository.xml</value>
+        </constructor-arg>
+    </bean>
+
+    <bean id="org.apache.jetspeed.sso.SSOProvider" parent="baseTransactionProxy" name="ssoProvider">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.sso.SSOProvider</value>
+        </property>
+
+        <property name="target">
+            <ref bean="PersistenceBrokerSSOProvider" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="addSite*">PROPAGATION_REQUIRED</prop>
+                <prop key="updateSite*">PROPAGATION_REQUIRED</prop>
+                <prop key="removeSite">PROPAGATION_REQUIRED</prop>
+                <prop key="addCredentialsForSite">PROPAGATION_REQUIRED</prop>
+                <prop key="updateCredentialsForSite">PROPAGATION_REQUIRED</prop>
+                <prop key="removeCredentialsForSite">PROPAGATION_REQUIRED</prop>
+                <prop key="setRealmForSite">PROPAGATION_REQUIRED</prop>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+            </props>
+        </property>
+
+    </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/sso.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/sso.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/statistics.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/statistics.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/statistics.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/statistics.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>
+    <!-- Statistics Implementation -->
+    <bean id="PortalStatistics" 
+          class="org.apache.jetspeed.statistics.impl.PortalStatisticsImpl"
+          init-method="springInit"
+          destroy-method="springDestroy"
+          >
+        <!-- logToCLF -->
+      	<constructor-arg index='0' type="boolean"><value>false</value></constructor-arg>
+		
+		<!-- logToDatabase -->
+      	<constructor-arg  index='1'  type="boolean"><value>true</value></constructor-arg>
+		
+		<!-- maxRecordToFlush_Portal -->
+      	<constructor-arg   index='2' ><value>300</value></constructor-arg>
+		
+		<!-- maxRecordToFlush_User -->
+      	<constructor-arg   index='3'><value>50</value></constructor-arg>
+		
+		<!-- maxRecordToFlush_Page -->
+      	<constructor-arg   index='4' ><value>100</value></constructor-arg>
+		
+		<!-- maxTimeMsToFlush_Portal -->
+      	<constructor-arg  index='5'  ><value>300000</value></constructor-arg>
+		
+		<!-- maxTimeMsToFlush_User -->
+      	<constructor-arg  index='6'  ><value>5000</value></constructor-arg>
+		
+		<!-- maxTimeMsToFlush_Page -->
+      	<constructor-arg  index='7' ><value>60000</value></constructor-arg>
+		
+		<!-- jetspeedDSEntry -->
+      	<constructor-arg  index='8' ><ref bean="JetspeedDS" /></constructor-arg>
+	</bean>
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/statistics.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/theme-engine.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/theme-engine.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/theme-engine.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/theme-engine.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,36 @@
+<?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="ResourceValidator" class="org.apache.jetspeed.decoration.validators.WebApplicationResourceValidator"/>
+  
+  <bean id="DecorationFactory"
+      class="org.apache.jetspeed.decoration.DecorationFactoryImpl">
+    <constructor-arg index="0">    
+ 	 	<ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+	</constructor-arg>	  	  
+    <constructor-arg index="1">
+      <value>/decorations</value>
+    </constructor-arg>
+	<constructor-arg index="2">
+		<ref bean="ResourceValidator" />
+	</constructor-arg>
+  </bean>  
+	
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/theme-engine.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/transaction.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/transaction.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/transaction.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/transaction.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,49 @@
+<?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">
+
+<!--
+  - Application context definition for PortletRegistry using Apache OJB.
+	-->
+<beans>
+  
+	<!-- Transaction manager for a single OJB PersistenceBroker (alternative to JTA) -->
+	<bean id="transactionManager" class="org.springmodules.orm.ojb.PersistenceBrokerTransactionManager"/>
+
+	<!-- Transaction manager that delegates to JTA (for a transactional JNDI DataSource) -->
+	<!--
+	<bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/>
+	-->
+
+	<!--
+		- A parent bean definition which is a base definition for transaction proxies.
+		- It is markes as abstract, since it is never supposed to be instantiated itself.
+		- We set shared transaction attributes here, following our naming patterns.
+		- The attributes can still be overridden in child bean definitions.
+		-->
+	<bean id="baseTransactionProxy" 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>
+	</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/transaction.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/transaction.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/userinfo.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/userinfo.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/userinfo.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/userinfo.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,52 @@
+<?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>
+
+<!-- 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>
+
+
+<!-- Multi-source User Info Manager 
+
+  <bean id="org.apache.jetspeed.userinfo.UserInfoManager" 	
+         class="org.apache.jetspeed.userinfo.impl.MultiSourceUserInfoManagerImpl">
+		 <property name="portletRegistry">
+		    <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>
+		  </property>
+		  <property name="sources">
+		     <list>
+		         <ref bean="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"/>
+		     </list>
+	     </property>
+  </bean>
+  
+  <bean id="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"	
+    class="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl">      
+      <property name="userManager">
+         <ref bean="org.apache.jetspeed.security.UserManager"/>
+      </property>
+  </bean>
+  -->
+  
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/userinfo.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/userinfo.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/wps.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/wps.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/wps.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/wps.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,26 @@
+<?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>
+    
+    <!-- required for websphere, uncomment if running under websphere
+         see:  http://issues.apache.org/jira/browse/JS2-355
+    <bean id="org.apache.jetspeed.request.PortalRequestFactory" class="org.apache.jetspeed.request.PortalRequestFactoryImpl"/>
+      -->
+    
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/wps.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/Log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/Log4j.properties?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/Log4j.properties (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/Log4j.properties Mon Mar 26 16:53:34 2007
@@ -0,0 +1,154 @@
+# 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.
+
+# ------------------------------------------------------------------------
+#
+# Logging Configuration
+#
+# $Id$
+#
+# ------------------------------------------------------------------------
+
+#
+# If we don't know the logging facility, put it into the jetspeed.log
+# 
+#
+log4j.rootLogger = ERROR, jetspeed
+
+#
+# Jetspeed goes into Jetspeed Log
+#
+log4j.category.org.apache.jetspeed = ERROR, jetspeed
+log4j.additivity.org.apache.jetspeed = false
+
+
+log4j.category.org.apache.jetspeed.tools = ERROR, jetspeed
+log4j.additivity.org.apache.jetspeed.tools = false
+
+log4j.category.org.apache.commons.digester = ERROR, digester
+log4j.additivity.org.apache.commons.digester = false
+
+
+#
+# Velocity Logfile
+#
+log4j.category.velocity = ERROR, velocity
+log4j.additivity.velocity = false
+
+#
+# OJB Logfile
+#
+log4j.category.org.apache.ojb= ERROR, ojb
+log4j.additivity.org.apache.ojb= false
+
+#
+# Scheduler Category
+#
+log4j.category.scheduler = ERROR, scheduler
+log4j.additivity.scheduler = false
+
+#
+# Pluto Category
+#
+log4j.category.org.apache.pluto = ERROR, PLUTO, console
+log4j.additivity.org.apache.pluto = false
+
+#
+# Deployment Category
+#
+log4j.category.deployment = ERROR, DEPLOYMENT, console
+log4j.additivity.deployment = false
+
+
+#
+# Console Category
+#
+log4j.category.console = ERROR, console
+log4j.additivity.console = false
+
+########################################################################
+#
+# Logfile definitions
+#
+########################################################################
+
+#
+# jetspeed.log
+#
+log4j.appender.jetspeed = org.apache.log4j.FileAppender
+log4j.appender.jetspeed.file = ${applicationRoot}/logs/jetspeed.log
+log4j.appender.jetspeed.layout = org.apache.log4j.PatternLayout
+log4j.appender.jetspeed.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.jetspeed.append = false
+
+log4j.appender.digester = org.apache.log4j.FileAppender
+log4j.appender.digester.file = ${applicationRoot}/logs/digester.log
+log4j.appender.digester.layout = org.apache.log4j.PatternLayout
+log4j.appender.digester.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.digester.append = false
+
+#
+# pluto.log
+#
+log4j.appender.PLUTO = org.apache.log4j.FileAppender
+log4j.appender.PLUTO.file = ${applicationRoot}/logs/pluto.log
+log4j.appender.PLUTO.layout = org.apache.log4j.PatternLayout
+log4j.appender.PLUTO.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.PLUTO.append = false
+
+#
+# deployment.log
+#
+log4j.appender.DEPLOYMENT = org.apache.log4j.FileAppender
+log4j.appender.DEPLOYMENT.file = ${applicationRoot}/logs/deployment.log
+log4j.appender.DEPLOYMENT.layout = org.apache.log4j.PatternLayout
+log4j.appender.DEPLOYMENT.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.DEPLOYMENT.append = false
+
+#
+# Scheduler Output
+#
+log4j.appender.scheduler = org.apache.log4j.FileAppender
+log4j.appender.scheduler.file = ${applicationRoot}/logs/scheduler.log
+log4j.appender.scheduler.layout = org.apache.log4j.PatternLayout
+log4j.appender.scheduler.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.scheduler.append = false
+
+#
+# Velocity gets configured to write its output onto the velocity
+# category.
+#
+log4j.appender.velocity = org.apache.log4j.FileAppender
+log4j.appender.velocity.file = ${applicationRoot}/logs/velocity.log
+log4j.appender.velocity.layout = org.apache.log4j.PatternLayout
+log4j.appender.velocity.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.velocity.append = false
+
+
+log4j.appender.ojb = org.apache.log4j.FileAppender
+log4j.appender.ojb.file = ${applicationRoot}/logs/ojb.log
+log4j.appender.ojb.layout = org.apache.log4j.PatternLayout
+log4j.appender.ojb.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.ojb.append = false
+
+#
+# Console
+#
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.console.layout.ConversionPattern=%5p: %m%n
+

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/Log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/Log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/jetspeed-production.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/jetspeed-production.properties?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/jetspeed-production.properties (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/jetspeed-production.properties Mon Mar 26 16:53:34 2007
@@ -0,0 +1,26 @@
+# 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.
+
+#
+# Properties that can be configured at runtime by system administrator
+# (example values)
+
+# Portal URL Override
+# useful for hard-coding portal URL in proxied host environments
+portal.url.scheme = http
+portal.url.name = 127.0.0.1
+portal.url.port = 8080
+portal.url.secure = false
+

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/jetspeed-production.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/jetspeed.properties?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/jetspeed.properties (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/jetspeed.properties Mon Mar 26 16:53:34 2007
@@ -0,0 +1,219 @@
+# 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.
+
+# ------------------------------------------------------------------------
+#
+# Jetspeed Portal Engine - Properties
+#
+# $Id$
+#
+# ------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------
+# override for jetspeed.properties.  This include needs to be come before
+# any other prop definitions.
+#-------------------------------------------------------------------------
+include=override.properties
+
+portal.name = Jetspeed
+portal.version = 2.2-dev
+
+# By setting this to true, the Engine will create its own
+# JNDI context.  Not needed in deployment.  We use Tomcat's JNDI
+# instead.
+portal.use.internal.jndi=false
+
+#----------------------------------------------------------------------------------
+# Portal URL NavigationalState Parameter Name (default: _ns)
+#----------------------------------------------------------------------------------
+portalurl.navigationalstate.parameter.name=_ns
+
+#----------------------------------------------------------------------------------
+# Generate all Portal URLs without schema, servername or port.
+# WARNING: Defining this to true (default = false) means requesting secure Portlet URLs
+#          won't have any effect anymore.
+#          But a proxy frontend (like Apache) can still be used for securing the whole site.
+#          See: https://issues.apache.org/jira/browse/JS2-275#action_12474326
+#----------------------------------------------------------------------------------
+portalurl.relative.only=false
+
+#----------------------------------------------------------------------------------
+# Until version 2.1, Jetspeed merged portal request parameters with portlet specific
+# parameters, effectively allowing "shared" parameters.
+# This is not compliant with the JSR-168 PLT.11, so by default this is now disabled.
+#
+# By setting merge.portal.parameters.with.portlet.parameters=true this feature can
+# be "restored".
+# In the situation of portal and portlet parameters with the same name, by default
+# the portlet parameters will be provided first in the values array, but this too
+# can be overridden by setting merge.portal.parameters.before.portlet.parameters=true
+#
+# Setting both these properties to true will deliver the "old" pre-2.1 behavior.
+# Note: for individual portlets, these global settings can be overridden by setting
+#       these properties as metadata in jetspeed-portlet.xml
+#----------------------------------------------------------------------------------
+merge.portal.parameters.with.portlet.parameters=false
+merge.portal.parameters.before.portlet.parameters=false
+# -------------------------------------------------------------------
+#  Portlet Mode Support
+# -------------------------------------------------------------------
+# standard
+supported.portletmode = view
+supported.portletmode = edit
+supported.portletmode = help
+# extended
+supported.portletmode = print
+supported.portletmode = secure  # currently only used for testing purposes
+
+# -------------------------------------------------------------------
+#  Window State Support
+# -------------------------------------------------------------------
+# standard
+supported.windowstate = normal
+supported.windowstate = maximized
+supported.windowstate = minimized
+supported.windowstate = solo
+    
+# -------------------------------------------------------------------
+#  Security Information
+# -------------------------------------------------------------------
+
+# if no user has been setup, default.user.principal will be
+# automatically added via HttpRequestContext.setUserPrincpal()
+default.user.principal=guest
+default.admin.user=admin
+
+# -------------------------------------------------------------------
+#  L O G 4 J - L O G G I N G
+# -------------------------------------------------------------------
+log4j.file = /WEB-INF/conf/Log4j.properties
+
+# -------------------------------------------------------------------
+#  C O N T A I N E R
+# -------------------------------------------------------------------
+container.impl = org.apache.pluto.PortletContainerImpl
+container.wrapper = org.apache.jetspeed.container.JetspeedPortletContainerWrapper
+
+
+# -------------------------------------------------------------------
+#  P I P E L I N E
+# -------------------------------------------------------------------
+pipeline.default = jetspeed-pipeline
+
+
+# -------------------------------------------------------------------
+#  F A C T O R Y
+# -------------------------------------------------------------------
+
+factory.container.response = org.apache.jetspeed.container.ContainerResponse
+factory.container.request = org.apache.jetspeed.container.ContainerRequest
+
+# Servlet Invoker
+factory.invoker.servlet = org.apache.jetspeed.container.invoker.ServletPortletInvoker
+factory.invoker.servlet.pool.size = 50
+factory.invoker.servlet.mapping.name = /container
+
+# Local Invoker
+factory.invoker.local = org.apache.jetspeed.container.invoker.LocalPortletInvoker
+factory.invoker.local.pool.size = 50
+
+#--------------------------------------------------------------------
+# P O R T L E T  D E P L O Y M E N T  D E S C R I P T O R
+#--------------------------------------------------------------------
+deployment.descriptor.mapping.xml=/WEB-INF/conf/portletdefinitionmapping.xml
+
+
+#-------------------------------------------------------------------------
+# C A P A B I L I T Y,  C O N T E N T  E N C O D I N G
+#-------------------------------------------------------------------------
+content.defaultencoding=iso-8859-1
+
+#---------------------------------------------------------------------------------
+# Run Auto-Deployment set up
+#----'-----------------------------------------------------------------------------
+# THE NEXT PROPERTY DEFINITION MAY NOT BE MODIFIED (NOT EVEN BE PADDED WITH WHITESPACE)
+# BECAUSE ITS FILTERED BY ANT DURING DEPLOYMENT.
+# ITS CONCREET VALUE WILL BE SET FROM BUILD PROPERTY org.apache.jetspeed.catalina.version.major
+autodeployment.catalina.version.major=5
+autodeployment.catalina.base=${applicationRoot}/../../
+autodeployment.catalina.engine=Catalina
+autodeployment.server=@AUTODEPLOYMENT_SERVER@
+autodeployment.port=8080
+autodeployment.user=@AUTODEPLOYMENT_USER@
+autodeployment.password=@AUTODEPLOYMENT_PASSWORD@
+autodeployment.staging.dir=${applicationRoot}/WEB-INF/deploy
+autodeployment.target.dir=${applicationRoot}/../
+autodeployment.delay=10000
+autodeployment.earlyInit = true
+
+#-------------------------------------------------------------------------
+# A S S E M B L Y (note may move this to class path)
+#-------------------------------------------------------------------------
+assembly.dir=/WEB-INF/assembly
+assembly.extension=.xml
+
+#-------------------------------------------------------------------------
+# E M A I L
+#-------------------------------------------------------------------------
+# email of the system administrator
+email.admin = someemailaddress@somecompanyororganization.comororgornet
+# email of the system manager
+email.manager = someemailaddress@somecompanyororganization.comororgornet
+# email user info attribute (non standard)
+email.userinfo.attribute = user.email
+
+#-------------------------------------------------------------------------
+# L A Y O U T
+#-------------------------------------------------------------------------
+# the default page layout if none is specified
+layout.page.default = jetspeed-layouts::VelocityTwoColumns
+
+#-------------------------------------------------------------------------
+# D E C O R A T O R S
+#-------------------------------------------------------------------------
+# default page decorator if none specified
+decorator.page.default = tigris
+# default portlet decorator if none specified
+decorator.portlet.default = tigris
+
+#-------------------------------------------------------------------------
+# P S M L
+#-------------------------------------------------------------------------
+# default page name (currently handled by PM)
+psml.page.default = default-page.psml    
+# PSML Folder Template to copy during new user creation and registration
+psml.template.folder = /_user/template/
+
+#-------------------------------------------------------------------------
+# P R O F I L E R
+#-------------------------------------------------------------------------
+# default profiling rule names assigned to a new user
+profiler.rule.names.default = page
+# default profiling rule values assigned to a new user
+profiler.rule.values.default = j2 
+    
+#-------------------------------------------------------------------------
+# R E G I S T R A T I O N
+#-------------------------------------------------------------------------
+# PSML Folder Template to copy during new user creation and registration
+# comma separated list
+registration.roles.default = user
+
+# Registration default groups assigned during registration or new user creation
+# comma separated list    
+registration.groups.default = 
+# Registration default profiling rules assigned during registration or new user creation
+# comma separated list
+registration.rules.default = 

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/jetspeed.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/jetspeed.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/override.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/override.properties?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/override.properties (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/override.properties Mon Mar 26 16:53:34 2007
@@ -0,0 +1,16 @@
+# 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.
+
+# Use this to override settings in jetspeed.properties
\ No newline at end of file

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/override.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/override.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/pam.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/pam.properties?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/pam.properties (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/pam.properties Mon Mar 26 16:53:34 2007
@@ -0,0 +1,42 @@
+# 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.
+
+# we need JNDI when using the command line deployment tools
+# --------------------------------------------------------------------------
+# JNDI Support Service
+#---------------------------------------------------------------------------
+#services.JNDIService.classname=org.apache.jetspeed.cps.jndi.TyrexJNDIService
+#services.JNDIService.earlyInit = true
+
+
+
+# --------------------------------------------------------------------------
+# HSQL Server (Only needed if you are using HSQL)
+#---------------------------------------------------------------------------
+# we need a JNDI datasource when using the command line deployment tools
+
+# use the below lines to setup HSQL within a JNDI pooled Datasource
+# needed for deployment
+#services.HSQLDBServer.use.jndi.datasource=true
+#services.HSQLDBServer.jndi.datasource.name=jdbc/jetspeed
+#services.HSQLDBServer.jndi.datasource.maxActive=25
+# When the pool is exhausted do 1 of the following
+# "grow"  increases the pool size by 1
+# "fail"   a "noSuchElementException" is thrown
+# "block"  waits for a datasource to become available
+#services.HSQLDBServer.jndi.datasource.when.exhausted=grow
+# The amount of time block while waiting for a released
+# object.  Only used if "block" is specified
+# services.HSQLDBServer.jndi.datasource.max.block.wait=5000
\ No newline at end of file

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/pam.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/pam.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/Log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/Log4j.properties?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/Log4j.properties (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/Log4j.properties Mon Mar 26 16:53:34 2007
@@ -0,0 +1,167 @@
+# 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.
+
+# ------------------------------------------------------------------------
+#
+# Logging Configuration
+#
+# $Id$
+#
+# ------------------------------------------------------------------------
+
+#
+# If we don't know the logging facility, put it into the jetspeed.log
+# 
+#
+log4j.rootLogger = INFO, jetspeed
+
+#
+# Jetspeed goes into Jetspeed Log
+#
+log4j.category.org.apache.jetspeed = DEBUG, jetspeed
+log4j.additivity.org.apache.jetspeed = false
+
+
+log4j.category.org.apache.jetspeed.tools = DEBUG, jetspeed
+log4j.additivity.org.apache.jetspeed.tools = false
+
+log4j.category.org.apache.commons.digester = DEBUG, digester
+log4j.additivity.org.apache.commons.digester = false
+
+#
+# Velocity Logfile
+#
+log4j.category.velocity = INFO, velocity
+log4j.additivity.velocity = false
+
+#
+# OJB Logfile
+#
+log4j.category.org.apache.ojb= INFO, ojb
+log4j.additivity.org.apache.ojb= false
+
+#
+# Scheduler Category
+#
+log4j.category.scheduler = INFO, scheduler
+log4j.additivity.scheduler = false
+
+#
+# Pluto Category
+#
+log4j.category.org.apache.pluto = DEBUG, PLUTO, console
+log4j.additivity.org.apache.pluto = false
+
+#
+# Betwixt Category
+#
+log4j.category.org.apache.commons.betwixt= INFO, BETWIXT
+log4j.additivity.org.apache.commons.betwixt = false
+
+#
+# Pluto Category
+#
+log4j.category.deployment = INFO, DEPLOYMENT, console
+log4j.additivity.deployment = false
+
+
+#
+# Console Category
+#
+log4j.category.console = WARN, console
+log4j.additivity.console = false
+
+########################################################################
+#
+# Logfile definitions
+#
+########################################################################
+
+#
+# jetspeed.log
+#
+log4j.appender.jetspeed = org.apache.log4j.FileAppender
+log4j.appender.jetspeed.file = ${applicationRoot}/logs/jetspeed.log
+log4j.appender.jetspeed.layout = org.apache.log4j.PatternLayout
+log4j.appender.jetspeed.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.jetspeed.append = false
+
+log4j.appender.digester = org.apache.log4j.FileAppender
+log4j.appender.digester.file = ${applicationRoot}/logs/digester.log
+log4j.appender.digester.layout = org.apache.log4j.PatternLayout
+log4j.appender.digester.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.digester.append = false
+
+#
+# pluto.log
+#
+log4j.appender.PLUTO = org.apache.log4j.FileAppender
+log4j.appender.PLUTO.file = ${applicationRoot}/logs/pluto.log
+log4j.appender.PLUTO.layout = org.apache.log4j.PatternLayout
+log4j.appender.PLUTO.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.PLUTO.append = false
+
+#
+# deployment.log
+#
+log4j.appender.DEPLOYMENT = org.apache.log4j.FileAppender
+log4j.appender.DEPLOYMENT.file = ${applicationRoot}/logs/deployment.log
+log4j.appender.DEPLOYMENT.layout = org.apache.log4j.PatternLayout
+log4j.appender.DEPLOYMENT.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.DEPLOYMENT.append = false
+
+#
+# betwixt.log
+#
+log4j.appender.BETWIXT = org.apache.log4j.FileAppender
+log4j.appender.BETWIXT.file = ${applicationRoot}/logs/betwixt.log
+log4j.appender.BETWIXT.layout = org.apache.log4j.PatternLayout
+log4j.appender.BETWIXT.layout.conversionPattern = %m%n
+log4j.appender.BETWIXT.append = false
+
+#
+# Scheduler Output
+#
+log4j.appender.scheduler = org.apache.log4j.FileAppender
+log4j.appender.scheduler.file = ${applicationRoot}/logs/scheduler.log
+log4j.appender.scheduler.layout = org.apache.log4j.PatternLayout
+log4j.appender.scheduler.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.scheduler.append = false
+
+#
+# Velocity gets configured to write its output onto the velocity
+# category.
+#
+log4j.appender.velocity = org.apache.log4j.FileAppender
+log4j.appender.velocity.file = ${applicationRoot}/logs/velocity.log
+log4j.appender.velocity.layout = org.apache.log4j.PatternLayout
+log4j.appender.velocity.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.velocity.append = false
+
+
+log4j.appender.ojb = org.apache.log4j.FileAppender
+log4j.appender.ojb.file = ${applicationRoot}/logs/ojb.log
+log4j.appender.ojb.layout = org.apache.log4j.PatternLayout
+log4j.appender.ojb.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.ojb.append = false
+
+#
+# Console
+#
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.console.layout.ConversionPattern=%5p: %m%n

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/Log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/Log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/jetspeed.properties?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/jetspeed.properties (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/jetspeed.properties Mon Mar 26 16:53:34 2007
@@ -0,0 +1,56 @@
+# 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.
+
+# ------------------------------------------------------------------------
+#
+# Jetspeed Portal Engine - Test Properties
+#    overrides properties in ../jetspeed.properties for testing
+#
+# $Id$
+#
+
+# we need internal JNDI for testing
+portal.use.internal.jndi=true
+
+# -------------------------------------------------------------------
+#  L O G 4 J - L O G G I N G
+# -------------------------------------------------------------------
+log4j.file = /WEB-INF/conf/test/Log4j.properties
+
+# -------------------------------------------------------------------
+#  C A P A B I L I T Y 
+# -------------------------------------------------------------------
+# Use the persistence plugin that points to the test system
+# services.capability.persistence.plugin.name=jetspeed-test
+
+# -------------------------------------------------------------------
+#  P S M L 
+# -------------------------------------------------------------------
+services.PsmlManager.root=./test/testdata/psml
+
+
+#---------------------------------------------------------------------------------
+# Run Auto-Deployment set up
+#---------------------------------------------------------------------------------
+autodeployment.server=localhost
+autodeployment.port=8080
+autodeployment.user=scott
+autodeployment.password=scott
+autodeployment.staging.dir=${applicationRoot}/WEB-INF/deploy
+autodeployment.target.dir=${applicationRoot}/../
+autodeployment.delay=10000
+
+
+

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/jetspeed.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/jetspeed.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/registry-hsql-database.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/registry-hsql-database.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/registry-hsql-database.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/registry-hsql-database.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,25 @@
+<?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.
+-->
+<database name="registry" engine="hsql">
+  <driver url="jdbc:hsqldb:./test/db/hsql/Registry"
+          class-name="org.hsqldb.jdbcDriver">
+    <param name="user" value="sa" />
+    <param name="password" value="" />
+  </driver>
+  <mapping href="registry-mapping.xml"/>
+</database>        
\ No newline at end of file

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/registry-hsql-database.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/registry-hsql-database.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/testcase-2.xreg
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/testcase-2.xreg?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/testcase-2.xreg (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/testcase-2.xreg Mon Mar 26 16:53:34 2007
@@ -0,0 +1,126 @@
+<?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.
+-->
+<registry>
+    <portlet-entry name="XSL" hidden="false" type="abstract" application="false">
+        <classname>org.apache.jetspeed.portal.portlets.XSLPortlet</classname>
+    </portlet-entry>
+    <portlet-entry name="RSS" hidden="false" type="abstract" application="false">
+        <meta-info>
+            <title>RSS-Default-Title</title>
+            <description>RSS-Default-Description</description>
+        </meta-info>
+
+        <classname>org.apache.jetspeed.portal.portlets.NewRSSPortlet</classname>
+        <parameter name="stylesheet" value="/WEB-INF/xsl/rss.xsl" hidden="false">
+            <security role="admin"/>
+        </parameter>
+        <parameter name="stylesheet.text/html" value="/WEB-INF/xsl/rss.xsl" hidden="false">
+            <security role="admin"/>
+        </parameter>
+        <parameter name="stylesheet.text/vnd.wap.wml" value="/WEB-INF/xsl/rss-wml.xsl" hidden="false">
+            <security role="admin"/>
+        </parameter>
+        <parameter name="itemdisplayed" value="15" hidden="false">
+            <meta-info>
+                <title>Number of items</title>
+                <description>This parameter controls how many items may
+                    be shown in this            portlet. If the
+                    information channel has more items, only the first
+                    will           be displayed.         </description>
+            </meta-info>
+        </parameter>
+        <parameter name="openinpopup" value="false" type="boolean" hidden="false">
+            <meta-info>
+                <title>Open links in Popup window</title>
+                <description>Links will be opened in a new browser window.</description>
+            </meta-info>
+        </parameter>
+        <parameter name="showdescription" value="true" type="boolean" hidden="false">
+            <meta-info>
+                <title>Show item description ?</title>
+                <description>           This parameter specify whether
+                    the item descriptions and icons should be
+                    displayed in this portlet, or only the headlines.         </description>
+            </meta-info>
+        </parameter>
+        <parameter name="showtitle" value="true" type="boolean" hidden="false">
+            <meta-info>
+                <title>Show title description ?</title>
+                <description>           This parameter specify whether
+                    the title description and icon should be
+                    displayed in this portlet, or only the title.         </description>
+            </meta-info>
+        </parameter>
+        <parameter name="showtextinput" value="true" type="boolean" hidden="false">
+            <meta-info>
+                <title>Show Text Input?</title>
+                <description>           This parameter specify whether
+                    the text input will be displayed.             Text
+                    Input is an optional element in the RSS feed.         </description>
+            </meta-info>
+        </parameter>
+        <category>news.feeds</category>
+        <category group="base">xml.rss</category>
+        <media-type ref="html"/>
+    </portlet-entry>
+
+    <portlet-entry name="XMLHack" hidden="true" type="ref" parent="RSS" application="false">
+        <meta-info>
+            <title>XMLHack Title</title>
+            <description>XMLHack Description</description>
+        </meta-info>
+        <classname/>
+        <url cachedOnURL="true">http://www.xmlhack.com/rss.php</url>
+        <parameter name="HACK" value="hacker"/>
+    </portlet-entry>
+
+<!--
+    <portlet-entry name="Feeder" hidden="true" type="ref" parent="RSS" application="false">
+        <url cachedOnURL="true">http://www.feeder-site.com/feed.rss</url>
+        <category group="news">news.world.politics</category>
+        <category group="news">news.world.wars</category>
+    </portlet-entry>
+
+    <portlet-entry name="AdminScreen" hidden="false" type="instance" application="false">
+        <meta-info>
+            <title>Turbine Screen in a portlet</title>
+            <description>We put the Admin Screen in a portlet.</description>
+        </meta-info>
+        <classname>org.apache.jetspeed.portal.portlets.TurbineScreenPortlet</classname>
+        <parameter name="display.screen" value="Admin" hidden="false"/>
+        <parameter name="bgcolor" value="gray" hidden="false"/>
+        <media-type ref="html"/>
+    </portlet-entry>
+
+    <portlet-entry name="MetaTest" hidden="false" type="ref" parent="AdminScreen" application="false">
+        <media-type ref="wml"/>
+        <media-type ref="xml"/>
+    </portlet-entry>
+
+    <portlet-entry name="NoMediaType" hidden="false" type="ref" parent="AdminScreen" application="false"/>
+
+    <portlet-entry name="KeyTest" hidden="true" type="ref" parent="RSS" application="false">
+        <url cachedOnURL="false">http://www.newnews.com/</url>
+        <parameter cachedOnName="false" cachedOnValue="true" name="newsid" value="99" hidden="false"/>
+        <parameter cachedOnName="true" cachedOnValue="false" name="sportsid" value="100" hidden="false"/>
+        <parameter  cachedOnName="false" cachedOnValue="false" name="contact" value="Joe" hidden="false"/>
+        <parameter  name="contact2" value="Jon" hidden="false"/>
+
+    </portlet-entry>
+-->
+</registry>

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/testcase-security.xreg
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/testcase-security.xreg?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/testcase-security.xreg (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/testcase-security.xreg Mon Mar 26 16:53:34 2007
@@ -0,0 +1,106 @@
+<?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.
+-->
+<registry>
+    <security-entry name="basic_testcase">
+        <access action="view">
+            <allow-if role="clerk"/>
+            <allow-if user="joe"/>
+            <allow-if role="manager" user="fred"/>
+        </access>
+        <access action="customize">
+            <allow-if user="*"/>
+        </access>
+        <access action="minimize">
+        </access>
+    </security-entry>
+    <security-entry name="admin_only">
+        <access action="customize">
+            <allow-if role="admin"/>
+        </access>
+        <access action="maximize">
+            <allow-if role="admin"/>
+        </access>
+        <access action="minimize">
+            <allow-if role="admin"/>
+        </access>
+        <access action="view">
+            <allow-if role="admin"/>
+        </access>
+    </security-entry>
+    <security-entry name="admin_all-user_view">
+        <access action="customize">
+            <allow-if role="admin"/>
+        </access>
+        <access action="maximize">
+            <allow-if role="admin"/>
+        </access>
+        <access action="minimize">
+            <allow-if role="admin"/>
+        </access>
+        <access action="view">
+            <allow-if role="admin"/>
+            <allow-if role="user"/>
+        </access>
+    </security-entry>
+    <security-entry name="user_only">
+        <access action="customize">
+            <allow-if role="user"/>
+        </access>
+        <access action="maximize">
+            <allow-if role="user"/>
+        </access>
+        <access action="minimize">
+            <allow-if role="user"/>
+        </access>
+        <access action="view">
+            <allow-if role="user"/>
+        </access>
+    </security-entry>
+    <security-entry name="wide_open">
+        <security-ref parent="admin_only"/>
+        <access>
+            <allow-if user="*"/>
+        </access>
+    </security-entry>
+    <security-entry name="owner_only">
+        <access action="*">
+            <allow-if-owner/>
+        </access>
+    </security-entry>
+    <portlet-entry name="XSL" hidden="false" type="abstract" application="false">
+        <security-ref name="user_only"/>
+    </portlet-entry>
+
+    <portlet-entry name="RSS" hidden="false" type="abstract" application="false">
+        <security-ref name="wide_open"/>
+
+        <classname>org.apache.jetspeed.portal.portlets.NewRSSPortlet</classname>
+        <parameter name="stylesheet" value="/WEB-INF/xsl/rss.xsl" hidden="false">
+            <security-ref name="admin_only"/>
+        </parameter>
+        <parameter name="stylesheet.text/html" value="/WEB-INF/xsl/rss.xsl" hidden="false">
+            <security-ref name="admin_only"/>
+        </parameter>
+        <parameter name="stylesheet.text/vnd.wap.wml" value="/WEB-INF/xsl/rss-wml.xsl" hidden="false">
+            <security-ref name="admin_only"/>
+        </parameter>
+        <parameter name="itemdisplayed" value="15" hidden="false">
+            <security-ref name="admin_all-user_view"/>
+        </parameter>
+    </portlet-entry>
+</registry>
\ No newline at end of file

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/url-testcase.xreg
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/url-testcase.xreg?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/url-testcase.xreg (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/conf/test/url-testcase.xreg Mon Mar 26 16:53:34 2007
@@ -0,0 +1,18 @@
+<?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.
+-->
+<url cacheKey='true'>http://www.xmlhack.com/rss.php</url>

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/deploy/README.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/deploy/README.txt?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/deploy/README.txt (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/deploy/README.txt Mon Mar 26 16:53:34 2007
@@ -0,0 +1,17 @@
+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.
+
+This is the default auto deployment folder where you can put portlet application
+war files and decorator jar (or zip) files to be automatically deployed by Jetspeed.
\ No newline at end of file

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/deploy/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/deploy/README.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/deploy/local/README.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/deploy/local/README.txt?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/deploy/local/README.txt (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/deploy/local/README.txt Mon Mar 26 16:53:34 2007
@@ -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.
+
+This is the default auto deployment folder where you can put portlet application
+war files to be automatically deployed as local portlet application by Jetspeed
+without a "jetspeed-" prefix in the name as is required for local portlet application
+when deployed in the "normal" auto deployment folder (by default this parent deploy folder).
\ No newline at end of file

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/deploy/local/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/deploy/local/README.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/jboss-web.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/jboss-web.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/jboss-web.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/jboss-web.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,32 @@
+<?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.
+-->
+<jboss-web>
+  <class-loading>
+    <loader-repository java2ClassLoadingCompliance="false">
+      org.apache.jetspeed:loader=jetspeed.war<loader-repository-config>java2ParentDelegation=false</loader-repository-config>
+    </loader-repository>
+  </class-loading>
+  <security-domain flushOnSessionInvalidation="true">java:/jaas/Jetspeed</security-domain>
+  <resource-ref>
+    <res-ref-name>jdbc/jetspeed</res-ref-name>
+    <res-type>javax.sql.DataSource</res-type>
+    <jndi-name>java:/JetspeedDS</jndi-name>
+  </resource-ref>
+</jboss-web>
+
+

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/jboss-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/jboss-web.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