portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r683497 [7/7] - in /portals/jetspeed-2/portal/branches/JS2-869: components/jetspeed-capability/src/main/java/org/apache/jetspeed/serializer/ components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/ components/jetspeed-...
Date Thu, 07 Aug 2008 03:52:09 GMT
Modified: portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml?rev=683497&r1=683496&r2=683497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml
(original)
+++ portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml
Wed Aug  6 20:52:05 2008
@@ -27,18 +27,28 @@
        Create Site to Principals association Table
     -->
     <!--
-       Create Security Principal Table
+       Create Security Principal Table - modified in version 2.2 
+       		dropped the PATH column (/user/david) 
+       normalized to 
+       		add column SP_TYPE (user)
+            add column SP_NAME (david)
+      Example 
+      	SP_TYPE = user | role | group (not limited to)
+      	SP_NAME = (a user | role | group) name such as 'admin'
+       
     -->
     <table name="SECURITY_PRINCIPAL">
         <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="CLASSNAME" required="true" size="254" type="VARCHAR"/>
         <column name="IS_MAPPING_ONLY" required="true" type="BOOLEANINT"/>
         <column name="IS_ENABLED" required="true" type="BOOLEANINT"/>
-        <column name="FULL_PATH" required="true" size="254" type="VARCHAR"/>
+        <column name="SP_TYPE" required="true" size="20" type="VARCHAR"/>
+        <column name="SP_NAME" required="true" size="200" type="VARCHAR"/>        
         <column name="CREATION_DATE" required="true" type="TIMESTAMP"/>
         <column name="MODIFIED_DATE" required="true" type="TIMESTAMP"/>
         <unique name="UIX_SECURITY_PRINCIPAL">
-          <unique-column name="FULL_PATH" />
+          <unique-column name="SP_TYPE" />
+          <unique-column name="SP_NAME" />
         </unique>        
     </table>
 
@@ -211,6 +221,36 @@
         </foreign-key>
     </table>
 
+   <!-- 
+      Create principal-security attributes for both Portlet API User Attributes and generic
principal preferences
+      Example 
+		ATTR_ID = unique primary key
+		PID = the primary key of the owning principal
+      	ATTR_NAME = a portlet api user info value such as 'user.name.given'
+       	ATTR_TYPE = USER_INFO | PREF (not limited to)      	
+   -->
+   
+    <table name="SECURITY_ATTRIBUTES">
+        <column name="ATTR_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PRINCIPAL_ID" required="true" type="INTEGER"/>
+        <column name="ATTR_NAME" required="true" size="200" type="VARCHAR"/>
+        <column name="ATTR_TYPE" required="true" size="20" type="VARCHAR"/>
+        <column name="PRINCIPAL_TYPE" size="10" type="VARCHAR"/>
+        <column name="ATTR_VALUE" size="1000" type="VARCHAR"/>
+        <index name="IX_PRINCIPAL_ID">
+            <index-column name="PRINCIPAL_ID"/>
+        </index>
+		<index name="IX_NAMEVALUE_LOOKUP">
+			<index-column name="ATTR_NAME"/>
+			<index-column name="ATTR_VALUE"/>
+		</index>
+		                
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_PRINCIPAL_ATTR" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
+        </foreign-key>        
+		
+    </table>
+
         
-    
+            
 </database>

Modified: portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/administration.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/administration.xml?rev=683497&r1=683496&r2=683497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/administration.xml
(original)
+++ portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/administration.xml
Wed Aug  6 20:52:05 2008
@@ -74,15 +74,12 @@
       <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
     <constructor-arg index='4'>
-      <ref bean="org.apache.jetspeed.prefs.PreferencesProvider" />
-    </constructor-arg>
-    <constructor-arg index='5'>
       <ref bean="org.apache.jetspeed.profiler.Profiler" />
     </constructor-arg>
-    <constructor-arg index='6'>
+    <constructor-arg index='5'>
       <ref bean="mailSender" />
     </constructor-arg>
-    <constructor-arg index='7'>
+    <constructor-arg index='6'>
       <ref bean="adminVelocityEngine" />
     </constructor-arg>
   </bean>

Modified: portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml?rev=683497&r1=683496&r2=683497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
(original)
+++ portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
Wed Aug  6 20:52:05 2008
@@ -124,6 +124,9 @@
         <entry key="JetspeedSerializerFactory">
           <ref bean="org.apache.jetspeed.serializer.JetspeedSerializerFactory" />
         </entry>
+        <entry key="SecurityAttributesProvider">
+        	<ref bean="org.apache.jetspeed.security.attributes.SecurityAttributesProvider"
/>
+        </entry>        
         <!-- first uncomment the below service bean in security-spi-atn.xml
           <entry key="PasswordEncodingService">
           <ref bean="org.apache.jetspeed.security.PasswordEncodingService" />

Modified: portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml?rev=683497&r1=683496&r2=683497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
(original)
+++ portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
Wed Aug  6 20:52:05 2008
@@ -129,6 +129,9 @@
         <entry key="JetspeedSerializer">
           <ref bean="org.apache.jetspeed.serializer.JetspeedSerializer" />
         </entry>
+        <entry key="SecurityAttributesProvider">
+        	<ref bean="org.apache.jetspeed.security.attributes.SecurityAttributesProvider"
/>
+        </entry>
         <!-- first uncomment the below service bean in security-spi-atn.xml
           <entry key="PasswordEncodingService">
           <ref bean="org.apache.jetspeed.security.PasswordEncodingService" />

Added: portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/security-attributes.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/security-attributes.xml?rev=683497&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/security-attributes.xml
(added)
+++ portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/security-attributes.xml
Wed Aug  6 20:52:05 2008
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+  <!-- Security: User Manager -->
+  <bean id="org.apache.jetspeed.security.attributes.SecurityAttributesProviderImpl" name="SecurityAttributesProviderImpl"
+        class="org.apache.jetspeed.security.attributes.PersistenceBrokerSecurityAttributesProvider">
+    <meta key="j2:cat" value="default,security" />
+  </bean>
+  
+  
+  <bean id="org.apache.jetspeed.security.attributes.SecurityAttributesProvider" name="SecurityAttributesProvider"
+    parent="baseTransactionProxy">
+    <meta key="j2:cat" value="default,security" />
+    <property name="proxyInterfaces">
+      <value>org.apache.jetspeed.security.attributes.SecurityAttributesProvider</value>
+    </property>
+    <property name="target">
+      <ref bean="org.apache.jetspeed.security.attributes.SecurityAttributesProviderImpl"
/>
+    </property>
+    <property name="transactionAttributes">
+      <props>
+        <prop key="save*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+        <prop key="delete*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+        <prop key="*">PROPAGATION_SUPPORTS</prop>
+      </props>
+    </property>
+  </bean>
+  
+</beans>
\ No newline at end of file

Modified: portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml?rev=683497&r1=683496&r2=683497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
(original)
+++ portals/jetspeed-2/portal/branches/JS2-869/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
Wed Aug  6 20:52:05 2008
@@ -21,25 +21,34 @@
   <!-- Security: User Manager -->
   <bean id="org.apache.jetspeed.security.UserManager" class="org.apache.jetspeed.security.impl.UserManagerImpl">
     <meta key="j2:cat" value="default,security" />
-    <constructor-arg>
+    <constructor-arg index='0'>
       <ref bean="org.apache.jetspeed.security.SecurityProvider" />
     </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="org.apache.jetspeed.security.attributes.SecurityAttributesProvider" />
+    </constructor-arg>    
   </bean>
 
   <!-- Security: Group Manager -->
   <bean id="org.apache.jetspeed.security.GroupManager" class="org.apache.jetspeed.security.impl.GroupManagerImpl">
     <meta key="j2:cat" value="default,security" />
-    <constructor-arg>
+    <constructor-arg index="0">
       <ref bean="org.apache.jetspeed.security.SecurityProvider" />
     </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="org.apache.jetspeed.security.attributes.SecurityAttributesProvider" />
+    </constructor-arg>
   </bean>
 
   <!-- Security: Role Manager -->
   <bean id="org.apache.jetspeed.security.RoleManager" class="org.apache.jetspeed.security.impl.RoleManagerImpl">
     <meta key="j2:cat" value="default,security" />
-    <constructor-arg>
+    <constructor-arg index='0'>
       <ref bean="org.apache.jetspeed.security.SecurityProvider" />
     </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="org.apache.jetspeed.security.attributes.SecurityAttributesProvider" />
+    </constructor-arg>    
   </bean>
 
   <!-- Security: Permission Manager -->



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message