Author: pete.muir(a)jboss.org
Date: 2008-04-08 06:26:33 -0400 (Tue, 08 Apr 2008)
New Revision: 7863
Added:
branches/Seam_2_0/examples/mail/view/seamlogo.png
trunk/examples/mail/view/seamlogo.png
Removed:
branches/Seam_2_0/examples/mail/view/no_image.png
trunk/examples/mail/view/no_image.png
Modified:
branches/Seam_2_0/examples/mail/src/org/jboss/seam/example/mail/Person.java
branches/Seam_2_0/examples/mail/view/attachment.xhtml
trunk/examples/mail/src/org/jboss/seam/example/mail/Person.java
trunk/examples/mail/view/attachment.xhtml
Log:
JBSEAM-2825
Modified: branches/Seam_2_0/examples/mail/src/org/jboss/seam/example/mail/Person.java
===================================================================
--- branches/Seam_2_0/examples/mail/src/org/jboss/seam/example/mail/Person.java 2008-04-08
10:15:58 UTC (rev 7862)
+++ branches/Seam_2_0/examples/mail/src/org/jboss/seam/example/mail/Person.java 2008-04-08
10:26:33 UTC (rev 7863)
@@ -15,7 +15,7 @@
private String firstname;
private String lastname;
private String address;
- private transient InputStream photo =
ResourceLoader.instance().getResourceAsStream("/no_image.png");
+ private transient InputStream photo =
ResourceLoader.instance().getResourceAsStream("/seamlogo.png");
@Factory("people")
public List<Person> getPeople() {
Modified: branches/Seam_2_0/examples/mail/view/attachment.xhtml
===================================================================
--- branches/Seam_2_0/examples/mail/view/attachment.xhtml 2008-04-08 10:15:58 UTC (rev
7862)
+++ branches/Seam_2_0/examples/mail/view/attachment.xhtml 2008-04-08 10:26:33 UTC (rev
7863)
@@ -6,9 +6,9 @@
<m:from name="Seam" address="do-not-reply(a)jboss.com"
/>
<m:to name="#{person.firstname}
#{person.lastname}">#{person.address}</m:to>
<m:subject>Try out Seam!</m:subject>
- <m:attachment value="/jboss.jpg" />
+ <m:attachment value="/jboss.jpg" status="jbossLogo"
/>
<m:attachment value="#{numbers}" />
- <m:attachment value="#{person.photo}"
contentType="image/png"
fileName="#{person.firstname}_#{person.lastname}.jpg"
status="personPhoto" disposition="inline" />
+ <m:attachment value="#{person.photo}"
contentType="image/png"
fileName="#{person.firstname}_#{person.lastname}.jpg"
disposition="inline" />
<m:attachment fileName="whyseam.pdf">
<ui:include src="/whyseam.xhtml" />
</m:attachment>
@@ -19,7 +19,7 @@
<p><h:outputText value="Dear #{person.firstname}"
/>,</p>
<p>This example email demonstrates how easy it is to add attachments
to an email!</p>
<p>We can even display attached images inline:</p>
- <img src="cid:#{personPhoto.contentId}" />
+ <img src="cid:#{jbossLogo.contentId}" />
<p>The attached pdf was generated by Seam's PDF
library</p>
</m:body>
</m:message>
\ No newline at end of file
Deleted: branches/Seam_2_0/examples/mail/view/no_image.png
===================================================================
(Binary files differ)
Added: branches/Seam_2_0/examples/mail/view/seamlogo.png
===================================================================
(Binary files differ)
Property changes on: branches/Seam_2_0/examples/mail/view/seamlogo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/examples/mail/src/org/jboss/seam/example/mail/Person.java
===================================================================
--- trunk/examples/mail/src/org/jboss/seam/example/mail/Person.java 2008-04-08 10:15:58
UTC (rev 7862)
+++ trunk/examples/mail/src/org/jboss/seam/example/mail/Person.java 2008-04-08 10:26:33
UTC (rev 7863)
@@ -15,7 +15,7 @@
private String firstname;
private String lastname;
private String address;
- private transient InputStream photo =
ResourceLoader.instance().getResourceAsStream("/no_image.png");
+ private transient InputStream photo =
ResourceLoader.instance().getResourceAsStream("/seamlogo.png");
@Factory("people")
public List<Person> getPeople() {
Modified: trunk/examples/mail/view/attachment.xhtml
===================================================================
--- trunk/examples/mail/view/attachment.xhtml 2008-04-08 10:15:58 UTC (rev 7862)
+++ trunk/examples/mail/view/attachment.xhtml 2008-04-08 10:26:33 UTC (rev 7863)
@@ -6,9 +6,9 @@
<m:from name="Seam" address="do-not-reply(a)jboss.com"
/>
<m:to name="#{person.firstname}
#{person.lastname}">#{person.address}</m:to>
<m:subject>Try out Seam!</m:subject>
- <m:attachment value="/jboss.jpg" />
+ <m:attachment value="/jboss.jpg" status="jbossLogo"
/>
<m:attachment value="#{numbers}" />
- <m:attachment value="#{person.photo}"
contentType="image/png"
fileName="#{person.firstname}_#{person.lastname}.jpg"
status="personPhoto" disposition="inline" />
+ <m:attachment value="#{person.photo}"
contentType="image/png"
fileName="#{person.firstname}_#{person.lastname}.jpg"
disposition="inline" />
<m:attachment fileName="whyseam.pdf">
<ui:include src="/whyseam.xhtml" />
</m:attachment>
@@ -19,7 +19,7 @@
<p><h:outputText value="Dear #{person.firstname}"
/>,</p>
<p>This example email demonstrates how easy it is to add attachments
to an email!</p>
<p>We can even display attached images inline:</p>
- <img src="cid:#{personPhoto.contentId}" />
+ <img src="cid:#{jbossLogo.contentId}" />
<p>The attached pdf was generated by Seam's PDF
library</p>
</m:body>
</m:message>
\ No newline at end of file
Deleted: trunk/examples/mail/view/no_image.png
===================================================================
(Binary files differ)
Added: trunk/examples/mail/view/seamlogo.png
===================================================================
(Binary files differ)
Property changes on: trunk/examples/mail/view/seamlogo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream