JBoss Portal SVN: r13856 - docs/enterprise/trunk/Reference_Guide/en-US.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-10 08:46:43 -0500 (Thu, 10 Dec 2009)
New Revision: 13856
Modified:
docs/enterprise/trunk/Reference_Guide/en-US/Jboss_Portlet_DTD.xml
docs/enterprise/trunk/Reference_Guide/en-US/XML_Descriptors.xml
Log:
JBEPP-151: Examples for <trans-attribute> element in the Reference Guide are incorrect
Modified: docs/enterprise/trunk/Reference_Guide/en-US/Jboss_Portlet_DTD.xml
===================================================================
--- docs/enterprise/trunk/Reference_Guide/en-US/Jboss_Portlet_DTD.xml 2009-12-10 13:39:29 UTC (rev 13855)
+++ docs/enterprise/trunk/Reference_Guide/en-US/Jboss_Portlet_DTD.xml 2009-12-10 13:46:43 UTC (rev 13856)
@@ -74,7 +74,9 @@
<portlet>
<portlet-name>MyPortlet</portlet-name>
<remotable>true</remotable>
- <trans-attribute>Required</trans-attribute>
+ <transaction>
+ <trans-attribute>Required</transaction>
+ <transaction>
</portlet>
-->
Modified: docs/enterprise/trunk/Reference_Guide/en-US/XML_Descriptors.xml
===================================================================
--- docs/enterprise/trunk/Reference_Guide/en-US/XML_Descriptors.xml 2009-12-10 13:39:29 UTC (rev 13855)
+++ docs/enterprise/trunk/Reference_Guide/en-US/XML_Descriptors.xml 2009-12-10 13:46:43 UTC (rev 13856)
@@ -94,7 +94,9 @@
<portlet>
<portlet-name>MyPortlet</portlet-name>
<remotable>true</remotable>
- <trans-attribute>Required</trans-attribute>
+ <transaction>
+ <trans-attribute>Required</transaction>
+ <transaction>
</portlet>]]>
</programlisting>
<programlisting><![CDATA[
16 years, 5 months
JBoss Portal SVN: r13855 - branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/hibernate/portal.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-10 08:39:29 -0500 (Thu, 10 Dec 2009)
New Revision: 13855
Modified:
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml
Log:
JBEPP-148: Creating a users dashboard results in a high number of sql selects
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2009-12-09 22:44:43 UTC (rev 13854)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2009-12-10 13:39:29 UTC (rev 13855)
@@ -54,7 +54,7 @@
name="children"
inverse="true"
cascade="none"
- fetch="select"
+ fetch="subselect"
lazy="true">
<cache usage="@portal.hibernate.cache.usage@"/>
<key column="PARENT_KEY"/>
@@ -73,7 +73,9 @@
name="object"
class="org.jboss.portal.core.impl.model.portal.PortalObjectImpl"
cascade="none"
- fetch="select">
+ fetch="join"
+ constrained="false"
+ lazy="false">
</one-to-one>
<map
name="securityConstraints"
16 years, 5 months
JBoss Portal SVN: r13854 - in modules/cms/trunk: cms-jackrabbit/src/main/java/org/jboss/portal/cms/security and 1 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-12-09 17:44:43 -0500 (Wed, 09 Dec 2009)
New Revision: 13854
Added:
modules/cms/trunk/cms-jackrabbit/src/main/resources/findPermissionsByUser.sql
Modified:
modules/cms/trunk/.classpath
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/security/AuthorizationProviderImpl.java
Log:
JBEPP-117 - CMS identity queries with case sensitive DB fails
Modified: modules/cms/trunk/.classpath
===================================================================
--- modules/cms/trunk/.classpath 2009-12-09 15:40:03 UTC (rev 13853)
+++ modules/cms/trunk/.classpath 2009-12-09 22:44:43 UTC (rev 13854)
@@ -13,14 +13,12 @@
<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
<classpathentry kind="var" path="M2_REPO/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-nodeps/1.6.5/ant-nodeps-1.6.5.jar"/>
<classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
<classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
<classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar"/>
<classpathentry kind="var" path="M2_REPO/bsh/bsh/1.3.0/bsh-1.3.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/codehaus/cargo/cargo-core-uberjar/0.8/cargo-core-uberjar-0.8.jar"/>
<classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/portal/common/common-common/1.2.0/common-common-1.2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
@@ -28,14 +26,12 @@
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
<classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/portal/core/core/2.7.0.CR1/core-2.7.0.CR1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
<classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
<classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
<classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.4.1/ehcache-1.4.1.jar"/>
<classpathentry kind="var" path="M2_REPO/hibernate/hibernate3/3.2.4.SP1/hibernate3-3.2.4.SP1.jar"/>
<classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/portal/identity/identity-identity/1.0.2/identity-identity-1.0.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar"/>
@@ -47,15 +43,12 @@
<classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss/4.0.4.GA/jboss-4.0.4.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR1/jboss-aop-2.0.0.CR1.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-common-jdbc-wrapper/4.0.4.GA/jboss-common-jdbc-wrapper-4.0.4.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta9/jboss-dependency-2.0.0.Beta9.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-j2ee/4.2.0.GA/jboss-j2ee-4.2.0.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-jca/4.0.4.GA/jboss-jca-4.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.0.GA/jboss-jmx-4.2.0.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta9/jboss-kernel-2.0.0.Beta9.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-local-jdbc/4.2.2.GA/jboss-local-jdbc-4.2.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-jdk/2.0.2.GA/jboss-logging-jdk-2.0.2.GA.jar"/>
@@ -67,10 +60,6 @@
<classpathentry kind="var" path="M2_REPO/jboss/jboss-system/4.2.2.GA/jboss-system-4.2.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-transaction/4.0.4.GA/jboss-transaction-4.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit/1.2.1/jboss-unit-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-mc/1.2.1/jboss-unit-mc-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-tooling-ant/1.2.1/jboss-unit-tooling-ant-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-tooling-core/1.2.1/jboss-unit-tooling-core-1.2.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/1.4.1.SP3/jbosscache-core-1.4.1.SP3.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jbossha/4.2.2.GA/jbossha-4.2.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar"/>
@@ -78,8 +67,6 @@
<classpathentry kind="var" path="M2_REPO/org/slf4j/jcl104-over-slf4j/1.3.0/jcl104-over-slf4j-1.3.0.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/sleepycat/je/3.0.12/je-3.0.12.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/portal/core/jems/2.7.0.CR1/jems-2.7.0.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.4.1/jgroups-2.4.1.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jnpserver/4.0.4.GA/jnpserver-4.0.4.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/net/sf/jsr107cache/jsr107cache/1.0/jsr107cache-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/>
@@ -90,18 +77,13 @@
<classpathentry kind="var" path="M2_REPO/sun-opends/opends-core/legacy/opends-core-legacy.jar"/>
<classpathentry kind="var" path="M2_REPO/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4.jar"/>
<classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/unit/portal-test/1.2.1/portal-test-1.2.1.jar"/>
<classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/portal/core/search/2.7.0.CR1/search-2.7.0.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/portal/core/security/2.7.0.CR1/security-2.7.0.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/portal/core/server/2.7.0.CR1/server-2.7.0.CR1.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/textmining/tm-extractors/0.4/tm-extractors-0.4.jar"/>
<classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/portal/core/workflow/2.7.0.CR1/workflow-2.7.0.CR1.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/security/AuthorizationProviderImpl.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/security/AuthorizationProviderImpl.java 2009-12-09 15:40:03 UTC (rev 13853)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/security/AuthorizationProviderImpl.java 2009-12-09 22:44:43 UTC (rev 13854)
@@ -40,17 +40,20 @@
import org.jboss.portal.identity.db.HibernateUserModuleImpl;
import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.jems.hibernate.HibernateProvider;
-import org.jboss.portal.jems.hibernate.SessionFactoryBinder;
import org.jboss.portal.security.spi.provider.DomainConfigurator;
import org.jboss.portal.security.spi.provider.PermissionFactory;
import org.jboss.portal.security.spi.provider.PermissionRepository;
import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
import org.jboss.portal.security.impl.jacc.JACCPortalPrincipal;
+import org.jboss.portal.common.io.IOTools;
+import java.io.InputStream;
import javax.management.ObjectName;
import javax.security.auth.Subject;
import javax.security.jacc.PolicyContext;
import javax.security.jacc.PolicyContextException;
+
+import java.text.MessageFormat;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
@@ -79,6 +82,8 @@
private String schemaName = null;
+ private String nativePermissionQuery;
+
/**
*
*/
@@ -108,6 +113,25 @@
// Will require a rework once fully based on MC.
log.warn("Can't access \"portal:service=Hibernate,type=Instance\" MBean");
}
+
+ //Read the externalized native query (using a native query for better performance)
+ InputStream is = null;
+ try
+ {
+ is = Thread.currentThread().getContextClassLoader().getResourceAsStream("findPermissionsByUser.sql");
+ byte[] bytes = IOTools.getBytes(is);
+ String nativeSql = new String(bytes).trim();
+
+ String schemaPrefix = (schemaName!=null ? schemaName+"." : "");
+ this.nativePermissionQuery = MessageFormat.format(nativeSql, new Object[]{schemaPrefix});
+ }
+ finally
+ {
+ if(is != null)
+ {
+ try{is.close();}catch(Exception ignoreMe){}
+ }
+ }
}
// ------AuthorizationDomain
@@ -461,20 +485,9 @@
permissions.addAll(userQuery.list());
if (this.userModule instanceof HibernateUserModuleImpl)
- {
- String schemaPrefix = (schemaName!=null ? schemaName+"." : "");
-
- // in case of a database version, use the cache optimized way to
- // lookup the permissions
- String lookupByRole = "SELECT p.* from " + schemaPrefix + "jbp_cms_perm p," + schemaPrefix + "jbp_cms_perm_role r," + schemaPrefix + "jbp_role_membership m," + schemaPrefix + "jbp_roles roles," + schemaPrefix + "jbp_users users WHERE "
- + "p.id=r.cms_perm_id AND "
- + "r.role_id=roles.jbp_name AND "
- + "m.jbp_rid=roles.jbp_rid AND "
- + "m.jbp_uid=users.jbp_uid AND " + "users.jbp_uname=?";
-
- // perform lookup based on role membership
- Query roleQuery = session.createSQLQuery(lookupByRole).addEntity(
- Permission.class);
+ {
+ Query roleQuery = session.createSQLQuery(this.nativePermissionQuery).addEntity(
+ Permission.class);
roleQuery.setString(0, userId);
roleQuery.setCacheable(true);
permissions.addAll(roleQuery.list());
Added: modules/cms/trunk/cms-jackrabbit/src/main/resources/findPermissionsByUser.sql
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/resources/findPermissionsByUser.sql (rev 0)
+++ modules/cms/trunk/cms-jackrabbit/src/main/resources/findPermissionsByUser.sql 2009-12-09 22:44:43 UTC (rev 13854)
@@ -0,0 +1 @@
+SELECT p.* from {0}jbp_cms_perm p,{0}jbp_cms_perm_role r,{0}jbp_role_membership m,{0}jbp_roles roles,{0}jbp_users users WHERE p.id=r.cms_perm_id AND r.role_id=roles.jbp_name AND m.jbp_rid=roles.jbp_rid AND m.jbp_uid=users.jbp_uid AND users.jbp_uname=?
\ No newline at end of file
16 years, 5 months
JBoss Portal SVN: r13853 - modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/src/main/java/org/jboss/portal/identity/sso/opensso.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2009-12-09 10:40:03 -0500 (Wed, 09 Dec 2009)
New Revision: 13853
Added:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/src/main/java/org/jboss/portal/identity/sso/opensso/OpenSSOAgent.java
modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/src/main/java/org/jboss/portal/identity/sso/opensso/OpenSSORESTAuthenticationValve.java
Log:
- OpenSSO REST support
Added: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/src/main/java/org/jboss/portal/identity/sso/opensso/OpenSSOAgent.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/src/main/java/org/jboss/portal/identity/sso/opensso/OpenSSOAgent.java (rev 0)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/src/main/java/org/jboss/portal/identity/sso/opensso/OpenSSOAgent.java 2009-12-09 15:40:03 UTC (rev 13853)
@@ -0,0 +1,223 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2009, 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.portal.identity.sso.opensso;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.apache.log4j.Logger;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.PostMethod;
+
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ */
+public class OpenSSOAgent
+{
+ private static Logger log = Logger.getLogger(OpenSSOAgent.class);
+ private static OpenSSOAgent singleton;
+
+ private String cookieName;
+ private String serverUrl;
+
+ private OpenSSOAgent(String serverUrl, String cookieName)
+ {
+ this.serverUrl = serverUrl;
+ this.cookieName = cookieName;
+ }
+
+ public static OpenSSOAgent getInstance(String serverUrl, String cookieName)
+ {
+ if(OpenSSOAgent.singleton == null)
+ {
+ synchronized(OpenSSOAgent.class)
+ {
+ if(OpenSSOAgent.singleton == null)
+ {
+ OpenSSOAgent.singleton = new OpenSSOAgent(serverUrl, cookieName);
+ }
+ }
+ }
+ return OpenSSOAgent.singleton;
+ }
+
+ public String validateTicket(HttpServletRequest httpRequest) throws Exception
+ {
+ String token = null;
+ Cookie[] cookies = httpRequest.getCookies();
+ for(Cookie cookie: cookies)
+ {
+ if(cookie.getName().equals(this.cookieName))
+ {
+ token = cookie.getValue();
+ break;
+ }
+ }
+
+ if(token != null)
+ {
+ boolean isValid = this.isTokenValid(token);
+
+ if(!isValid)
+ {
+ throw new IllegalStateException("OpenSSO Token is not valid!!");
+ }
+
+ String subject = this.getSubject(token);
+ if(subject != null)
+ {
+ return subject;
+ }
+ }
+
+ return null;
+ }
+
+ public void invalidateTicket(HttpServletResponse httpResponse)
+ {
+ Cookie clear = new Cookie(this.cookieName, null);
+ clear.setMaxAge(0);
+ httpResponse.addCookie(clear);
+
+ }
+ //-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ private boolean isTokenValid(String token) throws Exception
+ {
+ HttpClient client = new HttpClient();
+ PostMethod post = null;
+ try
+ {
+ String url = this.serverUrl+"/identity/isTokenValid";
+ post = new PostMethod(url);
+ post.addParameter("tokenid", token);
+
+ int status = client.executeMethod(post);
+ String response = post.getResponseBodyAsString();
+
+ log.debug("-------------------------------------------------------");
+ log.debug("Status: "+status);
+ log.debug("Response: "+response);
+ log.debug("-------------------------------------------------------");
+
+ if(response.contains(Boolean.TRUE.toString()))
+ {
+ return true;
+ }
+
+ return false;
+ }
+ finally
+ {
+ if(post != null)
+ {
+ post.releaseConnection();
+ }
+ }
+ }
+
+ private String getSubject(String token) throws Exception
+ {
+ HttpClient client = new HttpClient();
+ PostMethod post = null;
+ try
+ {
+ String uid = null;
+ String url = this.serverUrl+"/identity/attributes";
+ post = new PostMethod(url);
+ post.addParameter("subjectid", token);
+ post.addParameter("attributes_names", "uid");
+
+ int status = client.executeMethod(post);
+ String response = post.getResponseBodyAsString();
+
+ log.debug("--------------------------------------------------------");
+ log.debug("Status: "+status);
+ log.debug(response);
+ log.debug("--------------------------------------------------------");
+
+ if(response != null)
+ {
+ Properties properties = this.loadAttributes(response);
+ uid = properties.getProperty("uid");
+ }
+
+
+ return uid;
+ }
+ finally
+ {
+ if(post != null)
+ {
+ post.releaseConnection();
+ }
+ }
+ }
+
+ private Properties loadAttributes(String response) throws Exception
+ {
+ InputStream is = null;
+ try
+ {
+ Properties properties = new Properties();
+
+ String[] tokens = response.split("\n");
+ String name = null;
+ for(String token: tokens)
+ {
+ if(token.startsWith("userdetails.attribute.name"))
+ {
+ name = token.substring(token.indexOf("=")+1).trim();
+ }
+ else if(token.startsWith("userdetails.attribute.value"))
+ {
+ String value = token.substring(token.indexOf("=")+1).trim();
+ value = value.trim();
+
+ if(name != null)
+ {
+ properties.setProperty(name, value);
+ }
+
+ //cleanup
+ name = null;
+ }
+ }
+
+ return properties;
+ }
+ finally
+ {
+ if(is != null)
+ {
+ is.close();
+ }
+ }
+ }
+}
Added: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/src/main/java/org/jboss/portal/identity/sso/opensso/OpenSSORESTAuthenticationValve.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/src/main/java/org/jboss/portal/identity/sso/opensso/OpenSSORESTAuthenticationValve.java (rev 0)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/src/main/java/org/jboss/portal/identity/sso/opensso/OpenSSORESTAuthenticationValve.java 2009-12-09 15:40:03 UTC (rev 13853)
@@ -0,0 +1,408 @@
+/*
+* 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.portal.identity.sso.opensso;
+
+import org.apache.catalina.valves.ValveBase;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.Context;
+import org.apache.catalina.Session;
+import org.apache.catalina.authenticator.Constants;
+import org.jboss.portal.identity.helper.IdentityTools;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.security.Principal;
+import java.util.Set;
+import java.util.Iterator;
+import java.util.HashSet;
+
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version $Revision: 0.1 $
+ */
+public class OpenSSORESTAuthenticationValve extends ValveBase
+{
+ /** . */
+ private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(OpenSSOAuthenticationValve.class);
+
+ public static final String WEB_REQUEST_KEY = "javax.servlet.http.HttpServletRequest";
+
+ private Set urlPatterns;
+
+ private String serverURL;
+
+ private String cookieName;
+
+ private String loginURL;
+
+ private String logoutURL;
+
+ private boolean appendLoginGoto = true;
+
+ private boolean appendLogoutGoto = true;
+
+ private String loginParameters;
+
+ private String logoutParameters;
+
+ private String authType = "FORM";
+
+ public void invoke(Request request, Response response) throws IOException, ServletException
+ {
+
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ HttpSession session = httpRequest.getSession();
+ request.setAttribute("ssoEnabled", "true");
+
+
+ OpenSSOAgent agent = OpenSSOAgent.getInstance(this.serverURL, this.cookieName);
+
+ String openSSOSubject = null;
+
+ try
+ {
+ openSSOSubject = agent.validateTicket(request);
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to validate OpenSSO token:: ", e);
+ }
+
+ String requestURI = request.getRequestURI();
+
+ // When token is not present and secured portal url is requested
+
+ if (isSecuredURI(requestURI) && openSSOSubject == null)
+ {
+
+ // Perform OpenSSO login by going to the OpenSSO authentication server
+
+ redirectToOpenSSOLogin(request, response);
+ return;
+ }
+
+ // When token present and valid
+
+ if (openSSOSubject != null)
+ {
+
+ try
+ {
+ // Perform the portal JAAS authentication
+
+ request.setAttribute("ssoSuccess", new Boolean(true));
+ Principal principal = ((Context) this.container).getRealm().authenticate(openSSOSubject, (String) null);
+ if (principal != null)
+ {
+ this.register(request, response, principal, getAuthType(), openSSOSubject,
+ (String) null);
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to perform JAAS login: ", e);
+ }
+ }
+
+ // Continue processing the request
+
+ this.getNext().invoke(request, response);
+
+
+ // Signout request
+
+ if ((openSSOSubject != null && request.getAttribute("org.jboss.portal.logout") != null))
+ {
+ agent.invalidateTicket(response);
+ redirectToOpenSSOLogout(request,response);
+ }
+ else if (openSSOSubject == null && request.getUserPrincipal() != null)
+ {
+ // Illegal state - no SSO token present but still authenticated
+ request.getSession().invalidate();
+ }
+
+ }
+
+ private void redirectToOpenSSOLogin(HttpServletRequest request, HttpServletResponse response) throws IOException
+ {
+
+ StringBuffer redirect = new StringBuffer();
+ redirect.append(getLoginURL());
+ if (isAppendLoginGoto())
+ {
+ redirect.append("?goto=")
+ .append(request.getRequestURL());
+ }
+
+ if (getLoginParameters() != null && getLoginParameters().length() > 0)
+ {
+ if (isAppendLoginGoto())
+ {
+ redirect.append("&");
+ }
+ else
+ {
+ redirect.append("?");
+ }
+ redirect.append(getLoginParameters());
+ }
+
+ if (log.isDebugEnabled()) log.debug("Redirect to OpenSSO login URL: " + redirect.toString());
+
+ response.sendRedirect(redirect.toString());
+ }
+
+ private void redirectToOpenSSOLogout(HttpServletRequest request, HttpServletResponse response) throws IOException
+ {
+
+ StringBuffer redirect = new StringBuffer();
+ redirect.append(getLogoutURL());
+ if (isAppendLogoutGoto())
+ {
+ StringBuffer url = new StringBuffer();
+ if (request.isSecure())
+ {
+ url.append("https://");
+ }
+ else
+ {
+ url.append("http://");
+ }
+ url.append(request.getServerName())
+ .append(":")
+ .append(request.getServerPort())
+ .append(request.getContextPath());
+
+ redirect.append("?goto=")
+ .append(url);
+ }
+
+ if (getLogoutParameters() != null && getLogoutParameters().length() > 0)
+ {
+ if (isAppendLogoutGoto())
+ {
+ redirect.append("&");
+ }
+ else
+ {
+ redirect.append("?");
+ }
+ redirect.append(getLogoutParameters());
+ }
+
+ if (log.isDebugEnabled()) log.debug("Redirect to OpenSSO logout URL: " + redirect.toString());
+
+ response.sendRedirect(redirect.toString());
+ }
+
+
+
+ private boolean isSecuredURI(String uri)
+ {
+ Set patterns = getSecuredUrlPatterns();
+
+ if (log.isDebugEnabled())
+ {
+ log.debug("Checking if requested uri '" + uri + "' matches secured url patterns: " + patterns);
+ }
+
+ for (Iterator iterator = patterns.iterator(); iterator.hasNext();)
+ {
+ String pattern = (String)iterator.next();
+
+ if (uri.indexOf(pattern) != -1)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ public Set getSecuredUrlPatterns()
+ {
+ if (urlPatterns == null)
+ {
+ urlPatterns = IdentityTools.findSecuredURLs((Context)this.container);
+
+ //Remove wildcards
+ Set urls = new HashSet();
+ for (Iterator iterator = urlPatterns.iterator(); iterator.hasNext();)
+ {
+ String pattern = (String)iterator.next();
+ urls.add(pattern.replaceAll("\\*",""));
+ }
+ urlPatterns = urls;
+ }
+
+ return urlPatterns;
+ }
+
+ /**
+ * Register an authenticated Principal and authentication type in our
+ * request, in the current session (if there is one), and with our
+ * SingleSignOn valve, if there is one. Set the appropriate cookie to be
+ * returned.
+ *
+ * @param request
+ * The servlet request we are processing
+ * @param response
+ * The servlet response we are generating
+ * @param principal
+ * The authenticated Principal to be registered
+ * @param authType
+ * The authentication type to be registered
+ * @param username
+ * Username used to authenticate (if any)
+ * @param password
+ * Password used to authenticate (if any)
+ */
+ private void register(Request request, Response response,
+ Principal principal, String authType, String username, String password)
+ {
+ // Cache the authentication information in our request
+ request.setAuthType(authType);
+ request.setUserPrincipal(principal);
+
+ Session session = request.getSessionInternal(false);
+ // Cache the authentication information in our session, if any
+ if (session != null)
+ {
+ session.setAuthType(authType);
+ session.setPrincipal(principal);
+ if (username != null)
+ {
+ session.setNote(Constants.SESS_USERNAME_NOTE, username);
+ }
+ else
+ {
+ session.removeNote(Constants.SESS_USERNAME_NOTE);
+ }
+ if (password != null)
+ {
+ session.setNote(Constants.SESS_PASSWORD_NOTE, password);
+ }
+ else
+ {
+ session.removeNote(Constants.SESS_PASSWORD_NOTE);
+ }
+ }
+ }
+
+
+ public String getLoginURL()
+ {
+ return loginURL;
+ }
+
+ public void setLoginURL(String loginURL)
+ {
+ this.loginURL = loginURL;
+ }
+
+ public String getLogoutURL()
+ {
+ return logoutURL;
+ }
+
+ public void setLogoutURL(String logoutURL)
+ {
+ this.logoutURL = logoutURL;
+ }
+
+ public boolean isAppendLoginGoto()
+ {
+ return appendLoginGoto;
+ }
+
+ public void setAppendLoginGoto(boolean appendLoginGoto)
+ {
+ this.appendLoginGoto = appendLoginGoto;
+ }
+
+ public boolean isAppendLogoutGoto()
+ {
+ return appendLogoutGoto;
+ }
+
+ public void setAppendLogoutGoto(boolean appendLogoutGoto)
+ {
+ this.appendLogoutGoto = appendLogoutGoto;
+ }
+
+ public String getLoginParameters()
+ {
+ return loginParameters;
+ }
+
+ public void setLoginParameters(String loginParameters)
+ {
+ this.loginParameters = loginParameters;
+ }
+
+ public String getLogoutParameters()
+ {
+ return logoutParameters;
+ }
+
+ public void setLogoutParameters(String logoutParameters)
+ {
+ this.logoutParameters = logoutParameters;
+ }
+
+ public String getAuthType()
+ {
+ return authType;
+ }
+
+ public void setAuthType(String authType)
+ {
+ this.authType = authType;
+ }
+
+ public String getServerURL()
+ {
+ return serverURL;
+ }
+
+ public void setServerURL(String serverURL)
+ {
+ this.serverURL = serverURL;
+ }
+
+ public String getCookieName()
+ {
+ return cookieName;
+ }
+
+ public void setCookieName(String cookieName)
+ {
+ this.cookieName = cookieName;
+ }
+}
16 years, 5 months
JBoss Portal SVN: r13851 - branches/Enterprise_Portal_Platform_4_3/widget/src/resources/portal-widget-war/WEB-INF/jsp.
by portal-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-12-04 04:07:27 -0500 (Fri, 04 Dec 2009)
New Revision: 13851
Modified:
branches/Enterprise_Portal_Platform_4_3/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp
Log:
[JBEPP-149] - Google Gadgets User Preference does not set/show default values
Modified: branches/Enterprise_Portal_Platform_4_3/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp 2009-12-02 10:03:09 UTC (rev 13850)
+++ branches/Enterprise_Portal_Platform_4_3/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp 2009-12-04 09:07:27 UTC (rev 13851)
@@ -351,7 +351,7 @@
int prefType = prefInfo.getType().getOrdinal();
if (prefValue == null)
{
- prefInfo.getDefaultValue();
+ prefValue = prefInfo.getDefaultValue();
}
if (prefValue == null)
{
16 years, 5 months
JBoss Portal SVN: r13850 - in branches/Enterprise_Portal_Platform_4_3/core-admin/src: resources/portal-admin-war/jsf and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-02 05:03:09 -0500 (Wed, 02 Dec 2009)
New Revision: 13850
Modified:
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml
branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
Log:
JBEPP-146: null appears in content when Initial Mode property is set to Minimized
(If people had the value set through the admin console prior to this fix, this can be reset through the same admin feature)
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2009-12-02 09:42:51 UTC (rev 13849)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2009-12-02 10:03:09 UTC (rev 13850)
@@ -389,7 +389,7 @@
for (IteratorStatus i = new IteratorStatus(children.iterator()); i.hasNext();)
{
PortalObject portalObject = (PortalObject)i.next();
- if (portalObject.getDeclaredProperties().containsValue("MAXIMIZED"))
+ if (portalObject.getDeclaredProperties().containsValue("maximized"))
{
return Boolean.TRUE;
}
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2009-12-02 09:42:51 UTC (rev 13849)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2009-12-02 10:03:09 UTC (rev 13850)
@@ -109,17 +109,17 @@
<h:selectOneMenu id="prop-value-select" styleClass="portlet-form-input-field"
value="#{prop.value}"
- rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (!portalobjectmgr.maximizedStateExists or prop.value eq 'MAXIMIZED')}">
+ rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (!portalobjectmgr.maximizedStateExists or prop.value eq 'maximized')}">
<f:selectItem itemLabel="Choose One..." itemValue=""/>
- <f:selectItem itemLabel="Maximized" itemValue="MAXIMIZED"/>
- <f:selectItem itemLabel="Minimized" itemValue="MINIMIZED"/>
- <f:selectItem itemLabel="Normal" itemValue="NORMAL"/>
+ <f:selectItem itemLabel="Maximized" itemValue="maximized"/>
+ <f:selectItem itemLabel="Minimized" itemValue="minimized"/>
+ <f:selectItem itemLabel="Normal" itemValue="normal"/>
</h:selectOneMenu>
<h:selectOneMenu id="prop-value-select1" styleClass="portlet-form-input-field"
value="#{prop.value}" disabled="true"
- rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (portalobjectmgr.maximizedStateExists and prop.value ne 'MAXIMIZED')}">
- <f:selectItem itemLabel="Minimized" itemValue="MINIMIZED"/>
+ rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (portalobjectmgr.maximizedStateExists and prop.value ne 'maximized')}">
+ <f:selectItem itemLabel="Minimized" itemValue="minimized"/>
</h:selectOneMenu>
@@ -150,4 +150,4 @@
</div>
-</ui:composition>
\ No newline at end of file
+</ui:composition>
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2009-12-02 09:42:51 UTC (rev 13849)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2009-12-02 10:03:09 UTC (rev 13850)
@@ -151,16 +151,16 @@
</f:facet>
<h:graphicImage
- title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? bundle.THIS_MINIMIZED_STATE : bundle.THIS_NORMAL_STATE}."
+ title="#{object.declaredProperties['portal.windowInitialState'] eq 'minimized' ? bundle.THIS_MINIMIZED_STATE : bundle.THIS_NORMAL_STATE}."
rendered="#{!maximizedStateExists}"
- value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }"
+ value="#{object.declaredProperties['portal.windowInitialState'] eq 'minimized' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }"
styleClass="windowStateIcon"
alt=""/>
<h:graphicImage
- title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? bundle.THIS_MAXIMIZED_STATE : bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}."
+ title="#{object.declaredProperties['portal.windowInitialState'] eq 'maximized' ? bundle.THIS_MAXIMIZED_STATE : bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}."
rendered="#{maximizedStateExists}"
- value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}"
+ value="#{object.declaredProperties['portal.windowInitialState'] eq 'maximized' ? '/img/max-icon.gif' : '/img/min-icon.gif'}"
styleClass="windowStateIcon"
alt=""/>
16 years, 5 months
JBoss Portal SVN: r13849 - branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/js/tooltip.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-02 04:42:51 -0500 (Wed, 02 Dec 2009)
New Revision: 13849
Modified:
branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/js/tooltip/domLib.js
Log:
JBEPP-141: Mouse over effect in Admin portlet does not work with IE8
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/js/tooltip/domLib.js
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/js/tooltip/domLib.js 2009-12-02 09:39:19 UTC (rev 13848)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/js/tooltip/domLib.js 2009-12-02 09:42:51 UTC (rev 13849)
@@ -50,7 +50,7 @@
var domLib_isKonq = domLib_userAgent.indexOf('konqueror') != -1;
// Both konqueror and safari use the khtml rendering engine
var domLib_isKHTML = (domLib_isKonq || domLib_isSafari || domLib_userAgent.indexOf('khtml') != -1);
-var domLib_isIE = (!domLib_isKHTML && !domLib_isOpera && (domLib_userAgent.indexOf('msie 5') != -1 || domLib_userAgent.indexOf('msie 6') != -1 || domLib_userAgent.indexOf('msie 7') != -1));
+var domLib_isIE = (!domLib_isKHTML && !domLib_isOpera && (domLib_userAgent.indexOf('msie 5') != -1 || domLib_userAgent.indexOf('msie 6') != -1 || domLib_userAgent.indexOf('msie 7') != -1 || domLib_userAgent.indexOf('msie 8') != -1));
var domLib_isIE5up = domLib_isIE;
var domLib_isIE50 = (domLib_isIE && domLib_userAgent.indexOf('msie 5.0') != -1);
var domLib_isIE55 = (domLib_isIE && domLib_userAgent.indexOf('msie 5.5') != -1);
16 years, 5 months
JBoss Portal SVN: r13848 - docs/enterprise/trunk/Reference_Guide/en-US.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-02 04:39:19 -0500 (Wed, 02 Dec 2009)
New Revision: 13848
Modified:
docs/enterprise/trunk/Reference_Guide/en-US/CMS_Portlet.xml
Log:
JBEPP-123: Documentation on how to add custom CMS Interceptors is incorrect
Modified: docs/enterprise/trunk/Reference_Guide/en-US/CMS_Portlet.xml
===================================================================
--- docs/enterprise/trunk/Reference_Guide/en-US/CMS_Portlet.xml 2009-12-02 08:55:41 UTC (rev 13847)
+++ docs/enterprise/trunk/Reference_Guide/en-US/CMS_Portlet.xml 2009-12-02 09:39:19 UTC (rev 13848)
@@ -45,7 +45,6 @@
</section>
<section id="configuration-cms_content">
<title>CMS content</title>
- <para>Since 2.6 displaying CMS content in the portal is done using the new content integration
feature. Each window of the portal can be configured to display CMS content directly instead of
having to configure the CMS portlet as it used to be.
</para>
@@ -437,7 +436,7 @@
If you create your own interceptor <literal>org.example.myCMSInterceptor</literal>, the service descriptor file will look like:
<programlisting><![CDATA[<mbean code="org.example.myCMSInterceptor"
name="portal:service=Interceptor,type=Cms,name=MyName" xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean />
</mbean>
@@ -539,6 +538,7 @@
<depends-list-element>
portal:service=Interceptor,type=Cms,name=ApprovalWorkflow
</depends-list-element>
+ <!-- CUSTOM INTERCEPTOR ADDED HERE -->
<depends-list-element>
portal:service=Interceptor,type=Cms,name=MyName
</depends-list-element>
16 years, 5 months
JBoss Portal SVN: r13847 - 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-12-02 03:55:41 -0500 (Wed, 02 Dec 2009)
New Revision: 13847
Modified:
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-server-war/login.jsp
Log:
JBEPP-115: Garbage characters in login form in EPP 4.3 CP02
(will not look as great in IE8 for some obscure reason)
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-12-02 08:48:28 UTC (rev 13846)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-server-war/login.jsp 2009-12-02 08:55:41 UTC (rev 13847)
@@ -20,6 +20,7 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+<%@ page pageEncoding="utf-8" %>
<%@page import="org.jboss.portal.identity.UserStatus" %>
<%@page import="org.jboss.portal.server.ParameterSanitizer" %>
<%@page import="java.util.ResourceBundle" %>
16 years, 5 months
JBoss Portal SVN: r13846 - branches/Enterprise_Portal_Platform_4_3/theme/src/bin/portal-ajax-war/dyna.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-02 03:48:28 -0500 (Wed, 02 Dec 2009)
New Revision: 13846
Modified:
branches/Enterprise_Portal_Platform_4_3/theme/src/bin/portal-ajax-war/dyna/dyna.js
Log:
JBEPP-103: Resource serving doesn't work with Partial refresh
Modified: branches/Enterprise_Portal_Platform_4_3/theme/src/bin/portal-ajax-war/dyna/dyna.js
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/theme/src/bin/portal-ajax-war/dyna/dyna.js 2009-11-19 17:19:12 UTC (rev 13845)
+++ branches/Enterprise_Portal_Platform_4_3/theme/src/bin/portal-ajax-war/dyna/dyna.js 2009-12-02 08:48:28 UTC (rev 13846)
@@ -77,6 +77,11 @@
if (!url.match(eval(regexp))) {
return false;
}
+
+ // Resource URLs
+ if (url.indexOf("action=b") != -1) {
+ return false;
+ }
//
return true;
16 years, 5 months