You are viewing a plain text version of this content. The canonical link for it is here.
Posted to graffito-commits@incubator.apache.org by cl...@apache.org on 2005/02/17 23:46:39 UTC
svn commit: r154209 - in incubator/graffito/trunk/jetspeed2-deploy/src:
assembly/jetspeed-spring.xml pages/graffito.psml
Author: clombart
Date: Thu Feb 17 15:46:38 2005
New Revision: 154209
URL: http://svn.apache.org/viewcvs?view=rev&rev=154209
Log:
* Update to the newest J2 Spring assembly script
* Change graffito layout
Modified:
incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml
incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml
Modified: incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml?view=diff&r1=154208&r2=154209
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml Thu Feb 17 15:46:38 2005
@@ -15,6 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+
<beans>
<!-- Commons configuration object generated from jetspeed.properties -->
@@ -67,15 +69,16 @@
<entry key="EntityAccessor">
<ref bean='org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent'/>
</entry>
-
- <entry key="ContentServer">
+ <entry key="ContentServer">
<ref bean="org.apache.portals.graffito.ContentServerService"/>
</entry>
<entry key="ContentModel">
<ref bean="org.apache.portals.graffito.ContentModelService"/>
- </entry>
-
+ </entry>
</map>
+
+
+
</constructor-arg>
</bean>
@@ -360,216 +363,7 @@
</props>
</property>
</bean>
-
- <!-- ************** 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>META-INF/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>
-
- <bean id="org.apache.jetspeed.security.spi.CredentialPasswordValidator"
- class="org.apache.jetspeed.security.spi.impl.DefaultCredentialPasswordValidator"/>
-
- <bean id="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"
- class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
- <constructor-arg index="0"><value>SHA-1</value></constructor-arg>
- </bean>
-
- <bean id="org.apache.jetspeed.security.spi.PasswordCredentialProvider"
- class="org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialProvider">
- <constructor-arg index="0"><ref bean="org.apache.jetspeed.security.spi.CredentialPasswordValidator"/></constructor-arg>
- <constructor-arg index="1"><ref bean="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"/></constructor-arg>
- </bean>
-
- <bean id="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor"
- class="org.apache.jetspeed.security.spi.impl.InternalPasswordCredentialHistoryHandlingInterceptor">
- <!-- maxNumberOfAuthenticationFailures -->
- <constructor-arg index="0"><value>3</value></constructor-arg>
- <!-- maxLifeSpanInDays -->
- <constructor-arg index="1"><value>60</value></constructor-arg>
- <!-- historySize -->
- <constructor-arg index="2"><value>3</value></constructor-arg>
- </bean>
-
- <!-- Security SPI: CredentialHandler -->
- <bean id="org.apache.jetspeed.security.spi.CredentialHandler"
- class="org.apache.jetspeed.security.spi.impl.DefaultCredentialHandler"
- >
- <constructor-arg index="0"><ref bean="org.apache.jetspeed.security.spi.SecurityAccess"/></constructor-arg>
- <constructor-arg index="1"><ref bean="org.apache.jetspeed.security.spi.PasswordCredentialProvider"/></constructor-arg>
- <constructor-arg index="2"><ref bean="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor"/></constructor-arg>
- </bean>
-
- <!-- Security SPI: UserSecurityHandler -->
- <!-- The DefaultUSerSecurityHandler uses the raw SecurityAccessImpl so that it
- may demarcate its own transactions -->
- <bean id="org.apache.jetspeed.security.spi.UserSecurityHandlerImpl"
- class="org.apache.jetspeed.security.spi.impl.DefaultUserSecurityHandler"
- >
- <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.SecurityAccess"/></constructor-arg>
- </bean>
-
- <bean id="org.apache.jetspeed.security.spi.UserSecurityHandler" parent="baseTransactionProxy"
- name="userSecurityHandler" >
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.security.spi.UserSecurityHandler</value>
- </property>
- <property name="target">
- <ref bean="org.apache.jetspeed.security.spi.UserSecurityHandlerImpl"/>
- </property>
- <property name="transactionAttributes">
- <props>
- <prop key="*">PROPAGATION_REQUIRED</prop>
- </props>
- </property>
- </bean>
-
- <!-- 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>
-
- <!-- ************** Security Providers ************** -->
- <!-- Security: Default Authentication Provider -->
- <bean id="org.apache.jetspeed.security.AuthenticationProvider"
- class="org.apache.jetspeed.security.impl.AuthenticationProviderImpl"
- >
- <constructor-arg index="0"><value>DefaultAuthenticator</value></constructor-arg>
- <constructor-arg index="1"><value>The default authenticator</value></constructor-arg>
- <constructor-arg index="2"><value>login.conf</value></constructor-arg>
- <constructor-arg index="3"><ref bean="org.apache.jetspeed.security.spi.CredentialHandler"/></constructor-arg>
- <constructor-arg index="4"><ref bean="org.apache.jetspeed.security.spi.UserSecurityHandler"/></constructor-arg>
- </bean>
-
- <!-- Security: Authentication Provider Proxy -->
- <bean id="org.apache.jetspeed.security.AuthenticationProviderProxy"
- class="org.apache.jetspeed.security.impl.AuthenticationProviderProxyImpl"
- >
- <constructor-arg >
- <list>
- <ref bean="org.apache.jetspeed.security.AuthenticationProvider"/>
- </list>
- </constructor-arg>
- <constructor-arg ><value>DefaultAuthenticator</value></constructor-arg>
- </bean>
-
- <!-- Security: Security Provider -->
- <bean id="org.apache.jetspeed.security.SecurityProvider"
- class="org.apache.jetspeed.security.impl.SecurityProviderImpl"
- >
- <constructor-arg ><ref bean="org.apache.jetspeed.security.AuthenticationProviderProxy"/></constructor-arg>
- <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.RoleSecurityHandler"/></constructor-arg>
- <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.GroupSecurityHandler"/></constructor-arg>
- <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.SecurityMappingHandler"/></constructor-arg>
- </bean>
-
- <!-- Security: User Manager -->
- <bean id="org.apache.jetspeed.security.UserManager"
- class="org.apache.jetspeed.security.impl.UserManagerImpl"
- >
- <constructor-arg ><ref bean="org.apache.jetspeed.security.SecurityProvider"/></constructor-arg>
- </bean>
-
- <!-- Security: Group Manager -->
- <bean id="org.apache.jetspeed.security.GroupManager"
- class="org.apache.jetspeed.security.impl.GroupManagerImpl"
- >
- <constructor-arg ><ref bean="org.apache.jetspeed.security.SecurityProvider"/></constructor-arg>
- </bean>
-
- <!-- Security: Role Manager -->
- <bean id="org.apache.jetspeed.security.RoleManager"
- class="org.apache.jetspeed.security.impl.RoleManagerImpl"
- >
- <constructor-arg ><ref bean="org.apache.jetspeed.security.SecurityProvider"/></constructor-arg>
- </bean>
-
- <!-- ************** Login Module ************** -->
- <!-- Security: Login Module Proxy -->
- <bean id="org.apache.jetspeed.security.LoginModuleProxy"
- class="org.apache.jetspeed.security.impl.LoginModuleProxyImpl"
- >
- <constructor-arg ><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>
- </bean>
-
-
- <!-- ************** Authorization ************** -->
- <!-- Security: Permission Manager -->
- <bean id="org.apache.jetspeed.security.impl.PermissionManagerImpl"
- class="org.apache.jetspeed.security.impl.PermissionManagerImpl" />
-
- <bean id="org.apache.jetspeed.security.PermissionManager" parent="baseTransactionProxy"
- name="permissionManager" >
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.security.PermissionManager</value>
- </property>
- <property name="target">
- <ref bean="org.apache.jetspeed.security.impl.PermissionManagerImpl"/>
- </property>
- <property name="transactionAttributes">
- <props>
- <prop key="remove*">PROPAGATION_REQUIRED</prop>
- <prop key="grant*">PROPAGATION_REQUIRED</prop>
- <prop key="revoke*">PROPAGATION_REQUIRED</prop>
- <prop key="grant*">PROPAGATION_REQUIRED</prop>
- <prop key="add*">PROPAGATION_REQUIRED</prop>
- <prop key="*">PROPAGATION_SUPPORTS</prop>
- </props>
- </property>
- </bean>
-
- <!-- Security: RDBMS Policy implementation for JAAS -->
- <bean id="org.apache.jetspeed.security.impl.RdbmsPolicy"
- class="org.apache.jetspeed.security.impl.RdbmsPolicy"
- >
- <constructor-arg ><ref bean="org.apache.jetspeed.security.PermissionManager"/></constructor-arg>
- </bean>
-
- <!-- Security: Authorization Provider -->
- <bean id="org.apache.jetspeed.security.AuthorizationProvider"
- class="org.apache.jetspeed.security.impl.AuthorizationProviderImpl"
- >
- <constructor-arg ><ref bean="org.apache.jetspeed.security.impl.RdbmsPolicy"/></constructor-arg>
- </bean>
-
+
<!-- User Info -->
<bean id="org.apache.jetspeed.userinfo.UserInfoManager"
class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl"
@@ -593,7 +387,8 @@
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>
+ <constructor-arg ><ref bean="org.apache.jetspeed.userinfo.UserInfoManager" /></constructor-arg>
+ <constructor-arg ><ref bean="portletFactory" /></constructor-arg>
</bean>
<!-- Portlet Window Component -->
@@ -673,6 +468,7 @@
Provides hooks into the application server to help us deploy portlet applications
as web application into that server. This manager is for Tomcat 4/5
-->
+ <!--
<bean id="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager"
class="org.apache.jetspeed.tools.pamanager.servletcontainer.TomcatManager"
init-method="start" destroy-method="stop"
@@ -685,6 +481,7 @@
<constructor-arg index="5"><value>${autodeployment.user}</value></constructor-arg>
<constructor-arg index="6"><value>${autodeployment.password}</value></constructor-arg>
</bean>
+ -->
<!--
Application Server Manager for JBoss.
To support deployment in JBoss, comment the Tomcat app server definition above
@@ -702,6 +499,7 @@
and to application server Jetspeed is using to process the web application
portion of the portlet application.
-->
+ <!--
<bean id="PAM"
class="org.apache.jetspeed.tools.pamanager.ApplicationServerPAM"
init-method="start" destroy-method="stop"
@@ -712,6 +510,25 @@
<constructor-arg ><ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" /></constructor-arg>
<constructor-arg ><ref bean="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager" /></constructor-arg>
<constructor-arg ><ref bean="portletCache" /></constructor-arg>
+ <constructor-arg ><ref bean="portletFactory" /></constructor-arg>
+ <property name="searchEngine"><ref bean="org.apache.jetspeed.search.SearchEngine"/></property>
+ </bean>
+ -->
+ <bean id="deployFactory" class="org.apache.jetspeed.tools.deploy.JetspeedDeployFactory"/>
+ <bean id="PAM"
+ class="org.apache.jetspeed.tools.pamanager.WarInfusionPAM"
+ >
+ <constructor-arg><value>${autodeployment.target.dir}</value></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="portletCache"/></constructor-arg>
+ <constructor-arg><ref bean="portletFactory"/></constructor-arg>
+ <constructor-arg><ref bean="deployFactory"/></constructor-arg>
+ <!-- force deployment to use expanded wars, (i.e. Tomcat 4.X), default = not specified - inspect webapps to determine -->
+ <constructor-arg type="boolean"><value>true</value></constructor-arg>
+ <!-- force deployment to use war files, (i.e. Tomcat 5.X), default = not specified - inspect webapps to determine -->
+ <!-- <constructor-arg type="boolean"><value>false</value></constructor-arg> -->
<property name="searchEngine"><ref bean="org.apache.jetspeed.search.SearchEngine"/></property>
</bean>
@@ -722,7 +539,6 @@
<constructor-arg ><value>${autodeployment.staging.dir}</value></constructor-arg>
<constructor-arg ><ref bean="PAM" /></constructor-arg>
<constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" /></constructor-arg>
- <constructor-arg><ref bean="portletFactory"/></constructor-arg>
</bean>
<bean id="decoratorDeploymentRegistry"
class="org.apache.jetspeed.deployment.simpleregistry.impl.InMemoryRegistryImpl"
Modified: incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml?view=diff&r1=154208&r2=154209
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml Thu Feb 17 15:46:38 2005
@@ -1,31 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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.
--->
-<page id="GraffitoPortlets">
- <defaults
- skin="orange"
- layout-decorator="tigris"
- portlet-decorator="tigris"
- />
-
- <title>Graffito</title>
- <fragment id="graffitoportletspage" type="layout" name="jetspeed::VelocityTwoColumns">
- <fragment id="graffitoBrowser" type="portlet" name="graffito::graffitoBrowser">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="0" />
- </fragment>
- </fragment>
-</page>
+<?xml version="1.0" encoding="UTF-8"?>
+<page id="/jpetstore.psml" hidden="false">
+ <security-constraints>
+ <security-constraints-ref>public-view</security-constraints-ref>
+ </security-constraints>
+ <title>Graffito</title>
+ <short-title>Graffito</short-title>
+ <defaults skin="orange" layout-decorator="tigris" portlet-decorator="tigris"/>
+ <fragment id="gf-1" type="layout" name="jetspeed::VelocityOneColumn">
+ <fragment id="gf-2" type="portlet" name="graffito-browser::graffitoBrowser">
+ <property name="row" value="0" layout="OneColumn"/>
+ <property name="column" value="0" layout="OneColumn"/>
+ </fragment>
+ </fragment>
+</page>