Seam SVN: r9153 - trunk.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-09-30 14:02:48 -0400 (Tue, 30 Sep 2008)
New Revision: 9153
Modified:
trunk/changelog.txt
Log:
last minute change for 2.0.1 cr1
Modified: trunk/changelog.txt
===================================================================
--- trunk/changelog.txt 2008-09-30 15:16:41 UTC (rev 9152)
+++ trunk/changelog.txt 2008-09-30 18:02:48 UTC (rev 9153)
@@ -86,8 +86,8 @@
* [JBSEAM-3442] - JMS functionality broken in JBossAS 5
* [JBSEAM-3448] - MultipartFilter does not begin parsing until after transaction is started
* [JBSEAM-3453] - Deployed jar list files needed to be modified for remoting to work correctly in a newly generated project.
+ * [JBSEAM-3479] - seam-gen - target "compilemodel" does not exist
-
** Feature Request
* [JBSEAM-905] - Using the debug page without exceptions
* [JBSEAM-1485] - Configure Default Interceptors
16 years, 2 months
Seam SVN: r9152 - tags/JBoss_Seam_2_1_0_CR1.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-09-30 11:16:41 -0400 (Tue, 30 Sep 2008)
New Revision: 9152
Modified:
tags/JBoss_Seam_2_1_0_CR1/changelog.txt
Log:
changelog
Modified: tags/JBoss_Seam_2_1_0_CR1/changelog.txt
===================================================================
--- tags/JBoss_Seam_2_1_0_CR1/changelog.txt 2008-09-30 15:14:13 UTC (rev 9151)
+++ tags/JBoss_Seam_2_1_0_CR1/changelog.txt 2008-09-30 15:16:41 UTC (rev 9152)
@@ -86,8 +86,8 @@
* [JBSEAM-3442] - JMS functionality broken in JBossAS 5
* [JBSEAM-3448] - MultipartFilter does not begin parsing until after transaction is started
* [JBSEAM-3453] - Deployed jar list files needed to be modified for remoting to work correctly in a newly generated project.
+ * [JBSEAM-3479] - seam-gen - target "compilemodel" does not exist
-
** Feature Request
* [JBSEAM-905] - Using the debug page without exceptions
* [JBSEAM-1485] - Configure Default Interceptors
16 years, 2 months
Seam SVN: r9151 - in tags/JBoss_Seam_2_1_0_CR1/seam-gen: icefaces/build-scripts and 1 other directory.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-09-30 11:14:13 -0400 (Tue, 30 Sep 2008)
New Revision: 9151
Modified:
tags/JBoss_Seam_2_1_0_CR1/seam-gen/build-scripts/build.xml
tags/JBoss_Seam_2_1_0_CR1/seam-gen/icefaces/build-scripts/build.xml
Log:
JBSEAM-3479
Modified: tags/JBoss_Seam_2_1_0_CR1/seam-gen/build-scripts/build.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_CR1/seam-gen/build-scripts/build.xml 2008-09-30 12:29:54 UTC (rev 9150)
+++ tags/JBoss_Seam_2_1_0_CR1/seam-gen/build-scripts/build.xml 2008-09-30 15:14:13 UTC (rev 9151)
@@ -323,7 +323,7 @@
</testng>
</target>
- <target name="javadoc" depends="compilemodel,compileactions,copyclasses">
+ <target name="javadoc" depends="compile">
<mkdir dir="${dist.dir}/apidoc" />
<javadoc classpathref="build.classpath" destdir="${dist.dir}/apidoc" use="true" protected="true" version="true" windowtitle="${project.name} API Documentation" doctitle="${project.name} API Documentation" link="http://java.sun.com/j2se/5.0/docs/api">
Modified: tags/JBoss_Seam_2_1_0_CR1/seam-gen/icefaces/build-scripts/build.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_CR1/seam-gen/icefaces/build-scripts/build.xml 2008-09-30 12:29:54 UTC (rev 9150)
+++ tags/JBoss_Seam_2_1_0_CR1/seam-gen/icefaces/build-scripts/build.xml 2008-09-30 15:14:13 UTC (rev 9151)
@@ -318,7 +318,7 @@
</testng>
</target>
- <target name="javadoc" depends="compilemodel,compileactions,copyclasses">
+ <target name="javadoc" depends="compile">
<mkdir dir="${dist.dir}/apidoc" />
<javadoc classpathref="build.classpath" destdir="${dist.dir}/apidoc" use="true" protected="true" version="true" windowtitle="${project.name} API Documentation" doctitle="${project.name} API Documentation" link="http://java.sun.com/j2se/5.0/docs/api">
16 years, 2 months
Seam SVN: r9150 - trunk/examples/mail/view.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-30 08:29:54 -0400 (Tue, 30 Sep 2008)
New Revision: 9150
Modified:
trunk/examples/mail/view/attachment.xhtml
Log:
JBSEAM-3476
Modified: trunk/examples/mail/view/attachment.xhtml
===================================================================
--- trunk/examples/mail/view/attachment.xhtml 2008-09-30 12:03:43 UTC (rev 9149)
+++ trunk/examples/mail/view/attachment.xhtml 2008-09-30 12:29:54 UTC (rev 9150)
@@ -12,8 +12,8 @@
<m:attachment fileName="whyseam.pdf">
<ui:include src="/whyseam.xhtml" />
</m:attachment>
- <ui:repeat value="#{people}" var="person">
- <m:attachment value="#{person.photo}" contentType="image/jpeg" fileName="#{person.firstname}_#{person.lastname}.jpg" />
+ <ui:repeat value="#{people}" var="p">
+ <m:attachment value="#{p.photo}" contentType="image/jpeg" fileName="#{p.firstname}_#{p.lastname}.jpg" />
</ui:repeat>
<m:body>
<p><h:outputText value="Dear #{person.firstname}" />,</p>
16 years, 2 months
Seam SVN: r9149 - trunk/src/main/org/jboss/seam/mail.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-30 08:03:43 -0400 (Tue, 30 Sep 2008)
New Revision: 9149
Modified:
trunk/src/main/org/jboss/seam/mail/MailSession.java
Log:
Don't show port as null if not set
Modified: trunk/src/main/org/jboss/seam/mail/MailSession.java
===================================================================
--- trunk/src/main/org/jboss/seam/mail/MailSession.java 2008-09-29 19:40:50 UTC (rev 9148)
+++ trunk/src/main/org/jboss/seam/mail/MailSession.java 2008-09-30 12:03:43 UTC (rev 9149)
@@ -88,7 +88,14 @@
private void createSession()
{
- log.info("Creating JavaMail Session (" + getHost() + ':' + getPort() + ")");
+ if (getPort() != null)
+ {
+ log.info("Creating JavaMail Session (" + getHost() + ':' + getPort() + ")");
+ }
+ else
+ {
+ log.info("Creating JavaMail Session (" + getHost() + ")");
+ }
Properties properties = new Properties();
16 years, 2 months
Seam SVN: r9148 - trunk/src/excel/META-INF.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2008-09-29 15:40:50 -0400 (Mon, 29 Sep 2008)
New Revision: 9148
Modified:
trunk/src/excel/META-INF/seam-excel.taglib.xml
Log:
Forgot to update component type in taglib when refactoring commands to own package (resulting in all commands br0ken).
Modified: trunk/src/excel/META-INF/seam-excel.taglib.xml
===================================================================
--- trunk/src/excel/META-INF/seam-excel.taglib.xml 2008-09-29 12:44:49 UTC (rev 9147)
+++ trunk/src/excel/META-INF/seam-excel.taglib.xml 2008-09-29 19:40:50 UTC (rev 9148)
@@ -152,6 +152,13 @@
<component-type>org.jboss.seam.excel.ui.UIExcelExport</component-type>
</component>
</tag>
+
+ <tag>
+ <tag-name>debug</tag-name>
+ <component>
+ <component-type>org.jboss.seam.excel.ui.UIDebug</component-type>
+ </component>
+ </tag>
</facelet-taglib>
16 years, 2 months
Seam SVN: r9147 - trunk/ui/src/main/java/org/jboss/seam/ui/renderkit.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2008-09-29 08:44:49 -0400 (Mon, 29 Sep 2008)
New Revision: 9147
Modified:
trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java
Log:
JBSEAM-3471, more generic context store/restore
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java 2008-09-29 12:36:36 UTC (rev 9146)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java 2008-09-29 12:44:49 UTC (rev 9147)
@@ -8,6 +8,7 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.ui.component.UIDecorate;
import org.jboss.seam.ui.util.Decoration;
@@ -31,14 +32,15 @@
* Store away the attribute from the event context (if it is set)
*
* @param names The list of context keys to store away
+ * @param context The context to target
*/
- private void storeOriginalValues(String[] names)
+ private void storeOriginalValues(String[] names, Context context)
{
for (String name : names)
{
- if (Contexts.getEventContext().isSet(name))
+ if (context.isSet(name))
{
- originalValues.put(name, Contexts.getEventContext().get(name));
+ originalValues.put(name, context.get(name));
}
}
}
@@ -49,13 +51,14 @@
* up what we have placed there during this run.
*
* @param names The list of context keys to restore
+ * @param context The context to target
*/
- private void restoreOriginalValues(String[] names) {
+ private void restoreOriginalValues(String[] names, Context context) {
for (String name : names) {
if (originalValues.containsKey(name)) {
- Contexts.getEventContext().set(name, originalValues.get(name));
+ context.set(name, originalValues.get(name));
} else {
- Contexts.getEventContext().remove(name);
+ context.remove(name);
}
}
}
@@ -65,7 +68,7 @@
{
UIDecorate decorate = (UIDecorate) component;
- storeOriginalValues(storeOriginals);
+ storeOriginalValues(storeOriginals, Contexts.getEventContext());
Contexts.getEventContext().set("invalid", Decoration.hasMessage(decorate, context));
Contexts.getEventContext().set("required", Decoration.hasRequired(component, context));
@@ -117,7 +120,7 @@
}
context.getResponseWriter().endElement("div");
- restoreOriginalValues(storeOriginals);
+ restoreOriginalValues(storeOriginals, Contexts.getEventContext());
}
@Override
16 years, 2 months
Seam SVN: r9146 - trunk/ui/src/main/java/org/jboss/seam/ui/renderkit.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2008-09-29 08:36:36 -0400 (Mon, 29 Sep 2008)
New Revision: 9146
Modified:
trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java
Log:
JBSEAM-3471
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java 2008-09-26 14:58:00 UTC (rev 9145)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java 2008-09-29 12:36:36 UTC (rev 9146)
@@ -1,6 +1,8 @@
package org.jboss.seam.ui.renderkit;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -14,107 +16,146 @@
public class DecorateRendererBase extends RendererBase
{
-
+ // Place the attributes you want to store away
+ private Map<String, Object> originalValues = new HashMap();
+ // The list of attributes in the event scope to store away
+ String[] storeOriginals = new String[] {"invalid", "required"};
+
@Override
protected Class getComponentClass()
{
return UIDecorate.class;
}
+
+ /**
+ * Store away the attribute from the event context (if it is set)
+ *
+ * @param names The list of context keys to store away
+ */
+ private void storeOriginalValues(String[] names)
+ {
+ for (String name : names)
+ {
+ if (Contexts.getEventContext().isSet(name))
+ {
+ originalValues.put(name, Contexts.getEventContext().get(name));
+ }
+ }
+ }
+ /**
+ * Restores the state of the event context. If the value is stored away, it is restored
+ * It it was not in the map, it was not in the context in the first place so clean
+ * up what we have placed there during this run.
+ *
+ * @param names The list of context keys to restore
+ */
+ private void restoreOriginalValues(String[] names) {
+ for (String name : names) {
+ if (originalValues.containsKey(name)) {
+ Contexts.getEventContext().set(name, originalValues.get(name));
+ } else {
+ Contexts.getEventContext().remove(name);
+ }
+ }
+ }
+
@Override
protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException
{
UIDecorate decorate = (UIDecorate) component;
-
+
+ storeOriginalValues(storeOriginals);
+
Contexts.getEventContext().set("invalid", Decoration.hasMessage(decorate, context));
Contexts.getEventContext().set("required", Decoration.hasRequired(component, context));
-
+
boolean hasMessage = decorate.hasMessage();
-
+
writer.startElement("div", decorate);
if (decorate.getStyleClass() != null)
{
- writer.writeAttribute(HTML.CLASS_ATTR, decorate.getStyleClass(), HTML.CLASS_ATTR);
+ writer.writeAttribute(HTML.CLASS_ATTR, decorate.getStyleClass(), HTML.CLASS_ATTR);
}
if (decorate.getStyle() != null)
{
- writer.writeAttribute(HTML.STYLE_ATTR, decorate.getStyle(), HTML.STYLE_ATTR);
+ writer.writeAttribute(HTML.STYLE_ATTR, decorate.getStyle(), HTML.STYLE_ATTR);
}
writer.writeAttribute("id", decorate.getClientId(context), "id");
-
+
UIComponent aroundDecoration = decorate.getDecoration("aroundField");
UIComponent aroundInvalidDecoration = decorate.getDecoration("aroundInvalidField");
- if (aroundDecoration!=null && !hasMessage)
+ if (aroundDecoration != null && !hasMessage)
{
aroundDecoration.setParent(decorate);
aroundDecoration.encodeBegin(context);
}
- if (aroundInvalidDecoration!=null && hasMessage)
+ if (aroundInvalidDecoration != null && hasMessage)
{
aroundInvalidDecoration.setParent(decorate);
aroundInvalidDecoration.encodeBegin(context);
}
}
-
+
@Override
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException
{
UIDecorate decorate = (UIDecorate) component;
-
+
boolean hasMessage = decorate.hasMessage();
UIComponent aroundDecoration = decorate.getDecoration("aroundField");
UIComponent aroundInvalidDecoration = decorate.getDecoration("aroundInvalidField");
- if (aroundDecoration!=null && !hasMessage)
+ if (aroundDecoration != null && !hasMessage)
{
aroundDecoration.setParent(decorate);
aroundDecoration.encodeEnd(context);
}
- if (aroundInvalidDecoration!=null && hasMessage)
+ if (aroundInvalidDecoration != null && hasMessage)
{
aroundInvalidDecoration.setParent(decorate);
aroundInvalidDecoration.encodeEnd(context);
}
context.getResponseWriter().endElement("div");
- Contexts.getEventContext().remove("invalid");
- Contexts.getEventContext().remove("required");
+ restoreOriginalValues(storeOriginals);
}
-
+
@Override
protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException
{
UIDecorate decorate = (UIDecorate) component;
-
+
boolean hasMessage = decorate.hasMessage();
UIComponent beforeDecoration = decorate.getDecoration("beforeField");
UIComponent beforeInvalidDecoration = decorate.getDecoration("beforeInvalidField");
- if ( beforeDecoration!=null && !hasMessage )
+ if (beforeDecoration != null && !hasMessage)
{
beforeDecoration.setParent(decorate);
renderChild(context, beforeDecoration);
}
- if ( beforeInvalidDecoration!=null && hasMessage )
+ if (beforeInvalidDecoration != null && hasMessage)
{
beforeInvalidDecoration.setParent(decorate);
renderChild(context, beforeInvalidDecoration);
}
-
+
renderChildren(context, decorate);
-
+
UIComponent afterDecoration = decorate.getDecoration("afterField");
UIComponent afterInvalidDecoration = decorate.getDecoration("afterInvalidField");
- if ( afterDecoration!=null && !hasMessage )
+ if (afterDecoration != null && !hasMessage)
{
afterDecoration.setParent(decorate);
- renderChild(context, afterDecoration); }
- if ( afterInvalidDecoration!=null && hasMessage )
+ renderChild(context, afterDecoration);
+ }
+ if (afterInvalidDecoration != null && hasMessage)
{
afterInvalidDecoration.setParent(decorate);
renderChild(context, afterInvalidDecoration);
}
}
-
+
@Override
public boolean getRendersChildren()
{
16 years, 2 months
Seam SVN: r9145 - in trunk/seam-gen: icefaces/build-scripts and 1 other directory.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-26 10:58:00 -0400 (Fri, 26 Sep 2008)
New Revision: 9145
Modified:
trunk/seam-gen/build-scripts/build.xml
trunk/seam-gen/icefaces/build-scripts/build.xml
Log:
the depends for javadoc should be compile for EAR projects
Modified: trunk/seam-gen/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/build-scripts/build.xml 2008-09-24 19:32:48 UTC (rev 9144)
+++ trunk/seam-gen/build-scripts/build.xml 2008-09-26 14:58:00 UTC (rev 9145)
@@ -323,7 +323,7 @@
</testng>
</target>
- <target name="javadoc" depends="compilemodel,compileactions,copyclasses">
+ <target name="javadoc" depends="compile">
<mkdir dir="${dist.dir}/apidoc" />
<javadoc classpathref="build.classpath" destdir="${dist.dir}/apidoc" use="true" protected="true" version="true" windowtitle="${project.name} API Documentation" doctitle="${project.name} API Documentation" link="http://java.sun.com/j2se/5.0/docs/api">
Modified: trunk/seam-gen/icefaces/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build.xml 2008-09-24 19:32:48 UTC (rev 9144)
+++ trunk/seam-gen/icefaces/build-scripts/build.xml 2008-09-26 14:58:00 UTC (rev 9145)
@@ -318,7 +318,7 @@
</testng>
</target>
- <target name="javadoc" depends="compilemodel,compileactions,copyclasses">
+ <target name="javadoc" depends="compile">
<mkdir dir="${dist.dir}/apidoc" />
<javadoc classpathref="build.classpath" destdir="${dist.dir}/apidoc" use="true" protected="true" version="true" windowtitle="${project.name} API Documentation" doctitle="${project.name} API Documentation" link="http://java.sun.com/j2se/5.0/docs/api">
16 years, 3 months
Seam SVN: r9144 - trunk/build.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-09-24 15:32:48 -0400 (Wed, 24 Sep 2008)
New Revision: 9144
Modified:
trunk/build/default.build.properties
Log:
reset
Modified: trunk/build/default.build.properties
===================================================================
--- trunk/build/default.build.properties 2008-09-24 19:11:51 UTC (rev 9143)
+++ trunk/build/default.build.properties 2008-09-24 19:32:48 UTC (rev 9144)
@@ -8,7 +8,7 @@
major.version 2
minor.version .1
patchlevel .0
-qualifier .CR1
+qualifier -SNAPSHOT
#
# Other program locations
# -----------------------
16 years, 3 months