Author: thomas.heute(a)jboss.com
Date: 2007-07-17 12:30:45 -0400 (Tue, 17 Jul 2007)
New Revision: 7804
Added:
trunk/build/etc/resources/
trunk/build/etc/resources/jboss-log4j.xml.diff
Removed:
trunk/build/etc/resources/jboss-log4j.xml.diff
Modified:
trunk/build/distrib.xml
trunk/core/src/bin/portal-core-war/layouts/3columns/index.jsp
trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/index.jsp
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/header/tabs.jsp
Log:
- Log4j patch for bundle version
- IE improvements
- JBPORTAL-1591: Fixed 3 columns layout
Modified: trunk/build/distrib.xml
===================================================================
--- trunk/build/distrib.xml 2007-07-17 16:16:32 UTC (rev 7803)
+++ trunk/build/distrib.xml 2007-07-17 16:30:45 UTC (rev 7804)
@@ -152,6 +152,10 @@
</sequential>
</target>
+ <target name="patch-log4j">
+ <patch
patchfile="${source.dir}/build/etc/resources/jboss-log4j.xml.diff"
originalfile="${todir}/conf/jboss-log4j.xml" strip="1"/>
+ </target>
+
<!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses
etc-->
<target name="package-bin" unless="no-doc">
<sequential>
@@ -178,6 +182,9 @@
<antcall target="package-ds">
<param name="todir" value="${todir}/setup"/>
</antcall>
+ <antcall target="package-samples">
+ <param name="todir" value="${todir}/samples"/>
+ </antcall>
<copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README"
todir="${todir}"/>
<copy todir="${todir}/docs/portal/licenses">
<fileset dir="output/docs/licenses"/>
@@ -282,6 +289,7 @@
<copy file="${docs.dir}/readmeFiles/jboss-portal-ha-bin.README"
todir="${portal.build.ha.bin}"/>
</target>
+
<!--
| JBoss Portal bundled distribution
-->
@@ -306,6 +314,10 @@
<include name="server/default/**"/>
</fileset>
</copy>
+ <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README"
todir="${portal.build.normal.bundled}"/>
+ <antcall target="patch-log4j">
+ <param name="todir"
value="${portal.build.normal.bundled}/server/default"/>
+ </antcall>
</target>
<!--
@@ -324,13 +336,17 @@
<copy todir="${portal.build.ha.bundled}">
<fileset dir="${jboss.home}">
<include name="bin/**"/>
- <include name="clients/**"/>
+ <include name="client/**"/>
<include name="docs/**"/>
<include name="lib/**"/>
<include name="server/all/**"/>
</fileset>
</copy>
<copy file="${docs.dir}/readmeFiles/jboss-portal-ha-bin.README"
todir="${portal.build.ha.bundled}"/>
+ <antcall target="patch-log4j">
+ <param name="todir"
value="${portal.build.normal.bundled}/server/default"/>
+ </antcall>
+
</target>
<!-- Create packages -->
Copied: trunk/build/etc/resources (from rev 7800,
branches/JBoss_Portal_Branch_2_6/build/etc/resources)
Deleted: trunk/build/etc/resources/jboss-log4j.xml.diff
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/etc/resources/jboss-log4j.xml.diff 2007-07-17
15:06:25 UTC (rev 7800)
+++ trunk/build/etc/resources/jboss-log4j.xml.diff 2007-07-17 16:30:45 UTC (rev 7804)
@@ -1,22 +0,0 @@
-diff -u conf.orig/jboss-log4j.xml conf/jboss-log4j.xml
---- conf.orig/jboss-log4j.xml 2007-07-16 23:56:32.000000000 +0200
-+++ conf/jboss-log4j.xml 2007-07-17 09:26:16.000000000 +0200
-@@ -164,6 +164,16 @@
- <priority value="INFO"/>
- </category>
-
-+ <!-- Hibernate got a bit too verbose in JBoss AS 4.2.1.GA -->
-+ <category name="org.hibernate.engine.loading.LoadContexts">
-+ <priority value="ERROR"/>
-+ </category>
-+
-+ <!-- JBoss Cache likes to talk a lot -->
-+ <category
name="org.jboss.cache.interceptors.CacheLoaderInterceptor">
-+ <priority value="ERROR"/>
-+ </category>
-+
- <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is
verbose -->
- <category name="org.jboss.serial">
- <priority value="INFO"/>
-Common subdirectories: conf.orig/props and conf/props
-Common subdirectories: conf.orig/xmdesc and conf/xmdesc
Copied: trunk/build/etc/resources/jboss-log4j.xml.diff (from rev 7800,
branches/JBoss_Portal_Branch_2_6/build/etc/resources/jboss-log4j.xml.diff)
===================================================================
--- trunk/build/etc/resources/jboss-log4j.xml.diff (rev 0)
+++ trunk/build/etc/resources/jboss-log4j.xml.diff 2007-07-17 16:30:45 UTC (rev 7804)
@@ -0,0 +1,22 @@
+diff -u conf.orig/jboss-log4j.xml conf/jboss-log4j.xml
+--- conf.orig/jboss-log4j.xml 2007-07-16 23:56:32.000000000 +0200
++++ conf/jboss-log4j.xml 2007-07-17 09:26:16.000000000 +0200
+@@ -164,6 +164,16 @@
+ <priority value="INFO"/>
+ </category>
+
++ <!-- Hibernate got a bit too verbose in JBoss AS 4.2.1.GA -->
++ <category name="org.hibernate.engine.loading.LoadContexts">
++ <priority value="ERROR"/>
++ </category>
++
++ <!-- JBoss Cache likes to talk a lot -->
++ <category
name="org.jboss.cache.interceptors.CacheLoaderInterceptor">
++ <priority value="ERROR"/>
++ </category>
++
+ <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is
verbose -->
+ <category name="org.jboss.serial">
+ <priority value="INFO"/>
+Common subdirectories: conf.orig/props and conf/props
+Common subdirectories: conf.orig/xmdesc and conf/xmdesc
Modified: trunk/core/src/bin/portal-core-war/layouts/3columns/index.jsp
===================================================================
--- trunk/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2007-07-17 16:16:32 UTC
(rev 7803)
+++ trunk/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2007-07-17 16:30:45 UTC
(rev 7804)
@@ -36,18 +36,20 @@
<div id="content-container">
<table>
<tr>
- <td valign="top">
+ <td valign="top" width="33%">
<!-- insert the content of the 'left' region of the page,
and assign the css selector id 'regionA' -->
<p:region regionName='left' regionID='left'/>
</td>
- <td valign="top">
+ <td valign="top" width="34%">
<!-- insert the content of the 'center' region of the page,
and assign the css selector id 'regionB' -->
<p:region regionName='center'
regionID='center'/>
</td>
- <td valign="top">
+ <td valign="top" width="33%">
<!-- insert the content of the 'center' region of the page,
and assign the css selector id 'regionC' -->
<p:region regionName='right' regionID='right'/>
</td>
+ </tr>
+ </table>
<hr class="cleaner"/>
</div>
</div>
Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-07-17
16:16:32 UTC (rev 7803)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-07-17
16:30:45 UTC (rev 7804)
@@ -278,12 +278,12 @@
padding: 5px 15px 3px 15px; /*background-image: url(../images/tab_left.gif);*/
background-repeat: no-repeat;
background-position: top left;
- width: 90px;
+ width: 110px;
white-space: nowrap;
}
ul#tabsHeader a:hover {
- text-decoration: underline;
+ text-decoration: none;
color: #000000; /*background-image: url(../images/tab_left_hover2.gif);*/
background-repeat: no-repeat;
background-position: top left;
@@ -292,11 +292,9 @@
ul#tabsHeader #current {
line-height: 22px;
- background-color: #fff;
background-image: url( images/tab_right_current.gif );
background-repeat: no-repeat;
background-position: right top;
- padding-top: -3px; /*border-bottom: 2px solid #fff;*/
}
ul#tabsHeader #current a, #current a:hover {
@@ -314,7 +312,7 @@
height: 0;
top: 0px;
left: 0;
- width: 150px;
+ width: 160px;
text-align: left;
margin: 0px;
padding: 0px;
@@ -322,6 +320,8 @@
}
ul#tabsHeader ul a {
+ text-decoration: none;
+
font: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
@@ -352,7 +352,7 @@
background: #DFE8ED;
color: #5078aa;
padding: 3px;
- width: 120px;
+ width: 160px;
border: 1px solid #98b7c6;
border-width: 0px 1px 1px 1px;
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/index.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/index.jsp 2007-07-17
16:16:32 UTC (rev 7803)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/index.jsp 2007-07-17
16:30:45 UTC (rev 7804)
@@ -46,11 +46,11 @@
output += parent;
%>
-<div class="portlet-form-field-label"><%= output
%></div></li>
+<div class="portlet-form-field-label"><%= output %></div>
<ul id="foldinglist">
<li class="pagenosub">
- <div class="portlet-form-field-label"><%= parent
%></div></li>
+ <div class="portlet-form-field-label"><%= parent
%></div>
</li>
<%
for(Iterator i = parentChildMap.keySet().iterator(); i.hasNext();)
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/header/tabs.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/header/tabs.jsp 2007-07-17
16:16:32 UTC (rev 7803)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/header/tabs.jsp 2007-07-17
16:30:45 UTC (rev 7804)
@@ -44,19 +44,17 @@
}
}
%>
- <li <% if(child == mainPage) out.println(" id=\"current\"");
%> onmouseover="this.className='hoverOn'"
onmouseout="this.className='hoverOff'"><a href="<%=
child.createURL(context) %>"><%= child.getDisplayName(locale) %>
-<%
+ <li <% if(child == mainPage) out.println(" id=\"current\"");
%> onmouseover="this.className='hoverOn'"
onmouseout="this.className='hoverOff'"><a href="<%=
child.createURL(context) %>"><%= child.getDisplayName(locale) %><%
if (tmp.size() == 0)
{
-%>
- </a>
+%></a>
<%
}
else
{
%>
<!--[if IE 7]><!--></a><!--<![endif]-->
- <!--[if lte IE 6]><table><tr><td><![endif]-->
+ <!--[if lte IE
6]> <table><tr><td><![endif]-->
<ul>
<%
for (Iterator j = tmp.iterator(); j.hasNext();)