gatein SVN: r5129 - exo/portal/branches/3.1.x/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2010-11-17 02:32:25 -0500 (Wed, 17 Nov 2010)
New Revision: 5129
Modified:
exo/portal/branches/3.1.x/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java
Log:
EXOGTN-52 Show gadget wrong after continue click Click here to add into categories link
Modified: exo/portal/branches/3.1.x/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java
===================================================================
--- exo/portal/branches/3.1.x/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java 2010-11-17 07:23:30 UTC (rev 5128)
+++ exo/portal/branches/3.1.x/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java 2010-11-17 07:32:25 UTC (rev 5129)
@@ -146,7 +146,14 @@
appInfo.getChild(UICategorySelector.class).setRendered(false);
UIApplicationRegistryPortlet uiPortlet = appInfo.getAncestorOfType(UIApplicationRegistryPortlet.class);
UIApplicationOrganizer uiOrganizer = uiPortlet.getChild(UIApplicationOrganizer.class);
+ UIGadgetManagement uiGadgetManagement = uiPortlet.getChild(UIGadgetManagement.class);
+
uiOrganizer.reload();
+ if (uiGadgetManagement != null)
+ {
+ uiGadgetManagement.setSelectedGadget(selector.getApplication().getApplicationName());
+ }
+
event.getRequestContext().addUIComponentToUpdateByAjax(appInfo);
}
14 years, 2 months
gatein SVN: r5128 - exo/portal/branches/3.1.x/component/scripting/src/test/java/org/exoplatform/groovyscript.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2010-11-17 02:23:30 -0500 (Wed, 17 Nov 2010)
New Revision: 5128
Modified:
exo/portal/branches/3.1.x/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java
Log:
EXOGTN-167 Fix TestTemplateRendering
Modified: exo/portal/branches/3.1.x/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java
===================================================================
--- exo/portal/branches/3.1.x/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java 2010-11-17 06:50:14 UTC (rev 5127)
+++ exo/portal/branches/3.1.x/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java 2010-11-17 07:23:30 UTC (rev 5128)
@@ -24,6 +24,8 @@
import java.awt.*;
import java.io.*;
+import java.text.DateFormat;
+import java.util.Date;
import java.util.EmptyStackException;
import java.util.HashMap;
import java.util.Locale;
@@ -36,6 +38,19 @@
public class TestTemplateRendering extends AbstractGateInTest
{
+ private DateFormat dateFormatFR;
+ private DateFormat dateFormatEN;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ // TODO Auto-generated method stub
+ super.setUp();
+
+ dateFormatFR = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.FRANCE);
+ dateFormatEN = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.ENGLISH);
+ }
+
public void testOutputStreamWriter() throws Exception
{
GroovyTemplate template = new GroovyTemplate("a<%='b'%>c<%out.print('d');%>e");
@@ -48,28 +63,31 @@
public void testDate1() throws Exception
{
+ Date dateToTest = new Date(0);
GroovyTemplate template = new GroovyTemplate("<% print(new Date(0)); %>");
- assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
- assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
- assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ assertEquals(dateFormatFR.format(dateToTest), template.render(Locale.FRENCH));
+ assertEquals(dateFormatEN.format(dateToTest), template.render(Locale.ENGLISH));
+ assertEquals(dateToTest.toString(), template.render());
}
public void testDate2() throws Exception
{
+ Date dateToTest = new Date(0);
GroovyTemplate template = new GroovyTemplate("<% def date = new Date(0) %>$date");
System.out.println("template.getGroovy() = " + template.getGroovy());
- assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
- assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
- assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ assertEquals(dateFormatFR.format(dateToTest), template.render(Locale.FRENCH));
+ assertEquals(dateFormatEN.format(dateToTest), template.render(Locale.ENGLISH));
+ assertEquals(dateToTest.toString(), template.render());
}
public void testDate3() throws Exception
{
+ Date dateToTest = new Date(0);
GroovyTemplate template = new GroovyTemplate("<%= new Date(0) %>");
System.out.println("template.getGroovy() = " + template.getGroovy());
- assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
- assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
- assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ assertEquals(dateFormatFR.format(dateToTest), template.render(Locale.FRENCH));
+ assertEquals(dateFormatEN.format(dateToTest), template.render(Locale.ENGLISH));
+ assertEquals(dateToTest.toString(), template.render());
}
public void testFoo() throws Exception
14 years, 2 months
gatein SVN: r5127 - in exo/portal/branches/3.1.x: component/scripting/src/main/java/org/exoplatform/groovyscript/text and 2 other directories.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2010-11-17 01:50:14 -0500 (Wed, 17 Nov 2010)
New Revision: 5127
Modified:
exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyPrinter.java
exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyScript.java
exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyTemplate.java
exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java
exo/portal/branches/3.1.x/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java
exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/Lifecycle.java
Log:
EXOGTN-167 [PLF] Locale encoding in Groovy templates
Modified: exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyPrinter.java
===================================================================
--- exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyPrinter.java 2010-11-17 04:38:06 UTC (rev 5126)
+++ exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyPrinter.java 2010-11-17 06:50:14 UTC (rev 5127)
@@ -18,12 +18,16 @@
*/
package org.exoplatform.groovyscript;
+import groovy.lang.GString;
import groovy.lang.GroovyInterceptable;
import groovy.lang.GroovyObjectSupport;
import org.exoplatform.commons.utils.Text;
import java.io.IOException;
import java.io.Writer;
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.Locale;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -32,6 +36,19 @@
abstract class GroovyPrinter extends GroovyObjectSupport implements GroovyInterceptable
{
+ /** An optional locale. */
+ private Locale locale;
+
+ public Locale getLocale()
+ {
+ return locale;
+ }
+
+ public void setLocale(Locale locale)
+ {
+ this.locale = locale;
+ }
+
/**
* Optimize the call to the various print methods.
*
@@ -82,21 +99,65 @@
}
}
+ /**
+ * We handle in this method a conversion of an object to another one for formatting purposes.
+ *
+ * @param o the object to format
+ * @return the formatted object
+ */
+ private Object format(Object o)
+ {
+ if (o instanceof Date)
+ {
+ if (locale != null)
+ {
+ DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM, locale);
+ o = dateFormat.format((Date)o);
+ }
+ }
+
+ //
+ return o;
+ }
+
+ private String toString(Object o)
+ {
+ Object f = format(o);
+ if (f == null)
+ {
+ return "null";
+ }
+ else if (f instanceof String)
+ {
+ return (String)f;
+ }
+ else
+ {
+ return o.toString();
+ }
+ }
+
public final void print(Object o)
{
try
{
- if (o == null)
+ if (o instanceof Text)
{
- write("null");
+ write((Text)o);
}
- else if (o instanceof Text)
+ else if (o instanceof GString)
{
- write((Text)o);
+ GString gs = (GString)o;
+ Object[] values = gs.getValues();
+ for (int i = 0;i < values.length;i++)
+ {
+ values[i] = format(values[i]);
+ }
+ write(o.toString());
}
else
{
- write(o.toString());
+ write(toString(o));
}
}
catch (IOException ignore)
Modified: exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyScript.java
===================================================================
--- exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyScript.java 2010-11-17 04:38:06 UTC (rev 5126)
+++ exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyScript.java 2010-11-17 06:50:14 UTC (rev 5127)
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.io.Writer;
+import java.util.Locale;
import java.util.Map;
/**
@@ -70,7 +71,19 @@
return scriptClass;
}
- public void render(Map context, Writer writer) throws IOException, TemplateRuntimeException
+ /**
+ * Renders the script with the provided context and locale to the specified writer.
+ *
+ * @param context the context
+ * @param writer the writer
+ * @param locale the locale
+ * @throws IOException
+ * @throws TemplateRuntimeException
+ */
+ public void render(
+ Map context,
+ Writer writer,
+ Locale locale) throws IOException, TemplateRuntimeException
{
Binding binding = context != null ? new Binding(context) : new Binding();
@@ -86,6 +99,9 @@
}
//
+ printer.setLocale(locale);
+
+ //
BaseScript script = (BaseScript)InvokerHelper.createScript(scriptClass, binding);
script.printer = printer;
Modified: exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyTemplate.java
===================================================================
--- exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyTemplate.java 2010-11-17 04:38:06 UTC (rev 5126)
+++ exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyTemplate.java 2010-11-17 06:50:14 UTC (rev 5127)
@@ -22,6 +22,7 @@
import java.io.Reader;
import java.io.StringWriter;
import java.io.Writer;
+import java.util.Locale;
import java.util.Map;
/**
@@ -104,12 +105,22 @@
public void render(Writer writer) throws IOException, TemplateRuntimeException
{
- render(writer, null);
+ render(writer, (Map)null);
}
+ public void render(Writer writer, Locale locale) throws IOException, TemplateRuntimeException
+ {
+ render(writer, null, locale);
+ }
+
+ public void render(Writer writer, Map binding, Locale locale) throws IOException, TemplateRuntimeException
+ {
+ script.render(binding, writer, locale);
+ }
+
public void render(Writer writer, Map binding) throws IOException, TemplateRuntimeException
{
- script.render(binding, writer);
+ script.render(binding, writer, null);
}
public String render() throws IOException, TemplateRuntimeException
@@ -117,10 +128,20 @@
return render((Map)null);
}
+ public String render(Locale locale) throws IOException, TemplateRuntimeException
+ {
+ return render((Map)null, locale);
+ }
+
public String render(Map binding) throws IOException, TemplateRuntimeException
{
+ return render(binding, null);
+ }
+
+ public String render(Map binding, Locale locale) throws IOException, TemplateRuntimeException
+ {
StringWriter buffer = new StringWriter();
- render(buffer, binding);
+ render(buffer, binding, locale);
buffer.close();
return buffer.toString();
}
Modified: exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java
===================================================================
--- exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2010-11-17 04:38:06 UTC (rev 5126)
+++ exo/portal/branches/3.1.x/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2010-11-17 06:50:14 UTC (rev 5127)
@@ -44,6 +44,7 @@
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Locale;
/**
* Created by The eXo Platform SAS Dec 26, 2005
@@ -113,8 +114,7 @@
GroovyTemplate template = getTemplate(name, context.getResourceResolver());
context.put("_ctx", context);
context.setGroovyTemplateService(this);
- template.render(context.getWriter(), context);
-
+ template.render(context.getWriter(), context, (Locale)context.get("locale"));
long endTime = System.currentTimeMillis();
TemplateStatistic templateStatistic = statisticService.getTemplateStatistic(name);
@@ -137,7 +137,7 @@
throw new Exception("Binding cannot be null");
context.put("_ctx", context);
GroovyTemplate template = getTemplate(name, context.getResourceResolver());
- template.render(context.getWriter(), context);
+ template.render(context.getWriter(), context, (Locale)context.get("locale"));
}
final public GroovyTemplate getTemplate(String name, ResourceResolver resolver) throws Exception
Modified: exo/portal/branches/3.1.x/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java
===================================================================
--- exo/portal/branches/3.1.x/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java 2010-11-17 04:38:06 UTC (rev 5126)
+++ exo/portal/branches/3.1.x/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java 2010-11-17 06:50:14 UTC (rev 5127)
@@ -26,6 +26,7 @@
import java.io.*;
import java.util.EmptyStackException;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
/**
@@ -45,6 +46,32 @@
assertEquals("abcde", baos.toString("UTF-8"));
}
+ public void testDate1() throws Exception
+ {
+ GroovyTemplate template = new GroovyTemplate("<% print(new Date(0)); %>");
+ assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
+ assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
+ assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ }
+
+ public void testDate2() throws Exception
+ {
+ GroovyTemplate template = new GroovyTemplate("<% def date = new Date(0) %>$date");
+ System.out.println("template.getGroovy() = " + template.getGroovy());
+ assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
+ assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
+ assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ }
+
+ public void testDate3() throws Exception
+ {
+ GroovyTemplate template = new GroovyTemplate("<%= new Date(0) %>");
+ System.out.println("template.getGroovy() = " + template.getGroovy());
+ assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
+ assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
+ assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ }
+
public void testFoo() throws Exception
{
GroovyTemplate template = new GroovyTemplate("a");
Modified: exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/Lifecycle.java
===================================================================
--- exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/Lifecycle.java 2010-11-17 04:38:06 UTC (rev 5126)
+++ exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/Lifecycle.java 2010-11-17 06:50:14 UTC (rev 5127)
@@ -102,8 +102,9 @@
*/
protected void renderTemplate(String template, WebuiBindingContext bcontext) throws Exception
{
+ WebuiRequestContext context = bcontext.getRequestContext();
bcontext.put("decorator", decorator_);
- WebuiRequestContext context = bcontext.getRequestContext();
+ bcontext.put("locale", context.getLocale());
ExoContainer pcontainer = context.getApplication().getApplicationServiceContainer();
TemplateService service = (TemplateService)pcontainer.getComponentInstanceOfType(TemplateService.class);
ResourceResolver resolver = bcontext.getResourceResolver();
14 years, 2 months
gatein SVN: r5126 - exo/portal/branches/3.1.x/component/dashboard/src/main/resources/groovy/dashboard/webui/component.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-11-16 23:38:06 -0500 (Tue, 16 Nov 2010)
New Revision: 5126
Modified:
exo/portal/branches/3.1.x/component/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl
Log:
EXOGTN-41 When list gadget too long, can not view textbox to input URL of Gadget
Modified: exo/portal/branches/3.1.x/component/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl
===================================================================
--- exo/portal/branches/3.1.x/component/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2010-11-17 04:34:33 UTC (rev 5125)
+++ exo/portal/branches/3.1.x/component/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2010-11-17 04:38:06 UTC (rev 5126)
@@ -36,6 +36,9 @@
<%
List lstGadgets = uicomponent.getGadgetsOfCategory(category);
if(lstGadgets != null){
+ if(lstGadgets.size() >= 20)
+ uiPopup.setWindowSize(-1, 600);
+
for(gadget in lstGadgets){
%>
<div class="UIGadget SelectItem Item" id="${gadget.getId()}" style="top:0px; left:0px;">
14 years, 2 months
gatein SVN: r5125 - epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-11-16 23:34:33 -0500 (Tue, 16 Nov 2010)
New Revision: 5125
Modified:
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Middleware_Feedback.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml
Log:
Updated redhat links and cleaned section ids
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml 2010-11-17 04:31:56 UTC (rev 5124)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml 2010-11-17 04:34:33 UTC (rev 5125)
@@ -106,7 +106,7 @@
</step>
<step>
<para>
- Copy the following files from the extracted location to the configuration location of your &EPP; installation (as discussed in <xref linkend="sect-Installation_Guide-Installation-Configuration_Locations"/>).
+ Copy the following files from the extracted location to the configuration location of your &EPP; installation (as discussed in <xref linkend="sect-Installation_Guide-Installation-Configuration_Locations" />).
</para>
<itemizedlist>
<listitem>
@@ -173,7 +173,7 @@
<para>
In Windows:
</para>
-
+
<programlisting>run.bat</programlisting>
</listitem>
@@ -181,7 +181,7 @@
<para>
In Unix/Linux/cygwin:
</para>
-
+
<programlisting>./run.sh</programlisting>
</listitem>
@@ -220,6 +220,7 @@
</section>
+
</chapter>
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Middleware_Feedback.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Middleware_Feedback.xml 2010-11-17 04:31:56 UTC (rev 5124)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Middleware_Feedback.xml 2010-11-17 04:34:33 UTC (rev 5125)
@@ -4,7 +4,7 @@
%BOOK_ENTITIES;
]>
<section id="sect-Installation_Guide-Give_us_Feedback">
- <!-- NOTE: THE FOLLOWING ENTITIES WILL NOT BE REPLACED IN YOUR BUGZILLA URL.
+ <!-- NOTE: THE FOLLOWING ENTITIES WILL NOT BE REPLACED IN YOUR BUGZILLA URL.
YOU WILL NEED TO CORRECT THE URL MANUALLY.
&PRODUCT_NAME; of the form "JBoss Enterprise Application Platform"
&BZ_COMPONENT; of the form "doc-triage" (as listed in Bugzilla)
@@ -14,11 +14,11 @@
all Middleware books with minimal fuss.
These entities should not affect translated documents, since Bugzilla is not localised.
- --> <title>Give us Feedback</title>
+ --> <title>Give us Feedback</title>
<para>
If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in Bugzilla against the product <literal>&PRODUCT; &BOOKID;</literal>. The following link will take you to a pre-filled bug report for this book: <ulink url="https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Site%20Publishe...;">https://bugzilla.redhat.com/</ulink>.
</para>
- <!-- <para>
+ <!-- <para>
Fill out the following template and add it to Bugzilla's <literal>Description</literal> field. Be as specific as possible when describing the issue; this will help ensure that we can fix it quickly.
</para>
@@ -37,7 +37,7 @@
Additional information:
-</screen> --> <para>
+</screen> --> <para>
Be sure to give us your name so that you can receive full credit for reporting the issue.
</para>
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml 2010-11-17 04:31:56 UTC (rev 5124)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml 2010-11-17 04:34:33 UTC (rev 5125)
@@ -8,40 +8,36 @@
<simpara>
<revhistory>
<revision>
- <revision>
- <revnumber>1-1.1</revnumber>
- <date></date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email>smumford(a)redhat.com</email>
- </author>
- <revdescription>
- <simplelist>
- <member>Added first draft content.</member>
- </simplelist>
- </revdescription>
- </revision>
+ <revnumber>1-1.1</revnumber>
+ <date></date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Added first draft content.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+
+ <revision>
<revnumber>1-1.0</revnumber>
<date>Wed Nov 17 2010</date>
<author>
<firstname>Scott</firstname>
<surname>Mumford</surname>
<email>smumford(a)redhat.com</email>
-
</author>
<revdescription>
<simplelist>
<member>Initial creation of book by publican</member>
-
</simplelist>
-
</revdescription>
-
</revision>
-
+
</revhistory>
-
</simpara>
</appendix>
14 years, 2 months
gatein SVN: r5124 - epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-11-16 23:31:56 -0500 (Tue, 16 Nov 2010)
New Revision: 5124
Modified:
epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml
Log:
JBEPP-603: Updated docs.redhat link
Modified: epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml 2010-11-17 03:41:52 UTC (rev 5123)
+++ epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml 2010-11-17 04:31:56 UTC (rev 5124)
@@ -223,7 +223,7 @@
The JBoss Enterprise Portal Platform Installation Guide contains details of software and hardware requirements as well as detailed installation instructions.
</para>
<para>
- The Installation Guide can be found online at <ulink type="http" url="http://docs.redhat.com/docs/">http://docs.redhat.com/docs/</ulink>.
+ The Installation Guide can be found online at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...."/>.
</para>
</section>
14 years, 2 months
gatein SVN: r5123 - exo/portal/branches/3.1.x/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-11-16 22:41:52 -0500 (Tue, 16 Nov 2010)
New Revision: 5123
Modified:
exo/portal/branches/3.1.x/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
Log:
EXOGTN-145 [PLF] NullPointerException in UIUserToolBarDashboardPortlet.gtmpl if no navigation.xml created for a LDAP user
Modified: exo/portal/branches/3.1.x/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
===================================================================
--- exo/portal/branches/3.1.x/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2010-11-17 03:36:51 UTC (rev 5122)
+++ exo/portal/branches/3.1.x/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2010-11-17 03:41:52 UTC (rev 5123)
@@ -91,7 +91,7 @@
<%
String defaultDashboardPage;
- if(currentUserNavigation.getNodes() ==null || currentUserNavigation.getNodes().size() < 1){
+ if(currentUserNavigation == null || currentUserNavigation.getNodes() == null || currentUserNavigation.getNodes().size() < 1){
defaultDashboardPage = org.exoplatform.toolbar.webui.component.UIUserToolBarDashboardPortlet.DEFAULT_TAB_NAME;
%>
<div class="UIUserToolBarDashboardPortlet" id="$uicomponent.id">
14 years, 2 months
gatein SVN: r5122 - exo/portal/branches/3.1.x/component/resources/src/main/java/org/exoplatform/services/resources/impl.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-11-16 22:36:51 -0500 (Tue, 16 Nov 2010)
New Revision: 5122
Modified:
exo/portal/branches/3.1.x/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java
Log:
EXOGTN-131: Store the classpath ResourceBundles into the cache
Modified: exo/portal/branches/3.1.x/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java
===================================================================
--- exo/portal/branches/3.1.x/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java 2010-11-17 03:20:21 UTC (rev 5121)
+++ exo/portal/branches/3.1.x/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java 2010-11-17 03:36:51 UTC (rev 5122)
@@ -22,6 +22,7 @@
import org.exoplatform.commons.utils.IOUtil;
import org.exoplatform.commons.utils.MapResourceBundle;
import org.exoplatform.commons.utils.PageList;
+import org.exoplatform.commons.utils.PropertyManager;
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.services.cache.ExoCache;
import org.exoplatform.services.log.Log;
@@ -383,11 +384,6 @@
return IdentityResourceBundle.getInstance();
}
- // Case 1: ResourceBundle of portlets, standard java API is used
- if (isClasspathResource(name))
- return ResourceBundleLoader.load(name, locale, cl);
-
- // Case 2: ResourceBundle of portal
String country = locale.getCountry();
String id;
if (country != null && country.length() > 0)
@@ -411,6 +407,17 @@
{
}
+ // Case 1: ResourceBundle of portlets, standard java API is used
+ if (isClasspathResource(name))
+ {
+ ResourceBundle res = ResourceBundleLoader.load(name, locale, cl);
+ //Cache classpath resource bundle while running portal in non-dev mode
+ if(!PropertyManager.isDevelopping())
+ cache_.put(id, res);
+ return res;
+ }
+
+ // Case 2: ResourceBundle of portal
try
{
ResourceBundle res = null;
14 years, 2 months
gatein SVN: r5121 - portal/branches/branch-GTNPORTAL-1643/component/resources/src/main/java/org/exoplatform/services/resources/impl.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-11-16 22:20:21 -0500 (Tue, 16 Nov 2010)
New Revision: 5121
Modified:
portal/branches/branch-GTNPORTAL-1643/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java
Log:
GTNPORTAL-1665:Store the classpath resource bundle on cache while running portal in non-dev mode
Modified: portal/branches/branch-GTNPORTAL-1643/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java 2010-11-17 03:10:30 UTC (rev 5120)
+++ portal/branches/branch-GTNPORTAL-1643/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java 2010-11-17 03:20:21 UTC (rev 5121)
@@ -22,6 +22,7 @@
import org.exoplatform.commons.utils.IOUtil;
import org.exoplatform.commons.utils.MapResourceBundle;
import org.exoplatform.commons.utils.PageList;
+import org.exoplatform.commons.utils.PropertyManager;
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.services.cache.ExoCache;
import org.exoplatform.services.log.Log;
@@ -383,11 +384,6 @@
return IdentityResourceBundle.getInstance();
}
- // Case 1: ResourceBundle of portlets, standard java API is used
- if (isClasspathResource(name))
- return ResourceBundleLoader.load(name, locale, cl);
-
- // Case 2: ResourceBundle of portal
String country = locale.getCountry();
String id;
if (country != null && country.length() > 0)
@@ -411,6 +407,17 @@
{
}
+ // Case 1: ResourceBundle of portlets, standard java API is used
+ if (isClasspathResource(name))
+ {
+ ResourceBundle res = ResourceBundleLoader.load(name, locale, cl);
+ //Cache the classpath resource bundle if portal is running in non-developing mode
+ if(!PropertyManager.isDevelopping())
+ cache_.put(id, res);
+ return res;
+ }
+
+ // Case 2: ResourceBundle of portal
try
{
ResourceBundle res = null;
14 years, 2 months
gatein SVN: r5120 - epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-11-16 22:10:30 -0500 (Tue, 16 Nov 2010)
New Revision: 5120
Modified:
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Release_Notes.xml
Log:
Added Components and Issues Fixed sections for future iterations
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Release_Notes.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Release_Notes.xml 2010-11-17 03:08:46 UTC (rev 5119)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Release_Notes.xml 2010-11-17 03:10:30 UTC (rev 5120)
@@ -42,7 +42,68 @@
</listitem>
</itemizedlist>
</section>
-
+ <!-- <section id="sect-Release_Notes-New_Features_and_Components">
+ <title>New and Upgraded Components</title>
+ <variablelist id="vari-Release_Notes-New_Features_and_Components-New_Features">
+ <title>New Components</title>
+ <varlistentry>
+ <term></term>
+ <listitem>
+ <para>
+ stuff
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <variablelist id="vari-Release_Notes-New_Features_and_Components-Component_Upgrades_in_VERSION_MICRO">
+ <title><emphasis role="bold">Upgraded Components</emphasis></title>
+ <varlistentry>
+ <term></term>
+ <listitem>
+ <para>
+ stuff
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ </section>-->
+
+ <!--<section id="sect-Release_Notes-Component_Versions">
+ <title>Component Versions</title>
+ <para>
+ This section details the versions of the components in JBoss Enterprise Portal Platform 5.1.0.
+ </para>
+ <table id="tabl-Release_Notes-Component_Versions-JBoss_Enterprise_Portal_Platform_Component_Versions">
+ <title>JBoss Enterprise Portal Platform Component Versions</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>
+ Component
+ </entry>
+ <entry>
+ Version
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+
+ </entry>
+ <entry>
+
+ </entry>
+ </row>
+ </tbody>
+
+ </tgroup>
+
+ </table>
+
+ </section> -->
+
<section id="sect-Release_Notes-Component_Features">
<title>Component Features</title>
<variablelist>
@@ -121,6 +182,68 @@
</variablelist>
</section>
+ <section id="sect-Release_Notes-Installation">
+ <title>Installation</title>
+ <para>
+ The &PRODUCT; Installation Guide contains environment requirements as well as detailed installation instructions.
+ </para>
+ <para>
+ The Installation Guide can be found online at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Site_Publisher/index.html"/>.
+ </para>
+ </section>
+
+<!--<section id="sect-Release_Notes-Issues_fixed_in_this_release">
+ <title> Issues fixed in this release </title>
+ <para>
+ The following is a list of issues fixed in this release:
+ </para>
+ Commented out for current release. Retaining the text to be reused in future release drafts.
+ <warning>
+ <title>Draft Content!</title>
+ <para>
+ These entries are drafts.
+ </para>
+ <para>
+ <emphasis role="bold">They are likely not technically correct at the moment</emphasis>, but they will serve as a basis and will be corrected in subsequent iterations after technical and QE reviews.
+ </para>
+ </warning>
+ <variablelist>
+ <title><emphasis role="bold">Issues fixed in the product:</emphasis></title>
+ <varlistentry>
+ <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-"></ulink></term>
+ <listitem>
+ <para>
+ stuff
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <title>New Features</title>
+ <varlistentry>
+ <term></term>
+ <listitem>
+ <para>
+ stuff
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <title>Issues fixed upstream:</title>
+ <varlistentry>
+ <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-454"></ulink></term>
+ <listitem>
+ <para>
+ This release includes numerous fixes for issues reported upstream. Follow the link above to review a tracking ticket listing these issues and fixes.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </section> -->
+
<section id="sect-Release_Notes-_Known_Issues_in_this_release">
<title> Known Issues in this release</title>
<para>
14 years, 2 months