Author: taylor
Date: Sat Dec 12 00:53:28 2009
New Revision: 889872
URL: http://svn.apache.org/viewvc?rev=889872&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1084
added configuration to jetui engine
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalConfigurationConstants.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp?rev=889872&r1=889871&r2=889872&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
Sat Dec 12 00:53:28 2009
@@ -26,9 +26,12 @@
<%@ page import="org.apache.jetspeed.portlets.layout.ColumnLayout" %>
<%@ page import="org.apache.jetspeed.decoration.DecoratorAction" %>
<%@ page import="org.apache.jetspeed.PortalReservedParameters" %>
+<%@ page import="org.apache.jetspeed.administration.PortalConfiguration" %>
+<%@ page
import="org.apache.jetspeed.administration.PortalConfigurationConstants" %>
<%
Jetui jetui = (Jetui)request.getAttribute("jetui");
+ PortalConfiguration pc = jetui.getPortalConfiguration();
RequestContext rc =
(RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
Map userInfo = jetui.getUserAttributes(rc);
ContentPage portalPage = rc.getPage();
@@ -53,11 +56,20 @@
<link rel="shortcut icon" href="<%=baseUrl%>images/jetspeed.jpg"
type="image/x-icon" />
<script type="text/javascript"
src="<%=request.getContextPath()%>/javascript/yui/build/yui/yui-min.js"></script>
<script language="javascript">
-var JETUI_YUI_config = {
+var JetuiConfiguration = {
+ engine:
"<%=pc.getString(PortalConfigurationConstants.JETUI_RENDER_ENGINE)%>",
+ ajaxTransport:
"<%=pc.getString(PortalConfigurationConstants.JETUI_AJAX_TRANSPORT)%>",
+ dragMode:
"<%=pc.getString(PortalConfigurationConstants.JETUI_DRAG_MODE)%>",
+ portletStyle:
"<%=pc.getString(PortalConfigurationConstants.JETUI_STYLE_PORTLET)%>",
+ layoutStyle:
"<%=pc.getString(PortalConfigurationConstants.JETUI_STYLE_LAYOUT)%>",
+ dragHandleStyle:
"<%=pc.getString(PortalConfigurationConstants.JETUI_STYLE_DRAG_HANDLE)%>"
+};
+var JETUI_YUI = {
base: "<%=request.getContextPath()%>/javascript/yui/build/",
timeout: 10000,
debug: true,
useBrowserConsole: true,
+ config: JetuiConfiguration,
modules: {
'jetui-portal': { fullpath:
"<%=request.getContextPath()%>/javascript/jetspeed/jetui/jetui-portal.js" }
}
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm?rev=889872&r1=889871&r2=889872&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
Sat Dec 12 00:53:28 2009
@@ -23,6 +23,7 @@
#* Add all template constants to the current context *#
#defineNavigationConstants()
+#set($pc = $jetspeed.getPortalConfiguration())
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
@@ -30,11 +31,20 @@
#if ($jetspeed.isAjaxCustomizationEnabled())
<script type="text/javascript"
src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
<script language="javascript">
-var JETUI_YUI_config = {
+var JetuiConfiguration = {
+ engine: '$pc.getString("jetui.render.engine")',
+ ajaxTransport: '$pc.getString("jetui.ajax.transport")',
+ dragMode: '$pc.getString("jetui.drag.mode")',
+ portletStyle: '$pc.getString("jetui.style.portlet")',
+ layoutStyle: '$pc.getString("jetui.style.layout")',
+ dragHandleStyle: '$pc.getString("jetui.style.drag.handle")'
+};
+var JETUI_YUI = {
base: "#BaseHref()/javascript/yui/build/",
timeout: 10000,
debug: true,
useBrowserConsole: true,
+ config: JetuiConfiguration,
modules: {
'jetui-portal': { fullpath:
"#BaseHref()/javascript/jetspeed/jetui/jetui-portal.js" }
}
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm?rev=889872&r1=889871&r2=889872&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
Sat Dec 12 00:53:28 2009
@@ -23,6 +23,7 @@
#* Add all template constants to the current context *#
#defineNavigationConstants()
+#set($pc = $jetspeed.getPortalConfiguration())
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
@@ -30,11 +31,20 @@
#if ($jetspeed.isAjaxCustomizationEnabled())
<script type="text/javascript"
src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
<script language="javascript">
-var JETUI_YUI_config = {
+var JetuiConfiguration = {
+ engine: '$pc.getString("jetui.render.engine")',
+ ajaxTransport: '$pc.getString("jetui.ajax.transport")',
+ dragMode: '$pc.getString("jetui.drag.mode")',
+ portletStyle: '$pc.getString("jetui.style.portlet")',
+ layoutStyle: '$pc.getString("jetui.style.layout")',
+ dragHandleStyle: '$pc.getString("jetui.style.drag.handle")'
+};
+var JETUI_YUI = {
base: "#BaseHref()/javascript/yui/build/",
timeout: 10000,
debug: true,
useBrowserConsole: true,
+ config: JetuiConfiguration,
modules: {
'jetui-portal': { fullpath:
"#BaseHref()/javascript/jetspeed/jetui/jetui-portal.js" }
}
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm?rev=889872&r1=889871&r2=889872&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
Sat Dec 12 00:53:28 2009
@@ -23,6 +23,7 @@
#* Add all template constants to the current context *#
#defineNavigationConstants()
+#set($pc = $jetspeed.getPortalConfiguration())
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
@@ -30,11 +31,20 @@
#if ($jetspeed.isAjaxCustomizationEnabled())
<script type="text/javascript"
src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
<script language="javascript">
-var JETUI_YUI_config = {
+var JetuiConfiguration = {
+ engine: '$pc.getString("jetui.render.engine")',
+ ajaxTransport: '$pc.getString("jetui.ajax.transport")',
+ dragMode: '$pc.getString("jetui.drag.mode")',
+ portletStyle: '$pc.getString("jetui.style.portlet")',
+ layoutStyle: '$pc.getString("jetui.style.layout")',
+ dragHandleStyle: '$pc.getString("jetui.style.drag.handle")'
+};
+var JETUI_YUI = {
base: "#BaseHref()/javascript/yui/build/",
timeout: 10000,
debug: true,
useBrowserConsole: true,
+ config: JetuiConfiguration,
modules: {
'jetui-portal': { fullpath:
"#BaseHref()/javascript/jetspeed/jetui/jetui-portal.js" }
}
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm?rev=889872&r1=889871&r2=889872&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
Sat Dec 12 00:53:28 2009
@@ -23,6 +23,7 @@
#* Add all template constants to the current context *#
#defineNavigationConstants()
+#set($pc = $jetspeed.getPortalConfiguration())
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
@@ -30,11 +31,20 @@
#if ($jetspeed.isAjaxCustomizationEnabled())
<script type="text/javascript"
src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
<script language="javascript">
-var JETUI_YUI_config = {
+var JetuiConfiguration = {
+ engine: '$pc.getString("jetui.render.engine")',
+ ajaxTransport: '$pc.getString("jetui.ajax.transport")',
+ dragMode: '$pc.getString("jetui.drag.mode")',
+ portletStyle: '$pc.getString("jetui.style.portlet")',
+ layoutStyle: '$pc.getString("jetui.style.layout")',
+ dragHandleStyle: '$pc.getString("jetui.style.drag.handle")'
+};
+var JETUI_YUI = {
base: "#BaseHref()/javascript/yui/build/",
timeout: 10000,
debug: true,
useBrowserConsole: true,
+ config: JetuiConfiguration,
modules: {
'jetui-portal': { fullpath:
"#BaseHref()/javascript/jetspeed/jetui/jetui-portal.js" }
}
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js?rev=889872&r1=889871&r2=889872&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
Sat Dec 12 00:53:28 2009
@@ -172,10 +172,10 @@
* @method movePortlet
*/
movePortlet : function(e) {
- if (!JETUI_YUI_config || !JETUI_YUI_config.portalInstance)
+ if (!JETUI_YUI || !JETUI_YUI.portalInstance)
return;
- var portal = JETUI_YUI_config.portalInstance;
+ var portal = JETUI_YUI.portalInstance;
var drop = e.drop.get('node'),
drag = e.drag.get('node');
var dragParent = drag.get('parentNode');
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=889872&r1=889871&r2=889872&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
Sat Dec 12 00:53:28 2009
@@ -1,24 +1,15 @@
//Use loader to grab the modules needed
-YUI(JETUI_YUI_config).use('jetui-portal', 'console', 'dd', 'anim', 'io',
'datatype-xml', 'dataschema-xml', 'dataschema-json', 'node-base',
'node-menunav', function(Y) {
+YUI(JETUI_YUI).use('jetui-portal', 'console', 'dd', 'anim', 'io',
'datatype-xml', 'dataschema-xml', 'dataschema-json', 'node-base',
'node-menunav', function(Y) {
+
+ var config = JETUI_YUI.config;
+ Y.log("Starting up JETUI " + config.engine + " engine...");
// initialize singleton portal instance
- if (!JETUI_YUI_config.portalInstance) {
- JETUI_YUI_config.portalInstance = new Y.JetUI.Portal();
- }
-
- var portal = JETUI_YUI_config.portalInstance;
-
- // Retrieve the Node instance representing the root menu
- // (<div id="environments-menu">) and call the "plug" method
- // passing in a reference to the MenuNav Node Plugin.
-
- var menu = Y.one("#environments-menu");
- if (!Y.Lang.isNull(menu)) {
- menu.plug(Y.Plugin.NodeMenuNav);
- menu.setStyle("display","inline");
- }
- //new Y.Console().render();
-
+ if (!JETUI_YUI.portalInstance) {
+ JETUI_YUI.portalInstance = new Y.JetUI.Portal();
+ }
+ var portal = JETUI_YUI.portalInstance;
+
////////////////////////////////////////////////////
// Create Navigator Portlet
var navigator = new Y.JetUI.Portlet();
@@ -103,7 +94,7 @@
}).plug(Y.Plugin.DDProxy, {
moveOnEnd: false
});
- ddNav.addHandle('.PTitle');
+ ddNav.addHandle(config.dragHandleStyle);
nav.on('click', onClickToolbar);
}
var jetspeedZone = Y.one('#jetspeedZone');
@@ -123,7 +114,7 @@
}).plug(Y.Plugin.DDProxy, {
moveOnEnd: false
});
- ddToolbox.addHandle('.PTitle');
+ ddToolbox.addHandle(config.dragHandleStyle);
tb.on('click', onClickToolbar);
}
var jstbLeft = Y.one('#jstbLeft');
@@ -140,7 +131,7 @@
groups: ['toolbars']
});
}
- var draggablePortlets = Y.Node.all('.portal-layout-cell');
+ var draggablePortlets = Y.Node.all(config.portletStyle);
draggablePortlets.each(function(v, k) {
var portlet = new Y.JetUI.Portlet();
Y.log("portlet = " + v.getAttribute("name") + v.getAttribute("id"));
@@ -158,7 +149,7 @@
}).plug(Y.Plugin.DDProxy, {
moveOnEnd: false
});
- ddNav.addHandle('.PTitle');
+ ddNav.addHandle(config.dragHandleStyle);
var drop = new Y.DD.Drop({
node: v,
groups: ['portlets', 'toolbars']
@@ -166,7 +157,7 @@
//portlet.info();
});
- var dropLayouts = Y.Node.all('.portal-layout-column');
+ var dropLayouts = Y.Node.all(config.layoutStyle);
dropLayouts.each(function(v, k) {
Y.log("layout = " + v.getAttribute("name") + v.getAttribute("id"));
var layout = new Y.JetUI.Layout();
@@ -229,7 +220,7 @@
});
Y.DD.DDM.on('drag:drophit', function(e) {
- var portal = JETUI_YUI_config.portalInstance;
+ var portal = JETUI_YUI.portalInstance;
var drop = e.drop.get('node'),
drag = e.drag.get('node');
if (drag.data.get("toolbar"))
@@ -320,7 +311,7 @@
};
var reallocateColumn = function(column) {
- var columns = Y.Node.all('.portal-layout-column');
+ var columns = Y.Node.all(config.layoutStyle);
columns.each(function(v, k) {
if (v.data.get('locked') == false)
{
@@ -358,7 +349,7 @@
});
Y.DD.DDM.on('drag:over', function(e) {
- var portal = JETUI_YUI_config.portalInstance;
+ var portal = JETUI_YUI.portalInstance;
if (portal.isMoving)
return;
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java?rev=889872&r1=889871&r2=889872&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
Sat Dec 12 00:53:28 2009
@@ -24,6 +24,7 @@
import javax.servlet.RequestDispatcher;
+import org.apache.jetspeed.administration.PortalConfiguration;
import org.apache.jetspeed.aggregator.PortletRenderer;
import org.apache.jetspeed.container.PortletWindow;
import org.apache.jetspeed.decoration.Theme;
@@ -50,13 +51,16 @@
private PortletRenderer renderer;
private HeaderResourceFactory headerFactory;
private PageLayoutComponent pageLayoutComponent;
+ private PortalConfiguration pc;
private String layoutTemplate;
- public Jetui(PortletRenderer renderer, HeaderResourceFactory
headerFactory, PageLayoutComponent pageLayoutComponent, String layoutTemplate)
+ public Jetui(PortletRenderer renderer, HeaderResourceFactory
headerFactory, PageLayoutComponent pageLayoutComponent,
+ PortalConfiguration pc, String layoutTemplate)
{
this.renderer = renderer;
this.headerFactory = headerFactory;
this.pageLayoutComponent = pageLayoutComponent;
+ this.pc = pc;
this.layoutTemplate = layoutTemplate;
}
@@ -222,4 +226,9 @@
}
return map;
}
+
+ public PortalConfiguration getPortalConfiguration()
+ {
+ return this.pc;
+ }
}
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java?rev=889872&r1=889871&r2=889872&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java
Sat Dec 12 00:53:28 2009
@@ -38,6 +38,7 @@
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.PortalReservedParameters;
+import org.apache.jetspeed.administration.PortalConfiguration;
import org.apache.jetspeed.administration.PortalConfigurationConstants;
import org.apache.jetspeed.aggregator.PortletRenderer;
import org.apache.jetspeed.capabilities.CapabilityMap;
@@ -901,5 +902,9 @@
}
return map;
}
-
+
+ public PortalConfiguration getPortalConfiguration()
+ {
+ return Jetspeed.getConfiguration();
+ }
}
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalConfigurationConstants.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalConfigurationConstants.java?rev=889872&r1=889871&r2=889872&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalConfigurationConstants.java
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalConfigurationConstants.java
Sat Dec 12 00:53:28 2009
@@ -79,5 +79,18 @@
static final String JETUI_CUSTOMIZATION_AJAX = "ajax";
static final String JETUI_LAYOUT_VIEW = "jetui.layout.view";
static final String JETUI_LAYOUT_MAX = "jetui.layout.max";
- static final String JETUI_LAYOUT_SOLO = "jetui.layout.solo";
+ static final String JETUI_LAYOUT_SOLO = "jetui.layout.solo";
+ static final String JETUI_RENDER_TEMPLATE = "jetui.render.template";
+ static final String JETUI_RENDER_ENGINE = "jetui.render.engine";
+ static final String JETUI_CSRE = "CSRE";
+ static final String JETUI_SSRE = "SSRE";
+ static final String JETUI_AJAX_TRANSPORT = "jetui.ajax.transport";
+ static final String JETUI_TRANSPORT_JSON = "json";
+ static final String JETUI_TRANSPORT_XML = "xml";
+ static final String JETUI_DRAG_MODE = "jetui.drag.mode";
+ static final String JETUI_DRAG_FULL = "full";
+ static final String JETUI_DRAG_YAHOO = "yahoo";
+ static final String JETUI_STYLE_PORTLET = "jetui.style.portlet";
+ static final String JETUI_STYLE_LAYOUT = "jetui.style.layout";
+ static final String JETUI_STYLE_DRAG_HANDLE = "jetui.style.drag.handle";
}
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java?rev=889872&r1=889871&r2=889872&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java
Sat Dec 12 00:53:28 2009
@@ -24,6 +24,7 @@
import javax.portlet.WindowState;
import javax.security.auth.Subject;
+import org.apache.jetspeed.administration.PortalConfiguration;
import org.apache.jetspeed.container.PortletWindow;
import org.apache.jetspeed.locator.TemplateDescriptor;
import org.apache.jetspeed.locator.TemplateLocatorException;
@@ -278,5 +279,8 @@
*/
boolean isAjaxCustomizationEnabled();
- public Map getUserAttributes();
+ Map getUserAttributes();
+
+ PortalConfiguration getPortalConfiguration();
+
}
\ No newline at end of file
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml?rev=889872&r1=889871&r2=889872&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
Sat Dec 12 00:53:28 2009
@@ -926,6 +926,7 @@
<constructor-arg><ref
bean="org.apache.jetspeed.aggregator.PortletRenderer"/></constructor-arg>
<constructor-arg><ref
bean="org.apache.jetspeed.headerresource.HeaderResourceFactory"/></constructor-arg>
<constructor-arg><ref
bean="org.apache.jetspeed.layout.PageLayoutComponent" /></constructor-arg>
+ <constructor-arg><ref bean="PortalConfiguration" /></constructor-arg>
<constructor-arg><value>${jetui.render.template}</value></constructor-arg>
</bean>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties?rev=889872&r1=889871&r2=889872&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
Sat Dec 12 00:53:28 2009
@@ -370,8 +370,8 @@
# customization method, only applicable when jetui.render.engine = server
# values ( ajax | server )
jetui.customization.method = ajax
-# client | server
-jetui.render.engine = server
+# CCRE | SSRE
+jetui.render.engine = SSRE
# xml | json
jetui.ajax.transport = json
# jsp render template
@@ -380,4 +380,13 @@
jetui.layout.view = jetui
jetui.layout.max = maximized
jetui.layout.solo = solo
+# jetui drag mode (full : yahoo) - full: drag entire window full size, drop on
other portlets targets
+# yahoo: myyahoo like drag and drop (small icon, drop inbetween columns)
+jetui.drag.mode = full
+# portlet window style to find all portlets
+jetui.style.portlet = .portal-layout-cell
+# layout window style to find all layout containers
+jetui.style.layout = .portal-layout-column
+# title or handle of a portlet window to drag from
+jetui.style.drag.handle = .PTitle
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
