Jira-ID: CRNT-26580

reverted following changes as with Icefaces patch IPP fails
- changes to adapt new IceFaces patch jars


git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@61585 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

3 files changed, 6 insertions, 7 deletions

diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml
index 6c6efae..8b80171 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml
@@ -91,7 +91,7 @@
 				title="#{(row.totalPriority eq 0) ? null: row.title}">

 				<pc:automationTag value="auto-BCC-ProcMgr-PrioDataTable-Total"

 					standAlone="false" />

-				<f:param name="selectedPriorityForDetails" value="" />

+				<f:param name="selectedPriorityForDetails" value="#{null}" />

 				<f:param name="selectedCriticalForDetails" value="#{false}" />

 			</ice:commandLink>

 		</ice:panelGroup>

@@ -102,7 +102,7 @@
 				title="#{(row.criticalTotalPriority eq 0) ? null: row.title}">

 				<pc:automationTag value="auto-BCC-ProcMgr-PrioDataTable-CritTotal"

 					standAlone="false" />

-				<f:param name="selectedPriorityForDetails" value="" />

+				<f:param name="selectedPriorityForDetails" value="#{null}" />

 				<f:param name="selectedCriticalForDetails" value="#{true}" />

 			</ice:commandLink>

 		</ice:panelGroup>

diff --git a/portal-common/etc/icefaces-ee-ivy-conf.xml b/portal-common/etc/icefaces-ee-ivy-conf.xml
index 8056bb2..cf0fc9f 100644
--- a/portal-common/etc/icefaces-ee-ivy-conf.xml
+++ b/portal-common/etc/icefaces-ee-ivy-conf.xml
@@ -23,7 +23,7 @@
    <publications/>

    

    <dependencies>

-      <dependency org="org.icefaces" name="icefaces-ee" rev="EE-1.8.2.GA_P05" conf="icefaces->default">

+      <dependency org="org.icefaces" name="icefaces-ee" rev="EE-1.8.2.GA_P04" conf="icefaces->default">

          <exclude org="javax.faces" module="jsf-api" />

          <exclude org="javax.faces" module="jsf-impl" />

          <exclude org="commons-logging" module="commons-logging-api"/>

@@ -37,10 +37,10 @@
          <exclude org="avalon-framework" module="avalon-framework" />

          <exclude org="log4j" module="log4j" />

       </dependency>

-      <dependency org="org.icefaces" name="icefaces-comps-ee" rev="EE-1.8.2.GA_P05" conf="icefaces->default">

+      <dependency org="org.icefaces" name="icefaces-comps-ee" rev="EE-1.8.2.GA_P04" conf="icefaces->default">

          <exclude org="org.icefaces" module="icefaces-ee" />

       </dependency>

-      <dependency org="org.icefaces" name="icefaces-facelets-ee" rev="EE-1.8.2.GA_P05" conf="icefaces->default">

+      <dependency org="org.icefaces" name="icefaces-facelets-ee" rev="EE-1.8.2.GA_P04" conf="icefaces->default">

          <exclude org="org.icefaces" module="icefaces-ee" />

       </dependency>

    </dependencies>

diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/View.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/View.java
index 47d864f..31b50ed 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/View.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/View.java
@@ -356,7 +356,7 @@ public class View extends AbstractUiElement implements TabScopeManager
       {

          idParams = viewKey; // Keep the backward compatibility

       }

-      idParams = (idParams == null) ? "" : idParams;

+      

       return idParams;

    }

 

@@ -472,7 +472,6 @@ public class View extends AbstractUiElement implements TabScopeManager
    public String getViewId()

    {

       String viewId = (definition == null) ? getId() : definition.getName();

-      viewId = (definition == null) ? "" : viewId;

       return viewId;

    }