Author: manaRH Date: 2010-03-01 09:27:54 -0500 (Mon, 01 Mar 2010) New Revision: 12085 Modified: branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Mail.xml branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Preface.xml branches/enterprise/JBPAPP_4_3_FP01/examples/build.xml branches/enterprise/JBPAPP_4_3_FP01/examples/mail/build.xml branches/enterprise/JBPAPP_4_3_FP01/examples/mail/readme.txt branches/enterprise/JBPAPP_4_3_FP01/examples/mail/resources/WEB-INF/components.xml branches/enterprise/JBPAPP_4_3_FP01/examples/mail/view/index.xhtml branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/mail-2.0.xsd Log: JBPAPP-3335 - removing remaining Meldware references Modified: branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Mail.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Mail.xml 2010-03-01 04:47:41 UTC (rev 12084) +++ branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Mail.xml 2010-03-01 14:27:54 UTC (rev 12085) @@ -467,59 +467,7 @@ </section> </section> </section> - - <section> - <title>Meldware</title> - - <para> - Seam's mail examples use Meldware (from <ulink url="http://buni.org">buni.org</ulink>) - as a mail server. Meldware is a groupware package that provides - <literal>SMTP</literal>, <literal>POP3</literal>, <literal>IMAP</literal>, - webmail, a shared calendar and an graphical admin tool; it's written as a - JEE application so can be deployed onto JBoss AS alongside your Seam - application. - </para> - - <para> - The version of Meldware distributed with Seam (in the <literal>mail/buni-meldware</literal> - folder) is specially tailored for development - mailboxes, users and - aliases (email addresses) are created every time the application - deploys. If you want to use Meldware in production you should install - the latest release from <ulink url="http://buni.org">buni.org</ulink>. - </para> - <para> - To create mailboxes, users and aliases, you can use the - <literal>meldware</literal> component: - </para> - - <programlisting role="XHTML"><![CDATA[<components xmlns="http://jboss.com/products/seam/components" - xmlns:core="http://jboss.com/products/seam/core" - xmlns:mail="http://jboss.com/products/seam/mail"> - - <mail:mail-session host="smtp.example.com"/> - - <mail:meldware> - <mail:users> - <value>#{duke}</value> - <value>#{root}</value> - </mail:users> - </mail:meldware> - - <mail:meldware-user name="duke" username="duke" password="duke"> - <mail:aliases> - <value&gt;duke(a)jboss.org&lt;/value&gt; - <value&gt;duke(a)jboss.com&lt;/value&gt; - </mail:aliases> - <mail:meldware-user name="root" username="root" password="root" administrator="true" /> -</components>]]></programlisting> - <para> - Here we've created two users, <literal>duke</literal>, who has two email - addresses and an administrator with the username <literal>root</literal>. - </para> - - </section> - <section id="mail.tags"> <title>Tags</title> Modified: branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Preface.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Preface.xml 2010-03-01 04:47:41 UTC (rev 12084) +++ branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Preface.xml 2010-03-01 14:27:54 UTC (rev 12085) @@ -260,8 +260,8 @@ </para> <para> Seam integrates JPA and Hibernate3 for persistence, the EJB Timer Service and Quartz - for lightweight asychronicity, jBPM for workflow, JBoss Rules for business rules, Meldware - Mail for email, Hibernate Search and Lucene for full text search, JMS for messaging and JBoss + for lightweight asychronicity, jBPM for workflow, JBoss Rules for business rules, Hibernate Search + and Lucene for full text search, JMS for messaging and JBoss Cache for page fragment caching. Seam layers an innovative rule-based security framework over JAAS and JBoss Rules. There's even JSF tag libraries for rendering PDF, outgoing email, charts and wikitext. Seam components may be called synchronously as a Web Service, asynchronously Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/build.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/build.xml 2010-03-01 04:47:41 UTC (rev 12084) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/build.xml 2010-03-01 14:27:54 UTC (rev 12085) @@ -37,8 +37,7 @@ <!-- Library directories --> <property name="lib.dir" value="${seam.dir}/lib" /> - <property name="mail.dir" value="${seam.dir}/mail" /> - <!-- <property name="meldware.dir" value="${lib.dir}/meldware.deployable" />--> + <property name="mail.dir" value="${seam.dir}/mail" /> <!-- Target directories --> <property name="dist.dir" value="dist" /> @@ -308,27 +307,6 @@ <include name="jboss-common-core.jar" if="jboss-common-core.lib" /> </fileset> - <!-- ############################ MELDWARE ############################ --> - <!-- - Meldware from buni.org provides a java based mail server which Seam uses - to demonstrate it's mail capabilities. It's unlike other dependencies as - it is deployed as a number of standalone wars, rars and ears. - --> - - <!-- Meldware configuration --> - <patternset id="meldware.conf.files"> - <exclude name="**/*" unless="deploy.meldware.mail" /> - <include name="meldware.store" if="deploy.meldware.mail" /> - </patternset> - - <!-- Just the mail portion of meldware --> - <patternset id="meldware.files"> - <exclude name="**/*" unless="deploy.meldware.mail" /> - <include name="_mail.ear" if="deploy.meldware.mail" /> - <include name="meldwarebase.sar" if="deploy.meldware.mail" /> - </patternset> - - <!-- ############### RESOURCES FOR EXAMPLES ################ --> <!-- A number of configuration files are needed for Seam, and it's @@ -686,33 +664,9 @@ <copy file="${dist.dir}/${example.name}.ear" todir="${deploy.dir}" /> </target> - <!-- Deploy meldware to JBoss AS - <target name="meldware" if="deploy.meldware.mail"> - <copyInlineDependencies id="jbosscommoncore" scope="runtime" todir="${meldware.dir}"> - <dependency groupId="org.buni.meldware" artifactId="mail" type="ear" version="1.0M8" /> - <dependency groupId="org.buni.meldware" artifactId="meldware" type="store" version="1.0M8" /> - <dependency groupId="org.buni.meldware" artifactId="meldwarebase" type="sar" version="1.0M8" /> - </copyInlineDependencies> - <copy todir="${deploy.dir}"> - <fileset dir="${meldware.dir}"> - <patternset refid="meldware.files" /> - </fileset> - </copy> - <copy todir="${conf.dir}"> - <fileset dir="${meldware.dir}"> - <patternset refid="meldware.conf.files" /> - </fileset> - </copy> - </target>--> - <target name="undeploy" description="Undeploy the example from JBoss"> <delete file="${deploy.dir}/${example.name}.ear" /> <delete file="${deploy.dir}/${example.ds}" /> - <!-- <delete> - <fileset dir="${deploy.dir}"> - <patternset refid="meldware.files" /> - </fileset> - </delete>--> </target> <!-- Copy the data source to JBoss AS --> @@ -750,11 +704,6 @@ </delete> <delete file="${deploy.dir}/${example.ds}" failonerror="no" /> <delete dir="${ear.deploy.dir}" failonerror="no" /> - <!-- <delete failonerror="no"> - <fileset dir="${deploy.dir}"> - <patternset refid="meldware.files" /> - </fileset> - </delete> --> </target> <target name="restart" depends="explode" description="Restart the exploded archive"> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/mail/build.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/mail/build.xml 2010-03-01 04:47:41 UTC (rev 12084) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/mail/build.xml 2010-03-01 14:27:54 UTC (rev 12085) @@ -7,8 +7,7 @@ <!-- Libraries --> <property name="seam.ui.lib" value="yes" /> - <property name="seam.mail.lib" value="yes" /> - <property name="deploy.meldware.mail" value="yes" /> + <property name="seam.mail.lib" value="yes" /> <property name="seam.pdf.lib" value="yes"/> <property name="seam.debug.lib" value="yes" /> <property name="facelets.lib" value="yes" /> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/mail/readme.txt =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/mail/readme.txt 2010-03-01 04:47:41 UTC (rev 12084) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/mail/readme.txt 2010-03-01 14:27:54 UTC (rev 12085) @@ -1,5 +1,7 @@ Seam Mail Example ================== -This example demonstrates the Seam Mail functionality. It runs on JBoss AS. +This example demonstrates the Seam Mail functionality. It runs on JBoss AS and requires a configuration of an SMTP host and relay. +You'll need to edit <mail:mailSession> in resources/WEB-INF/components.xml, set a SMTP host and relay to relay via and then run +the ant deploy target again. example.name=mail \ No newline at end of file Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/mail/resources/WEB-INF/components.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/mail/resources/WEB-INF/components.xml 2010-03-01 04:47:41 UTC (rev 12084) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/mail/resources/WEB-INF/components.xml 2010-03-01 14:27:54 UTC (rev 12085) @@ -16,17 +16,7 @@ <mail:mail-session host="localhost" tls="false" port="2525" ssl="false" /> <!-- uncomment this one and set the host attribute to the name or IP address of your SMTP gateway--> - <!-- <mail:mail-session host="smtp.foo.com" />--> - - <!-- Configure meldware --> - <mail:meldware> - <mail:users> - <value>#{meldwareUser.test}</value> - </mail:users> - </mail:meldware> - - <!-- Meldware users --> - - <mail:meldware-user name="meldwareUser.test" username="test" password="test" /> + <!-- example of setting for gmail --> + <!-- <mail:mail-session host="smtp.gmail.com" port="465" username="<your_username>" password="" ssl="true" /> --> </components> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/mail/view/index.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/mail/view/index.xhtml 2010-03-01 04:47:41 UTC (rev 12084) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/mail/view/index.xhtml 2010-03-01 14:27:54 UTC (rev 12085) @@ -45,15 +45,8 @@ in <code>resources/WEB-INF/components.xml</code> a <code>&lt;mail:mailSession&gt;</code>, set a SMTP relay to relay via and then run the <code>ant deploy</code> again.</li> - <li><b>Servers other than JBoss AS</b> - This example deploys Meldware (from <a href="http://www.buni.org">buni.org</a> - - <code>meldware.ear</code>) to act as an SMTP server (it listens for authenticated - connections on <code>localhost:2525</code>). This means the mail example will - work out of the box on JBoss AS 4.0.5.GA. If you using another server you may need - to set an SMTP relay as described above.</li> + <li>This example <b>requires</b> a configuration of an SMTP host and relay as described above.</li> - <li>Meldware will fail if you have another service using port 2525 (you'll get a errors - when the applicaiton is deployed). To get around this you can set a SMTP gateway as - described above.</li> </ul> </body> </html> Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/mail-2.0.xsd =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/mail-2.0.xsd 2010-03-01 04:47:41 UTC (rev 12084) +++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/mail-2.0.xsd 2010-03-01 14:27:54 UTC (rev 12085) @@ -22,29 +22,4 @@ </xs:complexType> </xs:element> - <xs:element name="users" type="components:multiValuedProperty"/> - <xs:element name="meldware"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="mail:users" /> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component" /> - </xs:complexType> - </xs:element> - - <xs:element name="aliases" type="components:multiValuedProperty"/> - <xs:attributeGroup name="attlist.meldwareUser"> - <xs:attribute name="username" type="xs:string" /> - <xs:attribute name="password" type="xs:string" /> - <xs:attribute name="administrator" type="xs:boolean" default="false"/> - </xs:attributeGroup> - <xs:element name="meldware-user"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="mail:aliases" /> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attributeGroup ref="mail:attlist.meldwareUser" /> - </xs:complexType> - </xs:element> </xs:schema>