JBoss Portal SVN: r7066 - in trunk: core/src/bin/portal-core-war/themes/maple and 4 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-26 07:27:50 -0400 (Thu, 26 Apr 2007)
New Revision: 7066
Modified:
trunk/core/src/bin/portal-core-war/themes/industrial/portal_style.css
trunk/core/src/bin/portal-core-war/themes/maple/portal_style.css
trunk/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css
trunk/core/src/bin/portal-core-war/themes/phalanx/portal_style.css
trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
trunk/theme/src/bin/portal-ajax-war/dyna/style.css
Log:
- define droppable css in one common css file
- redefine the droppable css in renaissance to better fit with the theme
Modified: trunk/core/src/bin/portal-core-war/themes/industrial/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/industrial/portal_style.css 2007-04-26 10:14:41 UTC (rev 7065)
+++ trunk/core/src/bin/portal-core-war/themes/industrial/portal_style.css 2007-04-26 11:27:50 UTC (rev 7066)
@@ -1021,19 +1021,3 @@
/* Top level style for the content of a tab. */
.portlet-tab-area {
}
-
-/*****************
-* AJAX Selectors *
-*****************/
-
-.handle {
- cursor: move;
-}
-
-.emptyPlaceMarker {
- border-right: red 1px dashed;
- border-top: red 1px dashed;
- border-left: red 1px dashed;
- border-bottom: red 1px dashed;
- background-color: Transparent;
-}
Modified: trunk/core/src/bin/portal-core-war/themes/maple/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/maple/portal_style.css 2007-04-26 10:14:41 UTC (rev 7065)
+++ trunk/core/src/bin/portal-core-war/themes/maple/portal_style.css 2007-04-26 11:27:50 UTC (rev 7066)
@@ -1042,22 +1042,6 @@
}
-/*****************
-* AJAX Selectors *
-*****************/
-
-.handle {
- cursor: move;
-}
-
-.emptyPlaceMarker {
- border-right: red 1px dashed;
- border-top: red 1px dashed;
- border-left: red 1px dashed;
- border-bottom: red 1px dashed;
- background-color: Transparent;
-}
-
/****************** Not sure about the following selectors:
PortletHeaderColor
Modified: trunk/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css 2007-04-26 10:14:41 UTC (rev 7065)
+++ trunk/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css 2007-04-26 11:27:50 UTC (rev 7066)
@@ -1121,19 +1121,3 @@
/* Top level style for the content of a tab. */
.portlet-tab-area {
}
-
-/*****************
-* AJAX Selectors *
-*****************/
-
-.handle {
- cursor: move;
-}
-
-.emptyPlaceMarker {
- border-right: red 1px dashed;
- border-top: red 1px dashed;
- border-left: red 1px dashed;
- border-bottom: red 1px dashed;
- background-color: Transparent;
-}
Modified: trunk/core/src/bin/portal-core-war/themes/phalanx/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/phalanx/portal_style.css 2007-04-26 10:14:41 UTC (rev 7065)
+++ trunk/core/src/bin/portal-core-war/themes/phalanx/portal_style.css 2007-04-26 11:27:50 UTC (rev 7066)
@@ -1024,19 +1024,3 @@
/* Top level style for the content of a tab. */
.portlet-tab-area {
}
-
-/*****************
-* AJAX Selectors *
-*****************/
-
-.handle {
- cursor: move;
-}
-
-.emptyPlaceMarker {
- border-right: red 1px dashed;
- border-top: red 1px dashed;
- border-left: red 1px dashed;
- border-bottom: red 1px dashed;
- background-color: Transparent;
-}
Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-04-26 10:14:41 UTC (rev 7065)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-04-26 11:27:50 UTC (rev 7066)
@@ -1159,18 +1159,10 @@
* AJAX Selectors *
*****************/
-.handle {
- cursor: move;
+.dnd-droppable {
+ border: #E6E8E5 1px solid;
}
-.emptyPlaceMarker {
- border-right: red 1px dashed;
- border-top: red 1px dashed;
- border-left: red 1px dashed;
- border-bottom: red 1px dashed;
- background-color: Transparent;
-}
-
/*******************************************************************************************************************************
New Selectors added by JBoss.ORG UI Design for theme development
Modified: trunk/theme/src/bin/portal-ajax-war/dyna/style.css
===================================================================
--- trunk/theme/src/bin/portal-ajax-war/dyna/style.css 2007-04-26 10:14:41 UTC (rev 7065)
+++ trunk/theme/src/bin/portal-ajax-war/dyna/style.css 2007-04-26 11:27:50 UTC (rev 7066)
@@ -12,9 +12,6 @@
}
.dnd-droppable {
- border-right: red 1px dashed;
- border-top: red 1px dashed;
- border-left: red 1px dashed;
- border-bottom: red 1px dashed;
+ border: red 1px dashed;
background-color: Transparent;
}
17 years, 2 months
JBoss Portal SVN: r7065 - in trunk/theme: src/main/org/jboss/portal/test/theme and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-26 06:14:41 -0400 (Thu, 26 Apr 2007)
New Revision: 7065
Modified:
trunk/theme/.classpath
trunk/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java
Log:
Minor
Modified: trunk/theme/.classpath
===================================================================
--- trunk/theme/.classpath 2007-04-26 09:53:36 UTC (rev 7064)
+++ trunk/theme/.classpath 2007-04-26 10:14:41 UTC (rev 7065)
@@ -19,5 +19,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
<classpathentry combineaccessrules="false" kind="src" path="/web"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/test"/>
<classpathentry kind="output" path="output/classes"/>
</classpath>
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java 2007-04-26 09:53:36 UTC (rev 7064)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java 2007-04-26 10:14:41 UTC (rev 7065)
@@ -48,7 +48,6 @@
import org.jboss.portal.test.theme.model.RenderedObject;
import org.jboss.portal.test.theme.model.ObjectChange;
import org.jboss.portal.test.framework.driver.web.WebTestCase;
-import org.jboss.portal.test.framework.driver.remote.TestContext;
import org.jboss.portal.common.util.MarkupInfo;
import org.jboss.portal.common.util.MediaType;
import org.jboss.portal.common.util.IteratorStatus;
17 years, 2 months
JBoss Portal SVN: r7064 - in trunk: theme/src/bin/portal-ajax-war/dyna and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-26 05:53:36 -0400 (Thu, 26 Apr 2007)
New Revision: 7064
Modified:
trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js
trunk/theme/src/bin/portal-ajax-war/dyna/style.css
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderStatus.java
Log:
fixed the mouse shape and the droppable highlights
Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-04-26 09:42:59 UTC (rev 7063)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-04-26 09:53:36 UTC (rev 7064)
@@ -79,9 +79,6 @@
private static Logger log = Logger.getLogger(PageCustomizerInterceptor.class);
/** . */
- private static final DynaRenderOptions NO_AJAX_OPTIONS = DynaRenderOptions.getOptions(Boolean.FALSE, Boolean.FALSE);
-
- /** . */
private String targetContextPath;
/** . */
@@ -130,7 +127,7 @@
//
Region region = rendition.getPageResult().getRegion2("navigation");
- NO_AJAX_OPTIONS.setOptions(region.getProperties());
+ DynaRenderOptions.NO_AJAX.setOptions(region.getProperties());
}
}
@@ -148,7 +145,7 @@
//
Region region = rendition.getPageResult().getRegion2("dashboardnav");
- NO_AJAX_OPTIONS.setOptions(region.getProperties());
+ DynaRenderOptions.NO_AJAX.setOptions(region.getProperties());
}
}
Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js
===================================================================
--- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-26 09:42:59 UTC (rev 7063)
+++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-26 09:53:36 UTC (rev 7064)
@@ -24,7 +24,7 @@
function snapshot() {
// Find draggable regions
- var regions_on_page = document.getElementsByClassName("dyna-region");
+ var regions_on_page = document.getElementsByClassName("dnd-region");
// Save current state in the DOM itself
for(var i = 0;i < regions_on_page.length;i++) {
@@ -275,12 +275,12 @@
};
// Find the draggable regions
- var regions_on_page = document.getElementsByClassName("dyna-region");
+ var regions_on_page = document.getElementsByClassName("dnd-region");
// Create draggable regions
for(var i = 0;i < regions_on_page.length;i++) {
var region = regions_on_page[i];
- Sortable.create(region, {dropOnEmpty:true,handle:"dyna-handle",tag:"div",containment:regions_on_page,constraint:false});
+ Sortable.create(region, {dropOnEmpty:true,handle:"dnd-handle",tag:"div",containment:regions_on_page,constraint:false,hoverclass:"dnd-droppable"});
}
//
Modified: trunk/theme/src/bin/portal-ajax-war/dyna/style.css
===================================================================
--- trunk/theme/src/bin/portal-ajax-war/dyna/style.css 2007-04-26 09:42:59 UTC (rev 7063)
+++ trunk/theme/src/bin/portal-ajax-war/dyna/style.css 2007-04-26 09:53:36 UTC (rev 7064)
@@ -1,8 +1,20 @@
/* We need the min-height in order to have a region that is never empty and can receive draggables
min-height doees not work on IE6 and the 2 other lines are there to make it work in that situation.
32 pixels is the height of the region when it is empty. */
-div.dyna-region {
+.dnd-region {
min-height:32px;
height:auto !important;
height:32px;
}
+
+.dnd-handle {
+ cursor: move;
+}
+
+.dnd-droppable {
+ border-right: red 1px dashed;
+ border-top: red 1px dashed;
+ border-left: red 1px dashed;
+ border-bottom: red 1px dashed;
+ background-color: Transparent;
+}
Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-26 09:42:59 UTC (rev 7063)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-26 09:53:36 UTC (rev 7064)
@@ -63,7 +63,7 @@
DynaWindowRenderer.handleProvided.set(Boolean.TRUE);
//
- markup.print("<div class=\"dyna-handle\">");
+ markup.print("<div class=\"dnd-handle\">");
markup.print("<div class=\"dyna-decoration\">\n");
delegate.render(rendererContext, drc);
markup.print("</div>\n");
Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-04-26 09:42:59 UTC (rev 7063)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-04-26 09:53:36 UTC (rev 7064)
@@ -71,10 +71,12 @@
DynaWindowRenderer.handleProvided.set(Boolean.TRUE);
//
-// StringBuffer out = renderContext.getMarkupFragment();
-// out.append("<span class=\"handle\">");
+ PrintWriter out = rendererContext.getWriter();
+
+ //
+ out.print("<span class=\"dnd-handle\">");
doCatchClicks(rendererContext, prc);
-// out.append("</span>");
+ out.print("</span>");
}
else
{
Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-26 09:42:59 UTC (rev 7063)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-26 09:53:36 UTC (rev 7064)
@@ -98,7 +98,7 @@
public void endContext(RendererContext rendererContext, ObjectRendererContext objectRenderContext)
{
- if (DynaRenderStatus.get(rendererContext))
+ if (DynaRenderStatus.isActive(rendererContext))
{
rendererContext.setAttribute(DynaConstants.RENDER_OPTIONS, null);
}
@@ -157,8 +157,12 @@
}
//
- if (DynaRenderStatus.get(rendererContext))
+ if (DynaRenderStatus.isActive(rendererContext))
{
+ //
+ markup.print("<div class=\"dyna-region\">");
+
+ //
delegate.renderHeader(rendererContext, rrc);
//
@@ -167,7 +171,7 @@
//
if (options.isDnDEnabled())
{
- markup.print("<div class=\"dyna-region\" id=\"");
+ markup.print("<div class=\"dnd-region\" id=\"");
markup.print(rrc.getId());
markup.print("\">");
}
@@ -179,7 +183,7 @@
*/
public void renderBody(RendererContext rendererContext, final RegionRendererContext rrc) throws RenderException
{
- if (DynaRenderStatus.get(rendererContext))
+ if (DynaRenderStatus.isActive(rendererContext))
{
delegate.renderBody(rendererContext, rrc);
}
@@ -187,17 +191,22 @@
public void renderFooter(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException
{
- if (DynaRenderStatus.get(rendererContext))
+ if (DynaRenderStatus.isActive(rendererContext))
{
DynaRenderOptions options = (DynaRenderOptions)rendererContext.getAttribute(DynaConstants.RENDER_OPTIONS);
//
+ PrintWriter markup = rendererContext.getWriter();
+
+ // Close dnd-region
if (options.isDnDEnabled())
{
- PrintWriter markup = rendererContext.getWriter();
markup.print("</div>");
}
+ // Close dyna-region
+ markup.print("</div>");
+
//
delegate.renderFooter(rendererContext, rrc);
}
Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java 2007-04-26 09:42:59 UTC (rev 7063)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java 2007-04-26 09:53:36 UTC (rev 7064)
@@ -81,6 +81,10 @@
return getOptions(dndValue, partialRefreshValue);
}
+ /** . */
+ public static final DynaRenderOptions NO_AJAX = DynaRenderOptions.getOptions(Boolean.FALSE, Boolean.FALSE);
+
+
/**
* Set the options on the specifed property map.
*
Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderStatus.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderStatus.java 2007-04-26 09:42:59 UTC (rev 7063)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderStatus.java 2007-04-26 09:53:36 UTC (rev 7064)
@@ -31,21 +31,21 @@
public class DynaRenderStatus
{
- public static boolean get(RendererContext rendererContext)
+ public static boolean isActive(RendererContext rendererContext)
{
- Boolean status = (Boolean)rendererContext.getAttribute(DynaConstants.RENDER_STATUS);
- return status == null || status.booleanValue();
+ Boolean active = (Boolean)rendererContext.getAttribute(DynaConstants.RENDER_STATUS);
+ return active == null || active.booleanValue();
}
public static boolean remove(RendererContext rendererContext)
{
- Boolean status = (Boolean)rendererContext.getAttribute(DynaConstants.RENDER_STATUS);
+ Boolean active = (Boolean)rendererContext.getAttribute(DynaConstants.RENDER_STATUS);
rendererContext.setAttribute(DynaConstants.RENDER_STATUS, null);
- return status == null || status.booleanValue();
+ return active == null || active.booleanValue();
}
- public static void set(RendererContext rendererContext, boolean status)
+ public static void set(RendererContext rendererContext, boolean active)
{
- rendererContext.setAttribute(DynaConstants.RENDER_STATUS, Boolean.valueOf(status));
+ rendererContext.setAttribute(DynaConstants.RENDER_STATUS, Boolean.valueOf(active));
}
}
17 years, 2 months
JBoss Portal SVN: r7063 - in trunk/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: 2007-04-26 05:42:59 -0400 (Thu, 26 Apr 2007)
New Revision: 7063
Modified:
trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
Log:
Fixed typo
Fixed Dashboard link on dashboard (linking to default portal)
Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-04-26 09:20:47 UTC (rev 7062)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-04-26 09:42:59 UTC (rev 7063)
@@ -177,6 +177,14 @@
Controller controller = controllerCtx.getController();
User user = controllerCtx.getUser();
request.setAttribute("org.jboss.portal.header.USER", user);
+
+ if (user == null)
+ {
+ URLContext ctx = controllerCtx.getServerInvocation().getServerContext().getURLContext();
+ ctx = URLContext.newInstance(ctx.isSecure(), true);
+ String loginURL = controllerCtx.renderURL(cc, ctx, null);
+ request.setAttribute("org.jboss.portal.header.LOGIN_URL", loginURL);
+ }
// Edit dashboard page || Copy to dashboard link
boolean isDashboard = false;
@@ -194,7 +202,7 @@
PortletParametersStateString navState = new PortletParametersStateString();
navState.setValue("editPageSelect", pageName);
InvokePortletInstanceRenderCommand command = new InvokePortletInstanceRenderCommand("DashboardConfigPortletInstance", navState);
- request.setAttribute("org.jboss.portal.header.EDIT_DASDHBOARD_URL", controllerCtx.renderURL(command, null, null));
+ request.setAttribute("org.jboss.portal.header.EDIT_DASHBOARD_URL", controllerCtx.renderURL(command, null, null));
}
else
{
@@ -252,7 +260,7 @@
{
// Link to default page of default portal
ViewPageCommand _rpc = new ViewPageCommand(new PortalObjectId(new String[]{"default", "default"}));
- request.setAttribute("org.jboss.portal.header.DASHBOARD_URL", controllerCtx.renderURL(_rpc, null, null));
+ request.setAttribute("org.jboss.portal.header.DEFAULT_PORTAL_URL", controllerCtx.renderURL(_rpc, null, null));
}
//
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-04-26 09:20:47 UTC (rev 7062)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-04-26 09:42:59 UTC (rev 7063)
@@ -3,9 +3,10 @@
<%
User user = (User) request.getAttribute("org.jboss.portal.header.USER");
String dashboardURL = (String) request.getAttribute("org.jboss.portal.header.DASHBOARD_URL");
+ String loginURL = (String) request.getAttribute("org.jboss.portal.header.LOGIN_URL");
String defaultPortalURL = (String) request.getAttribute("org.jboss.portal.header.DEFAULT_PORTAL_URL");
String adminPortalURL = (String) request.getAttribute("org.jboss.portal.header.ADMIN_PORTAL_URL");
- String editDashboardURL = (String) request.getAttribute("org.jboss.portal.header.EDIT_DASDHBOARD_URL");
+ String editDashboardURL = (String) request.getAttribute("org.jboss.portal.header.EDIT_DASHBOARD_URL");
String copyToDashboardURL = (String) request.getAttribute("org.jboss.portal.header.COPY_TO_DASHBOARD_URL");
String signOutURL = (String) request.getAttribute("org.jboss.portal.header.SIGN_OUT_URL");
%>
@@ -14,7 +15,7 @@
if (user == null)
{
%>
- <a href="/portal/auth/portal/default/default">Login</a>
+ <a href="<%= loginURL %>">Login</a>
<%
}
else
17 years, 2 months
JBoss Portal SVN: r7062 - trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-26 05:20:47 -0400 (Thu, 26 Apr 2007)
New Revision: 7062
Modified:
trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
Log:
Change log level, easier to figure out which XML file is not valid
Modified: trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
===================================================================
--- trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2007-04-26 08:09:51 UTC (rev 7061)
+++ trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2007-04-26 09:20:47 UTC (rev 7062)
@@ -286,7 +286,7 @@
in = Tools.safeBufferedWrapper(servletContext.getResourceAsStream("/WEB-INF/jboss-portlet.xml"));
if (in != null)
{
- log.debug("Parsing jboss-portlet.xml" + contextPath);
+ log.info("Parsing jboss-portlet.xml" + contextPath);
//
JBossApplicationMetaDataFactory factory = this.factory.createJBossApplicationMetaDataFactory();
17 years, 2 months
JBoss Portal SVN: r7061 - trunk/portlet-federation.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-26 04:09:51 -0400 (Thu, 26 Apr 2007)
New Revision: 7061
Modified:
trunk/portlet-federation/.project
Log:
portlet-federation Eclipse project file JBPORTAL-1360
Modified: trunk/portlet-federation/.project
===================================================================
--- trunk/portlet-federation/.project 2007-04-25 21:48:13 UTC (rev 7060)
+++ trunk/portlet-federation/.project 2007-04-26 08:09:51 UTC (rev 7061)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>federation</name>
+ <name>portlet-federation</name>
<comment></comment>
<projects>
</projects>
17 years, 2 months
JBoss Portal SVN: r7060 - in trunk/wsrp/src/main/org/jboss/portal: wsrp/endpoints and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-04-25 17:48:13 -0400 (Wed, 25 Apr 2007)
New Revision: 7060
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java
Log:
- Slight behavior change while waiting for JBWS-1515 resolution.
- Only force session access if there is a session in ServletAccess.
- Only try session access on Markup endpoint.
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2007-04-25 21:25:41 UTC (rev 7059)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2007-04-25 21:48:13 UTC (rev 7060)
@@ -136,9 +136,13 @@
HttpSession session = invocationContext.getClientRequest().getSession();
producer.setResponse(invocationContext.getClientResponse());
+ ProducerSessionInformation sessionInfo = consumer.getProducerSessionInformationFrom(session);
+ ExtendedAssert.assertNull(sessionInfo);
+
consumer.invoke(render);
- ProducerSessionInformation sessionInfo = consumer.getProducerSessionInformationFrom(session);
+ sessionInfo = consumer.getProducerSessionInformationFrom(session);
+ ExtendedAssert.assertNotNull(sessionInfo);
ExtendedAssert.assertFalse(sessionInfo.isPerGroupCookies());
ExtendedAssert.assertFalse(sessionInfo.isInitCookieDone());
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java 2007-04-25 21:25:41 UTC (rev 7059)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java 2007-04-25 21:48:13 UTC (rev 7060)
@@ -55,37 +55,31 @@
public PortletDescriptionResponse getPortletDescription(GetPortletDescription getPortletDescription) throws AccessDeniedFault, InvalidHandleFault, InvalidUserCategoryFault, InconsistentParametersFault, MissingParametersFault, InvalidRegistrationFault, OperationFailedFault, RemoteException
{
- forceSessionAccess();
return producer.getPortletDescription(getPortletDescription);
}
public PortletContext clonePortlet(ClonePortlet clonePortlet) throws InvalidUserCategoryFault, AccessDeniedFault, OperationFailedFault, InvalidHandleFault, InvalidRegistrationFault, InconsistentParametersFault, MissingParametersFault, RemoteException
{
- forceSessionAccess();
return producer.clonePortlet(clonePortlet);
}
public DestroyPortletsResponse destroyPortlets(DestroyPortlets destroyPortlets) throws InconsistentParametersFault, MissingParametersFault, InvalidRegistrationFault, OperationFailedFault, RemoteException
{
- forceSessionAccess();
return producer.destroyPortlets(destroyPortlets);
}
public PortletContext setPortletProperties(SetPortletProperties setPortletProperties) throws OperationFailedFault, InvalidHandleFault, MissingParametersFault, InconsistentParametersFault, InvalidUserCategoryFault, AccessDeniedFault, InvalidRegistrationFault, RemoteException
{
- forceSessionAccess();
return producer.setPortletProperties(setPortletProperties);
}
public PropertyList getPortletProperties(GetPortletProperties getPortletProperties) throws InvalidHandleFault, MissingParametersFault, InvalidRegistrationFault, AccessDeniedFault, OperationFailedFault, InconsistentParametersFault, InvalidUserCategoryFault, RemoteException
{
- forceSessionAccess();
return producer.getPortletProperties(getPortletProperties);
}
public PortletPropertyDescriptionResponse getPortletPropertyDescription(GetPortletPropertyDescription getPortletPropertyDescription) throws MissingParametersFault, InconsistentParametersFault, InvalidUserCategoryFault, InvalidRegistrationFault, AccessDeniedFault, InvalidHandleFault, OperationFailedFault, RemoteException
{
- forceSessionAccess();
return producer.getPortletPropertyDescription(getPortletPropertyDescription);
}
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java 2007-04-25 21:25:41 UTC (rev 7059)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java 2007-04-25 21:48:13 UTC (rev 7060)
@@ -45,21 +45,18 @@
public RegistrationContext register(RegistrationData register)
throws MissingParametersFault, OperationFailedFault, RemoteException
{
- forceSessionAccess();
return producer.register(register);
}
public ReturnAny deregister(RegistrationContext deregister)
throws OperationFailedFault, InvalidRegistrationFault, RemoteException
{
- forceSessionAccess();
return producer.deregister(deregister);
}
public RegistrationState modifyRegistration(ModifyRegistration modifyRegistration)
throws MissingParametersFault, OperationFailedFault, InvalidRegistrationFault, RemoteException
{
- forceSessionAccess();
return producer.modifyRegistration(modifyRegistration);
}
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java 2007-04-25 21:25:41 UTC (rev 7059)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java 2007-04-25 21:48:13 UTC (rev 7060)
@@ -40,7 +40,6 @@
public ServiceDescription getServiceDescription(GetServiceDescription gs)
throws InvalidRegistrationFault, OperationFailedFault, RemoteException
{
- forceSessionAccess();
return producer.getServiceDescription(gs);
}
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java 2007-04-25 21:25:41 UTC (rev 7059)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java 2007-04-25 21:48:13 UTC (rev 7060)
@@ -26,7 +26,9 @@
import org.jboss.portal.jems.as.JMX;
import org.jboss.portal.wsrp.WSRPConstants;
import org.jboss.portal.wsrp.WSRPProducer;
+import org.jboss.portal.wsrp.servlet.ServletAccess;
+import javax.servlet.http.HttpSession;
import javax.xml.rpc.ServiceException;
import javax.xml.rpc.server.ServiceLifecycle;
import javax.xml.rpc.server.ServletEndpointContext;
@@ -55,8 +57,13 @@
protected void forceSessionAccess()
{
- // force access to HttpSession to bypass JBWS optimization and allow cookies to be transmitted to client see: JBWS-1515
- context.getHttpSession();
+ // Check if there is a session associated with this thread
+ HttpSession portalSession = ServletAccess.getRequest().getSession(false);
+ if (portalSession != null)
+ {
+ // force session access from context so that cookies will be properly tranmitted to consumers. See JBWS-1515.
+ context.getHttpSession();
+ }
}
protected WSRPProducer producer;
17 years, 2 months
JBoss Portal SVN: r7059 - trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-04-25 17:25:41 -0400 (Wed, 25 Apr 2007)
New Revision: 7059
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
Log:
- Properly propagate event context.
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2007-04-25 21:21:38 UTC (rev 7058)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2007-04-25 21:25:41 UTC (rev 7059)
@@ -634,6 +634,6 @@
*/
public void onEvent(PortalEventContext eventContext, PortalEvent event)
{
- sessionHandler.onEvent(null, event);
+ sessionHandler.onEvent(eventContext, event);
}
}
17 years, 2 months
JBoss Portal SVN: r7058 - branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2007-04-25 17:21:38 -0400 (Wed, 25 Apr 2007)
New Revision: 7058
Modified:
branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/edit.jsp
Log:
backporting JBPORTAL-1227 from 2.6
Modified: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-04-25 20:00:44 UTC (rev 7057)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-04-25 21:21:38 UTC (rev 7058)
@@ -35,7 +35,7 @@
plugin_insertdate_timeFormat : "%H:%M:%S",
relative_urls : "false",
document_base_url : "<%= sDocBase %>",
- extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
+ extended_valid_elements : "style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
</script>
<!-- /tinyMCE -->
17 years, 2 months
JBoss Portal SVN: r7057 - in trunk/core/src/main/org/jboss/portal/core/impl/model/content: generic and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-25 16:00:44 -0400 (Wed, 25 Apr 2007)
New Revision: 7057
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java
trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java
Log:
rename method with a more generic name
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-25 19:52:47 UTC (rev 7056)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-25 20:00:44 UTC (rev 7057)
@@ -147,7 +147,7 @@
* @param command
* @return the portlet instance for the view mode
*/
- protected abstract Instance getViewModePortletInstance(RenderWindowCommand command);
+ protected abstract Instance getPortletInstance(RenderWindowCommand command);
public ControllerResponse renderWindow(RenderWindowCommand cmd) throws Exception
{
@@ -178,7 +178,7 @@
try
{
// Obtain instance
- Instance instance = getViewModePortletInstance(cmd);
+ Instance instance = getPortletInstance(cmd);
// No instance means we can't continue
if (instance == null)
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-04-25 19:52:47 UTC (rev 7056)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-04-25 20:00:44 UTC (rev 7057)
@@ -129,7 +129,7 @@
return new GenericContent(state);
}
- protected Instance getViewModePortletInstance(RenderWindowCommand command)
+ protected Instance getPortletInstance(RenderWindowCommand command)
{
String id = contentPortlet.getPortletName(Mode.VIEW);
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java 2007-04-25 19:52:47 UTC (rev 7056)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java 2007-04-25 20:00:44 UTC (rev 7057)
@@ -179,7 +179,7 @@
// ContentRenderer implementation ***********************************************************************************
- protected Instance getViewModePortletInstance(RenderWindowCommand command)
+ protected Instance getPortletInstance(RenderWindowCommand command)
{
ControllerContext context = command.getControllerContext();
17 years, 2 months