JBoss Portal SVN: r13664 - in branches/JBoss_Portal_Branch_2_7: core/src/resources/portal-core-war/WEB-INF/classes and 1 other directories.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2009-08-04 15:30:33 -0400 (Tue, 04 Aug 2009)
New Revision: 13664
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
Log:
It is cleaner
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2009-08-04 19:26:43 UTC (rev 13663)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2009-08-04 19:30:33 UTC (rev 13664)
@@ -22,4 +22,4 @@
################################################################################
org.jboss.portal.object.name.admin.default=Amministrazione
-org.jboss.portal.object.name.admin.Members=Membri
+org.jboss.portal.object.name.admin.Members=Iscritti
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2009-08-04 19:26:43 UTC (rev 13663)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2009-08-04 19:30:33 UTC (rev 13664)
@@ -33,5 +33,5 @@
COPY_TO_DASHBOARD=Copia nella mia dashboard
PORTAL=Portale
ADMIN=Amministrazione
-MEMBERS=Membri
+MEMBERS=Iscritti
LOGGED=Connesso come
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-08-04 19:26:43 UTC (rev 13663)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-08-04 19:30:33 UTC (rev 13664)
@@ -112,7 +112,7 @@
IDENTITY_MANAGEMENT_USER_DELETED=Utente cancellato
IDENTITY_MANAGEMENT_ROLE=Ruolo
IDENTITY_MANAGEMENT_ROLE_DISPLAY=Nome visualizzato
-IDENTITY_MANAGEMENT_ROLE_MEMBERS=Membri
+IDENTITY_MANAGEMENT_ROLE_MEMBERS=Iscritti
IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Ruoli assegnati
IDENTITY_MANAGEMENT_CREATE_ROLE=Crea un nuovo ruolo
IDENTITY_MANAGEMENT_EDIT_ROLE=Modifica il ruolo
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r13663 - in branches/JBoss_Portal_Branch_2_7_AS5: core/src/resources/portal-core-war/WEB-INF/classes and 1 other directories.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2009-08-04 15:26:43 -0400 (Tue, 04 Aug 2009)
New Revision: 13663
Modified:
branches/JBoss_Portal_Branch_2_7_AS5/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
Log:
It is cleaner
Modified: branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2009-08-04 18:16:01 UTC (rev 13662)
+++ branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2009-08-04 19:26:43 UTC (rev 13663)
@@ -22,4 +22,4 @@
################################################################################
org.jboss.portal.object.name.admin.default=Amministrazione
-org.jboss.portal.object.name.admin.Members=Membri
+org.jboss.portal.object.name.admin.Members=Iscritti
Modified: branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2009-08-04 18:16:01 UTC (rev 13662)
+++ branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2009-08-04 19:26:43 UTC (rev 13663)
@@ -33,5 +33,5 @@
COPY_TO_DASHBOARD=Copia nella mia dashboard
PORTAL=Portale
ADMIN=Amministrazione
-MEMBERS=Membri
+MEMBERS=Iscritti
LOGGED=Connesso come
Modified: branches/JBoss_Portal_Branch_2_7_AS5/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-08-04 18:16:01 UTC (rev 13662)
+++ branches/JBoss_Portal_Branch_2_7_AS5/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-08-04 19:26:43 UTC (rev 13663)
@@ -112,7 +112,7 @@
IDENTITY_MANAGEMENT_USER_DELETED=Utente cancellato
IDENTITY_MANAGEMENT_ROLE=Ruolo
IDENTITY_MANAGEMENT_ROLE_DISPLAY=Nome visualizzato
-IDENTITY_MANAGEMENT_ROLE_MEMBERS=Membri
+IDENTITY_MANAGEMENT_ROLE_MEMBERS=Iscritti
IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Ruoli assegnati
IDENTITY_MANAGEMENT_CREATE_ROLE=Crea un nuovo ruolo
IDENTITY_MANAGEMENT_EDIT_ROLE=Modifica il ruolo
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r13662 - in docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02: PortletBridge/en-US and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-04 14:16:01 -0400 (Tue, 04 Aug 2009)
New Revision: 13662
Modified:
docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Installation_Guide/en-US/Book_Info.xml
docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Installation_Guide/en-US/Getting_Started.xml
docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/PortletBridge/en-US/Getting_Started.xml
docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Read_Me/en-US/Release_Notes_GA.xml
docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Reference_Guide/en-US/Book_Info.xml
docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Reference_Guide/en-US/Supported.xml
Log:
upgrade versions
Modified: docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Installation_Guide/en-US/Book_Info.xml 2009-08-04 16:47:45 UTC (rev 13661)
+++ docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Installation_Guide/en-US/Book_Info.xml 2009-08-04 18:16:01 UTC (rev 13662)
@@ -7,8 +7,8 @@
<edition>1.0</edition>
<pubsnumber>1</pubsnumber>
<productname>JBoss Enterprise Portal Platform</productname>
- <productnumber>4.3</productnumber>
- <pubdate>Jan, 2009</pubdate>
+ <productnumber>4.3 CP02</productnumber>
+ <pubdate>Aug, 2009</pubdate>
<isbn>N/A</isbn>
<abstract><para>This Installation Guide documents relevant information regarding
the installation of JBoss Enterprise Portal Platform</para>
Modified: docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Installation_Guide/en-US/Getting_Started.xml
===================================================================
--- docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Installation_Guide/en-US/Getting_Started.xml 2009-08-04 16:47:45 UTC (rev 13661)
+++ docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Installation_Guide/en-US/Getting_Started.xml 2009-08-04 18:16:01 UTC (rev 13662)
@@ -419,13 +419,13 @@
</section>
</section>
-
+ <!--
<section id="Getting_Started-Components_of_JBoss_Enterprise_Application_Platform">
<title>Components of &JBEPP;</title>
<para>For current information on the revision level of included components please refer to <ulink url="http://www.jboss.com/products/platforms/portals/components">http://www.jboss.com/products/platforms/portals/components</ulink>.
</para>
-
+ -->
<!--<para>
Below is a listing of the components of &JBEPP; and their revision level at the time of writing. For an updated list of component revision levels please refer to <ulink url="http://www.redhat.com/docs/manuals/jboss">http://www.redhat.com/docs/manuals/jboss</ulink>.
</para>
@@ -587,7 +587,8 @@
</tgroup>
</table>
</para> -->
+ <!--
</section>
-
+ -->
</chapter>
Modified: docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/PortletBridge/en-US/Getting_Started.xml
===================================================================
--- docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/PortletBridge/en-US/Getting_Started.xml 2009-08-04 16:47:45 UTC (rev 13661)
+++ docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/PortletBridge/en-US/Getting_Started.xml 2009-08-04 18:16:01 UTC (rev 13662)
@@ -42,12 +42,12 @@
</entry>
<entry align="left" nameend="c5" namest="c2">
<para>
- By including the following dependency in your web pom, you will automatically enable SSO between JBoss Portal and your Seam application.
+ By including the following dependency in your web pom, you will automatically enable SSO between JBoss Portal and your Seam 2.1.1.GA application.
<programlisting>
<dependency>
<groupId>org.jboss.portletbridge.extensions.seam</groupId>
<artifactId>PortalIdentity</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
</dependency>
</programlisting>
</para>
@@ -106,7 +106,7 @@
<programlisting>mvn archetype:generate
-DarchetypeGroupId=org.jboss.portletbridge.archetypes
-DarchetypeArtifactId=1.2-basic
- -DarchetypeVersion=1.0.0-SNAPSHOT
+ -DarchetypeVersion=1.0.0.CR2
-DgroupId=org.whatever.project
-DartifactId=myprojectname
-DarchetypeRepository=http://repository.jboss.org/maven2/
@@ -122,7 +122,7 @@
<programlisting>mvn archetype:generate
-DarchetypeGroupId=org.jboss.portletbridge.archetypes
-DarchetypeArtifactId=richfaces-basic
- -DarchetypeVersion=1.0.0-SNAPSHOT
+ -DarchetypeVersion=1.0.0.CR2
-DgroupId=org.whatever.project
-DartifactId=myprojectname
-DarchetypeRepository=http://repository.jboss.org/maven2/
@@ -138,7 +138,7 @@
<programlisting>mvn archetype:generate
-DarchetypeGroupId=org.jboss.portletbridge.archetypes
-DarchetypeArtifactId=seam-basic
- -DarchetypeVersion=1.0.0-SNAPSHOT
+ -DarchetypeVersion=1.0.0.CR2
-DgroupId=org.whatever.project
-DartifactId=seamproject
-DarchetypeRepository=http://repository.jboss.org/maven2/
@@ -158,21 +158,24 @@
Each example application is configured to download the latest version of JBoss Portal bundled with JBoss Application Server. After running the archetype <xref linkend="sect-JBoss_Portlet_Bridge_Overview-Getting_started_with_JBoss_Portlet_Bridge-Maven_Archetypes" /> or <ulink url="http://www.jboss.org/portletbridge/download/">downloading the source code</ulink> for the example application that you are interested in, you can run one of the following Maven profiles to save time and get everything up and running with only 2 commands.
</para>
<para>
- <emphasis role="bold">JBoss Portal 2.7.0.B1 + JBoss AS 4.2.2 (Bundled)</emphasis>
+ <emphasis role="bold">JBoss Portal 2.7.2.GA + JBoss AS 4.2.3 (Bundled)</emphasis>
</para>
<programlisting role="XML">
-mvn install cargo:start -Premote-portal -Dportal-2.7.0.B1
-mvn cargo:deploy -Premote-portal -Dportal-2.7.0.B1
+mvn install -Plocal-portal cargo:start
+mvn cargo:deploy -Plocal-portal
+visit http://localhost:8080/portal
</programlisting>
+<!--
<para>
- <emphasis role="bold">JBoss Portlet Container 2.0 + JBoss AS 4.2.2 (Bundled)</emphasis>
+ <emphasis role="bold">JBoss Portlet Container 2.0 + JBoss AS 4.2.3 (Bundled)</emphasis>
</para>
<programlisting role="XML">
mvn install cargo:start -Premote-portal -Dpc20
mvn cargo:deploy -Premote-portal -Dpc20
</programlisting>
+ -->
<para>
<emphasis>Time Saving Tips</emphasis>
</para>
@@ -180,8 +183,7 @@
<emphasis role="normal">If you plan on using the cargo profiles to do active development, you can save a lot of time by not downloading the bundle each time you do a clean install. To use a locally configured server bundled with portal, use the following command line parameters. The variable for JBOSS_HOME_DIR is related to how you zip the server directory. If you zip the files under JBOSS_HOME/* then it will only be the name of your archive. But if you zip the actual folder JBOSS_HOME then JBOSS_HOME_DIR must be defined as 'zip file name/JBOSS_HOME folder name'.</emphasis>
</para>
-<literallayout>
-</literallayout>
+<!--
<para>
<emphasis role="bold">JBoss Portal 2.7.0.B1</emphasis>
</para>
@@ -198,6 +200,7 @@
mvn install cargo:start -Plocal-portal -DJBOSS_ZIP_HOME=/path_to_bundle_zip/Jboss-4.2.2-PC20.zip -DJBOSS_HOME_DIR=Jboss-4.2.2-PC20
mvn cargo:deploy -Plocal-portal -DJBOSS_ZIP_HOME=/path_to_bundle_zip/Jboss-4.2.2-PC20.zip -DJBOSS_HOME_DIR=Jboss-4.2.2-PC20
</programlisting>
+ -->
</section>
</section>
Modified: docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Read_Me/en-US/Release_Notes_GA.xml
===================================================================
--- docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Read_Me/en-US/Release_Notes_GA.xml 2009-08-04 16:47:45 UTC (rev 13661)
+++ docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Read_Me/en-US/Release_Notes_GA.xml 2009-08-04 18:16:01 UTC (rev 13662)
@@ -48,17 +48,17 @@
<itemizedlist>
<listitem>
<para>
- Identity Module 1.0.7
+ Identity Module 1.1.0
</para>
</listitem>
<listitem>
<para>
- Common Module 1.2.3
+ Common Module 1.2.5
</para>
</listitem>
<listitem>
<para>
- Portlet Module 2.0.5
+ Portlet Module 2.0.8
</para>
</listitem>
<listitem>
@@ -68,11 +68,11 @@
</listitem>
<listitem>
<para>
- CMS Module 1.2.4
+ CMS Module 1.2.6
</para>
</listitem> <listitem>
<para>
- JBoss Portlet Bridge 1.0.B6
+ JBoss Portlet Bridge 1.0.0CR2
</para>
</listitem>
</itemizedlist>
Modified: docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Reference_Guide/en-US/Book_Info.xml
===================================================================
--- docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Reference_Guide/en-US/Book_Info.xml 2009-08-04 16:47:45 UTC (rev 13661)
+++ docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Reference_Guide/en-US/Book_Info.xml 2009-08-04 18:16:01 UTC (rev 13662)
@@ -13,7 +13,7 @@
<issuenum>1</issuenum>
- <abstract><para>This book is a Enterprise Portal Platform Reference Guide.</para>
+ <abstract><para>This book is the Enterprise Portal Platform Reference Guide.</para>
</abstract>
<corpauthor>
<inlinemediaobject>
Modified: docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Reference_Guide/en-US/Supported.xml
===================================================================
--- docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Reference_Guide/en-US/Supported.xml 2009-08-04 16:47:45 UTC (rev 13661)
+++ docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/Reference_Guide/en-US/Supported.xml 2009-08-04 18:16:01 UTC (rev 13662)
@@ -30,7 +30,7 @@
</section>
<section>
<title>JBoss Enterprise Application Platform (EAP)</title>
- <para>Enterprise Portal Platform 4.3 embeds JBoss EAP 4.3_CP03 and supports the same environment unless specified.</para>
+ <para>Enterprise Portal Platform 4.3 CP02 embeds JBoss EAP 4.3_CP06 and JBoss EAP FP01 4.3_CP05 and supports the same environment unless specified.</para>
</section>
<section id="supportedversions-db">
<title>Databases</title>
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r13661 - in modules/authorization/trunk: agent and 3 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-08-04 12:47:45 -0400 (Tue, 04 Aug 2009)
New Revision: 13661
Added:
modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/EnforcementCache.java
modules/authorization/trunk/agent/src/test/java/org/jboss/security/authz/agent/features/TestAgentCache.java
Modified:
modules/authorization/trunk/.classpath
modules/authorization/trunk/agent/pom.xml
modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/EnforcementResponse.java
modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/LocalEnforcementPoint.java
modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/PolicyEnforcementPoint.java
modules/authorization/trunk/agent/src/main/resources/META-INF/authz-config.xml
modules/authorization/trunk/pom.xml
Log:
Started Agent Side Caching Service implementation
Modified: modules/authorization/trunk/.classpath
===================================================================
--- modules/authorization/trunk/.classpath 2009-08-04 15:15:06 UTC (rev 13660)
+++ modules/authorization/trunk/.classpath 2009-08-04 16:47:45 UTC (rev 13661)
@@ -44,5 +44,6 @@
<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.9.GA/jboss-common-core-2.2.9.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: modules/authorization/trunk/agent/pom.xml
===================================================================
--- modules/authorization/trunk/agent/pom.xml 2009-08-04 15:15:06 UTC (rev 13660)
+++ modules/authorization/trunk/agent/pom.xml 2009-08-04 16:47:45 UTC (rev 13661)
@@ -28,7 +28,14 @@
<groupId>org.jboss.security.authz</groupId>
<artifactId>policy-server</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
+
+ <!-- cache service related dependencies -->
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </dependency>
+
<!-- jboss xacml -->
<dependency>
<groupId>org.jboss.security</groupId>
Added: modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/EnforcementCache.java
===================================================================
--- modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/EnforcementCache.java (rev 0)
+++ modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/EnforcementCache.java 2009-08-04 16:47:45 UTC (rev 13661)
@@ -0,0 +1,86 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.security.authz.agent.enforcement;
+
+import org.apache.log4j.Logger;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Date;
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+
+/**
+ * TODO: implement this using JBoss Cache (for cluster wide invalidation events) once the functionality is properly implemented.
+ * This needs to be a cluster aware cache. But this fact should stay an implementation detail
+ *
+ * This is not really an in-request transactional cache. It does need to be invalidated based on the state of the Policies in the Policy Store
+ * Hence, Policy Provisioning requests do affect the data integrity of this Cache. These invalidation events need to be propagated across a
+ * cluster of nodes in case of a clustered application
+ *
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class EnforcementCache implements PolicyEnforcementPoint
+{
+ private static Logger log = Logger.getLogger(EnforcementCache.class);
+
+ private Map<Integer, EnforcementResponse> responseCache;
+ private XStream xstream;
+
+ public EnforcementCache()
+ {
+
+ }
+
+ public void start()
+ {
+ this.responseCache = new HashMap<Integer, EnforcementResponse>();
+ this.xstream = new XStream(new DomDriver());
+ }
+
+ public void stop()
+ {
+
+ }
+ //--------------PolicyEnforcementPoint implementation------------------------------------------------------------------------------------------------------------------------------
+ public EnforcementResponse checkAccess(EnforcementContext enforcementContext)
+ throws EnforcementException
+ {
+ return this.responseCache.get(this.getCacheEntryKey(enforcementContext));
+ }
+ //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ public void cache(EnforcementContext enforcementContext, EnforcementResponse enforcementResponse)
+ {
+ this.responseCache.put(this.getCacheEntryKey(enforcementContext), enforcementResponse);
+ enforcementResponse.setAttribute(EnforcementResponse.CACHED, new Date());
+ }
+
+ //TODO: Add Cache Invalidation Operations
+ //---------------------------------------------------------------------------------------------------------------------------------------------
+ private Integer getCacheEntryKey(EnforcementContext enforcementContext)
+ {
+ String xml = xstream.toXML(enforcementContext);
+ int xmlHashCode = xml.trim().hashCode();
+ return xmlHashCode;
+ }
+}
Modified: modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/EnforcementResponse.java
===================================================================
--- modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/EnforcementResponse.java 2009-08-04 15:15:06 UTC (rev 13660)
+++ modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/EnforcementResponse.java 2009-08-04 16:47:45 UTC (rev 13661)
@@ -22,6 +22,9 @@
package org.jboss.security.authz.agent.enforcement;
import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
/**
* An Authorization Response
@@ -30,12 +33,16 @@
*/
public class EnforcementResponse implements Serializable
{
+ static final String CACHED = "cached";
+ static final String EVALUATED = "evaluated";
+
private boolean accessGranted;
private String message;
+ private Map<String, Object> attributes;
public EnforcementResponse()
{
-
+ this.attributes = new HashMap<String, Object>();
}
public boolean isAccessGranted()
@@ -93,4 +100,44 @@
return isDenied;
}
+
+ public boolean isCached()
+ {
+ return this.getAttribute(CACHED)!=null;
+ }
+
+ public boolean isEvaluated()
+ {
+ return (Boolean)this.getAttribute(EVALUATED);
+ }
+
+ public Object getAttribute(String name)
+ {
+ return this.attributes.get(name);
+ }
+
+ public void setAttribute(String name, Object attribute)
+ {
+ this.attributes.put(name, attribute);
+ }
+
+ public Set<String> getNames()
+ {
+ return this.attributes.keySet();
+ }
+
+ public Object[] getValues()
+ {
+ return this.attributes.values().toArray();
+ }
+
+ public void clear(String name)
+ {
+ this.attributes.remove(name);
+ }
+
+ public void clearAll()
+ {
+ this.attributes.clear();
+ }
}
Modified: modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/LocalEnforcementPoint.java
===================================================================
--- modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/LocalEnforcementPoint.java 2009-08-04 15:15:06 UTC (rev 13660)
+++ modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/LocalEnforcementPoint.java 2009-08-04 16:47:45 UTC (rev 13661)
@@ -48,6 +48,7 @@
private PolicyServer policyServer;
private EnforcementStateGenerator stateGenerator;
+ private EnforcementCache enforcementCache;
public LocalEnforcementPoint()
{
@@ -73,6 +74,17 @@
{
this.stateGenerator = stateGenerator;
}
+
+
+ public EnforcementCache getEnforcementCache()
+ {
+ return enforcementCache;
+ }
+
+ public void setEnforcementCache(EnforcementCache enforcementCache)
+ {
+ this.enforcementCache = enforcementCache;
+ }
//------------------------------------------------------------------------------------------------------------------------------------------------------------------------
public EnforcementResponse checkAccess(EnforcementContext enforcementContext) throws EnforcementException
{
@@ -80,22 +92,42 @@
{
throw new IllegalArgumentException("Enforcement Context is Null");
}
+ EnforcementResponse enforcementResponse = null;
try
{
+ enforcementResponse = this.enforcementCache.checkAccess(enforcementContext);
- Response response = this.policyServer.evaluate(this.generateEnforcementRequest(enforcementContext));
+ if(enforcementResponse == null)
+ {
+ Response response = this.policyServer.evaluate(this.generateEnforcementRequest(enforcementContext));
+
+ enforcementResponse = new EnforcementResponse();
+ enforcementResponse.setAccessGranted(response.isAccessGranted());
+ enforcementResponse.setMessage(response.getMessage());
+ enforcementResponse.setAttribute(EnforcementResponse.EVALUATED, Boolean.TRUE);
+
+ //Cache this response into the Agent Side Enforcement Cache
+ //Perform this outside the application request context to improve performance
+ //The application request lifecycle has no interest in this system level service
+ //of the authorization layer, so it should not be bogged down by it
+ CacheUpdater cacheUpdater = this.new CacheUpdater();
+ cacheUpdater.context = enforcementContext;
+ cacheUpdater.response = enforcementResponse;
+ Thread thread = new Thread(cacheUpdater);
+ thread.start();
+ }
+ else
+ {
+ enforcementResponse.setAttribute(EnforcementResponse.EVALUATED, Boolean.FALSE);
+ }
- EnforcementResponse enforcementResponse = new EnforcementResponse();
- enforcementResponse.setAccessGranted(response.isAccessGranted());
- enforcementResponse.setMessage(response.getMessage());
-
return enforcementResponse;
}
catch(PolicyServerException pe)
{
log.error(this, pe);
throw new EnforcementException(pe);
- }
+ }
}
//-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
private Request generateEnforcementRequest(EnforcementContext enforcementContext)
@@ -160,4 +192,15 @@
return request;
}
+ //---------------------------------------------------------------------------------------------------------------------------------------------
+ private class CacheUpdater implements Runnable
+ {
+ private EnforcementContext context;
+ private EnforcementResponse response;
+
+ public void run()
+ {
+ LocalEnforcementPoint.this.enforcementCache.cache(context, response);
+ }
+ }
}
Modified: modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/PolicyEnforcementPoint.java
===================================================================
--- modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/PolicyEnforcementPoint.java 2009-08-04 15:15:06 UTC (rev 13660)
+++ modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/PolicyEnforcementPoint.java 2009-08-04 16:47:45 UTC (rev 13661)
@@ -21,8 +21,6 @@
*/
package org.jboss.security.authz.agent.enforcement;
-import org.jboss.security.authz.policy.client.enforcement.Response;
-
/**
* This component typically integrates natively with the application layer to receive Authorization Requests
* It then processes the native request and routes it to the Policy Decision Point component of the Policy Server to get a decision whether the
Modified: modules/authorization/trunk/agent/src/main/resources/META-INF/authz-config.xml
===================================================================
--- modules/authorization/trunk/agent/src/main/resources/META-INF/authz-config.xml 2009-08-04 15:15:06 UTC (rev 13660)
+++ modules/authorization/trunk/agent/src/main/resources/META-INF/authz-config.xml 2009-08-04 16:47:45 UTC (rev 13661)
@@ -9,6 +9,9 @@
<bean name="/agent/EnforcementStateGenerator" class="org.jboss.security.authz.agent.services.EnforcementStateGenerator">
</bean>
+ <bean name="/agent/EnforcementCache" class="org.jboss.security.authz.agent.enforcement.EnforcementCache">
+ </bean>
+
<bean name="/agent/LocalEnforcementPoint" class="org.jboss.security.authz.agent.enforcement.LocalEnforcementPoint">
<property name="policyServer">
<inject bean="/policy-server/PolicyServer"/>
@@ -16,6 +19,10 @@
<property name="stateGenerator">
<inject bean="/agent/EnforcementStateGenerator"/>
+ </property>
+
+ <property name="enforcementCache">
+ <inject bean="/agent/EnforcementCache"/>
</property>
</bean>
Added: modules/authorization/trunk/agent/src/test/java/org/jboss/security/authz/agent/features/TestAgentCache.java
===================================================================
--- modules/authorization/trunk/agent/src/test/java/org/jboss/security/authz/agent/features/TestAgentCache.java (rev 0)
+++ modules/authorization/trunk/agent/src/test/java/org/jboss/security/authz/agent/features/TestAgentCache.java 2009-08-04 16:47:45 UTC (rev 13661)
@@ -0,0 +1,182 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.security.authz.agent.features;
+
+import java.net.URI;
+
+import junit.framework.TestCase;
+import org.apache.log4j.Logger;
+
+import org.jboss.security.authz.bootstrap.ServiceContainer;
+
+import org.jboss.security.authz.components.resource.URIResource;
+import org.jboss.security.authz.components.subject.Identity;
+import org.jboss.security.authz.components.subject.Roles;
+import org.jboss.security.authz.components.action.Read;
+
+import org.jboss.security.authz.model.Effect;
+import org.jboss.security.authz.model.Policy;
+import org.jboss.security.authz.model.PolicyMetaData;
+
+import org.jboss.security.authz.agent.enforcement.PolicyEnforcementPoint;
+import org.jboss.security.authz.agent.enforcement.EnforcementContext;
+import org.jboss.security.authz.agent.enforcement.EnforcementResponse;
+import org.jboss.security.authz.agent.provisioning.PolicyProvisioner;
+
+import org.jboss.security.authz.agent.services.CompositionContext;
+import org.jboss.security.authz.agent.services.PolicyComposer;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class TestAgentCache extends TestCase
+{
+ private static Logger log = Logger.getLogger(TestAgentCache.class);
+
+ private PolicyComposer policyComposer;
+ private PolicyEnforcementPoint enforcer;
+ private PolicyProvisioner provisioner;
+
+ public void setUp() throws Exception
+ {
+ ServiceContainer.bootstrap();
+
+ this.policyComposer = (PolicyComposer) ServiceContainer
+ .lookup("/agent/PolicyComposer");
+ this.enforcer = (PolicyEnforcementPoint) ServiceContainer
+ .lookup("/agent/LocalEnforcementPoint");
+ this.provisioner = (PolicyProvisioner) ServiceContainer
+ .lookup("/agent/LocalPolicyProvisioner");
+ }
+
+ public void tearDown() throws Exception
+ {
+ }
+
+ public void testMultipleInvocations() throws Exception
+ {
+ // SetUp Resource
+ URIResource resource = new URIResource();
+ resource.setUri(new URI("/root/level1/level2/index.html"));
+
+ Read action = new Read();
+
+ Roles allowedRoles = new Roles();
+ allowedRoles.addName("user");
+
+ // Setup the Context for the Composition with these components
+ CompositionContext context = new CompositionContext();
+ context.setPolicyTarget(resource);
+ context.addPolicyRule(Effect.PERMIT, action, allowedRoles,
+ "allowExpression");
+
+ // Store the policy into the Policy Server
+ PolicyMetaData policyMetaData = this.policyComposer.compose(context);
+ this.provisioner.newPolicy(policyMetaData);
+
+ this.assertServerState();
+
+ // Go ahead and produce a RequestContext for a "Permit" Enforcement
+ URIResource contextResource = new URIResource();
+ contextResource.setUri(new URI("/root/level1/level2/index.html"));
+
+ // Perform enforcement
+ for(int i=0; i<5; i++)
+ {
+ EnforcementContext enforcementContext = this.createEnforcementContext(contextResource, action);
+ EnforcementResponse response = this.enforce(enforcementContext, true);
+
+ //Assert response state for caching related meta data
+ assertTrue("Must be Cached!!", response.isCached());
+ if(i == 0)
+ {
+ assertTrue("Must be Evaluated by the Policy Server", response.isEvaluated());
+
+ Thread.currentThread().sleep(10); //to make sure the background caching thread finished its job
+ }
+ else
+ {
+ assertFalse("Must Not Be Evaluated. Cache should be used instead!!", response.isEvaluated());
+ }
+ }
+ }
+
+ // ------------------------------------------------------------------------------------------------------------------------------------------------------
+ private EnforcementResponse enforce(EnforcementContext enforcementContext,
+ boolean mustBePermitted) throws Exception
+ {
+ EnforcementResponse response = this.enforcer
+ .checkAccess(enforcementContext);
+
+ assertNotNull(response);
+ log.info("-----------------------------------");
+ log.info("Decision=" + response.getMessage());
+
+ if (mustBePermitted)
+ {
+ assertTrue("Access must be granted!!!", response.isAccessGranted());
+ }
+ else
+ {
+ assertFalse("Access must be denied!!!", response.isAccessGranted());
+ }
+ return response;
+ }
+
+ private EnforcementContext createEnforcementContext(
+ URIResource protectedResource, Read action) throws Exception
+ {
+ // Create an EnforcementContext
+ EnforcementContext context = new EnforcementContext();
+
+ // Enable Hierarchial Enforcement
+ context.activateHierarchialEnforcement();
+
+ // Create Resource
+ context.setAttribute("uri-resource", protectedResource);
+
+ // Create Subjects
+ Roles roles = new Roles();
+ roles.addName("user");
+ context.setAttribute("roles", roles);
+ Identity identity = new Identity();
+ identity.setName("blah(a)blah.com");
+ context.setAttribute("identity", identity);
+
+ // Create Action
+ context.setAttribute("action", action);
+
+ return context;
+ }
+
+ private void assertServerState() throws Exception
+ {
+ // Assert Policy State of the Server
+ Policy[] policies = this.provisioner.readAllPolicies();
+
+ assertTrue("Policy Store must not be empty!!",
+ (policies != null && policies.length == 1));
+ log
+ .info("------------------------------------------------------------------------------");
+ log.info(policies[0].generateSystemPolicy());
+ }
+}
Modified: modules/authorization/trunk/pom.xml
===================================================================
--- modules/authorization/trunk/pom.xml 2009-08-04 15:15:06 UTC (rev 13660)
+++ modules/authorization/trunk/pom.xml 2009-08-04 16:47:45 UTC (rev 13661)
@@ -20,21 +20,7 @@
-->
</modules>
- <properties>
- <!--
- Not needed for nows
- <version.jboss.seam>2.0.2.SP1</version.jboss.seam>
- <version.facelets>1.1.14</version.facelets>
- <version.ajax4jsf>1.1.1</version.ajax4jsf>
- <version.richfaces>3.0.1</version.richfaces>
- <version.hibernate>3.0.0.GA</version.hibernate>
- <version.javax.persistence>1.0</version.javax.persistence>
- <version.javax.ejb>3.0</version.javax.ejb>
- <version.javax.faces>1.2_04-p02</version.javax.faces>
- <version.commons-beanutils>1.6</version.commons-beanutils>
- <version.commons-digester>1.6</version.commons-digester>
- -->
-
+ <properties>
<version.junit>3.8.2</version.junit>
<version.apache.log4j>1.2.14</version.apache.log4j>
@@ -46,6 +32,9 @@
<version.org.mvel.mvel>1.3.1-java1.4</version.org.mvel.mvel>
<version.org.antlr>3.0</version.org.antlr>
+ <!-- xstream dependency used by the agent side caching service -->
+ <version.com.thoughtworks.xstream>1.3.1</version.com.thoughtworks.xstream>
+
<version.org.jboss.microcontainer>2.0.2.GA</version.org.jboss.microcontainer>
<version.org.jboss.jboss-reflect>2.0.2.GA</version.org.jboss.jboss-reflect>
<version.org.jboss.jboss-common-core>2.2.9.GA</version.org.jboss.jboss-common-core>
@@ -56,86 +45,7 @@
</properties>
<dependencyManagement>
- <dependencies>
- <!-- seam dependencies -->
- <!--
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <version>${version.jboss.seam}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- <version>${version.jboss.seam}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>${version.facelets}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>${version.commons-beanutils}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>${version.commons-digester}</version>
- <scope>provided</scope>
- </dependency>
- -->
-
- <!-- richfaces dependencies -->
- <!--
- <dependency>
- <groupId>org.ajax4jsf</groupId>
- <artifactId>ajax4jsf</artifactId>
- <version>${version.ajax4jsf}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces</artifactId>
- <version>${version.richfaces}</version>
- <scope>provided</scope>
- </dependency>
- -->
-
-
- <!-- dependencies provided by the runtime -->
- <!--
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>${version.hibernate}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>${version.javax.persistence}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>${version.javax.ejb}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${version.javax.faces}</version>
- <scope>provided</scope>
- </dependency>
- -->
-
+ <dependencies>
<!-- sun jaxb -->
<dependency>
<groupId>sun-jaxb</groupId>
@@ -229,8 +139,15 @@
<artifactId>antlr-runtime</artifactId>
<version>${version.org.antlr}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
+ <!-- xstream dependeny -->
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>${version.com.thoughtworks.xstream}</version>
+ </dependency>
+
<!-- JBoss Microcontainer -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r13660 - in docs/enterprise/trunk: PortletBridge/en-US and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-04 11:15:06 -0400 (Tue, 04 Aug 2009)
New Revision: 13660
Modified:
docs/enterprise/trunk/Installation_Guide/en-US/Getting_Started.xml
docs/enterprise/trunk/PortletBridge/en-US/Getting_Started.xml
docs/enterprise/trunk/Read_Me/en-US/Release_Notes_GA.xml
docs/enterprise/trunk/Reference_Guide/en-US/Book_Info.xml
docs/enterprise/trunk/Reference_Guide/en-US/Supported.xml
Log:
Minor
Modified: docs/enterprise/trunk/Installation_Guide/en-US/Getting_Started.xml
===================================================================
--- docs/enterprise/trunk/Installation_Guide/en-US/Getting_Started.xml 2009-08-04 14:08:48 UTC (rev 13659)
+++ docs/enterprise/trunk/Installation_Guide/en-US/Getting_Started.xml 2009-08-04 15:15:06 UTC (rev 13660)
@@ -419,13 +419,13 @@
</section>
</section>
-
+ <!--
<section id="Getting_Started-Components_of_JBoss_Enterprise_Application_Platform">
<title>Components of &JBEPP;</title>
<para>For current information on the revision level of included components please refer to <ulink url="http://www.jboss.com/products/platforms/portals/components">http://www.jboss.com/products/platforms/portals/components</ulink>.
</para>
-
+ -->
<!--<para>
Below is a listing of the components of &JBEPP; and their revision level at the time of writing. For an updated list of component revision levels please refer to <ulink url="http://www.redhat.com/docs/manuals/jboss">http://www.redhat.com/docs/manuals/jboss</ulink>.
</para>
@@ -587,7 +587,8 @@
</tgroup>
</table>
</para> -->
+ <!--
</section>
-
+ -->
</chapter>
Modified: docs/enterprise/trunk/PortletBridge/en-US/Getting_Started.xml
===================================================================
--- docs/enterprise/trunk/PortletBridge/en-US/Getting_Started.xml 2009-08-04 14:08:48 UTC (rev 13659)
+++ docs/enterprise/trunk/PortletBridge/en-US/Getting_Started.xml 2009-08-04 15:15:06 UTC (rev 13660)
@@ -42,12 +42,12 @@
</entry>
<entry align="left" nameend="c5" namest="c2">
<para>
- By including the following dependency in your web pom, you will automatically enable SSO between JBoss Portal and your Seam application.
+ By including the following dependency in your web pom, you will automatically enable SSO between JBoss Portal and your Seam 2.1.1.GA application.
<programlisting>
<dependency>
<groupId>org.jboss.portletbridge.extensions.seam</groupId>
<artifactId>PortalIdentity</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
</dependency>
</programlisting>
</para>
@@ -106,7 +106,7 @@
<programlisting>mvn archetype:generate
-DarchetypeGroupId=org.jboss.portletbridge.archetypes
-DarchetypeArtifactId=1.2-basic
- -DarchetypeVersion=1.0.0-SNAPSHOT
+ -DarchetypeVersion=1.0.0.CR2
-DgroupId=org.whatever.project
-DartifactId=myprojectname
-DarchetypeRepository=http://repository.jboss.org/maven2/
@@ -122,7 +122,7 @@
<programlisting>mvn archetype:generate
-DarchetypeGroupId=org.jboss.portletbridge.archetypes
-DarchetypeArtifactId=richfaces-basic
- -DarchetypeVersion=1.0.0-SNAPSHOT
+ -DarchetypeVersion=1.0.0.CR2
-DgroupId=org.whatever.project
-DartifactId=myprojectname
-DarchetypeRepository=http://repository.jboss.org/maven2/
@@ -138,7 +138,7 @@
<programlisting>mvn archetype:generate
-DarchetypeGroupId=org.jboss.portletbridge.archetypes
-DarchetypeArtifactId=seam-basic
- -DarchetypeVersion=1.0.0-SNAPSHOT
+ -DarchetypeVersion=1.0.0.CR2
-DgroupId=org.whatever.project
-DartifactId=seamproject
-DarchetypeRepository=http://repository.jboss.org/maven2/
@@ -158,21 +158,24 @@
Each example application is configured to download the latest version of JBoss Portal bundled with JBoss Application Server. After running the archetype <xref linkend="sect-JBoss_Portlet_Bridge_Overview-Getting_started_with_JBoss_Portlet_Bridge-Maven_Archetypes" /> or <ulink url="http://www.jboss.org/portletbridge/download/">downloading the source code</ulink> for the example application that you are interested in, you can run one of the following Maven profiles to save time and get everything up and running with only 2 commands.
</para>
<para>
- <emphasis role="bold">JBoss Portal 2.7.0.B1 + JBoss AS 4.2.2 (Bundled)</emphasis>
+ <emphasis role="bold">JBoss Portal 2.7.2.GA + JBoss AS 4.2.3 (Bundled)</emphasis>
</para>
<programlisting role="XML">
-mvn install cargo:start -Premote-portal -Dportal-2.7.0.B1
-mvn cargo:deploy -Premote-portal -Dportal-2.7.0.B1
+mvn install -Plocal-portal cargo:start
+mvn cargo:deploy -Plocal-portal
+visit http://localhost:8080/portal
</programlisting>
+<!--
<para>
- <emphasis role="bold">JBoss Portlet Container 2.0 + JBoss AS 4.2.2 (Bundled)</emphasis>
+ <emphasis role="bold">JBoss Portlet Container 2.0 + JBoss AS 4.2.3 (Bundled)</emphasis>
</para>
<programlisting role="XML">
mvn install cargo:start -Premote-portal -Dpc20
mvn cargo:deploy -Premote-portal -Dpc20
</programlisting>
+ -->
<para>
<emphasis>Time Saving Tips</emphasis>
</para>
@@ -180,8 +183,7 @@
<emphasis role="normal">If you plan on using the cargo profiles to do active development, you can save a lot of time by not downloading the bundle each time you do a clean install. To use a locally configured server bundled with portal, use the following command line parameters. The variable for JBOSS_HOME_DIR is related to how you zip the server directory. If you zip the files under JBOSS_HOME/* then it will only be the name of your archive. But if you zip the actual folder JBOSS_HOME then JBOSS_HOME_DIR must be defined as 'zip file name/JBOSS_HOME folder name'.</emphasis>
</para>
-<literallayout>
-</literallayout>
+<!--
<para>
<emphasis role="bold">JBoss Portal 2.7.0.B1</emphasis>
</para>
@@ -198,6 +200,7 @@
mvn install cargo:start -Plocal-portal -DJBOSS_ZIP_HOME=/path_to_bundle_zip/Jboss-4.2.2-PC20.zip -DJBOSS_HOME_DIR=Jboss-4.2.2-PC20
mvn cargo:deploy -Plocal-portal -DJBOSS_ZIP_HOME=/path_to_bundle_zip/Jboss-4.2.2-PC20.zip -DJBOSS_HOME_DIR=Jboss-4.2.2-PC20
</programlisting>
+ -->
</section>
</section>
Modified: docs/enterprise/trunk/Read_Me/en-US/Release_Notes_GA.xml
===================================================================
--- docs/enterprise/trunk/Read_Me/en-US/Release_Notes_GA.xml 2009-08-04 14:08:48 UTC (rev 13659)
+++ docs/enterprise/trunk/Read_Me/en-US/Release_Notes_GA.xml 2009-08-04 15:15:06 UTC (rev 13660)
@@ -48,17 +48,17 @@
<itemizedlist>
<listitem>
<para>
- Identity Module 1.0.7
+ Identity Module 1.1.0
</para>
</listitem>
<listitem>
<para>
- Common Module 1.2.3
+ Common Module 1.2.5
</para>
</listitem>
<listitem>
<para>
- Portlet Module 2.0.5
+ Portlet Module 2.0.8
</para>
</listitem>
<listitem>
@@ -68,11 +68,11 @@
</listitem>
<listitem>
<para>
- CMS Module 1.2.4
+ CMS Module 1.2.6
</para>
</listitem> <listitem>
<para>
- JBoss Portlet Bridge 1.0.B6
+ JBoss Portlet Bridge 1.0.0CR2
</para>
</listitem>
</itemizedlist>
Modified: docs/enterprise/trunk/Reference_Guide/en-US/Book_Info.xml
===================================================================
--- docs/enterprise/trunk/Reference_Guide/en-US/Book_Info.xml 2009-08-04 14:08:48 UTC (rev 13659)
+++ docs/enterprise/trunk/Reference_Guide/en-US/Book_Info.xml 2009-08-04 15:15:06 UTC (rev 13660)
@@ -13,7 +13,7 @@
<issuenum>1</issuenum>
- <abstract><para>This book is a Enterprise Portal Platform Reference Guide.</para>
+ <abstract><para>This book is the Enterprise Portal Platform Reference Guide.</para>
</abstract>
<corpauthor>
<inlinemediaobject>
Modified: docs/enterprise/trunk/Reference_Guide/en-US/Supported.xml
===================================================================
--- docs/enterprise/trunk/Reference_Guide/en-US/Supported.xml 2009-08-04 14:08:48 UTC (rev 13659)
+++ docs/enterprise/trunk/Reference_Guide/en-US/Supported.xml 2009-08-04 15:15:06 UTC (rev 13660)
@@ -30,7 +30,7 @@
</section>
<section>
<title>JBoss Enterprise Application Platform (EAP)</title>
- <para>Enterprise Portal Platform 4.3 embeds JBoss EAP 4.3_CP03 and supports the same environment unless specified.</para>
+ <para>Enterprise Portal Platform 4.3 CP02 embeds JBoss EAP 4.3_CP06 and JBoss EAP FP01 4.3_CP05 and supports the same environment unless specified.</para>
</section>
<section id="supportedversions-db">
<title>Databases</title>
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r13659 - branches/Enterprise_Portal_Platform_4_3/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-04 10:08:48 -0400 (Tue, 04 Aug 2009)
New Revision: 13659
Modified:
branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml
Log:
Set correct version of modules
Modified: branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2009-08-04 09:57:12 UTC (rev 13658)
+++ branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2009-08-04 14:08:48 UTC (rev 13659)
@@ -63,27 +63,27 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="1.2.4"/>
+ <componentref name="jboss-portal/modules/common" version="1.2.5"/>
<componentref name="jboss-portal/modules/web" version="1.2.3"/>
<componentref name="jboss-portal/modules/test" version="1.0.4"/>
- <componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/portlet" version="2.0.8"/>
<componentref name="jboss-portal/modules/identity" version="1.1.0"/>
- <componentref name="jboss-portal/modules/cms" version="1.2.5"/>
+ <componentref name="jboss-portal/modules/cms" version="1.2.6"/>
<componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.4"/>
<componentref name="apache-beanutils" version="1.8.0clean-brew"/>
- <componentref name="apache-codec" version="1.3.0"/>
+ <componentref name="apache-codec" version="1.3.0-brew"/>
<componentref name="apache-collections" version="3.1-brew"/>
<componentref name="apache-digester" version="1.7-brew"/>
<componentref name="apache-fileupload" version="1.2"/>
- <componentref name="apache-httpclient" version="3.0.1"/>
+ <componentref name="apache-httpclient" version="3.0.1-brew"/>
<componentref name="apache-lang" version="2.1"/>
<componentref name="apache-log4j" version="1.2.14-brew"/>
<componentref name="apache-logging" version="1.1.0.jboss-brew"/>
<componentref name="apache-lucene" version="2.2.0"/>
<componentref name="apache-net" version="1.4.1"/>
- <componentref name="apache-xerces" version="2.7.1-brew"/>
+ <componentref name="apache-xerces" version="2.7.1.patch01-brew"/>
<componentref name="asm" version="1.5.3"/>
<componentref name="beanshell" version="1.3.0-brew"/>
<componentref name="cglib" version="2.1.3dep-brew"/>
@@ -93,21 +93,21 @@
<componentref name="ehcache" version="1.2.2"/>
<componentref name="el" version="1.0"/>
<componentref name="facelets" version="1.1.15-B1"/>
- <componentref name="jboss/portlet-bridge" version="1.0.0.CR1"/>
- <componentref name="hibernate" version="3.2.4.SP1_CP07-brew"/>
+ <componentref name="jboss/portlet-bridge" version="1.0.0.CR2"/>
+ <componentref name="hibernate" version="3.2.4.SP1_CP08-brew"/>
<componentref name="httpunit" version="1.6"/>
- <componentref name="hsqldb" version="1.8.0.8.patch01-brew"/>
+ <componentref name="hsqldb" version="1.8.0.8.patch02-brew"/>
<componentref name="ibm-wsdl4j" version="1.6.2"/>
<componentref name="jakarta-cactus" version="1.7.2-portal"/>
<componentref name="jakarta-io" version="1.0"/>
<componentref name="jbossas/core-libs" version="4.0.4.GA"/>
- <componentref name="jboss/aop" version="1.5.2.GA"/>
- <componentref name="jboss/cache" version="1.4.1.SP11-brew"/>
+ <componentref name="jboss/aop" version="1.5.5.GA_CP03-brew"/>
+ <componentref name="jboss/cache" version="1.4.1.SP13-brew"/>
<componentref name="jboss/jbossretro-rt" version="1.0.3.GA"/>
<componentref name="jboss/jbossws" version="2.0.1.SP2"/>
<componentref name="jboss/jbossxb" version="1.0.0.SP3-brew"/>
<componentref name="jboss/microcontainer" version="1.0.2-brew"/>
- <componentref name="jboss/remoting" version="2.2.2.SP11-brew"/>
+ <componentref name="jboss/remoting" version="2.2.3-brew"/>
<componentref name="jboss/serialization" version="1.0.3.GA-brew"/>
<componentref name="jboss/test" version="1.0.0.CR1"/>
<componentref name="jflex" version="1.4.0"/>
@@ -115,7 +115,7 @@
<componentref name="jwebunit" version="1.2"/>
<componentref name="jcr" version="1.0"/>
<componentref name="jetty" version="6.0"/>
- <componentref name="jgroups" version="2.4.5.GA-brew"/>
+ <componentref name="jgroups" version="2.4.6.GA-brew"/>
<componentref name="jsunit" version="2.1"/>
<componentref name="junit" version="3.8.2-brew"/>
<componentref name="odmg" version="3.0-brew"/>
@@ -130,18 +130,18 @@
<componentref name="glassfish/javamail" version="1.4.0-brew"/>
<componentref name="glassfish/jsf" version="1.2_10-brew"/>
<componentref name="sun-opends" version="snapshot"/>
- <componentref name="sun-servlet" version="2.4"/>
+ <componentref name="sun-servlet" version="2.5-brew"/>
<componentref name="sun-jaxb" version="2.1.4"/>
<componentref name="xdoclet" version="1.2.3-brew"/>
- <componentref name="jbpm/jpdl" version="3.2.2"/>
+ <componentref name="jbpm/jpdl" version="3.2.5.SP5"/>
<componentref name="freemarker" version="2.3.9"/>
<componentref name="wutka-dtdparser" version="1.2.1"/>
<componentref name="portals-bridges" version="1.0.4"/>
<componentref name="tagsoup" version="1.2"/>
<componentref name="portlet" version="2.0-Draft32"/>
<componentref name="glassfish/jstl" version="1.2.0-brew"/>
- <componentref name="jboss/web" version="2.0.0.GA_CP09-brew"/>
- <!-- To use new jboss-cahce/hibernate integration library-->
+ <componentref name="jboss/web" version="2.0.0.GA_CP11-brew"/>
+ <!-- To use new jboss-cache/hibernate integration library-->
<componentref name="org/jboss/cluster/hibernate-jbc-cacheprovider" version="1.0.0.GA"/>
</build>
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r13658 - in modules/authorization/trunk/agent/src/main: resources/META-INF and 1 other directory.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-08-04 05:57:12 -0400 (Tue, 04 Aug 2009)
New Revision: 13658
Modified:
modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/provisioning/LocalPolicyProvisioner.java
modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/provisioning/PolicyProvisioner.java
modules/authorization/trunk/agent/src/main/resources/META-INF/authz-config.xml
Log:
baseline before implementing agent side caching
Modified: modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/provisioning/LocalPolicyProvisioner.java
===================================================================
--- modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/provisioning/LocalPolicyProvisioner.java 2009-08-04 08:34:28 UTC (rev 13657)
+++ modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/provisioning/LocalPolicyProvisioner.java 2009-08-04 09:57:12 UTC (rev 13658)
@@ -1,107 +1,146 @@
/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, a division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.security.authz.agent.provisioning;
import org.apache.log4j.Logger;
+import org.jboss.security.authz.agent.services.CompositionContext;
+import org.jboss.security.authz.agent.services.PolicyComposer;
import org.jboss.security.authz.model.Policy;
import org.jboss.security.authz.model.PolicyMetaData;
import org.jboss.security.authz.policy.server.PolicyServer;
import org.jboss.security.authz.policy.server.PolicyServerException;
/**
- * This Policy Provisioner integrates with the Policy Server in the same VM. This provides fastest provisioning option
+ * This Policy Provisioner integrates with the Policy Server in the same VM.
+ * This provides fastest provisioning option
*
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
-public class LocalPolicyProvisioner implements PolicyProvisioner
+public class LocalPolicyProvisioner implements PolicyProvisioner
{
private static Logger log = Logger.getLogger(LocalPolicyProvisioner.class);
-
+
private PolicyServer policyServer;
-
+ private PolicyComposer policyComposer;
+
public LocalPolicyProvisioner()
{
}
-
- public PolicyServer getPolicyServer()
+
+ public PolicyServer getPolicyServer()
{
return policyServer;
}
- public void setPolicyServer(PolicyServer policyServer)
+ public void setPolicyServer(PolicyServer policyServer)
{
this.policyServer = policyServer;
}
- //--------PolicyProvisioner implementation-----------------------------------------------------------------------------------------------------------------------------------------------------------
- public void newPolicy(PolicyMetaData policyMetaData) throws ProvisioningException
+
+
+ public PolicyComposer getPolicyComposer()
{
+ return policyComposer;
+ }
+
+ public void setPolicyComposer(PolicyComposer policyComposer)
+ {
+ this.policyComposer = policyComposer;
+ }
+ // --------PolicyProvisioner
+ // implementation-----------------------------------------------------------------------------------------------------------------------------------------------------------
+ public void newPolicy(PolicyMetaData policyMetaData)
+ throws ProvisioningException
+ {
try
{
this.policyServer.newPolicy(policyMetaData);
}
- catch(PolicyServerException pe)
+ catch (PolicyServerException pe)
{
log.error(this, pe);
throw new ProvisioningException(pe);
}
}
- public Policy[] readAllPolicies() throws ProvisioningException
- {
+ public Policy[] readAllPolicies() throws ProvisioningException
+ {
try
{
return this.policyServer.readAllPolicies();
}
- catch(PolicyServerException pe)
+ catch (PolicyServerException pe)
{
log.error(this, pe);
throw new ProvisioningException(pe);
}
}
- public Policy readPolicy(String policyUri) throws ProvisioningException
- {
+ public Policy readPolicy(String policyUri) throws ProvisioningException
+ {
try
{
return this.policyServer.readPolicy(policyUri);
}
- catch(PolicyServerException pe)
+ catch (PolicyServerException pe)
{
log.error(this, pe);
throw new ProvisioningException(pe);
}
}
-
- public void deletePolicy(String policyUri) throws ProvisioningException
- {
+
+ public void deletePolicy(String policyUri) throws ProvisioningException
+ {
try
{
this.policyServer.deletePolicy(policyUri);
}
- catch(PolicyServerException pe)
+ catch (PolicyServerException pe)
{
log.error(this, pe);
throw new ProvisioningException(pe);
}
}
+
+ /**
+ * Composes a Policy based on the "Security Components" inside the composition
+ * context and deploys it to the Policy Server
+ *
+ * @param compositionContext
+ * @throws ProvisioningException
+ */
+ public void composeAndDeploy(CompositionContext compositionContext)
+ throws ProvisioningException
+ {
+ try
+ {
+ PolicyMetaData policyMetaData = this.policyComposer.compose(compositionContext);
+ this.policyServer.newPolicy(policyMetaData);
+ }
+ catch (PolicyServerException pe)
+ {
+ log.error(this, pe);
+ throw new ProvisioningException(pe);
+ }
+ }
}
Modified: modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/provisioning/PolicyProvisioner.java
===================================================================
--- modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/provisioning/PolicyProvisioner.java 2009-08-04 08:34:28 UTC (rev 13657)
+++ modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/provisioning/PolicyProvisioner.java 2009-08-04 09:57:12 UTC (rev 13658)
@@ -1,60 +1,76 @@
/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, a division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.security.authz.agent.provisioning;
import org.jboss.security.authz.model.Policy;
import org.jboss.security.authz.model.PolicyMetaData;
+import org.jboss.security.authz.agent.services.CompositionContext;
+
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
-public interface PolicyProvisioner
+public interface PolicyProvisioner
{
- /**
- * Generates a new Policy instance based on the supplied MetaData and stores it into the Policy Store
- *
- * @param policyMetaData meta data for the policy to be created
- */
- public void newPolicy(PolicyMetaData policyMetaData) throws ProvisioningException;
-
- /**
- * Read a stored Policy identified by the unique policyUri
- *
- * @param policyUri
- * @return a stored Policy
- */
+ /**
+ * Generates a new Policy instance based on the supplied MetaData and stores
+ * it into the Policy Store
+ *
+ * @param policyMetaData
+ * meta data for the policy to be created
+ */
+ public void newPolicy(PolicyMetaData policyMetaData)
+ throws ProvisioningException;
+
+ /**
+ * Read a stored Policy identified by the unique policyUri
+ *
+ * @param policyUri
+ * @return a stored Policy
+ */
public Policy readPolicy(String policyUri) throws ProvisioningException;
-
+
/**
* Returns all the stored Policies for the system
*
* @return all the stored Policies
*/
public Policy[] readAllPolicies() throws ProvisioningException;
-
+
/**
* Deletes the specified Policy from storage
*
- * @param policyUri unique identifier for the Policy
+ * @param policyUri
+ * unique identifier for the Policy
*/
public void deletePolicy(String policyUri) throws ProvisioningException;
+
+ /**
+ * Composes a Policy based on the "Security Components" inside the composition
+ * context and deploys it to the Policy Server
+ *
+ * @param compositionContext
+ * @throws ProvisioningException
+ */
+ public void composeAndDeploy(CompositionContext compositionContext)
+ throws ProvisioningException;
}
Modified: modules/authorization/trunk/agent/src/main/resources/META-INF/authz-config.xml
===================================================================
--- modules/authorization/trunk/agent/src/main/resources/META-INF/authz-config.xml 2009-08-04 08:34:28 UTC (rev 13657)
+++ modules/authorization/trunk/agent/src/main/resources/META-INF/authz-config.xml 2009-08-04 09:57:12 UTC (rev 13658)
@@ -23,5 +23,8 @@
<property name="policyServer">
<inject bean="/policy-server/PolicyServer"/>
</property>
+ <property name="policyComposer">
+ <inject bean="/agent/PolicyComposer"/>
+ </property>
</bean>
</deployment>
\ No newline at end of file
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r13657 - branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-server-war.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-04 04:34:28 -0400 (Tue, 04 Aug 2009)
New Revision: 13657
Modified:
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-server-war/login.jsp
Log:
oups
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-server-war/login.jsp
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-server-war/login.jsp 2009-08-03 20:23:50 UTC (rev 13656)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-server-war/login.jsp 2009-08-04 08:34:28 UTC (rev 13657)
@@ -104,7 +104,7 @@
</tr>
<tr class="form-field">
<td><label for="j_password" style="white-space: nowrap;"><%= rb.getString("LOGIN_PASSWORD") %></label></td>
- <td><input type="text" name="j_password" id="j_password" value="" size="12"/></td>
+ <td><input type="password" name="j_password" id="j_password" value="" size="12"/></td>
</tr>
</table>
<div class="button-container">
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r13656 - in jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal: src/main/java/org/exoplatform/portal/config and 4 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-08-03 16:23:50 -0400 (Mon, 03 Aug 2009)
New Revision: 13656
Modified:
jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/pom.xml
jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java
jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/jcr/DataStorageImpl.java
jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/jboss/security/enforcement/ExoEnforcementPoint.java
jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/jboss/security/provisioning/ExoPolicyProvisioner.java
jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/security/jboss/TestJBossPageNavACL.java
Log:
last commit before moving over to the new svn repo
* baseline for first successful end-to-end click thru integration test (tomcat6)
Modified: jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/pom.xml
===================================================================
--- jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/pom.xml 2009-08-03 04:27:36 UTC (rev 13655)
+++ jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/pom.xml 2009-08-03 20:23:50 UTC (rev 13656)
@@ -165,8 +165,7 @@
<artifactId>jboss-mdr</artifactId>
<version>2.0.1.GA</version>
<scope>provided</scope>
- </dependency>
-
+ </dependency>
</dependencies>
<build>
@@ -195,7 +194,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skip>false</skip>
+ <skip>true</skip>
</configuration>
</plugin>
</plugins>
Modified: jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java
===================================================================
--- jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java 2009-08-03 04:27:36 UTC (rev 13655)
+++ jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java 2009-08-03 20:23:50 UTC (rev 13656)
@@ -108,7 +108,7 @@
//Activate/Deactivate security based on JBoss Security Framework
ValueParam jbossSecurityStatus = params.getValueParam("activate.jboss.security");
- if(jbossSecurityStatus.getValue().equalsIgnoreCase(String.valueOf(Boolean.TRUE)))
+ if(jbossSecurityStatus != null && jbossSecurityStatus.getValue().equalsIgnoreCase(String.valueOf(Boolean.TRUE)))
{
md.setActivateJBossSecurity(true);
}
Modified: jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/jcr/DataStorageImpl.java
===================================================================
--- jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/jcr/DataStorageImpl.java 2009-08-03 04:27:36 UTC (rev 13655)
+++ jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/jcr/DataStorageImpl.java 2009-08-03 20:23:50 UTC (rev 13656)
@@ -21,6 +21,7 @@
import javax.jcr.PathNotFoundException;
+
import org.exoplatform.commons.utils.LazyPageList;
import org.exoplatform.portal.application.PortletPreferences;
import org.exoplatform.portal.config.DataStorage;
@@ -36,6 +37,9 @@
import org.exoplatform.services.portletcontainer.pci.WindowID;
import org.picocontainer.Startable;
+import org.exoplatform.portal.jboss.security.provisioning.ExoPolicyProvisioner;
+import org.jboss.security.authz.bootstrap.ServiceContainer;
+
/**
* Created by The eXo Platform SARL
* Author : Tung Pham
@@ -62,9 +66,12 @@
private DataMapper mapper_ = new DataMapper() ;
private ListenerService listenerService;
+ //TODO: Figure out a way to inject this service instead of Service Lookup...for cleanliness
+ private ExoPolicyProvisioner policyProvisioner;
+
public DataStorageImpl(RegistryService service,ListenerService listenerService) throws Exception {
regService_ = service ;
- this.listenerService = listenerService;
+ this.listenerService = listenerService;
}
public PortalConfig getPortalConfig(String portalName) throws Exception {
@@ -83,6 +90,15 @@
return config ;
}
+ private ExoPolicyProvisioner getPolicyProvisioner()
+ {
+ if(this.policyProvisioner == null)
+ {
+ this.policyProvisioner = (ExoPolicyProvisioner)ServiceContainer.lookup("/exo/jboss/PolicyProvisioner");
+ }
+ return this.policyProvisioner;
+ }
+
public void create(PortalConfig config) throws Exception {
String portalAppPath = getApplicationRegistryPath(PortalConfig.PORTAL_TYPE, config.getName()) ;
SessionProvider sessionProvider = SessionProvider.createSystemProvider() ;
@@ -103,7 +119,8 @@
listenerService.broadcast(CREATE_PORTAL_EVENT,this,config);
}
finally {
- sessionProvider.close() ;
+ sessionProvider.close() ;
+ this.getPolicyProvisioner().provision(config);
}
}
@@ -165,7 +182,8 @@
regService_.createEntry(sessionProvider, pageSetPath, pageEntry) ;
}
finally {
- sessionProvider.close() ;
+ sessionProvider.close() ;
+ this.getPolicyProvisioner().provision(page);
}
}
@@ -230,7 +248,8 @@
regService_.createEntry(sessionProvider, appRegPath, NavigationEntry) ;
}
finally {
- sessionProvider.close() ;
+ sessionProvider.close() ;
+ this.getPolicyProvisioner().provision(navigation);
}
}
Modified: jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/jboss/security/enforcement/ExoEnforcementPoint.java
===================================================================
--- jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/jboss/security/enforcement/ExoEnforcementPoint.java 2009-08-03 04:27:36 UTC (rev 13655)
+++ jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/jboss/security/enforcement/ExoEnforcementPoint.java 2009-08-03 20:23:50 UTC (rev 13656)
@@ -145,7 +145,7 @@
try
{
// Create an EnforcementContext
- EnforcementContext context = this.generateEnforcementContext(user, "pagenav://"+nav.getDescription());
+ EnforcementContext context = this.generateEnforcementContext(user, "pagenav://"+nav.getId());
context.setAttribute("action", new Read());
@@ -165,7 +165,7 @@
try
{
// Create an EnforcementContext
- EnforcementContext context = this.generateEnforcementContext(user, "pagenav://"+nav.getDescription());
+ EnforcementContext context = this.generateEnforcementContext(user, "pagenav://"+nav.getId());
context.setAttribute("action", new Write());
Modified: jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/jboss/security/provisioning/ExoPolicyProvisioner.java
===================================================================
--- jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/jboss/security/provisioning/ExoPolicyProvisioner.java 2009-08-03 04:27:36 UTC (rev 13655)
+++ jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/main/java/org/exoplatform/portal/jboss/security/provisioning/ExoPolicyProvisioner.java 2009-08-03 20:23:50 UTC (rev 13656)
@@ -298,7 +298,7 @@
// SetUp Resource
URIResource target = new URIResource();
- target.setUri(new URI("pagenav://"+pageNavigation.getDescription()));
+ target.setUri(new URI("pagenav://"+pageNavigation.getId()));
context.setPolicyTarget(target);
// Super User
Modified: jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/security/jboss/TestJBossPageNavACL.java
===================================================================
--- jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/security/jboss/TestJBossPageNavACL.java 2009-08-03 04:27:36 UTC (rev 13655)
+++ jbossexo/branches/security-integration-sandbox/portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/security/jboss/TestJBossPageNavACL.java 2009-08-03 20:23:50 UTC (rev 13656)
@@ -122,7 +122,7 @@
// SetUp Resource
URIResource target = new URIResource();
- target.setUri(new URI(pageNavigation.getDescription()));
+ target.setUri(new URI(String.valueOf(pageNavigation.getId())));
context.setPolicyTarget(target);
// Super User/Everyone (gives access without further evaluation)
@@ -184,7 +184,7 @@
// Create Resource
URIResource portalRes = new URIResource();
- portalRes.setUri(new URI(pageNavigation.getDescription()));
+ portalRes.setUri(new URI(String.valueOf(pageNavigation.getId())));
context.setAttribute("resource", portalRes);
// Create Identity
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r13655 - jbossexo/branches/portlet-container-integration.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-08-03 00:27:36 -0400 (Mon, 03 Aug 2009)
New Revision: 13655
Added:
jbossexo/branches/portlet-container-integration/portal/
Log:
Add portal directory.
16 years, 11 months
- 1
- 0