JBoss Portal SVN: r7675 - in trunk: core/src/resources/portal-core-sar/conf/identity and 4 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-07-05 19:15:40 -0400 (Thu, 05 Jul 2007)
New Revision: 7675
Modified:
trunk/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java
trunk/core/src/resources/portal-core-sar/conf/identity/profile-config.xml
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp
trunk/identity/src/main/org/jboss/portal/identity/User.java
trunk/identity/src/resources/test/config/profile-config.xml
Log:
JBPORTAL-1307 - Added XMMP (Jabber) to user profile
Modified: trunk/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-07-05 23:02:42 UTC (rev 7674)
+++ trunk/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-07-05 23:15:40 UTC (rev 7675)
@@ -878,6 +878,7 @@
ctx.put("YIM", (String)getProperty(user,User.INFO_USER_IM_YIM));
ctx.put("MSNM", (String)getProperty(user,User.INFO_USER_IM_MSNM));
ctx.put("SKYPE", (String)getProperty(user,User.INFO_USER_IM_SKYPE));
+ ctx.put("XMMP", (String)getProperty(user,User.INFO_USER_IM_XMMP));
ctx.put("SIGNATURE", (String)getProperty(user,User.INFO_USER_SIGNATURE));
ctx.put("LOCATION", (String)getProperty(user,User.INFO_USER_LOCATION));
ctx.put("OCCUPATION", (String)getProperty(user,User.INFO_USER_OCCUPATION));
@@ -975,6 +976,7 @@
String yim = req.getParameter("yim");
String aim = req.getParameter("aim");
String skype = req.getParameter("skype");
+ String xmmp = req.getParameter("xmmp");
String location = req.getParameter("location");
String occupation = req.getParameter("occupation");
String interests = req.getParameter("interests");
@@ -1055,6 +1057,7 @@
putNonEmptyProperty(user, User.INFO_USER_IM_YIM, yim);
putNonEmptyProperty(user, User.INFO_USER_IM_AIM, aim);
putNonEmptyProperty(user, User.INFO_USER_IM_SKYPE, skype);
+ putNonEmptyProperty(user, User.INFO_USER_IM_XMMP, xmmp);
putNonEmptyProperty(user, User.INFO_USER_SIGNATURE, signature);
putNonEmptyProperty(user, User.INFO_USER_LOCATION, location);
putNonEmptyProperty(user, User.INFO_USER_OCCUPATION, occupation);
@@ -1090,6 +1093,7 @@
portletHelper.setRenderParameter(resp, "YIM", yim);
portletHelper.setRenderParameter(resp, "MSNM", msnm);
portletHelper.setRenderParameter(resp, "SKYPE", skype);
+ portletHelper.setRenderParameter(resp, "XMMP", xmmp);
portletHelper.setRenderParameter(resp, "SIGNATURE", signature);
portletHelper.setRenderParameter(resp, "LOCATION", location);
portletHelper.setRenderParameter(resp, "OCCUPATION", occupation);
Modified: trunk/core/src/resources/portal-core-sar/conf/identity/profile-config.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2007-07-05 23:02:42 UTC (rev 7674)
+++ trunk/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2007-07-05 23:15:40 UTC (rev 7675)
@@ -309,6 +309,20 @@
</mapping>
</property>
<property>
+ <name>portal.user.im.xmmp</name>
+ <type>java.lang.String</type>
+ <access-mode>read-write</access-mode>
+ <usage>optional</usage>
+ <display-name xml:lang="en">XMMP</display-name>
+ <description xml:lang="en">The user XMMP id</description>
+ <mapping>
+ <database>
+ <type>dynamic</type>
+ <value>portal.user.im.xmmp</value>
+ </database>
+ </mapping>
+ </property>
+ <property>
<name>portal.user.homepage</name>
<type>java.lang.String</type>
<access-mode>read-write</access-mode>
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2007-07-05 23:02:42 UTC (rev 7674)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2007-07-05 23:15:40 UTC (rev 7675)
@@ -221,6 +221,7 @@
REGISTER_YIM=Yahoo id
REGISTER_MSNM=MSN messenger id
REGISTER_SKYPE=Skype id
+REGISTER_XMMP=XMMP id
REGISTER_LOCATION=Location
REGISTER_LANGUAGE=Preferred language
REGISTER_OCCUPATION=Occupation
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp 2007-07-05 23:02:42 UTC (rev 7674)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp 2007-07-05 23:15:40 UTC (rev 7675)
@@ -119,6 +119,10 @@
<td><input type="text" name="skype" value="${n:out("SKYPE")}" size="30" maxlength="100"></td>
</tr>
<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_XMMP")}</td>
+ <td><input type="text" name="xmmp" value="${n:out("XMMP")}" size="30" maxlength="100"></td>
+</tr>
+<tr>
<td colspan="3" nowrap><h4>${n:i18n("REGISTER_ADDITIONAL")}</h4></td>
</tr>
<tr>
Modified: trunk/identity/src/main/org/jboss/portal/identity/User.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/User.java 2007-07-05 23:02:42 UTC (rev 7674)
+++ trunk/identity/src/main/org/jboss/portal/identity/User.java 2007-07-05 23:15:40 UTC (rev 7675)
@@ -51,6 +51,7 @@
public static final String INFO_USER_IM_MSNM = "portal.user.im.msnm";
public static final String INFO_USER_IM_YIM = "portal.user.im.yim";
public static final String INFO_USER_IM_SKYPE = "portal.user.im.skype";
+ public static final String INFO_USER_IM_XMMP = "portal.user.im.xmmp";
public static final String INFO_USER_HOMEPAGE = "portal.user.homepage";
public static final String INFO_USER_TIME_ZONE_OFFSET = "portal.user.time-zone-offset";
public static final String INFO_USER_THEME = "portal.user.theme";
Modified: trunk/identity/src/resources/test/config/profile-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/profile-config.xml 2007-07-05 23:02:42 UTC (rev 7674)
+++ trunk/identity/src/resources/test/config/profile-config.xml 2007-07-05 23:15:40 UTC (rev 7675)
@@ -309,6 +309,20 @@
</mapping>
</property>
<property>
+ <name>portal.user.im.xmmp</name>
+ <type>java.lang.String</type>
+ <access-mode>read-write</access-mode>
+ <usage>optional</usage>
+ <display-name xml:lang="en">XMMP</display-name>
+ <description xml:lang="en">The user XMMP id</description>
+ <mapping>
+ <database>
+ <type>dynamic</type>
+ <value>portal.user.im.xmmp</value>
+ </database>
+ </mapping>
+ </property>
+ <property>
<name>portal.user.homepage</name>
<type>java.lang.String</type>
<access-mode>read-write</access-mode>
16 years, 12 months
- 1
- 0
JBoss Portal SVN: r7674 - in branches/JBoss_Portal_Branch_2_6: core/src/resources/portal-core-sar/conf/identity and 4 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-07-05 19:02:42 -0400 (Thu, 05 Jul 2007)
New Revision: 7674
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp
branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/User.java
branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/profile-config.xml
Log:
JBPORTAL-1307 - Added XMMP (Jabber) to user profile
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-07-05 22:21:07 UTC (rev 7673)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-07-05 23:02:42 UTC (rev 7674)
@@ -891,6 +891,7 @@
ctx.put("YIM", (String)getProperty(user,User.INFO_USER_IM_YIM));
ctx.put("MSNM", (String)getProperty(user,User.INFO_USER_IM_MSNM));
ctx.put("SKYPE", (String)getProperty(user,User.INFO_USER_IM_SKYPE));
+ ctx.put("XMMP", (String)getProperty(user,User.INFO_USER_IM_XMMP));
ctx.put("SIGNATURE", (String)getProperty(user,User.INFO_USER_SIGNATURE));
ctx.put("LOCATION", (String)getProperty(user,User.INFO_USER_LOCATION));
ctx.put("OCCUPATION", (String)getProperty(user,User.INFO_USER_OCCUPATION));
@@ -988,6 +989,7 @@
String yim = req.getParameter("yim");
String aim = req.getParameter("aim");
String skype = req.getParameter("skype");
+ String xmmp = req.getParameter("xmmp");
String location = req.getParameter("location");
String occupation = req.getParameter("occupation");
String interests = req.getParameter("interests");
@@ -1068,6 +1070,7 @@
putNonEmptyProperty(user, User.INFO_USER_IM_YIM, yim);
putNonEmptyProperty(user, User.INFO_USER_IM_AIM, aim);
putNonEmptyProperty(user, User.INFO_USER_IM_SKYPE, skype);
+ putNonEmptyProperty(user, User.INFO_USER_IM_XMMP, xmmp);
putNonEmptyProperty(user, User.INFO_USER_SIGNATURE, signature);
putNonEmptyProperty(user, User.INFO_USER_LOCATION, location);
putNonEmptyProperty(user, User.INFO_USER_OCCUPATION, occupation);
@@ -1103,6 +1106,7 @@
portletHelper.setRenderParameter(resp, "YIM", yim);
portletHelper.setRenderParameter(resp, "MSNM", msnm);
portletHelper.setRenderParameter(resp, "SKYPE", skype);
+ portletHelper.setRenderParameter(resp, "XMMP", xmmp);
portletHelper.setRenderParameter(resp, "SIGNATURE", signature);
portletHelper.setRenderParameter(resp, "LOCATION", location);
portletHelper.setRenderParameter(resp, "OCCUPATION", occupation);
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2007-07-05 22:21:07 UTC (rev 7673)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2007-07-05 23:02:42 UTC (rev 7674)
@@ -309,6 +309,20 @@
</mapping>
</property>
<property>
+ <name>portal.user.im.xmmp</name>
+ <type>java.lang.String</type>
+ <access-mode>read-write</access-mode>
+ <usage>optional</usage>
+ <display-name xml:lang="en">XMMP</display-name>
+ <description xml:lang="en">The user XMMP id</description>
+ <mapping>
+ <database>
+ <type>dynamic</type>
+ <value>portal.user.im.xmmp</value>
+ </database>
+ </mapping>
+ </property>
+ <property>
<name>portal.user.homepage</name>
<type>java.lang.String</type>
<access-mode>read-write</access-mode>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2007-07-05 22:21:07 UTC (rev 7673)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2007-07-05 23:02:42 UTC (rev 7674)
@@ -221,6 +221,7 @@
REGISTER_YIM=Yahoo id
REGISTER_MSNM=MSN messenger id
REGISTER_SKYPE=Skype id
+REGISTER_XMMP=XMMP id
REGISTER_LOCATION=Location
REGISTER_LANGUAGE=Preferred language
REGISTER_OCCUPATION=Occupation
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp 2007-07-05 22:21:07 UTC (rev 7673)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp 2007-07-05 23:02:42 UTC (rev 7674)
@@ -119,6 +119,10 @@
<td><input type="text" name="skype" value="${n:out("SKYPE")}" size="30" maxlength="100"></td>
</tr>
<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_XMMP")}</td>
+ <td><input type="text" name="xmmp" value="${n:out("XMMP")}" size="30" maxlength="100"></td>
+</tr>
+<tr>
<td colspan="3" nowrap><h4>${n:i18n("REGISTER_ADDITIONAL")}</h4></td>
</tr>
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/User.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/User.java 2007-07-05 22:21:07 UTC (rev 7673)
+++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/User.java 2007-07-05 23:02:42 UTC (rev 7674)
@@ -51,6 +51,7 @@
public static final String INFO_USER_IM_MSNM = "portal.user.im.msnm";
public static final String INFO_USER_IM_YIM = "portal.user.im.yim";
public static final String INFO_USER_IM_SKYPE = "portal.user.im.skype";
+ public static final String INFO_USER_IM_XMMP = "portal.user.im.xmmp";
public static final String INFO_USER_HOMEPAGE = "portal.user.homepage";
public static final String INFO_USER_TIME_ZONE_OFFSET = "portal.user.time-zone-offset";
public static final String INFO_USER_THEME = "portal.user.theme";
Modified: branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/profile-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/profile-config.xml 2007-07-05 22:21:07 UTC (rev 7673)
+++ branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/profile-config.xml 2007-07-05 23:02:42 UTC (rev 7674)
@@ -309,6 +309,20 @@
</mapping>
</property>
<property>
+ <name>portal.user.im.xmmp</name>
+ <type>java.lang.String</type>
+ <access-mode>read-write</access-mode>
+ <usage>optional</usage>
+ <display-name xml:lang="en">XMMP</display-name>
+ <description xml:lang="en">The user XMMP id</description>
+ <mapping>
+ <database>
+ <type>dynamic</type>
+ <value>portal.user.im.xmmp</value>
+ </database>
+ </mapping>
+ </property>
+ <property>
<name>portal.user.homepage</name>
<type>java.lang.String</type>
<access-mode>read-write</access-mode>
16 years, 12 months
- 1
- 0
JBoss Portal SVN: r7673 - in trunk/widget/src: main/org/jboss/portal/widget/google and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-07-05 18:21:07 -0400 (Thu, 05 Jul 2007)
New Revision: 7673
Modified:
trunk/widget/src/main/org/jboss/portal/test/widget/google/PreferencesTestCase.java
trunk/widget/src/main/org/jboss/portal/widget/google/GGPreferencesInfo.java
trunk/widget/src/main/org/jboss/portal/widget/google/GGWidget.java
trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp
Log:
renamed getPreferencesInfo() and getPreferenceInfo() to getPreferences() and getPreference() on the GGWidgetPreferencesInfo
Modified: trunk/widget/src/main/org/jboss/portal/test/widget/google/PreferencesTestCase.java
===================================================================
--- trunk/widget/src/main/org/jboss/portal/test/widget/google/PreferencesTestCase.java 2007-07-05 22:03:29 UTC (rev 7672)
+++ trunk/widget/src/main/org/jboss/portal/test/widget/google/PreferencesTestCase.java 2007-07-05 22:21:07 UTC (rev 7673)
@@ -68,7 +68,7 @@
GGPreferencesInfo prefs = ggw.getPreferencesInfo();
// String
- GGPreferenceInfo pi = prefs.getPreferenceInfo("testString");
+ GGPreferenceInfo pi = prefs.getPreference("testString");
assertNotNull(pi);
assertEquals("testString", pi.getName());
assertEquals("Test String", pi.getDisplayName());
@@ -76,7 +76,7 @@
assertEquals(DataType.STRING, pi.getType().getOrdinal());
// Default
- pi = prefs.getPreferenceInfo("testDefault");
+ pi = prefs.getPreference("testDefault");
assertNotNull(pi);
assertEquals("testDefault", pi.getName());
assertEquals("Test Default", pi.getDisplayName());
@@ -84,7 +84,7 @@
assertEquals(DataType.STRING, pi.getType().getOrdinal());
// Required
- pi = prefs.getPreferenceInfo("testRequired");
+ pi = prefs.getPreference("testRequired");
assertNotNull(pi);
assertEquals("testRequired", pi.getName());
assertEquals("Test Required", pi.getDisplayName());
@@ -93,7 +93,7 @@
assertTrue(pi.isRequired());
// Enum
- pi = prefs.getPreferenceInfo("testEnum");
+ pi = prefs.getPreference("testEnum");
assertNotNull(pi);
assertEquals("testEnum", pi.getName());
assertEquals("Test Enum", pi.getDisplayName());
@@ -109,7 +109,7 @@
assertEquals("enumThree", enumer.getValue(2).getDisplayValue());
// Bool
- pi = prefs.getPreferenceInfo("testBool");
+ pi = prefs.getPreference("testBool");
assertNotNull(pi);
assertEquals("testBool", pi.getName());
assertEquals("Test Bool", pi.getDisplayName());
@@ -117,7 +117,7 @@
assertEquals(DataType.BOOL, pi.getType().getOrdinal());
// Hidden
- pi = prefs.getPreferenceInfo("testHidden");
+ pi = prefs.getPreference("testHidden");
assertNotNull(pi);
assertEquals("testHidden", pi.getName());
assertEquals("Test Hidden", pi.getDisplayName());
@@ -125,7 +125,7 @@
assertEquals(DataType.HIDDEN, pi.getType().getOrdinal());
// List
- pi = prefs.getPreferenceInfo("testList");
+ pi = prefs.getPreference("testList");
assertNotNull(pi);
assertEquals("testList", pi.getName());
assertEquals("Test List", pi.getDisplayName());
Modified: trunk/widget/src/main/org/jboss/portal/widget/google/GGPreferencesInfo.java
===================================================================
--- trunk/widget/src/main/org/jboss/portal/widget/google/GGPreferencesInfo.java 2007-07-05 22:03:29 UTC (rev 7672)
+++ trunk/widget/src/main/org/jboss/portal/widget/google/GGPreferencesInfo.java 2007-07-05 22:21:07 UTC (rev 7673)
@@ -35,6 +35,7 @@
public final class GGPreferencesInfo
{
+ /** . */
public static final GGPreferencesInfo EMPTY_PREFS = new GGPreferencesInfo();
/** . */
@@ -59,12 +60,12 @@
content = null;
}
- public Collection getPreferencesInfo()
+ public Collection getPreferences()
{
return content == null ? Collections.EMPTY_SET : content.values();
}
- public GGPreferenceInfo getPreferenceInfo(String name)
+ public GGPreferenceInfo getPreference(String name)
{
if (name == null)
{
Modified: trunk/widget/src/main/org/jboss/portal/widget/google/GGWidget.java
===================================================================
--- trunk/widget/src/main/org/jboss/portal/widget/google/GGWidget.java 2007-07-05 22:03:29 UTC (rev 7672)
+++ trunk/widget/src/main/org/jboss/portal/widget/google/GGWidget.java 2007-07-05 22:21:07 UTC (rev 7673)
@@ -112,7 +112,7 @@
tmp.append("&output=js");
// Append default values
- for (Iterator i = prefsInfo.getPreferencesInfo().iterator();i.hasNext();)
+ for (Iterator i = prefsInfo.getPreferences().iterator();i.hasNext();)
{
GGPreferenceInfo prefInfo = (GGPreferenceInfo)i.next();
String prefName = prefInfo.getName();
Modified: trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp
===================================================================
--- trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp 2007-07-05 22:03:29 UTC (rev 7672)
+++ trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp 2007-07-05 22:21:07 UTC (rev 7673)
@@ -80,7 +80,7 @@
selectURL.setParameter("content.uri", widget.getId());
// Set default parametrization state
- for (Iterator j = widget.getPreferencesInfo().getPreferencesInfo().iterator(); j.hasNext();)
+ for (Iterator j = widget.getPreferencesInfo().getPreferences().iterator(); j.hasNext();)
{
GGPreferenceInfo prefInfo = (GGPreferenceInfo)j.next();
String paramName = "content.param." + prefInfo.getName();
@@ -105,7 +105,7 @@
</p>
<%
- if (selWidget != null && !selWidget.getPreferencesInfo().getPreferencesInfo().isEmpty())
+ if (selWidget != null && !selWidget.getPreferencesInfo().getPreferences().isEmpty())
{
PortletURL selectURL = renderResponse.createActionURL();
@@ -120,7 +120,7 @@
<p>
<form action="<%= selectURL %>" method="post">
<%
- for (Iterator i = selWidget.getPreferencesInfo().getPreferencesInfo().iterator(); i.hasNext();)
+ for (Iterator i = selWidget.getPreferencesInfo().getPreferences().iterator(); i.hasNext();)
{
GGPreferenceInfo prefInfo = (GGPreferenceInfo)i.next();
if (prefInfo.getType().getOrdinal() == DataType.HIDDEN)
@@ -135,7 +135,7 @@
<table>
<tbody>
<%
- for (Iterator i = selWidget.getPreferencesInfo().getPreferencesInfo().iterator(); i.hasNext();)
+ for (Iterator i = selWidget.getPreferencesInfo().getPreferences().iterator(); i.hasNext();)
{
GGPreferenceInfo prefInfo = (GGPreferenceInfo)i.next();
16 years, 12 months
- 1
- 0
JBoss Portal SVN: r7672 - in trunk: build and 14 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2007-07-05 18:03:29 -0400 (Thu, 05 Jul 2007)
New Revision: 7672
Added:
trunk/core/src/main/org/jboss/portal/core/controller/handler/UIServerResponse.java
trunk/uiserver/
trunk/uiserver/build.bat
trunk/uiserver/build.sh
trunk/uiserver/build.xml
trunk/uiserver/src/
trunk/uiserver/src/main/
trunk/uiserver/src/main/org/
trunk/uiserver/src/main/org/jboss/
trunk/uiserver/src/main/org/jboss/portal/
trunk/uiserver/src/main/org/jboss/portal/uiserver/
trunk/uiserver/src/main/org/jboss/portal/uiserver/ClassicUI.java
trunk/uiserver/src/main/org/jboss/portal/uiserver/ClientUI.java
trunk/uiserver/src/main/org/jboss/portal/uiserver/PartialRefreshUI.java
trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServer.java
trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServerImpl.java
trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServerPageRendition.java
trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServerRequest.java
trunk/uiserver/src/resources/
Modified:
trunk/build/build.xml
trunk/core/build.xml
trunk/core/src/main/org/jboss/portal/core/controller/Controller.java
trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java
trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
trunk/core/src/main/org/jboss/portal/core/theme/PageRendition.java
trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
First cut at the UIServer prototype.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-07-05 21:50:44 UTC (rev 7671)
+++ trunk/build/build.xml 2007-07-05 22:03:29 UTC (rev 7672)
@@ -127,6 +127,7 @@
<module name="bridge"/>
<module name="cms"/>
<module name="format"/>
+ <module name="uiserver"/>
<module name="core"/>
<module name="core-cms"/>
<module name="core-management"/>
@@ -136,14 +137,14 @@
<module name="wsrp"/>
<module name="registration"/>
<module name="workflow"/>
- <module name="widget"/>
+ <module name="widget"/>
<!--<module name="core-admin"/>-->
<!-- Module groups -->
<group name="portal">
<include
- modules="common, test, api, web, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-samples, widget"/>
+ modules="common, test, api, web, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, uiserver, core, wsrp, core-admin, core-cms, core-management, core-samples, widget"/>
</group>
<group name="cms">
Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml 2007-07-05 21:50:44 UTC (rev 7671)
+++ trunk/core/build.xml 2007-07-05 22:03:29 UTC (rev 7672)
@@ -134,6 +134,7 @@
<path refid="jboss.portal-theme.classpath"/>
<path refid="jboss.portal-security.classpath"/>
<path refid="jboss.portal-test.classpath"/>
+ <path refid="jboss.portal-uiserver.classpath"/>
</path>
<!--+=======================================+-->
@@ -334,6 +335,7 @@
<fileset dir="${jboss.portal-search.root}/lib" includes="portal-search-lib.jar"/>
<fileset dir="${jboss.portal-identity.root}/lib" includes="portal-identity-lib.jar"/>
<fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/>
+ <fileset dir="${jboss.portal-uiserver.root}/lib" includes="portal-uiserver-lib.jar"/>
<fileset dir="${ehcache.ehcache.lib}" includes="ehcache.jar"/>
<fileset dir="${apache.collections.lib}" includes="commons-collections.jar"/>
<fileset dir="${javassist.javassist.lib}" includes="javassist.jar"/>
Modified: trunk/core/src/main/org/jboss/portal/core/controller/Controller.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/Controller.java 2007-07-05 21:50:44 UTC (rev 7671)
+++ trunk/core/src/main/org/jboss/portal/core/controller/Controller.java 2007-07-05 22:03:29 UTC (rev 7672)
@@ -46,6 +46,10 @@
import org.jboss.portal.server.ServerException;
import org.jboss.portal.web.spi.ServletContainerContext;
+import org.jboss.portal.uiserver.UIServer;
+import org.jboss.portal.uiserver.UIServerRequest;
+import org.jboss.portal.core.controller.handler.UIServerResponse;
+
import javax.servlet.ServletException;
import java.io.IOException;
@@ -92,6 +96,12 @@
/** . */
protected PageControlPolicy pageControlPolicy;
+
+ /**
+ *
+ */
+ protected UIServer uiServer = null;
+
public ContentRendererRegistry getContentRendererRegistry()
{
@@ -207,7 +217,25 @@
{
this.pageControlPolicy = pageControlPolicy;
}
+
+ /**
+ *
+ * @return
+ */
+ public UIServer getUIServer()
+ {
+ return uiServer;
+ }
+ /**
+ *
+ * @param uiServer
+ */
+ public void setUIServer(UIServer uiServer)
+ {
+ this.uiServer = uiServer;
+ }
+
public final void handle(ServerInvocation invocation) throws ServerException
{
// Create controller context
@@ -317,6 +345,19 @@
AjaxResponse ar = (AjaxResponse)handlerResponse;
sendResponse(controllerContext, ar);
}
+
+ //This condition hands over UI aggregation function to the
+ //UI Server, regardless of what type of UI is being catered to
+ else if(handlerResponse instanceof UIServerResponse)
+ {
+ //Create a request to be handled by the UIServer
+ UIServerRequest request = new UIServerRequest();
+ request.setAttribute(UIServerRequest.SERVER_INVOCATION, controllerContext.getServerInvocation());
+ request.setAttribute(UIServerRequest.UI_INDICATOR, ((UIServerResponse)handlerResponse).getUiIndicator());
+
+ //Perform aggregation of the UI to be sent back to the client
+ this.uiServer.aggregate(request);
+ }
}
/**
Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-07-05 21:50:44 UTC (rev 7671)
+++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-07-05 22:03:29 UTC (rev 7672)
@@ -68,6 +68,8 @@
import org.jboss.portal.theme.page.Region;
import org.apache.log4j.Logger;
+import org.jboss.portal.core.controller.handler.UIServerResponse;
+
import java.io.StringWriter;
import java.util.Set;
import java.util.HashSet;
@@ -174,7 +176,7 @@
ViewPageCommand rpc = new ViewPageCommand(upr.getPageId());
String url = controllerContext.renderURL(rpc, null, null);
UpdatePageLocationResponse dresp = new UpdatePageLocationResponse(url);
- return new AjaxResponse(dresp);
+ return new UIServerResponse(dresp);
}
else if (controllerResponse instanceof UpdateWindowResponse)
{
@@ -366,7 +368,7 @@
//
if (!fullRefresh)
{
- return new AjaxResponse(updatePage);
+ return new UIServerResponse(updatePage);
}
}
@@ -374,7 +376,7 @@
ViewPageCommand rpc = new ViewPageCommand(page.getId());
String url = controllerContext.renderURL(rpc, null, null);
UpdatePageLocationResponse dresp = new UpdatePageLocationResponse(url);
- return new AjaxResponse(dresp);
+ return new UIServerResponse(dresp);
}
else
{
Added: trunk/core/src/main/org/jboss/portal/core/controller/handler/UIServerResponse.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/handler/UIServerResponse.java (rev 0)
+++ trunk/core/src/main/org/jboss/portal/core/controller/handler/UIServerResponse.java 2007-07-05 22:03:29 UTC (rev 7672)
@@ -0,0 +1,83 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.core.controller.handler;
+
+import org.jboss.portal.core.controller.handler.HandlerResponse;
+import org.jboss.portal.server.ServerInvocationContext;
+
+import javax.servlet.ServletException;
+import java.io.IOException;
+
+/**
+ *
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ *
+ */
+public class UIServerResponse extends HandlerResponse
+{
+ /**
+ *
+ */
+ private Object uiIndicator = null;
+
+ /**
+ *
+ * @param controllerResponse
+ */
+ public UIServerResponse(Object uiIndicator)
+ {
+ this.uiIndicator = uiIndicator;
+ }
+
+
+ /**
+ *
+ * @return
+ */
+ public Object getUiIndicator()
+ {
+ return uiIndicator;
+ }
+
+
+ /**
+ *
+ * @param uiIndicator
+ */
+ public void setUiIndicator(Object uiIndicator)
+ {
+ this.uiIndicator = uiIndicator;
+ }
+
+ /**
+ * Leave this empty.....The UIServer will take care of sending the response
+ *
+ *
+ * @param ctx
+ * @throws IOException
+ * @throws ServletException
+ */
+ public void sendResponse(ServerInvocationContext ctx) throws IOException, ServletException
+ {
+ }
+}
Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2007-07-05 21:50:44 UTC (rev 7671)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2007-07-05 22:03:29 UTC (rev 7672)
@@ -41,6 +41,9 @@
import org.jboss.portal.web.ServletContextDispatcher;
import org.jboss.portal.common.util.MarkupInfo;
+import org.jboss.portal.core.controller.handler.UIServerResponse;
+import org.jboss.portal.uiserver.UIServerPageRendition;
+
import javax.servlet.ServletException;
import java.io.IOException;
@@ -76,17 +79,11 @@
//
if (resp instanceof PageRendition)
{
- final PageRendition rendition = (PageRendition)resp;
- final ServerInvocation invocation = controllerContext.getServerInvocation();
- return new HTTPResponse()
- {
- public void sendResponse(ServerInvocationContext ctx) throws IOException, ServletException
- {
- ServletContextDispatcher dispatcher = new ServletContextDispatcher(invocation.getServerContext().getClientRequest(), invocation.getServerContext().getClientResponse(), invocation.getRequest().getServer().getServletContainerContext());
- MarkupInfo markupInfo = (MarkupInfo)invocation.getResponse().getContentInfo();
- rendition.render(markupInfo, dispatcher);
- }
- };
+ PageRendition pageRendition = (PageRendition)resp;
+ UIServerPageRendition uiServerPageRendition = new UIServerPageRendition(
+ pageRendition.getLayout(),pageRendition.getTheme(),pageRendition.getPageResult(),pageRendition.getPageService()
+ );
+ return new UIServerResponse(uiServerPageRendition);
}
else
{
Modified: trunk/core/src/main/org/jboss/portal/core/theme/PageRendition.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/theme/PageRendition.java 2007-07-05 21:50:44 UTC (rev 7671)
+++ trunk/core/src/main/org/jboss/portal/core/theme/PageRendition.java 2007-07-05 22:03:29 UTC (rev 7672)
@@ -68,7 +68,7 @@
this.pageResult = markupResult;
this.pageService = pageService;
}
-
+
/** Performs the page rendition. */
public void render(MarkupInfo markupInfo, ServletContextDispatcher dispatcher) throws IOException, ServletException
{
@@ -102,4 +102,19 @@
{
return pageResult;
}
+
+ public PortalLayout getLayout()
+ {
+ return this.layout;
+ }
+
+ public PortalTheme getTheme()
+ {
+ return this.theme;
+ }
+
+ public PageService getPageService()
+ {
+ return this.pageService;
+ }
}
Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-07-05 21:50:44 UTC (rev 7671)
+++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-07-05 22:03:29 UTC (rev 7672)
@@ -1090,6 +1090,9 @@
<depends
optional-attribute-name="PageControlPolicy"
proxy-type="attribute">portal:service=ControlPolicy,type=Page</depends>
+ <depends
+ optional-attribute-name="UIServer"
+ proxy-type="attribute">portal:service=UIServer</depends>
</mbean>
<!-- The controller factory -->
@@ -1286,5 +1289,24 @@
optional-attribute-name="JBossAppEntityResolver"
proxy-type="attribute">portal:service=EntityResolver</depends>
</mbean>
-
+
+ <!-- Using the new UIServer -->
+ <mbean
+ code="org.jboss.portal.uiserver.UIServerImpl"
+ name="portal:service=UIServer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <!--
+ A map of some UIIndicator object provided from the Controller Layer to the corresponding Client Side
+ UI technology which will be used to handle the UI related tasks
+ -->
+ <attribute name="ClientUiConfig">
+ <properties>
+ <entry key="org.jboss.portal.uiserver.UIServerPageRendition">org.jboss.portal.uiserver.ClassicUI</entry>
+ <entry key="org.jboss.portal.theme.impl.render.dynamic.response.UpdatePageStateResponse">org.jboss.portal.uiserver.PartialRefreshUI</entry>
+ <entry key="org.jboss.portal.theme.impl.render.dynamic.response.UpdatePageLocationResponse">org.jboss.portal.uiserver.PartialRefreshUI</entry>
+ </properties>
+ </attribute>
+ </mbean>
</server>
Added: trunk/uiserver/build.bat
===================================================================
--- trunk/uiserver/build.bat (rev 0)
+++ trunk/uiserver/build.bat 2007-07-05 22:03:29 UTC (rev 7672)
@@ -0,0 +1,54 @@
+@echo off
+rem
+rem Invokes a script of the same name in the 'tools' module.
+rem
+rem The 'tools' module is expected to be a peer directory of the directory
+rem in which this script lives.
+rem
+rem @author Jason Dillon <jason(a)planet57.com>
+rem
+
+rem $Id: build.bat 1015 2005-11-04 20:15:13Z mholzner $
+
+setlocal
+
+set PROGNAME=%~nx0
+set DIRNAME=%~dp0
+
+rem Legacy shell support
+if x%PROGNAME%==x set PROGNAME=build.bat
+if x%DIRNAME%==x set DIRNAME=.\
+
+set MODULE_ROOT=%DIRNAME%
+if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools
+set TARGET=%TOOLS_ROOT%\bin\build.bat
+set ARGS=%*
+
+rem Start'er up yo
+goto main
+
+:debug
+if not x%DEBUG%==x echo %PROGNAME%: %*
+goto :EOF
+
+:main
+call :debug PROGNAME=%PROGNAME%
+call :debug DIRNAME=%DIRNAME%
+call :debug TOOLS_ROOT=%TOOLS_ROOT%
+call :debug TARGET=%TARGET%
+
+if exist %TARGET% call :call-script & goto :EOF
+rem else fail, we can not go on
+
+echo %PROGNAME%: *ERROR* The target executable does not exist:
+echo %PROGNAME%:
+echo %PROGNAME%: %TARGET%
+echo %PROGNAME%:
+echo %PROGNAME%: Please make sure you have checked out the 'tools' module
+echo %PROGNAME%: and make sure it is up to date.
+goto :EOF
+
+:call-script
+call :debug Executing %TARGET% %ARGS%
+call %TARGET% %ARGS%
+goto :EOF
Property changes on: trunk/uiserver/build.bat
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/uiserver/build.sh
===================================================================
--- trunk/uiserver/build.sh (rev 0)
+++ trunk/uiserver/build.sh 2007-07-05 22:03:29 UTC (rev 7672)
@@ -0,0 +1,49 @@
+#!/bin/sh
+##
+## Invokes a script of the same name in the 'tools' module.
+##
+## The 'tools' module is expected to be a peer directory of the directory
+## in which this script lives.
+##
+## @author Jason Dillon <jason(a)planet57.com>
+##
+
+# $Id: build.sh 1015 2005-11-04 20:15:13Z mholzner $
+
+PROGNAME=`basename $0`
+DIRNAME=`dirname $0`
+
+# Buss it yo
+main() {
+ if [ "x$TOOLS_ROOT" = "x" ]; then
+ TOOLS_ROOT=`cd $DIRNAME/../tools && pwd`
+ fi
+
+ MODULE_ROOT=`cd $DIRNAME; pwd`
+ export TOOLS_ROOT MODULE_ROOT DEBUG TRACE
+
+ # Where is the target script?
+ target="$TOOLS_ROOT/bin/$PROGNAME"
+ if [ ! -f "$target" ]; then
+ echo "${PROGNAME}: *ERROR* The target executable does not exist:"
+ echo "${PROGNAME}:"
+ echo "${PROGNAME}: $target"
+ echo "${PROGNAME}:"
+ echo "${PROGNAME}: Please make sure you have checked out the 'tools' module"
+ echo "${PROGNAME}: and make sure it is up to date."
+ exit 2
+ fi
+
+ # Get busy yo!
+ if [ "x$DEBUG" != "x" ]; then
+ echo "${PROGNAME}: Executing: /bin/sh $target $@"
+ fi
+ if [ "x$TRACE" = "x" ]; then
+ exec /bin/sh $target "$@"
+ else
+ exec /bin/sh -x $target "$@"
+ fi
+}
+
+# Lets get ready to rumble!
+main "$@"
Property changes on: trunk/uiserver/build.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/uiserver/build.xml
===================================================================
--- trunk/uiserver/build.xml (rev 0)
+++ trunk/uiserver/build.xml 2007-07-05 22:03:29 UTC (rev 7672)
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE project [
+ <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
+ <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
+ <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
+ <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
+ <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
+ ]>
+
+<!--+======================================================================+-->
+<!--| JBoss Portal (The OpenSource Portal) Build File |-->
+<!--| |-->
+<!--| Distributable under LGPL license. |-->
+<!--| See terms of license at http://www.gnu.org. |-->
+<!--| |-->
+<!--| This file has been designed to work with the 'tools' module and |-->
+<!--| Buildmagic extentions. |-->
+<!--+======================================================================+-->
+
+<project default="main" name="JBoss Portal">
+
+ <!--+====================================================================+-->
+ <!--| Setup |-->
+ <!--| |-->
+ <!--| Include the common build elements. |-->
+ <!--| |-->
+ <!--| This defines several different targets, properties and paths. |-->
+ <!--| It also sets up the basic extention tasks amoung other things. |-->
+ <!--+====================================================================+-->
+
+ &buildmagic;
+ &modules;
+ &defaults;
+ &tools;
+ &targets;
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Initialize the build system. Must depend on '_buildmagic:init'.
+ | Other targets should depend on 'init' or things will mysteriously fail.
+ -->
+
+ <target name="init" unless="init.disable" depends="_buildmagic:init">
+ </target>
+
+ <!--+====================================================================+-->
+ <!--| Configuration |-->
+ <!--| |-->
+ <!--| This target is invoked by the Buildmagic initialization logic |-->
+ <!--| and should contain module specific configuration elements. |-->
+ <!--+====================================================================+-->
+
+ <target name="configure" unless="configure.disable">
+
+ <!-- Configure some properties -->
+ <property name="jboss-junit-configuration" value=""/>
+ <property name="junit.formatter.usefile" value="true"/>
+
+ <!-- Configure thirdparty libraries -->
+ &libraries;
+
+ <path id="library.classpath">
+ <path refid="jbossas/core.libs.classpath"/>
+ <path refid="sun.servlet.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ </path>
+
+ <!-- Configure modules -->
+ <call target="configure-modules"/>
+ <path id="dependentmodule.classpath">
+ <path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
+ <path refid="jboss.portal-server.classpath"/>
+ <path refid="jboss.portal-theme.classpath"/>
+ <path refid="jboss.portal-web.classpath"/>
+ </path>
+
+ <!--+=======================================+-->
+ <!--| Override any default properties here. |-->
+ <!--+=======================================+-->
+
+ <!-- Configure defaults & build tools -->
+ <call target="configure-defaults"/>
+ <call target="configure-tools"/>
+ <call target="configure-explode"/>
+ <call target="configure-jbossaop"/>
+
+ <!--+=======================================+-->
+ <!--| Define module specific elements here. |-->
+ <!--+=======================================+-->
+ <property name="javadoc.private" value="true"/>
+ <property name="javadoc.protected" value="false"/>
+
+ <path id="hibernate.classpath">
+ <path refid="apache.commons.classpath"/>
+ <path refid="asm.asm.classpath"/>
+ <path refid="cglib.cglib.classpath"/>
+ <path refid="antlr.antlr.classpath"/>
+ <path refid="odmg.odmg.classpath"/>
+ <path refid="ehcache.ehcache.classpath"/>
+ <path refid="hibernate.hibernate.classpath"/>
+ </path>
+
+ <path id="aop.classpath">
+ <pathelement path="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
+ <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
+ <path refid="javassist.javassist.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="trove.trove.classpath"/>
+ <path refid="qdox.qdox.classpath"/>
+ </path>
+
+ <taskdef name="explode"
+ classname="org.jboss.portal.common.ant.Explode"
+ classpathref="explode.task.classpath"/>
+ <taskdef name="implode"
+ classname="org.jboss.portal.common.ant.Implode"
+ classpathref="explode.task.classpath"/>
+
+ </target>
+
+ <target name="configure-explode">
+ <path id="explode.task.classpath">
+ <pathelement location="${project.tools}/lib/explode.jar"/>
+ <path refid="apache.ant.classpath"/>
+ </path>
+ <taskdef
+ name="explode"
+ classname="org.jboss.portal.common.ant.Explode"
+ classpathref="explode.task.classpath"/>
+ </target>
+
+ <target name="configure-jbossaop">
+ <path id="jbossaop.task.classpath">
+ <path refid="jboss.aop.classpath"/>
+ <path refid="javassist.javassist.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="trove.trove.classpath"/>
+ <path refid="qdox.qdox.classpath"/>
+ </path>
+ <taskdef
+ name="aopc"
+ classname="org.jboss.aop.ant.AopC"
+ classpathref="jbossaop.task.classpath"/>
+ </target>
+
+ <!--+====================================================================+-->
+ <!--| Compile |-->
+ <!--| |-->
+ <!--| This target should depend on other compile-* targets for each |-->
+ <!--| different type of compile that needs to be performed, short of |-->
+ <!--| documentation compiles. |-->
+ <!--+====================================================================+-->
+
+ <target name="compile"
+ description="Compile all source files."
+ depends="_default:compile-classes,
+ _default:compile-etc,
+ _default:compile-resources">
+ </target>
+
+ <!--+====================================================================+-->
+ <!--| Generate Output |-->
+ <!--| |-->
+ <!--| Generates the target output for this module. Target output is |-->
+ <!--| the output which is ment to be released or used by external |-->
+ <!--| modules. |-->
+ <!--+====================================================================+-->
+
+ <target name="artifacts"
+ description="Generate all target output."
+ depends="compile">
+
+ <mkdir dir="${build.lib}"/>
+
+ <!-- portal-uiserver-lib.jar -->
+ <jar jarfile="${build.lib}/portal-uiserver-lib.jar">
+ <fileset dir="${build.classes}">
+ </fileset>
+ <fileset dir="../portlet/output/classes">
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="output" depends="artifacts">
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Cleaning -->
+ <!-- ================================================================== -->
+
+ <!-- Clean up all build output -->
+ <target name="clean" depends="_default:clean">
+ <!-- Add module specific elements here. -->
+ </target>
+
+ <!--+====================================================================+-->
+ <!--| Documents |-->
+ <!--| |-->
+ <!--| Generate all documentation for this module. |-->
+ <!--+====================================================================+-->
+
+ <target name="docs" depends="_default:docs">
+ <!-- Add module specific elements here. -->
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Misc. -->
+ <!-- ================================================================== -->
+
+ <target name="main" depends="most"/>
+ <target name="all" depends="_default:all"/>
+ <target name="most" depends="_default:most"/>
+ <target name="help" depends="_default:help"/>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+</project>
Property changes on: trunk/uiserver/build.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/uiserver/src/main/org/jboss/portal/uiserver/ClassicUI.java
===================================================================
--- trunk/uiserver/src/main/org/jboss/portal/uiserver/ClassicUI.java (rev 0)
+++ trunk/uiserver/src/main/org/jboss/portal/uiserver/ClassicUI.java 2007-07-05 22:03:29 UTC (rev 7672)
@@ -0,0 +1,52 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.uiserver;
+
+import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.web.ServletContextDispatcher;
+import org.jboss.portal.common.util.MarkupInfo;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ *
+ */
+public class ClassicUI implements ClientUI
+{
+ /**
+ *
+ * @param request
+ */
+ public void sendResponse(UIServerRequest request) throws Exception
+ {
+ ServerInvocation invocation = (ServerInvocation)request.getAttribute(UIServerRequest.SERVER_INVOCATION);
+ UIServerPageRendition rendition = (UIServerPageRendition)request.getAttribute(UIServerRequest.UI_INDICATOR);
+
+ ServletContextDispatcher dispatcher = new ServletContextDispatcher(invocation.getServerContext().getClientRequest(),
+ invocation.getServerContext().getClientResponse(),
+ invocation.getRequest().getServer().getServletContainerContext());
+
+ MarkupInfo markupInfo = (MarkupInfo)invocation.getResponse().getContentInfo();
+
+ rendition.render(markupInfo, dispatcher);
+ }
+}
Added: trunk/uiserver/src/main/org/jboss/portal/uiserver/ClientUI.java
===================================================================
--- trunk/uiserver/src/main/org/jboss/portal/uiserver/ClientUI.java (rev 0)
+++ trunk/uiserver/src/main/org/jboss/portal/uiserver/ClientUI.java 2007-07-05 22:03:29 UTC (rev 7672)
@@ -0,0 +1,36 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.uiserver;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ *
+ */
+public interface ClientUI
+{
+ /**
+ *
+ * @param request
+ */
+ public void sendResponse(UIServerRequest request) throws Exception;
+}
Added: trunk/uiserver/src/main/org/jboss/portal/uiserver/PartialRefreshUI.java
===================================================================
--- trunk/uiserver/src/main/org/jboss/portal/uiserver/PartialRefreshUI.java (rev 0)
+++ trunk/uiserver/src/main/org/jboss/portal/uiserver/PartialRefreshUI.java 2007-07-05 22:03:29 UTC (rev 7672)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.uiserver;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.portal.server.ServerInvocation;
+
+import org.jboss.portal.theme.impl.render.dynamic.JSONMarshaller;
+import org.jboss.portal.theme.impl.render.dynamic.DynaResponse;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ *
+ */
+public class PartialRefreshUI implements ClientUI
+{
+ /**
+ *
+ */
+ private static final JSONMarshaller marshaller = new JSONMarshaller();
+
+ /**
+ *
+ */
+ public void sendResponse(UIServerRequest request) throws Exception
+ {
+ ServerInvocation serverInvocation = (ServerInvocation)request.getAttribute(UIServerRequest.SERVER_INVOCATION);
+ HttpServletResponse resp = serverInvocation.getServerContext().getClientResponse();
+ DynaResponse dynaResponse = (DynaResponse)request.getAttribute(UIServerRequest.UI_INDICATOR);
+
+ resp.setContentType("text/html");
+ marshaller.write(dynaResponse, resp.getWriter());
+ }
+}
Added: trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServer.java
===================================================================
--- trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServer.java (rev 0)
+++ trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServer.java 2007-07-05 22:03:29 UTC (rev 7672)
@@ -0,0 +1,36 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.uiserver;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ *
+ */
+public interface UIServer
+{
+ /**
+ *
+ * @param uiServerContext
+ */
+ public void aggregate(UIServerRequest uiServerRequest);
+}
Added: trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServerImpl.java
===================================================================
--- trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServerImpl.java (rev 0)
+++ trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServerImpl.java 2007-07-05 22:03:29 UTC (rev 7672)
@@ -0,0 +1,141 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.uiserver;
+
+import java.util.Map;
+import java.util.Iterator;
+import java.util.HashMap;
+import java.util.Properties;
+
+import org.w3c.dom.Element;
+import org.apache.log4j.Logger;
+
+import org.jboss.portal.common.xml.XMLTools;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ *
+ */
+public class UIServerImpl extends AbstractJBossService implements UIServer
+{
+ /**
+ *
+ */
+ private static Logger log = Logger.getLogger(UIServerImpl.class);
+
+ /**
+ * A map of some UIIndicator object provided from the Controller Layer to the corresponding Client Side
+ * UI technology which will be used to handle the UI related tasks
+ */
+ private Map clientUiConfig = null;
+
+
+ /**
+ *
+ *
+ */
+ public UIServerImpl()
+ {
+ this.clientUiConfig = new HashMap();
+ }
+
+ /**
+ *
+ */
+ protected void startService() throws Exception
+ {
+ super.startService();
+ }
+
+ /**
+ *
+ */
+ protected void stopService() throws Exception
+ {
+ super.stopService();
+ this.clientUiConfig = null;
+ }
+
+
+ /**
+ * Used to register the different Client side UI technologies supported by the Portal
+ *
+ * @param clientUiConfig
+ */
+ public void setClientUiConfig(Element clientUiConfigElement)
+ {
+ try
+ {
+ Properties properties = XMLTools.loadXMLProperties(clientUiConfigElement);
+ if(properties != null)
+ {
+ for(Iterator itr=properties.keySet().iterator();itr.hasNext();)
+ {
+ String key = (String)itr.next();
+ String value = (String)properties.get(key);
+
+ this.clientUiConfig.put(key,
+ Thread.currentThread().getContextClassLoader().loadClass(value).newInstance());
+ }
+ }
+ }
+ catch(Exception e)
+ {
+ log.error(this,e);
+ try
+ {
+ this.stopService();
+ }
+ catch(Exception ex)
+ {
+ //Dont worry about it...we tried to stop it..
+ //Just cleanup now and proceed
+ this.clientUiConfig = null;
+ }
+ throw new RuntimeException(e);
+ }
+ }
+ //--------UIServer implementation----------------------------------------------------------------------------------------------------
+ /**
+ *
+ */
+ public void aggregate(UIServerRequest uiServerRequest)
+ {
+ try
+ {
+ Object uiIndicator = uiServerRequest.getAttribute(UIServerRequest.UI_INDICATOR);
+
+ //Lookup the client UI that should be used to handle the aggregation/response back to the Client
+ ClientUI clientUI = (ClientUI)this.clientUiConfig.get(uiIndicator.getClass().getName());
+
+ //Actually send an aggregated response back to the Client
+ clientUI.sendResponse(uiServerRequest);
+ }
+ catch(Exception e)
+ {
+ log.error(this,e);
+ throw new RuntimeException(e);
+ }
+ }
+}
Added: trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServerPageRendition.java
===================================================================
--- trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServerPageRendition.java (rev 0)
+++ trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServerPageRendition.java 2007-07-05 22:03:29 UTC (rev 7672)
@@ -0,0 +1,104 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.uiserver;
+
+import org.jboss.portal.theme.PageService;
+import org.jboss.portal.theme.render.RendererContext;
+import org.jboss.portal.theme.render.RenderException;
+import org.jboss.portal.theme.render.ThemeContext;
+import org.jboss.portal.theme.PortalLayout;
+import org.jboss.portal.theme.PortalTheme;
+import org.jboss.portal.theme.page.PageResult;
+import org.jboss.portal.common.util.MarkupInfo;
+import org.jboss.portal.web.ServletContextDispatcher;
+
+import javax.servlet.ServletException;
+import java.io.IOException;
+
+/**
+ * Should not be a controller response, but it comes from legacy design.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class UIServerPageRendition
+{
+
+ /** . */
+ private PortalLayout layout;
+
+ /** . */
+ private PageResult pageResult;
+
+ /** . */
+ private PortalTheme theme;
+
+ /** . */
+ private PageService pageService;
+
+ public UIServerPageRendition(
+ PortalLayout layout,
+ PortalTheme theme,
+ PageResult markupResult,
+ PageService pageService)
+ {
+ this.layout = layout;
+ this.theme = theme;
+ this.pageResult = markupResult;
+ this.pageService = pageService;
+ }
+
+ /** Performs the page rendition. */
+ public void render(MarkupInfo markupInfo, ServletContextDispatcher dispatcher) throws IOException, ServletException
+ {
+ // Compute correct content type response header
+// String contentType = rendererContext.getContentType() + "; charset=" + rendererContext.getCharset();
+ String contentType = markupInfo.getContentType() + "; charset=" + markupInfo.getCharset();
+
+ // Set charset and content type on the response
+ dispatcher.getResponse().setContentType(contentType);
+ dispatcher.getResponse().setCharacterEncoding(markupInfo.getCharset());
+
+
+ //
+ ThemeContext themeContext = new ThemeContext(theme, pageService.getThemeService());
+
+ //
+ RendererContext rendererContext = layout.getRenderContext(themeContext, markupInfo, dispatcher);
+
+ //
+ try
+ {
+ rendererContext.render(pageResult);
+ }
+ catch (RenderException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ public PageResult getPageResult()
+ {
+ return pageResult;
+ }
+}
Added: trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServerRequest.java
===================================================================
--- trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServerRequest.java (rev 0)
+++ trunk/uiserver/src/main/org/jboss/portal/uiserver/UIServerRequest.java 2007-07-05 22:03:29 UTC (rev 7672)
@@ -0,0 +1,94 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.uiserver;
+
+import java.io.Serializable;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ *
+ */
+public class UIServerRequest implements Serializable
+{
+ public static final String UI_INDICATOR = "uiIndicator";
+ public static final String SERVER_INVOCATION = "serverInvocation";
+
+ /**
+ *
+ */
+ private Map attributes = null;
+
+ /**
+ *
+ *
+ */
+ public UIServerRequest()
+ {
+ this.attributes = new HashMap();
+ }
+
+ /**
+ *
+ * @param name
+ * @param value
+ */
+ public void setAttribute(String name,Object value)
+ {
+ if(name == null)
+ {
+ throw new IllegalArgumentException("Attribute Name cannot be null");
+ }
+
+ if(value == null)
+ {
+ this.removeAttribute(name);
+ return;
+ }
+
+ this.attributes.put(name, value);
+ }
+
+ /**
+ *
+ * @param name
+ * @return
+ */
+ public Object getAttribute(String name)
+ {
+ return this.attributes.get(name);
+ }
+
+ /**
+ *
+ * @param name
+ */
+ public void removeAttribute(String name)
+ {
+ if(this.attributes.containsKey(name))
+ {
+ this.attributes.remove(name);
+ }
+ }
+}
16 years, 12 months
- 1
- 0
JBoss Portal SVN: r7671 - branches/JBoss_Portal_Branch_2_6/testsuite.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-07-05 17:50:44 -0400 (Thu, 05 Jul 2007)
New Revision: 7671
Added:
branches/JBoss_Portal_Branch_2_6/testsuite/build.bat
branches/JBoss_Portal_Branch_2_6/testsuite/build.sh
Log:
add shell scripts to testsuite module
Added: branches/JBoss_Portal_Branch_2_6/testsuite/build.bat
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/build.bat (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/build.bat 2007-07-05 21:50:44 UTC (rev 7671)
@@ -0,0 +1,54 @@
+@echo off
+rem
+rem Invokes a script of the same name in the 'tools' module.
+rem
+rem The 'tools' module is expected to be a peer directory of the directory
+rem in which this script lives.
+rem
+rem @author Jason Dillon <jason(a)planet57.com>
+rem
+
+rem $Id: build.bat 21 2005-01-14 23:14:21Z vietj $
+
+setlocal
+
+set PROGNAME=%~nx0
+set DIRNAME=%~dp0
+
+rem Legacy shell support
+if x%PROGNAME%==x set PROGNAME=build.bat
+if x%DIRNAME%==x set DIRNAME=.\
+
+set MODULE_ROOT=%DIRNAME%
+if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools
+set TARGET=%TOOLS_ROOT%\bin\build.bat
+set ARGS=%*
+
+rem Start'er up yo
+goto main
+
+:debug
+if not x%DEBUG%==x echo %PROGNAME%: %*
+goto :EOF
+
+:main
+call :debug PROGNAME=%PROGNAME%
+call :debug DIRNAME=%DIRNAME%
+call :debug TOOLS_ROOT=%TOOLS_ROOT%
+call :debug TARGET=%TARGET%
+
+if exist %TARGET% call :call-script & goto :EOF
+rem else fail, we can not go on
+
+echo %PROGNAME%: *ERROR* The target executable does not exist:
+echo %PROGNAME%:
+echo %PROGNAME%: %TARGET%
+echo %PROGNAME%:
+echo %PROGNAME%: Please make sure you have checked out the 'tools' module
+echo %PROGNAME%: and make sure it is up to date.
+goto :EOF
+
+:call-script
+call :debug Executing %TARGET% %ARGS%
+call %TARGET% %ARGS%
+goto :EOF
Property changes on: branches/JBoss_Portal_Branch_2_6/testsuite/build.bat
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/JBoss_Portal_Branch_2_6/testsuite/build.sh
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/build.sh (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/build.sh 2007-07-05 21:50:44 UTC (rev 7671)
@@ -0,0 +1,49 @@
+#!/bin/sh
+##
+## Invokes a script of the same name in the 'tools' module.
+##
+## The 'tools' module is expected to be a peer directory of the directory
+## in which this script lives.
+##
+## @author Jason Dillon <jason(a)planet57.com>
+##
+
+# $Id: build.sh 21 2005-01-14 23:14:21Z vietj $
+
+PROGNAME=`basename $0`
+DIRNAME=`dirname $0`
+
+# Buss it yo
+main() {
+ if [ "x$TOOLS_ROOT" = "x" ]; then
+ TOOLS_ROOT=`cd $DIRNAME/../tools && pwd`
+ fi
+
+ MODULE_ROOT=`cd $DIRNAME; pwd`
+ export TOOLS_ROOT MODULE_ROOT DEBUG TRACE
+
+ # Where is the target script?
+ target="$TOOLS_ROOT/bin/$PROGNAME"
+ if [ ! -f "$target" ]; then
+ echo "${PROGNAME}: *ERROR* The target executable does not exist:"
+ echo "${PROGNAME}:"
+ echo "${PROGNAME}: $target"
+ echo "${PROGNAME}:"
+ echo "${PROGNAME}: Please make sure you have checked out the 'tools' module"
+ echo "${PROGNAME}: and make sure it is up to date."
+ exit 2
+ fi
+
+ # Get busy yo!
+ if [ "x$DEBUG" != "x" ]; then
+ echo "${PROGNAME}: Executing: /bin/sh $target $@"
+ fi
+ if [ "x$TRACE" = "x" ]; then
+ exec /bin/sh $target "$@"
+ else
+ exec /bin/sh -x $target "$@"
+ fi
+}
+
+# Lets get ready to rumble!
+main "$@"
Property changes on: branches/JBoss_Portal_Branch_2_6/testsuite/build.sh
___________________________________________________________________
Name: svn:executable
+ *
16 years, 12 months
- 1
- 0
JBoss Portal SVN: r7670 - trunk/testsuite.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-07-05 17:49:48 -0400 (Thu, 05 Jul 2007)
New Revision: 7670
Added:
trunk/testsuite/build.bat
trunk/testsuite/build.sh
Log:
add shell scripts to testsuite module
Added: trunk/testsuite/build.bat
===================================================================
--- trunk/testsuite/build.bat (rev 0)
+++ trunk/testsuite/build.bat 2007-07-05 21:49:48 UTC (rev 7670)
@@ -0,0 +1,54 @@
+@echo off
+rem
+rem Invokes a script of the same name in the 'tools' module.
+rem
+rem The 'tools' module is expected to be a peer directory of the directory
+rem in which this script lives.
+rem
+rem @author Jason Dillon <jason(a)planet57.com>
+rem
+
+rem $Id: build.bat 21 2005-01-14 23:14:21Z vietj $
+
+setlocal
+
+set PROGNAME=%~nx0
+set DIRNAME=%~dp0
+
+rem Legacy shell support
+if x%PROGNAME%==x set PROGNAME=build.bat
+if x%DIRNAME%==x set DIRNAME=.\
+
+set MODULE_ROOT=%DIRNAME%
+if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools
+set TARGET=%TOOLS_ROOT%\bin\build.bat
+set ARGS=%*
+
+rem Start'er up yo
+goto main
+
+:debug
+if not x%DEBUG%==x echo %PROGNAME%: %*
+goto :EOF
+
+:main
+call :debug PROGNAME=%PROGNAME%
+call :debug DIRNAME=%DIRNAME%
+call :debug TOOLS_ROOT=%TOOLS_ROOT%
+call :debug TARGET=%TARGET%
+
+if exist %TARGET% call :call-script & goto :EOF
+rem else fail, we can not go on
+
+echo %PROGNAME%: *ERROR* The target executable does not exist:
+echo %PROGNAME%:
+echo %PROGNAME%: %TARGET%
+echo %PROGNAME%:
+echo %PROGNAME%: Please make sure you have checked out the 'tools' module
+echo %PROGNAME%: and make sure it is up to date.
+goto :EOF
+
+:call-script
+call :debug Executing %TARGET% %ARGS%
+call %TARGET% %ARGS%
+goto :EOF
Property changes on: trunk/testsuite/build.bat
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/testsuite/build.sh
===================================================================
--- trunk/testsuite/build.sh (rev 0)
+++ trunk/testsuite/build.sh 2007-07-05 21:49:48 UTC (rev 7670)
@@ -0,0 +1,49 @@
+#!/bin/sh
+##
+## Invokes a script of the same name in the 'tools' module.
+##
+## The 'tools' module is expected to be a peer directory of the directory
+## in which this script lives.
+##
+## @author Jason Dillon <jason(a)planet57.com>
+##
+
+# $Id: build.sh 21 2005-01-14 23:14:21Z vietj $
+
+PROGNAME=`basename $0`
+DIRNAME=`dirname $0`
+
+# Buss it yo
+main() {
+ if [ "x$TOOLS_ROOT" = "x" ]; then
+ TOOLS_ROOT=`cd $DIRNAME/../tools && pwd`
+ fi
+
+ MODULE_ROOT=`cd $DIRNAME; pwd`
+ export TOOLS_ROOT MODULE_ROOT DEBUG TRACE
+
+ # Where is the target script?
+ target="$TOOLS_ROOT/bin/$PROGNAME"
+ if [ ! -f "$target" ]; then
+ echo "${PROGNAME}: *ERROR* The target executable does not exist:"
+ echo "${PROGNAME}:"
+ echo "${PROGNAME}: $target"
+ echo "${PROGNAME}:"
+ echo "${PROGNAME}: Please make sure you have checked out the 'tools' module"
+ echo "${PROGNAME}: and make sure it is up to date."
+ exit 2
+ fi
+
+ # Get busy yo!
+ if [ "x$DEBUG" != "x" ]; then
+ echo "${PROGNAME}: Executing: /bin/sh $target $@"
+ fi
+ if [ "x$TRACE" = "x" ]; then
+ exec /bin/sh $target "$@"
+ else
+ exec /bin/sh -x $target "$@"
+ fi
+}
+
+# Lets get ready to rumble!
+main "$@"
Property changes on: trunk/testsuite/build.sh
___________________________________________________________________
Name: svn:executable
+ *
16 years, 12 months
- 1
- 0
JBoss Portal SVN: r7669 - branches/JBoss_Portal_Branch_2_6/demo.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-05 07:11:16 -0400 (Thu, 05 Jul 2007)
New Revision: 7669
Added:
branches/JBoss_Portal_Branch_2_6/demo/.project
Log:
Eclipse project file
Added: branches/JBoss_Portal_Branch_2_6/demo/.project
===================================================================
--- branches/JBoss_Portal_Branch_2_6/demo/.project (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/demo/.project 2007-07-05 11:11:16 UTC (rev 7669)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>demo</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
16 years, 12 months
- 1
- 0
JBoss Portal SVN: r7668 - in trunk: theme/src/bin/portal-ajax-war/dyna and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-04 19:21:44 -0400 (Wed, 04 Jul 2007)
New Revision: 7668
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
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
Log:
Apply fixes from 2.6 Branch. Fixing: JBPORTAL-1531, JBPORTAL-1526
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-07-04 23:09:48 UTC (rev 7667)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-07-04 23:21:44 UTC (rev 7668)
@@ -33,7 +33,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlAccessDenied.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.pageControlAccessDenied.inherit}"
value="#{properties.pageControlAccessDenied.inherited}"/>inherit action
from parent
@@ -51,7 +51,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlUnavailable.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.pageControlUnavailable.inherit}"
value="#{properties.pageControlUnavailable.inherited}"/>inherit action
from parent
@@ -69,7 +69,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlError.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.pageControlError.inherit}"
value="#{properties.pageControlError.inherited}"/>inherit action from
parent
@@ -87,7 +87,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlInternalError.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.pageControlInternalError.inherit}"
value="#{properties.pageControlInternalError.inherited}"/>inherit action
from parent
@@ -105,7 +105,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlNotFound.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.pageControlNotFound.inherit}"
value="#{properties.pageControlNotFound.inherited}"/>inherit action from
parent
@@ -123,7 +123,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlResourceURI.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.pageControlResourceURI.inherit}"
value="#{properties.pageControlResourceURI.inherited}"/>inherit action
from parent
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-04 23:09:48 UTC (rev 7667)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-04 23:21:44 UTC (rev 7668)
@@ -114,11 +114,11 @@
value="#{pageManager.windowItemsMap[regionName]}"/>
</h:selectManyListbox>
</td>
- <td valign="top">
+ <td valign="top" width="250">
<h:commandButton
value="Up" id="u_#{regionName}"
actionListener="#{pageManager.assignWindows}"
- styleClass="portlet-form-button layout-button"/>
+ styleClass="portlet-form-button layout-button"/><br/>
<h:commandButton
value="Down" id="d_#{regionName}"
actionListener="#{pageManager.assignWindows}"
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-07-04 23:09:48 UTC (rev 7667)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-07-04 23:21:44 UTC (rev 7668)
@@ -33,7 +33,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlAccessDenied.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.portalControlAccessDenied.inherit}"
value="#{properties.portalControlAccessDenied.inherited}"/>inherit
action from parent
@@ -52,7 +52,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlUnavailable.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.portalControlUnavailable.inherit}"
value="#{properties.portalControlUnavailable.inherited}"/>inherit
action from parent
@@ -71,7 +71,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlError.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.portalControlError.inherit}"
value="#{properties.portalControlError.inherited}"/>inherit action from
parent
@@ -89,7 +89,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlInternalError.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.portalControlInternalError.inherit}"
value="#{properties.portalControlInternalError.inherited}"/>inherit
action from parent
@@ -108,7 +108,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlNotFound.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.portalControlNotFound.inherit}"
value="#{properties.portalControlNotFound.inherited}"/>inherit action
from parent
@@ -126,7 +126,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlResourceURI.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.portalControlResourceURI.inherit}"
value="#{properties.portalControlResourceURI.inherited}"/>inherit
action from parent
Modified: trunk/theme/src/bin/portal-ajax-war/dyna/style.css
===================================================================
--- trunk/theme/src/bin/portal-ajax-war/dyna/style.css 2007-07-04 23:09:48 UTC (rev 7667)
+++ trunk/theme/src/bin/portal-ajax-war/dyna/style.css 2007-07-04 23:21:44 UTC (rev 7668)
@@ -9,15 +9,9 @@
.dnd-handle {
cursor: move;
+ overflow: auto;
}
-.dnd-cleaner {
- clear:both;
- height:1px;
- margin: -1px 0 0 0; padding:0;
- border:none;
- visibility: hidden;
-}
.dnd-droppable {
border: red 1px dashed;
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-07-04 23:09:48 UTC (rev 7667)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-07-04 23:21:44 UTC (rev 7668)
@@ -71,9 +71,6 @@
//
delegate.render(rendererContext, drc);
- // Clear the float that the div decoration renderer uses which prevent the handle to cover fully the zone
- markup.print("<hr class=\"dnd-cleaner\"/>");
-
//
markup.print("</div>\n");
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-07-04 23:09:48 UTC (rev 7667)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-07-04 23:21:44 UTC (rev 7668)
@@ -77,9 +77,6 @@
//
doCatchClicks(rendererContext, prc);
- // Clear the float that the div decoration renderer uses which prevent the handle to cover fully the zone
- out.print("<hr class=\"dnd-cleaner\"/>");
-
//
out.print("</div>");
}
16 years, 12 months
- 1
- 0
JBoss Portal SVN: r7667 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-04 19:09:48 -0400 (Wed, 04 Jul 2007)
New Revision: 7667
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
Log:
remove style on checkbox, a checkbox is not a button (Ugly on IE, wasn't affected FF anyway)
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-07-04 21:51:56 UTC (rev 7666)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-07-04 23:09:48 UTC (rev 7667)
@@ -33,7 +33,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlAccessDenied.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.pageControlAccessDenied.inherit}"
value="#{properties.pageControlAccessDenied.inherited}"/>inherit action
from parent
@@ -51,7 +51,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlUnavailable.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.pageControlUnavailable.inherit}"
value="#{properties.pageControlUnavailable.inherited}"/>inherit action
from parent
@@ -69,7 +69,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlError.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.pageControlError.inherit}"
value="#{properties.pageControlError.inherited}"/>inherit action from
parent
@@ -87,7 +87,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlInternalError.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.pageControlInternalError.inherit}"
value="#{properties.pageControlInternalError.inherited}"/>inherit action
from parent
@@ -105,7 +105,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlNotFound.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.pageControlNotFound.inherit}"
value="#{properties.pageControlNotFound.inherited}"/>inherit action from
parent
@@ -123,7 +123,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlResourceURI.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.pageControlResourceURI.inherit}"
value="#{properties.pageControlResourceURI.inherited}"/>inherit action
from parent
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-07-04 21:51:56 UTC (rev 7666)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-07-04 23:09:48 UTC (rev 7667)
@@ -33,7 +33,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlAccessDenied.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.portalControlAccessDenied.inherit}"
value="#{properties.portalControlAccessDenied.inherited}"/>inherit
action from parent
@@ -52,7 +52,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlUnavailable.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.portalControlUnavailable.inherit}"
value="#{properties.portalControlUnavailable.inherited}"/>inherit
action from parent
@@ -71,7 +71,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlError.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.portalControlError.inherit}"
value="#{properties.portalControlError.inherited}"/>inherit action from
parent
@@ -89,7 +89,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlInternalError.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.portalControlInternalError.inherit}"
value="#{properties.portalControlInternalError.inherited}"/>inherit
action from parent
@@ -108,7 +108,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlNotFound.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.portalControlNotFound.inherit}"
value="#{properties.portalControlNotFound.inherited}"/>inherit action
from parent
@@ -126,7 +126,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlResourceURI.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onchange="submit();"
valueChangeListener="#{properties.portalControlResourceURI.inherit}"
value="#{properties.portalControlResourceURI.inherited}"/>inherit
action from parent
16 years, 12 months
- 1
- 0
JBoss Portal SVN: r7666 - in branches/JBoss_Portal_Branch_2_6/theme/src: main/org/jboss/portal/theme/impl/render/dynamic and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-04 17:51:56 -0400 (Wed, 04 Jul 2007)
New Revision: 7666
Modified:
branches/JBoss_Portal_Branch_2_6/theme/src/bin/portal-ajax-war/dyna/style.css
branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java
Log:
JBPORTAL-1531: Fix alignment problem on IE7
Modified: branches/JBoss_Portal_Branch_2_6/theme/src/bin/portal-ajax-war/dyna/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/theme/src/bin/portal-ajax-war/dyna/style.css 2007-07-04 15:57:35 UTC (rev 7665)
+++ branches/JBoss_Portal_Branch_2_6/theme/src/bin/portal-ajax-war/dyna/style.css 2007-07-04 21:51:56 UTC (rev 7666)
@@ -9,15 +9,9 @@
.dnd-handle {
cursor: move;
+ overflow: auto;
}
-.dnd-cleaner {
- clear:both;
- height:1px;
- margin: -1px 0 0 0; padding:0;
- border:none;
- visibility: hidden;
-}
.dnd-droppable {
border: red 1px dashed;
Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-07-04 15:57:35 UTC (rev 7665)
+++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-07-04 21:51:56 UTC (rev 7666)
@@ -71,9 +71,6 @@
//
delegate.render(rendererContext, drc);
- // Clear the float that the div decoration renderer uses which prevent the handle to cover fully the zone
- markup.print("<hr class=\"dnd-cleaner\"/>");
-
//
markup.print("</div>\n");
markup.print("</div>\n");
Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-07-04 15:57:35 UTC (rev 7665)
+++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-07-04 21:51:56 UTC (rev 7666)
@@ -77,9 +77,6 @@
//
doCatchClicks(rendererContext, prc);
- // Clear the float that the div decoration renderer uses which prevent the handle to cover fully the zone
- out.print("<hr class=\"dnd-cleaner\"/>");
-
//
out.print("</div>");
}
16 years, 12 months
- 1
- 0