portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r736069 [3/3] - in /portals/jetspeed-2/portal/branches/JPA_BRANCH: ./ applications/jetspeed-demo/ applications/jetspeed-dependencies/ components/ components/jetspeed-capability/ components/jetspeed-db-tools/ components/jetspeed-page-manager...
Date Tue, 20 Jan 2009 19:10:46 GMT
Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/pom.xml?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/pom.xml Tue Jan 20 11:10:43 2009
@@ -54,9 +54,7 @@
         <module>jetspeed-search</module>
         <module>jetspeed-security</module>
         <module>jetspeed-serializer</module>
-        <!-- Commenting out SSO module for now
-        module>jetspeed-sso</module>
-         -->
+        <module>jetspeed-sso</module>
         <module>jetspeed-statistics</module>
         <module>jetspeed-utils</module>
         <module>jetspeed-web-content</module>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties Tue Jan 20 11:10:43 2009
@@ -45,6 +45,8 @@
 org.apache.jetspeed.security.SecurityException.UNEXPECTED = Unexpected security error at {0} from {1}: {2}
 org.apache.jetspeed.security.SecurityException.INVALID_UID = The uid cannot contain any regular expression meta-characters or be null or be empty.
 org.apache.jetspeed.security.SecurityException.INVALID_DN = The dn cannot be null or empty.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_EXISTS = The security domain {0} already exists.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_DOES_NOT_EXIST = The security domain {0} does not exist.
 
 #### deprecated resource strings: see SecurityException #####
 org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = The user {0} already exists.
@@ -109,4 +111,4 @@
 org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_READ_ONLY = The group attribute {0} is read only.
 org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_REQUIRED = The group attribute {0} is required.
 org.apache.jetspeed.security.SecurityException.group.ATTRIBUTES_ARE_READ_ONLY = The group attributes are read only.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_NOT_EXTENDABLE = Adding new group attributes is not supported.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_NOT_EXTENDABLE = Adding new group attributes is not supported.
\ No newline at end of file

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties Tue Jan 20 11:10:43 2009
@@ -44,6 +44,8 @@
 org.apache.jetspeed.security.SecurityException.UNEXPECTED = Unexpected security error at {0} from {1}: {2}
 org.apache.jetspeed.security.SecurityException.INVALID_UID = The uid cannot contain any regular expression meta-characters or be null or be empty.
 org.apache.jetspeed.security.SecurityException.INVALID_DN = The dn cannot be null or empty.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_EXISTS = The security domain {0} already exists.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_DOES_NOT_EXIST = The security domain {0} does not exist.
 
 #### deprecated resource strings: see SecurityException #####
 org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = The user {0} already exists.

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties Tue Jan 20 11:10:43 2009
@@ -44,6 +44,8 @@
 org.apache.jetspeed.security.SecurityException.UNEXPECTED = {1} \u304b\u3089 {0} \u3067\u4e88\u671f\u3057\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30a8\u30e9\u30fc: {2}
 org.apache.jetspeed.security.SecurityException.INVALID_UID = UID\u306f\u6b63\u898f\u8868\u73fe\u306e\u30e1\u30bf\u30ad\u30e3\u30e9\u30af\u30bf\u3001null\u3001\u307e\u305f\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093\u3002
 org.apache.jetspeed.security.SecurityException.INVALID_DN = DN\u306f null \u307e\u305f\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093\u3002
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_EXISTS = The security domain {0} already exists.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_DOES_NOT_EXIST = The security domain {0} does not exist.
 
 #### deprecated resource strings: see SecurityException #####
 org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u30e6\u30fc\u30b6\u30fc {0} \u304c\u5b58\u5728\u3057\u307e\u3059\u3002

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties Tue Jan 20 11:10:43 2009
@@ -44,6 +44,8 @@
 org.apache.jetspeed.security.SecurityException.UNEXPECTED = \uc608\uae30\uce58 \uc54a\uc740 \ubcf4\uc548 \uc624\ub958\uc785\ub2c8\ub2e4: at {0} from {1}: {2}
 org.apache.jetspeed.security.SecurityException.INVALID_UID = UID\ub294 \uc815\uaddc\uc2dd \ud45c\ud604\uc774\ub098 \uba54\ud0c0 \ubb38\uc790\uac00 \ud3ec\ud568\ub420 \uc218 \uc5c6\uc73c\uba70, \ub110 \uac12\uc774\uac70\ub098 \ube48 \uac12\uc774\uba74 \uc548\ub429\ub2c8\ub2e4.
 org.apache.jetspeed.security.SecurityException.INVALID_DN = DN\uc740 \ub110 \uac12\uc774\uac70\ub098 \ube48 \uac12\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_EXISTS = The security domain {0} already exists.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_DOES_NOT_EXIST = The security domain {0} does not exist.
 
 #### deprecated resource strings: see SecurityException #####
 org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \uc0ac\uc6a9\uc790, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties Tue Jan 20 11:10:43 2009
@@ -44,6 +44,8 @@
 org.apache.jetspeed.security.SecurityException.UNEXPECTED = Onverwachte beveiligingsfout in {0} vanuit {1}: {2}
 # org.apache.jetspeed.security.SecurityException.INVALID_UID = The uid cannot contain any regular expression meta-characters or be null or be empty.
 # org.apache.jetspeed.security.SecurityException.INVALID_DN = The dn cannot be null or empty.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_EXISTS = Het beveilingingsdomein {0} bestaat al.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_DOES_NOT_EXIST = Het beveilingingsdomein {0} bestaat niet.
 
 #### deprecated resource strings: see SecurityException #####
 org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = De gebruiker {0} bestaat al.
@@ -94,7 +96,7 @@
 # resource strings for specific principal, group
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_DOES_NOT_EXIST = The groep {0} bestaat niet.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = De groep {0} bestaat al.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = De groep {0} mag niet gewijzigd worden.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = De groep {0} mag nThe security domainiet gewijzigd worden.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Opslaan van de groep {0} is mislukt.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = De groep {0} mag niet worden verwijderd.
 org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = De groep {0} heeft een of meer verplichte {1} {2} koppelingen.
@@ -108,4 +110,4 @@
 org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_READ_ONLY = Het groepsattribuut {0} mag niet gewijzigd worden.
 org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_REQUIRED = Het groepsattribuut {0} is verplicht.
 org.apache.jetspeed.security.SecurityException.group.ATTRIBUTES_ARE_READ_ONLY = De groepsattributen mogen niet gewijzigd worden.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_NOT_EXTENDABLE = Toevoegen van nieuwe groepsattributen is niet mogelijk.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_NOT_EXTENDABLE = Toevoegen van nieuwe groepsattributen is niet mogelijk.
\ No newline at end of file

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties Tue Jan 20 11:10:43 2009
@@ -44,6 +44,8 @@
 org.apache.jetspeed.security.SecurityException.UNEXPECTED = \u041d\u0435\u043e\u0447\u0456\u043a\u0443\u0432\u0430\u043d\u0430 \u043f\u043e\u043c\u0438\u043b\u043a\u0430 \u0431\u0435\u0437\u043f\u0435\u043a\u0438 \u043d\u0430 {0} \u0437 {1}: {2}
 org.apache.jetspeed.security.SecurityException.INVALID_UID = uid \u043d\u0435 \u043c\u043e\u0436\u0435 \u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043c\u0435\u0442\u0430\u0441\u0438\u043c\u0432\u043e\u043b\u0438 \u0441\u0442\u0430\u043b\u043e\u0433\u043e \u0432\u0438\u0440\u0430\u0437\u0443, \u0430 \u0442\u0430\u043a\u043e\u0436 \u0431\u0443\u0442\u0438 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u043c.
 org.apache.jetspeed.security.SecurityException.INVALID_DN = dn \u043d\u0435 \u043c\u043e\u0436\u0435 \u0431\u0443\u0442\u0438 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u043c.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_EXISTS = The security domain {0} already exists.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_DOES_NOT_EXIST = The security domain {0} does not exist.
 
 #### deprecated resource strings: see SecurityException #####
 org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447 {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties Tue Jan 20 11:10:43 2009
@@ -44,6 +44,8 @@
 org.apache.jetspeed.security.SecurityException.UNEXPECTED = \u610f\u5916\u7684\u5b89\u5168\u9519\u8bef {0} \u4ece {1}: {2}
 org.apache.jetspeed.security.SecurityException.INVALID_UID = uid\u4e0d\u80fd\u4e3a\u7a7a\u5b57\u7b26\u4e32, null\u6216\u5305\u542b\u4efb\u4f55\u6b63\u5219\u8868\u8fbe\u5f0f\u4e13\u7528\u5b57\u7b26.
 org.apache.jetspeed.security.SecurityException.INVALID_DN = dn\u4e0d\u80fd\u4e3a\u7a7a\u5b57\u7b26\u4e32\u6216\u4e3anull.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_EXISTS = The security domain {0} already exists.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_DOES_NOT_EXIST = The security domain {0} does not exist.
 
 #### deprecated resource strings: see SecurityException #####
 org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u7528\u6237 {0} \u5df2\u5b58\u5728.
@@ -108,4 +110,4 @@
 org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_READ_ONLY = The group attribute {0} is read only.
 org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_REQUIRED = The group attribute {0} is required.
 org.apache.jetspeed.security.SecurityException.group.ATTRIBUTES_ARE_READ_ONLY = The group attributes are read only.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_NOT_EXTENDABLE = Adding new group attributes is not supported.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_NOT_EXTENDABLE = Adding new group attributes is not supported.
\ No newline at end of file

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties Tue Jan 20 11:10:43 2009
@@ -44,6 +44,8 @@
 org.apache.jetspeed.security.SecurityException.UNEXPECTED = \u610f\u5916\u7684\u5b89\u5168\u932f\u8aa4 {0} \u5728 {1}: {2} 
 org.apache.jetspeed.security.SecurityException.INVALID_UID = uid\u4e0d\u80fd\u70ba\u7a7a\u5b57\u4e32, null\u6216\u5305\u542b\u4efb\u4f55\u5e38\u898f\u8868\u793a\u5f0f\u8b8a\u5316\u7528\u5b57\u5143. 
 org.apache.jetspeed.security.SecurityException.INVALID_DN = dn\u4e0d\u80fd\u70ba\u7a7a\u5b57\u4e32\u6216\u662fnull. 
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_EXISTS = The security domain {0} already exists.
+org.apache.jetspeed.security.SecurityException.SECURITY_DOMAIN_DOES_NOT_EXIST = The security domain {0} does not exist.
 
 #### deprecated resource strings: see SecurityException #####
 org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u4f7f\u7528\u8005 {0} \u5df2\u5b58\u5728. 

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipal.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipal.java?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipal.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipal.java Tue Jan 20 11:10:43 2009
@@ -16,7 +16,7 @@
  */
 package org.apache.jetspeed.security;
 
-import java.security.Principal;
+import java.security.Principal; 
 import java.sql.Timestamp;
 import java.util.Map;
 
@@ -55,4 +55,6 @@
      * @return an unmodifiable Map<String,String> of the SecurityAttributes.INFO_CATEGORY SecurityAttributes
      */
     Map<String, String> getInfoMap();
+    
+    Long getDomainId();
 }

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalManager.java?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalManager.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalManager.java Tue Jan 20 11:10:43 2009
@@ -146,8 +146,8 @@
     
     void removeAssociation(JetspeedPrincipal from, JetspeedPrincipal to, String associationName)
         throws SecurityException;
-    
-    void setListener(PrincipalManagerEventListener listener);
+           
+    void addListener(PrincipalManagerEventListener listener);
     
     void removeListener(PrincipalManagerEventListener listener);
 }

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalType.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalType.java?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalType.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalType.java Tue Jan 20 11:10:43 2009
@@ -32,6 +32,8 @@
     String ROLE = "role";
     /** build-in supported JetspeedPrincipalType "user" */
     String USER = "user";
+    /** build-in supported JetspeedPrincipalType "ssoUser" */
+    String SSO_USER = "ssoUser";
     
     /**
      * The name to identify the type of a JetspeedPrincipal.

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java Tue Jan 20 11:10:43 2009
@@ -151,6 +151,17 @@
     public static final KeyedMessage ATTRIBUTES_ARE_READ_ONLY = new KeyedMessage("The principal attributes are read only.");
 
     public static final KeyedMessage ATTRIBUTES_NOT_EXTENDABLE = new KeyedMessage("Adding new principal attributes is not supported.");
+
+    public static final KeyedMessage SECURITY_DOMAIN_EXISTS = new KeyedMessage("The security domain {0} already exists.");
+
+    public static final KeyedMessage SECURITY_DOMAIN_DOES_NOT_EXIST = new KeyedMessage("The security domain {0} does not exist.");
+
+    public static final KeyedMessage SECURITY_DOMAIN_NOT_REMOVABLE = new KeyedMessage("The security domain {0} could not be removed.");
+
+    public static final KeyedMessage SECURITY_DOMAIN_UPDATE_FAILURE = new KeyedMessage("Failed to update security domain {0}.");
+
+    public static final KeyedMessage DEFAULT_SECURITY_DOMAIN_DOES_NOT_EXIST = new KeyedMessage("The default security domain does not exist.");
+
     /**
      * <p>Default Constructor.</p>
      */

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOException.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOException.java?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOException.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOException.java Tue Jan 20 11:10:43 2009
@@ -29,7 +29,13 @@
 
    /** <p>Adding the credentials to the request failed.</p> */
    public static final String BASIC_AUTHENTICATION_ADD_FAILED = "Adding the credentials to the request failed.";
- 
+
+   /** <p>The site could not be created because a site with the same name exists.</p> */
+   public static final String SITE_ALREADY_EXISTS = "The site could not be created because a site with the same name exists.";
+
+   /** <p>The site could not be created because a site with the same name exists.</p> */
+   public static final String SITE_COULD_NOT_BE_CREATED = "The site could not be created.";
+
    /** <p>The site has no Single Sign On credentails attached.</p> */
    public static final String NO_CREDENTIALS_FOR_SITE = "The site has no Single Sign On credentails attached.";
 

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOProvider.java?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOProvider.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOProvider.java Tue Jan 20 11:10:43 2009
@@ -22,6 +22,8 @@
 
 import javax.security.auth.Subject;
 
+import org.apache.jetspeed.security.JetspeedPrincipal;
+
 
 /**
 * <p>Utility component to handle SSO requests</p>
@@ -30,14 +32,8 @@
 */
 public interface SSOProvider
 {   
-	/**
-	 * Init
-	 * Called from the Spring Framework to initialize SSO Provider component
-	 * @throws Exception
-	 */
-   void init() throws Exception;
-   
-   /**
+
+    /**
     * This method first authenticates the the SSOSite and then forwards the request
     * to the destination URL. The content will be returned as a string.
     * If the SSOSite and the url match only one call will be executed since the
@@ -50,7 +46,7 @@
     * @return
     * @throws SSOException
     */
-   public String useSSO(Subject subject, String url, String SSOSite, boolean bRefresh) throws SSOException;
+   public String useSSO(SSOUser user, String url, String SSOSite, boolean bRefresh) throws SSOException;
    
    /**
     * Same as the method above except that the user will be authenticated against all
@@ -79,23 +75,22 @@
     */
    Collection getCookiesForUser(Subject user);
    
-   
    /**
     * Public API's for SSO functinality
     * @return
     */
-	boolean	hasSSOCredentials(Subject subject, String site);
+    boolean hasSSOCredentials(Subject subject, String site);
         
-	SSOContext getCredentials(Subject subject, String site)  
+    SSOContext getCredentials(Subject subject, String site)  
         throws SSOException;
     
-	void  addCredentialsForSite(Subject subject, String remoteUser, String site, String pwd)  
+    void  addCredentialsForSite(Subject subject, String remoteUser, String site, String pwd)  
         throws SSOException;
     
     void  updateCredentialsForSite(Subject subject, String remoteUser, String site, String pwd)  
     throws SSOException;
     
-	void removeCredentialsForSite(Subject subject, String site)  
+    void removeCredentialsForSite(Subject subject, String site)  
         throws SSOException;
     
     /**
@@ -151,8 +146,8 @@
     String getSiteURL(String site);
     String getSiteName(String site); 
     
-    void	setRealmForSite(String site, String realm) throws SSOException;
-    String	getRealmForSite(String site) throws SSOException;
+    void    setRealmForSite(String site, String realm) throws SSOException;
+    String  getRealmForSite(String site) throws SSOException;
     
     /**
      * Get all SSOSites that the principal has access to

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOSite.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOSite.java?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOSite.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOSite.java Tue Jan 20 11:10:43 2009
@@ -17,9 +17,6 @@
 
 package org.apache.jetspeed.sso;
 
-import java.util.Collection;
-import org.apache.jetspeed.sso.SSOPrincipal;
-
 /**
  * Interface SSOSite
  * 
@@ -58,60 +55,20 @@
 	public void setName(String name) ;
 	
 	/**
-	 * @return Returns the principals.
-	 */
-	public Collection getPrincipals() ;
-	
-	/**
-	 * @param principals The principals to set.
-	 */
-	public void setPrincipals(Collection principals);
-	
-	/**
-	 * @return Returns the siteId.
-	 */
-	public int getSiteId() ;
-	
-	/**
-	 * @param siteId The siteId to set.
+	 * @return Returns the id of the site.
 	 */
-	public void setSiteId(int siteId) ;
+	public int getId() ;
 	
 	/**
 	 * @return Returns the siteURL.
 	 */
-	public String getSiteURL() ;
+	public String getURL() ;
 	
 	/**
 	 * @param siteURL The siteURL to set.
 	 */
-	public void setSiteURL(String siteURL) ;
-	
-	
-	
-	/**
-	 * Adds the SSOPrincipal to the principals collection
-	 *
-	 */
-	public void addPrincipal(SSOPrincipal principal) throws SSOException;
-	
-	/**
-	* removePrincipal()
-	 * removes a principal from the principals collection
-	 *
-	 */
-	public void removePrincipal(long principalId) throws SSOException;
+	public void setURL(String siteURL) ;
 	
-	 /**
-     * getRemotePrincipals 
-     */
-	public Collection getRemotePrincipals();
-	
-    /**
-     * setRemotePrincipals 
-     */
-    public void setRemotePrincipals(Collection remotePrincipals);
-    
     /**
      * Define the Authentication methods. 
      * Supported are: Challenge Response and From based
@@ -130,7 +87,7 @@
      */
     public void setChallengeResponseAuthentication(boolean isChallengeResponseAuthentication);
     
-    public boolean isChallangeResponseAuthentication();
+    public boolean isChallengeResponseAuthentication();
 	public boolean isFormAuthentication();
 
 	public String getFormPwdField();
@@ -141,4 +98,7 @@
 	
 	public void setRealm(String realm);
 	public String getRealm();
+	
+    public Long getSecurityDomainId();
+    public void setSecurityDomainId(Long securityDomain);
 }

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml Tue Jan 20 11:10:43 2009
@@ -47,14 +47,19 @@
         <column name="IS_REMOVABLE" required="true" type="BOOLEANINT"/>
         <column name="CREATION_DATE" required="true" type="TIMESTAMP"/>
         <column name="MODIFIED_DATE" required="true" type="TIMESTAMP"/>
+        <column name="DOMAIN_ID" required="true" type="INTEGER"/>
         <unique name="UIX_SECURITY_PRINCIPAL">
           <unique-column name="PRINCIPAL_TYPE" />
           <unique-column name="PRINCIPAL_NAME" />
-        </unique>        
+          <unique-column name="DOMAIN_ID" />
+        </unique>     
+        <foreign-key foreignTable="SECURITY_DOMAIN" name="FK_SECURITY_DOMAIN_1" onDelete="cascade">
+            <reference foreign="DOMAIN_ID" local="DOMAIN_ID"/>
+        </foreign-key>  
     </table>
 
    <!-- 
-      Create principal-security attributes for both Portlet API User Attributes and generic principal preferences
+      Create1 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
@@ -163,66 +168,31 @@
         <column name="FORM_USER_FIELD" required="false" size="128" type="VARCHAR"/>
         <column name="FORM_PWD_FIELD" required="false" size="128" type="VARCHAR"/>
         <column name="REALM" required="false" size="128" type="VARCHAR"/>
-        
+        <column name="DOMAIN_ID" required="true" type="INTEGER"/>
+        <foreign-key foreignTable="SECURITY_DOMAIN" name="FK_SECURITY_DOMAIN_2" onDelete="cascade">
+            <reference foreign="DOMAIN_ID" local="DOMAIN_ID"/>
+        </foreign-key>  
+        <unique name="UIX_SITE_NAME">
+            <unique-column name="NAME" />
+        </unique>   
         <unique name="UIX_SITE_URL">
           <unique-column name="URL" />
         </unique>                
     </table>
     
-    <table name="SSO_COOKIE">
-        <column name="COOKIE_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="COOKIE" required="true" size="1024" type="VARCHAR"/> 
-        <column name="CREATE_DATE" required="true" type="TIMESTAMP"/>         
+    <table name="SECURITY_DOMAIN">
+        <column name="DOMAIN_ID" primaryKey="true" type="INTEGER" autoIncrement="true"/>
+        <column name="DOMAIN_NAME" type="VARCHAR" size="30"/>
+        <column name="REMOTE" default="0" type="BOOLEANINT"/>
+        <column name="ENABLED" default="1" type="BOOLEANINT"/>
+        <column name="OWNER_DOMAIN_ID" type="INTEGER" required="false"/>
+        <unique name="UIX_DOMAIN_NAME">
+            <unique-column name="DOMAIN_NAME" />
+        </unique>           
+        <!--<foreign-key foreignTable="SECURITY_DOMAIN" name="FK_OWNER_DOMAIN_ID" onDelete="none">
+            <reference foreign="DOMAIN_ID" local="OWNER_DOMAIN_ID"/>
+        </foreign-key>-->
     </table>
-	
-    <table name="SSO_SITE_TO_PRINCIPALS">
-    	<column name="SITE_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
-         <foreign-key foreignTable="SSO_SITE" name="SSO_SITE_TO_PRINC_FK1" onDelete="cascade">             
-            <reference foreign="SITE_ID" local="SITE_ID"/>
-        </foreign-key>
-       <foreign-key foreignTable="SECURITY_PRINCIPAL"  name="SSO_SITE_TO_PRINC_FK2" onDelete="cascade">
-            <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
-        </foreign-key>
-    </table>
-    
-    <!--
-       Create Principals to Remote Principals association Table
-    -->
     
-    <table name="SSO_PRINCIPAL_TO_REMOTE">
-    	<column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="REMOTE_PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
-         <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_PRINCIPAL_TO_REMOTE_1" onDelete="cascade">
-            <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
-        </foreign-key>
-       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_PRINCIPAL_TO_REMOTE_2" onDelete="cascade">
-            <reference foreign="PRINCIPAL_ID" local="REMOTE_PRINCIPAL_ID"/>
-        </foreign-key>
-    </table>
-    
-    <table name="SSO_SITE_TO_REMOTE">
-    	<column name="SITE_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
-           
-         <foreign-key foreignTable="SSO_SITE"  name="FK_SSO_SITE_TO_REMOTE_1" onDelete="cascade">
-            <reference foreign="SITE_ID" local="SITE_ID"/>
-        </foreign-key>
-       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_SITE_TO_REMOTE_2" onDelete="cascade">
-            <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
-        </foreign-key>
-    </table>
-    
-    <table name="SSO_COOKIE_TO_REMOTE">
-    	<column name="COOKIE_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="REMOTE_PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
-           
-         <foreign-key foreignTable="SSO_COOKIE" name="FK_SSO_COOKIE_TO_REMOTE_1" onDelete="cascade">
-            <reference foreign="COOKIE_ID" local="COOKIE_ID"/>
-        </foreign-key>
-       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_COOKIE_TO_REMOTE_2" onDelete="cascade">
-            <reference foreign="PRINCIPAL_ID" local="REMOTE_PRINCIPAL_ID"/>
-        </foreign-key>
-    </table>
          
 </database>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml Tue Jan 20 11:10:43 2009
@@ -47,9 +47,9 @@
         <entry key="Profiler">
           <ref bean="org.apache.jetspeed.profiler.Profiler" />
         </entry>
-        <!--<entry key="SSO">
-          <ref bean="org.apache.jetspeed.sso.SSOProvider" />
-          </entry>-->
+        <entry key="SSO">
+          <ref bean="org.apache.jetspeed.sso.SSOManager" />
+          </entry>
         <entry key="EntityAccessor">
           <ref bean='org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent' />
         </entry>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml Tue Jan 20 11:10:43 2009
@@ -128,7 +128,7 @@
     </bean>
 
     <bean id="org.apache.pluto.services.PortletEnvironmentService"
-          class="org.apache.pluto.core.DefaultPortletEnvironmentService">
+          class="org.apache.jetspeed.container.services.JetspeedPortletEnvironmentService">
       <meta key="j2:cat" value="default" />          
     </bean>
 

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml Tue Jan 20 11:10:43 2009
@@ -138,9 +138,15 @@
     <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
     <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
     <constructor-arg index="5" ref="org.apache.jetspeed.security.spi.UserPasswordCredentialManager" />
-    <property name="listener">
+  </bean>
+
+  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+    <meta key="j2:cat" value="default,security" />
+    <property name="targetObject"><ref local="org.apache.jetspeed.security.impl.UserManagerImpl"/></property>
+    <property name="targetMethod"><value>addListener</value></property>
+    <property name="arguments">
       <ref bean="org.apache.jetspeed.security.PrincipalManagerEventAdapter" />
-    </property>    
+    </property>
   </bean>
 
   <!-- Security: Group Manager -->
@@ -174,9 +180,15 @@
     <constructor-arg index="2" ref="org.apache.jetspeed.security.JetspeedPrincipalType.role" />
     <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
     <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
-    <property name="listener">
+  </bean>
+
+  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+    <meta key="j2:cat" value="default,security" />
+    <property name="targetObject"><ref local="org.apache.jetspeed.security.impl.GroupManagerImpl"/></property>
+    <property name="targetMethod"><value>addListener</value></property>
+    <property name="arguments">
       <ref bean="org.apache.jetspeed.security.PrincipalManagerEventAdapter" />
-    </property>    
+    </property>
   </bean>
 
   <!-- Security: Role Manager -->
@@ -210,9 +222,15 @@
     <constructor-arg index="2" ref="org.apache.jetspeed.security.JetspeedPrincipalType.group" />
     <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
     <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
-    <property name="listener">
+  </bean>
+
+  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+    <meta key="j2:cat" value="default,security" />
+    <property name="targetObject"><ref local="org.apache.jetspeed.security.impl.RoleManagerImpl"/></property>
+    <property name="targetMethod"><value>addListener</value></property>
+    <property name="arguments">
       <ref bean="org.apache.jetspeed.security.PrincipalManagerEventAdapter" />
-    </property>    
+    </property>
   </bean>
 
   <!-- Security: Permission Manager -->
@@ -265,6 +283,7 @@
         <ref bean="org.apache.jetspeed.security.UserManager" />
         <ref bean="org.apache.jetspeed.security.GroupManager" />
         <ref bean="org.apache.jetspeed.security.RoleManager" />
+        <ref bean="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" />
       </set>
     </constructor-arg>
   </bean>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml Tue Jan 20 11:10:43 2009
@@ -39,7 +39,10 @@
         org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager,
         org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager,
         org.apache.jetspeed.security.spi.UserPasswordCredentialAccessManager,
-        org.apache.jetspeed.security.spi.UserPasswordCredentialStorageManager
+        org.apache.jetspeed.security.spi.UserPasswordCredentialStorageManager,        
+        org.apache.jetspeed.security.spi.SecurityDomainStorageManager,        
+        org.apache.jetspeed.security.spi.SecurityDomainAccessManager,
+        org.apache.jetspeed.security.spi.JetspeedDomainPrincipalAccessManager
       </value>
     </property>
     <property name="target">
@@ -82,6 +85,18 @@
     <meta key="j2:alias" value="org.apache.jetspeed.security.spi.UserPasswordCredentialStorageManager" />
     <property name="targetBeanName" value="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
   </bean>
+
+  <bean class="org.springframework.beans.factory.config.BeanReferenceFactoryBean">
+    <meta key="j2:cat" value="dbSecurity" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.spi.SecurityDomainStorageManager" />
+    <property name="targetBeanName" value="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+  </bean>
+  
+  <bean class="org.springframework.beans.factory.config.BeanReferenceFactoryBean">
+    <meta key="j2:cat" value="dbSecurity" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.spi.SecurityDomainAccessManager" />
+    <property name="targetBeanName" value="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+  </bean>
   
   <bean id="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialManagerImpl"
     class="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialManagerImpl">

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml Tue Jan 20 11:10:43 2009
@@ -17,6 +17,8 @@
           <constructor-arg index="3" ref="org.apache.jetspeed.security.UserManager" />
           <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.CredentialPasswordEncoder" />
           <constructor-arg index="5" ref="org.apache.jetspeed.security.PermissionManager" />
+          <constructor-arg index="6" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+          <constructor-arg index="7" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
         </bean>
         <bean class="org.apache.jetspeed.serializer.JetspeedProfilerSerializer">
           <constructor-arg index="0" ref="org.apache.jetspeed.profiler.Profiler" />

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/sso.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/sso.xml?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/sso.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/sso.xml Tue Jan 20 11:10:43 2009
@@ -15,40 +15,155 @@
   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"
+<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">
 
   <!-- SSO Implementation -->
-  <!-- 
-    <bean id="PersistenceBrokerSSOProvider" class="org.apache.jetspeed.sso.impl.PersistenceBrokerSSOProvider"
-    init-method="init">
-    <meta key="j2:cat" value="default" />
+
+  <bean id="org.apache.jetspeed.sso.spi.impl.SSOUserManagerSPIImpl" class="org.apache.jetspeed.sso.spi.impl.SSOUserManagerSPIImpl">
+      <meta key="j2:cat" value="default,security" />
+      <constructor-arg index="0" ref="org.apache.jetspeed.security.JetspeedPrincipalType.sso_user" />
+      <constructor-arg index="1" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+      <constructor-arg index="2" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
+      <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+      <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+      <constructor-arg index="5" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+      <constructor-arg index="6" ref="org.apache.jetspeed.security.spi.SecurityDomainAccessManager" />    
+  </bean>
+    
+  <bean id="org.apache.jetspeed.security.JetspeedPrincipalType.sso_user"
+    class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0" value="sso_user" />
+    <constructor-arg index="1" value="org.apache.jetspeed.sso.impl.SSOUserImpl" />
+    <constructor-arg index="2">
+      <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypesImpl">
+        <constructor-arg index="0">
+          <value>true</value>
+        </constructor-arg>
+        <constructor-arg index="1">
+          <value>false</value>
+        </constructor-arg>
+        <constructor-arg index="2">
+          <list>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="org.apache.jetspeed.user.subsite" />
+              <constructor-arg index="1" value="jetspeed" />
+            </bean>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="org.apache.jetspeed.prefered.locale" />
+              <constructor-arg index="1" value="jetspeed" />
+            </bean>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="org.apache.jetspeed.sso.user.shared" />
+              <constructor-arg index="1" value="jetspeed" />
+            </bean>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="user.name.given" />
+              <constructor-arg index="1" value="info" />
+            </bean>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="user.name.family" />
+              <constructor-arg index="1" value="info" />
+            </bean>
+          </list>
+        </constructor-arg>
+      </bean>
+    </constructor-arg>
+  </bean>
+  
+  <bean id="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" parent="baseTransactionProxy">
+    <meta key="j2:cat" value="default,security" />
+    <property name="proxyInterfaces">
+      <value>
+        org.apache.jetspeed.sso.spi.SSOUserManagerSPI, org.apache.jetspeed.security.JetspeedPrincipalManager,
+        org.apache.jetspeed.security.spi.JetspeedPrincipalManagerSPI
+      </value>
+    </property>
+    <property name="target">
+      <ref bean="org.apache.jetspeed.sso.spi.impl.SSOUserManagerSPIImpl" />
+    </property>
+    <property name="transactionAttributes">
+      <props>
+        <prop key="get*">PROPAGATION_SUPPORTS</prop>
+        <prop key="lookup*">PROPAGATION_SUPPORTS</prop>
+        <prop key="userExists">PROPAGATION_SUPPORTS</prop>
+        <prop key="*">PROPAGATION_REQUIRED</prop>
+      </props>
+    </property>
+  </bean>
+
+  <bean id="ssoUserIsOwnedByUserAssociationHandler"
+    class="org.apache.jetspeed.sso.impl.IsOwnedByPrincipalAssociationHandler">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0" ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager" />
+    <constructor-arg index="2" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
+  </bean>
+
+  <bean id="ssoUserIsOwnedByGroupAssociationHandler"
+    class="org.apache.jetspeed.sso.impl.IsOwnedByPrincipalAssociationHandler">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0" ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.GroupManager" />
+    <constructor-arg index="2" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
+  </bean>
+  
+  <bean id="ssoUserIsRelatedToUserAssociationHandler"
+    class="org.apache.jetspeed.sso.impl.IsRemoteIdentityForPrincipalAssociationHandler">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0" ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager" />
+    <constructor-arg index="2" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
+  </bean>
+
+  <bean id="ssoUserIsRelatedGroupAssociationHandler"
+    class="org.apache.jetspeed.sso.impl.IsRemoteIdentityForPrincipalAssociationHandler">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0" ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.GroupManager" />
+    <constructor-arg index="2" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
+  </bean>
+  
+  <bean id="org.apache.jetspeed.sso.SSOManager" class="org.apache.jetspeed.sso.impl.SSOManagerImpl">
+    <meta key="j2:cat" value="default,security"/>
+    <property name="userManager" ref="org.apache.jetspeed.security.UserManager"/>
+    <property name="SSOUserManagerSPI" ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI"/>
+    <property name="domainAccessManager" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"/>
+    <property name="domainStorageManager" ref="org.apache.jetspeed.security.spi.SecurityDomainStorageManager"/>
+    <property name="SSOSiteManagerSPI" ref="org.apache.jetspeed.sso.spi.SSOSiteManagerSPI"/>
+  </bean>
+  
+  <bean id="PersistenceBrokerSSOSiteManager"
+    class="org.apache.jetspeed.sso.spi.impl.JetspeedPersistentSSOSiteManager" init-method="init">
+    <meta key="j2:cat" value="default,security"/>
     <constructor-arg index="0">
-    <value>JETSPEED-INF/ojb/sso_repository.xml</value>
+      <value>JETSPEED-INF/ojb/sso_repository.xml</value>
     </constructor-arg>
-    </bean>
-    
-    <bean id="org.apache.jetspeed.sso.SSOProvider" parent="baseTransactionProxy" name="ssoProvider">
-    <meta key="j2:cat" value="default" />
+  </bean>
+
+  <bean id="org.apache.jetspeed.sso.spi.SSOSiteManagerSPI" parent="baseTransactionProxy" name="ssoSiteManager">
+    <meta key="j2:cat" value="default,security"/>
     <property name="proxyInterfaces">
-    <value>org.apache.jetspeed.sso.SSOProvider</value>
+      <value>org.apache.jetspeed.sso.spi.SSOSiteManagerSPI</value>
     </property>
-    
+
     <property name="target">
-    <ref bean="PersistenceBrokerSSOProvider" />
+      <ref bean="PersistenceBrokerSSOSiteManager"/>
     </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>
+      <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
+
+  </bean>
+</beans>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml Tue Jan 20 11:10:43 2009
@@ -272,6 +272,21 @@
 			<mimeTypes>text/html</mimeTypes>
 		</Client>
 	</Clients>
+	<SecurityDomains>
+		<!-- NB: the system and default domains will be added automatically. Only specify custom Security Domains here -->
+		<!--
+			example of a local domain : 
+			<SecurityDomain name="departmentA"/>
+			
+			example of a remote domain :
+			(the owner domain will be the "default" domain if no owner domain is specified)
+			<SecurityDomain name="nytimes" remote="true""/>
+			
+			non-default owner domain:
+			<SecurityDomain name="nytimes" remote="true" ownerDomain="departmentA"/>
+			
+		-->
+	</SecurityDomains>
 	<Roles>
 		<Role>admin</Role>
 		<Role>manager</Role>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/seed/min/j2-seed.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/seed/min/j2-seed.xml?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/seed/min/j2-seed.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/seed/min/j2-seed.xml Tue Jan 20 11:10:43 2009
@@ -272,6 +272,21 @@
 			<mimeTypes>text/html</mimeTypes>
 		</Client>
 	</Clients>
+	<SecurityDomains>
+		<!-- NB: the system and default domains will be added automatically. Only specify custom Security Domains here -->
+		<!--
+			example of a local domain : 
+			<SecurityDomain name="departmentA"/>
+			
+			example of a remote domain :
+			(the owner domain will be the "default" domain if no owner domain is specified)
+			<SecurityDomain name="nytimes" remote="true""/>
+			
+			non-default owner domain:
+			<SecurityDomain name="nytimes" remote="true" ownerDomain="departmentA"/>
+			
+		-->
+	</SecurityDomains>
 	<Roles>
 		<Role>admin</Role>
 		<Role>guest</Role>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/pom.xml?rev=736069&r1=736068&r2=736069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/pom.xml Tue Jan 20 11:10:43 2009
@@ -474,13 +474,11 @@
         <artifactId>jetspeed-portlet-factory</artifactId>
         <version>${pom.version}</version>
       </dependency>
-      <!-- Commenting out SSO module for now
       <dependency>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-sso</artifactId>
         <version>${pom.version}</version>
       </dependency>
-      -->
       <dependency>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-statistics</artifactId>
@@ -554,7 +552,7 @@
         <version>${pom.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <groupId>org.apache.portals.applications</groupId>
         <artifactId>demo</artifactId>
         <type>war</type>
         <version>${pom.version}</version>
@@ -1476,7 +1474,34 @@
             </targets>
           </configuration>
         </plugin>
-        
+
+        <!-- OpenJPA Enhancer maven plugin -->
+ 	    <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>openjpa-maven-plugin</artifactId>
+          <version>1.0-alpha</version>
+          <dependencies>
+            <!-- persistent objects implement Jetspeed/Pluto APIs -->
+            <dependency>
+              <groupId>${pom.groupId}</groupId>
+              <artifactId>jetspeed-api</artifactId>
+              <version>${pom.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.pluto</groupId>
+              <artifactId>pluto-container-api</artifactId>
+              <version>${org.apache.pluto.version}</version>
+            </dependency>
+            <!-- force upgrade of JPA for plugin -->
+            <dependency>
+              <groupId>org.apache.openjpa</groupId>
+              <artifactId>openjpa-persistence-jdbc</artifactId>
+              <version>${openjpa.version}</version>
+              <scope>runtime</scope>
+            </dependency>
+          </dependencies>
+        </plugin>
+
       </plugins>
     </pluginManagement>
     <plugins>



---------------------------------------------------------------------
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