September 2011 - portal-commits - Jboss List Archives

JBoss Portal SVN: r14021 - branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-09-13 09:19:40 -0400 (Tue, 13 Sep 2011) New Revision: 14021 Modified: branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/PortalConstants.java Log: Preparing for 4.3 CP7 release Modified: branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/PortalConstants.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/PortalConstants.java 2011-09-13 13:18:59 UTC (rev 14020) +++ branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/PortalConstants.java 2011-09-13 13:19:40 UTC (rev 14021) @@ -36,7 +36,7 @@ { /** Current version. */ - public static final Version VERSION = new Version("JBoss Enterprise Portal Platform", 4, 3, 0, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Enterprise"); + public static final Version VERSION = new Version("JBoss Enterprise Portal Platform", 4, 3, 0, new Version.Qualifier(Version.Qualifier.Prefix.CP, Version.Qualifier.Suffix.SUFFIX_7), "Enterprise"); /** The default portal name. */ public static final String DEFAULT_PORTAL_NAME = "default";

12 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r14020 - branches/Enterprise_Portal_Platform_4_3/build.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-09-13 09:18:59 -0400 (Tue, 13 Sep 2011) New Revision: 14020 Modified: branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml Log: JBEPP-920: Upgrade Jackrabbit version to 1.6.4 Modified: branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2011-09-08 19:12:15 UTC (rev 14019) +++ branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2011-09-13 13:18:59 UTC (rev 14020) @@ -68,10 +68,10 @@ <componentref name="jboss-portal/modules/test" version="1.0.5"/> <componentref name="jboss-portal/modules/portlet" version="2.0.9"/> <componentref name="jboss-portal/modules/identity" version="1.1.3"/> - <componentref name="jboss-portal/modules/cms" version="1.2.8"/> + <componentref name="jboss-portal/modules/cms" version="1.2.9"/> <componentref name="antlr" version="2.7.6-brew"/> <componentref name="apache-ant" version="1.6.5"/> - <componentref name="jackrabbit" version="1.4"/> + <componentref name="jackrabbit" version="1.6.4"/> <componentref name="apache-beanutils" version="1.8.0clean-brew"/> <componentref name="apache-codec" version="1.3.0-brew"/> <componentref name="apache-collections" version="3.1-brew"/> @@ -81,7 +81,7 @@ <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-lucene" version="2.4.1-brew"/> <componentref name="apache-net" version="1.4.1"/> <componentref name="apache-xerces" version="2.7.1.patch01-brew"/> <componentref name="asm" version="1.5.3"/> @@ -99,7 +99,7 @@ <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="jakarta-io" version="1.4"/> <componentref name="jbossas/core-libs" version="4.0.4.GA"/> <componentref name="jboss/aop" version="1.5.5.GA_CP03-brew"/> <componentref name="jboss/cache" version="1.4.1.SP13-brew"/>

12 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r14019 - in modules/cms/trunk: build and 1 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-09-08 15:12:15 -0400 (Thu, 08 Sep 2011) New Revision: 14019 Modified: modules/cms/trunk/build/pom.xml modules/cms/trunk/cms-jackrabbit/pom.xml modules/cms/trunk/pom.xml Log: Prepare for next iteration Modified: modules/cms/trunk/build/pom.xml =================================================================== --- modules/cms/trunk/build/pom.xml 2011-09-08 19:09:03 UTC (rev 14018) +++ modules/cms/trunk/build/pom.xml 2011-09-08 19:12:15 UTC (rev 14019) @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.portal.cms</groupId> <artifactId>module-parent</artifactId> - <version>1.2.9</version> + <version>1.2.10-SNAPSHOT</version> <packaging>pom</packaging> <name>JBoss Portal CMS</name> <url>http://www.jboss.com/products/jbossmc</url> Modified: modules/cms/trunk/cms-jackrabbit/pom.xml =================================================================== --- modules/cms/trunk/cms-jackrabbit/pom.xml 2011-09-08 19:09:03 UTC (rev 14018) +++ modules/cms/trunk/cms-jackrabbit/pom.xml 2011-09-08 19:12:15 UTC (rev 14019) @@ -5,7 +5,7 @@ <groupId>org.jboss.portal.cms</groupId> <artifactId>module-parent</artifactId> <relativePath>../build/pom.xml</relativePath> - <version>1.2.9</version> + <version>1.2.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>cms-jackrabbit</artifactId> Modified: modules/cms/trunk/pom.xml =================================================================== --- modules/cms/trunk/pom.xml 2011-09-08 19:09:03 UTC (rev 14018) +++ modules/cms/trunk/pom.xml 2011-09-08 19:12:15 UTC (rev 14019) @@ -5,7 +5,7 @@ <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal CMS Module</name> - <version>1.2.9</version> + <version>1.2.10-SNAPSHOT</version> <url>http://labs.jboss.com/jbossportal</url> <dependencies/>

12 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r14018 - modules/cms/tags.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-09-08 15:09:03 -0400 (Thu, 08 Sep 2011) New Revision: 14018 Added: modules/cms/tags/JBP_CMS_1_2_9/ Log: Tagging cms 1.2.9

12 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r14017 - in modules/cms/trunk: build and 1 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-09-08 12:21:56 -0400 (Thu, 08 Sep 2011) New Revision: 14017 Modified: modules/cms/trunk/build/pom.xml modules/cms/trunk/cms-jackrabbit/pom.xml modules/cms/trunk/pom.xml Log: Prepare for 1.2.9 release Modified: modules/cms/trunk/build/pom.xml =================================================================== --- modules/cms/trunk/build/pom.xml 2011-09-08 09:34:34 UTC (rev 14016) +++ modules/cms/trunk/build/pom.xml 2011-09-08 16:21:56 UTC (rev 14017) @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.portal.cms</groupId> <artifactId>module-parent</artifactId> - <version>trunk-SNAPSHOT</version> + <version>1.2.9</version> <packaging>pom</packaging> <name>JBoss Portal CMS</name> <url>http://www.jboss.com/products/jbossmc</url> Modified: modules/cms/trunk/cms-jackrabbit/pom.xml =================================================================== --- modules/cms/trunk/cms-jackrabbit/pom.xml 2011-09-08 09:34:34 UTC (rev 14016) +++ modules/cms/trunk/cms-jackrabbit/pom.xml 2011-09-08 16:21:56 UTC (rev 14017) @@ -5,7 +5,7 @@ <groupId>org.jboss.portal.cms</groupId> <artifactId>module-parent</artifactId> <relativePath>../build/pom.xml</relativePath> - <version>trunk-SNAPSHOT</version> + <version>1.2.9</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>cms-jackrabbit</artifactId> Modified: modules/cms/trunk/pom.xml =================================================================== --- modules/cms/trunk/pom.xml 2011-09-08 09:34:34 UTC (rev 14016) +++ modules/cms/trunk/pom.xml 2011-09-08 16:21:56 UTC (rev 14017) @@ -5,7 +5,7 @@ <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal CMS Module</name> - <version>trunk-SNAPSHOT</version> + <version>1.2.9</version> <url>http://labs.jboss.com/jbossportal</url> <dependencies/>

12 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r14016 - branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/aspects/server.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-09-08 05:34:34 -0400 (Thu, 08 Sep 2011) New Revision: 14016 Modified: branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/aspects/server/SignOutInterceptor.java Log: JBEPP-1118 Portal SessionListener attempts to invalidate session that has already been invalidated Modified: branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/aspects/server/SignOutInterceptor.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/aspects/server/SignOutInterceptor.java 2011-09-08 09:12:28 UTC (rev 14015) +++ branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/aspects/server/SignOutInterceptor.java 2011-09-08 09:34:34 UTC (rev 14016) @@ -187,7 +187,7 @@ HttpSession session = req.getSession(false); // - if (session != null) + if ((session != null) && (req.isRequestedSessionIdValid())) { session.invalidate(); }

12 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r14015 - modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/security.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-09-08 05:12:28 -0400 (Thu, 08 Sep 2011) New Revision: 14015 Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/security/AuthorizationProviderImpl.java Log: JBEPP-918 Secured content not available through CMSPreviewServlet if LDAP is used 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 2011-09-07 13:04:06 UTC (rev 14014) +++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/security/AuthorizationProviderImpl.java 2011-09-08 09:12:28 UTC (rev 14015) @@ -493,15 +493,9 @@ permissions.addAll(roleQuery.list()); } else - { - + { - // in the case of LDAP use the IdentityModule - // now find permissions for all the roles that this user belongs to - //Set belongedRoles = this.membershipModule.getRoles(this.userModule - // .findUserByUserName(userId)); - - Set belongedRoles = getCurrentRoles(); + Set belongedRoles = getCurrentRoles(userId); if (belongedRoles != null) { @@ -585,7 +579,7 @@ return permissions; } - private Set getCurrentRoles() throws PolicyContextException + private Set getCurrentRoles(String userId) throws PolicyContextException, IdentityException { Set<String> roles = new HashSet<String>(); @@ -617,6 +611,17 @@ } } } + // JBEPP-918: Fallback if JACC context is not available, + // for instance when the call is coming from the CMSPreviewServlet + else + { + Set ldapRoles = this.membershipModule.getRoles(this.userModule.findUserByUserName(userId)); + for (Iterator i = ldapRoles.iterator(); i.hasNext();) + { + Role role = (Role)i.next(); + roles.add(role.getName()); + } + } if(roles.isEmpty()) {

12 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r14014 - in modules/cms/trunk: build and 3 other directories.

by portal-commits＠lists.jboss.org

Author: mputz Date: 2011-09-07 09:04:06 -0400 (Wed, 07 Sep 2011) New Revision: 14014 Modified: modules/cms/trunk/.classpath modules/cms/trunk/build/pom.xml modules/cms/trunk/cms-jackrabbit/notes.txt modules/cms/trunk/cms-jackrabbit/pom.xml modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java Log: JBEPP-920: Upgrade Jackrabbit version to 1.6.4; Improve DeleteCommand Modified: modules/cms/trunk/.classpath =================================================================== --- modules/cms/trunk/.classpath 2011-09-06 16:02:46 UTC (rev 14013) +++ modules/cms/trunk/.classpath 2011-09-07 13:04:06 UTC (rev 14014) @@ -32,12 +32,12 @@ <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/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"/> - <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.6.4/jackrabbit-api-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.6.4/jackrabbit-core-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.6.4/jackrabbit-jcr-commons-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.6.4/jackrabbit-spi-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.6.4/jackrabbit-spi-commons-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.6.4/jackrabbit-text-extractors-1.6.4.jar"/> <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar"/> <classpathentry kind="var" path="M2_REPO/jboss/jboss/4.2.2.GA/jboss-4.2.2.GA.jar"/> <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss/4.0.4.GA/jboss-4.0.4.GA.jar"/> Modified: modules/cms/trunk/build/pom.xml =================================================================== --- modules/cms/trunk/build/pom.xml 2011-09-06 16:02:46 UTC (rev 14013) +++ modules/cms/trunk/build/pom.xml 2011-09-07 13:04:06 UTC (rev 14014) @@ -43,7 +43,7 @@ <version.bsh>1.3.0</version.bsh> <version.ehcache>1.4.1</version.ehcache> <version.javax.jcr>1.0</version.javax.jcr> - <version.jackrabbit.core>1.4.5</version.jackrabbit.core> + <version.jackrabbit.core>1.6.4</version.jackrabbit.core> <version.jboss.portal.common>1.2.5</version.jboss.portal.common> <version.jboss.portal.identity>1.1.1</version.jboss.portal.identity> <version.jboss.portal.test>1.2.3</version.jboss.portal.test> Modified: modules/cms/trunk/cms-jackrabbit/notes.txt =================================================================== --- modules/cms/trunk/cms-jackrabbit/notes.txt 2011-09-06 16:02:46 UTC (rev 14013) +++ modules/cms/trunk/cms-jackrabbit/notes.txt 2011-09-07 13:04:06 UTC (rev 14014) @@ -1,3 +1,9 @@ Upgrade from 1.1 to 1.4 -1.4 uses lucene-2.0.0, which means the Portal search module needs to be upgraded. It depends on lucene 1.4.3 right now \ No newline at end of file +1.4 uses lucene-2.0.0, which means the Portal search module needs to be upgraded. It depends on lucene 1.4.3 right now + +--- + +Upgrade from 1.4 to 1.6.4 + +1.6.4 requires lucene 2.4.1, commons-io 1.4 Modified: modules/cms/trunk/cms-jackrabbit/pom.xml =================================================================== --- modules/cms/trunk/cms-jackrabbit/pom.xml 2011-09-06 16:02:46 UTC (rev 14013) +++ modules/cms/trunk/cms-jackrabbit/pom.xml 2011-09-07 13:04:06 UTC (rev 14014) @@ -10,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>cms-jackrabbit</artifactId> <packaging>jar</packaging> - <name>JBoss Portal CMS based on JackRabbit 1.4</name> + <name>JBoss Portal CMS based on JackRabbit 1.6.4</name> <dependencies> <dependency> Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java 2011-09-06 16:02:46 UTC (rev 14013) +++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java 2011-09-07 13:04:06 UTC (rev 14014) @@ -134,6 +134,12 @@ this.enablePreLoading = true; //enabled by default. can be disabled via configuration } + /** + * This implementation does nothing. + */ + public void checkConsistency(String[] uuids, boolean recursive, boolean fix) { + } + // ------------------------------------------------------------------------------------------------------------------------------------------------ public String getJNDIName() { Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java 2011-09-06 16:02:46 UTC (rev 14013) +++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java 2011-09-07 13:04:06 UTC (rev 14014) @@ -78,7 +78,7 @@ Content content = new ContentImpl(); Version version = vi.nextVersion(); - if (!(version.equals(rootVersion))) // ignore the root version + if (!(version.equals(rootVersion) || version.getName().equals(rootVersion.getName()))) // ignore the root version { NodeIterator ni = version.getNodes(); while (ni.hasNext()) Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java 2011-09-06 16:02:46 UTC (rev 14013) +++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java 2011-09-07 13:04:06 UTC (rev 14014) @@ -26,7 +26,13 @@ import javax.jcr.Item; import javax.jcr.Node; +import javax.jcr.NodeIterator; +import javax.jcr.RepositoryException; import javax.jcr.Session; +import javax.jcr.UnsupportedRepositoryOperationException; +import javax.jcr.version.Version; +import javax.jcr.version.VersionHistory; +import javax.jcr.version.VersionIterator; /** @author <a href="mailto:roy@jboss.org">Roy Russo</a> */ public class DeleteCommand extends JCRCommand @@ -52,10 +58,17 @@ Session session = context.getSession(); if (session.itemExists(msPath)) { - Item item = session.getItem(msPath); - Node parentNode = item.getParent(); - item.remove(); - parentNode.save(); + Node node = (Node)session.getItem(msPath); + if(node.hasNodes()) + { + NodeIterator ni = node.getNodes(); + while(ni.hasNext()) + { + Node n = ni.nextNode(); + removeNodeWithVersions(n); + } + } + removeNodeWithVersions(node); } } catch (Exception e) @@ -64,4 +77,34 @@ } return null; } + + private void removeNodeWithVersions(Node n) throws RepositoryException + { + VersionHistory vh = null; + try + { + vh = n.getVersionHistory(); + } + catch (UnsupportedRepositoryOperationException ex) + { + // nothing to do, this node is simply not versionable + } + Node parentNode = n.getParent(); + n.remove(); + parentNode.save(); + if(vh!=null) + { + VersionIterator vi = vh.getAllVersions(); + while (vi.hasNext()) // loop versions + { + Version version = vi.nextVersion(); + if("jcr:rootVersion".equals(version.getName())) + { + // skip the root version + continue; + } + vh.removeVersion(version.getName()); + } + } + } }

12 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r14013 - in branches/Enterprise_Portal_Platform_4_3/core/src: resources/portal-core-war/WEB-INF/jsp/header and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-09-06 12:02:46 -0400 (Tue, 06 Sep 2011) New Revision: 14013 Modified: branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/layouts/common/modal_body.jsp branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp Log: JBEPP-995: IE 6 displays 'This page contains both secure and nonsecure items' on every pages when using SSL Modified: branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/layouts/common/modal_body.jsp =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/layouts/common/modal_body.jsp 2011-09-06 16:01:37 UTC (rev 14012) +++ branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/layouts/common/modal_body.jsp 2011-09-06 16:02:46 UTC (rev 14013) @@ -1,5 +1,5 @@ <div id="login-modal" style="display:none"> <div id="login-modal-msg" style="display:none;width:257px;height:157px"> - <iframe src="" frameborder="0" width="257" height="157" scrolling="no" marginheight="0" marginwidth="0" name="login-content" class="login-content" id="loginIframe"></iframe> + <iframe src="javascript:" frameborder="0" width="257" height="157" scrolling="no" marginheight="0" marginwidth="0" name="login-content" class="login-content" id="loginIframe"></iframe> </div> - </div> \ No newline at end of file + </div> Modified: branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2011-09-06 16:01:37 UTC (rev 14012) +++ branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2011-09-06 16:02:46 UTC (rev 14013) @@ -51,7 +51,7 @@ <script type="text/javascript"> /* <![CDATA[ */ //we don't need the iframe/modal if logged in - document.getElementById('loginIframe').src = ''; + document.getElementById('loginIframe').src = "javascript:''"; /* ]]> */ </script> <%= rb.getString("LOGGED") %>: <%= principal.getName() %><br/><br/>

12 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r14012 - in branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core: impl/model and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-09-06 12:01:37 -0400 (Tue, 06 Sep 2011) New Revision: 14012 Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java Log: JBEPP-928: NullPointerException if dashboard context is missing Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2011-08-24 04:38:03 UTC (rev 14011) +++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2011-09-06 16:01:37 UTC (rev 14012) @@ -266,8 +266,11 @@ if (!isDashboard && user != null) { PortalObjectId dashboardId = cm.getDashboardIdFor(user); - ViewPortalCommand vdc = new ViewPortalCommand(dashboardId); - rd.setAttribute("org.jboss.portal.header.DASHBOARD_URL", new PortalURLImpl(vdc, controllerCtx, null, null)); + if (dashboardId != null) + { + ViewPortalCommand vdc = new ViewPortalCommand(dashboardId); + rd.setAttribute("org.jboss.portal.header.DASHBOARD_URL", new PortalURLImpl(vdc, controllerCtx, null, null)); + } } // Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java 2011-08-24 04:38:03 UTC (rev 14011) +++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java 2011-09-06 16:01:37 UTC (rev 14012) @@ -370,8 +370,11 @@ String userId = getUserId(user); Context dashboardContext = portalObjectContainer.getContext(dashboardContextId); - - return dashboardContext.getId().getChildId(userId); + + if (dashboardContext != null) + { + return dashboardContext.getId().getChildId(userId); + } } return null;

12 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits September 2011