Author: smilek
Date: Sat Dec 8 01:31:36 2007
New Revision: 602380
URL: http://svn.apache.org/viewvc?rev=602380&view=rev
Log:
The following revision comments are from branches/JETSPEED-2.1.3 revisions
which were not individually checked-in to trunk
=== ---------------------------------------------------------------- ===
[ from branches/JETSPEED-2.1.3 r584857 ] | smilek | 2007-10-15 13:19:33 -0600
(Mon, 15 Oct 2007) | 1 line
removed 'desktop.' prefix from DesktopConfiguration entry keys; added
DESKTOP_JSON_WINDOW_* constants
=== ---------------------------------------------------------------- ===
[ from branches/JETSPEED-2.1.3 r578926 ] | smilek | 2007-09-24 13:23:39 -0600
(Mon, 24 Sep 2007) | 1 line
added constant HEADER_DEBUG_REQUIRES
=== ---------------------------------------------------------------- ===
Modified:
portals/jetspeed-2/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/headerresource/HeaderResource.java
Modified:
portals/jetspeed-2/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/headerresource/HeaderResource.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/headerresource/HeaderResource.java?rev=602380&r1=602379&r2=602380&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/headerresource/HeaderResource.java
(original)
+++
portals/jetspeed-2/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/headerresource/HeaderResource.java
Sat Dec 8 01:31:36 2007
@@ -77,6 +77,8 @@
public final static String HEADER_INTERNAL_JETSPEED_VAR_NAME = "jetspeed";
public final static String HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME =
"djConfig." + HEADER_INTERNAL_JETSPEED_VAR_NAME; // internal use - not a
configuration entry name
+ public final static String
HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME_SCOPE =
HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME + "."; // internal use - not a
configuration entry name
+
// header configuration - dojo
public final static String HEADER_CONFIG_DOJO_ENABLE = "dojo.enable";
@@ -91,25 +93,39 @@
public final static String HEADER_CONFIG_DOJO_REQUIRES_MODULES =
"dojo.requires.modules";
// header configuration - desktop
- public final static String HEADER_CONFIG_DESKTOP_LAYOUT_DECORATION_DEFAULT
= "desktop.decoration.layout";
- public final static String
HEADER_CONFIG_DESKTOP_PORTLET_DECORATION_DEFAULT = "desktop.decoration.portlet";
- public final static String HEADER_CONFIG_DESKTOP_PAGE_AJAXNAVIGATION =
"desktop.page.ajaxnavigation";
- public final static String HEADER_CONFIG_DESKTOP_WINDOW_TILING =
"desktop.window.tiling";
- public final static String HEADER_CONFIG_DESKTOP_WINDOW_HEIGHT_EXPAND =
"desktop.window.heightexpand";
- public final static String HEADER_CONFIG_DESKTOP_WINDOW_HEIGHT =
"desktop.window.height";
- public final static String HEADER_CONFIG_DESKTOP_WINDOW_WIDTH =
"desktop.window.width";
- public final static String
HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_ORDER =
"desktop.window.action.button.order";
- public final static String HEADER_CONFIG_DESKTOP_WINDOW_ACTION_NOIMAGE =
"desktop.window.action.noimage";
- public final static String HEADER_CONFIG_DESKTOP_WINDOW_ACTION_MENU_ORDER
= "desktop.window.action.menu.order";
- public final static String HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_HIDE
= "desktop.window.action.button.hide";
- public final static String
HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_TOOLTIP =
"desktop.window.action.button.tooltip";
- public final static String HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_MAX
= "desktop.window.action.button.maximum";
- public final static String HEADER_CONFIG_DESKTOP_WINDOW_ICON_ENABLED =
"desktop.window.icon.enabled";
- public final static String HEADER_CONFIG_DESKTOP_WINDOW_ICON_PATH =
"desktop.window.icon.path";
- public final static String
HEADER_CONFIG_DESKTOP_PAGE_ACTION_BUTTON_TOOLTIP =
"desktop.page.action.button.tooltip";
+ public final static String HEADER_CONFIG_DESKTOP_LAYOUT_DECORATION_DEFAULT
= "decoration.layout";
+ public final static String
HEADER_CONFIG_DESKTOP_PORTLET_DECORATION_DEFAULT = "decoration.portlet";
+ public final static String HEADER_CONFIG_DESKTOP_PAGE_AJAXNAVIGATION =
"page.ajaxnavigation";
+ public final static String
HEADER_CONFIG_DESKTOP_PAGE_ACTION_BUTTON_TOOLTIP = "page.action.button.tooltip";
+ public final static String HEADER_CONFIG_DESKTOP_WINDOW_TILING =
"window.tiling";
+ public final static String HEADER_CONFIG_DESKTOP_WINDOW_HEIGHT_EXPAND =
"window.heightexpand";
+ public final static String HEADER_CONFIG_DESKTOP_WINDOW_HEIGHT =
"window.height";
+ public final static String HEADER_CONFIG_DESKTOP_WINDOW_WIDTH =
"window.width";
+ public final static String
HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_ORDER = "window.action.button.order";
+ public final static String HEADER_CONFIG_DESKTOP_WINDOW_ACTION_NOIMAGE =
"window.action.noimage";
+ public final static String HEADER_CONFIG_DESKTOP_WINDOW_ACTION_MENU_ORDER
= "window.action.menu.order";
+ public final static String HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_MAX
= "window.action.button.maximum";
+ public final static String
HEADER_CONFIG_DESKTOP_WINDOW_ACTION_BUTTON_TOOLTIP =
"window.action.button.tooltip";
+ public final static String HEADER_CONFIG_DESKTOP_WINDOW_ICON_ENABLED =
"window.icon.enabled";
+ public final static String HEADER_CONFIG_DESKTOP_WINDOW_ICON_PATH =
"window.icon.path";
+ public final static String HEADER_CONFIG_DESKTOP_WINDOW_TITLEBAR_ENABLED =
"window.titlebar.enabled";
+ public final static String HEADER_CONFIG_DESKTOP_WINDOW_RESIZEBAR_ENABLED
= "window.resizebar.enabled";
+
+ public final static String DESKTOP_JSON_WINDOW_ACTION_BUTTON_ORDER =
"windowActionButtonOrder";
+ public final static String DESKTOP_JSON_WINDOW_ACTION_NOIMAGE =
"windowActionNoImage";
+ public final static String DESKTOP_JSON_WINDOW_ACTION_MENU_ORDER =
"windowActionMenuOrder";
+ public final static String DESKTOP_JSON_WINDOW_ACTION_BUTTON_MAX =
"windowActionButtonMax";
+ public final static String DESKTOP_JSON_WINDOW_ACTION_BUTTON_TOOLTIP =
"windowActionButtonTooltip";
+ public final static String DESKTOP_JSON_WINDOW_ICON_ENABLED =
"windowIconEnabled";
+ public final static String DESKTOP_JSON_WINDOW_ICON_PATH =
"windowIconPath";
+ public final static String DESKTOP_JSON_WINDOW_TITLEBAR_ENABLED =
"windowTitlebar";
+ public final static String DESKTOP_JSON_WINDOW_RESIZEBAR_ENABLED =
"windowResizebar";
+
public final static String HEADER_INTERNAL_CONFIG_DESKTOP_WINDOW_ACTION =
"desktop.window.action";
+ public final static String HEADER_DEBUG_REQUIRES =
"jetspeed.desktop.debug";
+
/**
* Output all content (that has not already been output)
*
@@ -380,4 +396,4 @@
* @param path CSS file path
*/
public void addStyleSheet(String path);
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
