Seam SVN: r12094 - modules/remoting/trunk.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-04 01:01:31 -0500 (Thu, 04 Mar 2010)
New Revision: 12094
Modified:
modules/remoting/trunk/pom.xml
Log:
oops
Modified: modules/remoting/trunk/pom.xml
===================================================================
--- modules/remoting/trunk/pom.xml 2010-03-04 06:00:52 UTC (rev 12093)
+++ modules/remoting/trunk/pom.xml 2010-03-04 06:01:31 UTC (rev 12094)
@@ -21,7 +21,6 @@
<module>docs</module>
<module>examples/helloworld</module>
<module>examples/model</module>
- <module>dist</module>
</modules>
<build>
14 years, 8 months
Seam SVN: r12093 - modules/remoting/trunk.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-04 01:00:52 -0500 (Thu, 04 Mar 2010)
New Revision: 12093
Added:
modules/remoting/trunk/assembly.xml
modules/remoting/trunk/pom.xml
Removed:
modules/remoting/trunk/dist/
Log:
restructured build
Added: modules/remoting/trunk/assembly.xml
===================================================================
--- modules/remoting/trunk/assembly.xml (rev 0)
+++ modules/remoting/trunk/assembly.xml 2010-03-04 06:00:52 UTC (rev 12093)
@@ -0,0 +1,41 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.seam.remoting:seam-remoting-core</include>
+ </includes>
+ <binaries>
+ <outputDirectory>seam-remoting/lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+
+ <moduleSet>
+ <includes>
+ <include>org.jboss.seam.remoting:seam-remoting-reference-guide</include>
+ </includes>
+ <binaries>
+ <outputDirectory>seam-remoting/doc/reference</outputDirectory>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
+
+ <moduleSet>
+ <includes>
+ <include>org.jboss.seam.remoting:seam-remoting-helloworld-example</include>
+ </includes>
+ <sources>
+ <outputDirectory>seam-remoting/examples/helloworld</outputDirectory>
+ <includeModuleDirectory>false</includeModuleDirectory>
+ </sources>
+ </moduleSet>
+ </moduleSets>
+</assembly>
Added: modules/remoting/trunk/pom.xml
===================================================================
--- modules/remoting/trunk/pom.xml (rev 0)
+++ modules/remoting/trunk/pom.xml 2010-03-04 06:00:52 UTC (rev 12093)
@@ -0,0 +1,109 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>weld-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <version>8</version>
+ </parent>
+
+ <groupId>org.jboss.seam.remoting</groupId>
+ <artifactId>seam-remoting-parent</artifactId>
+ <packaging>pom</packaging>
+ <version>3.0.0-SNAPSHOT</version>
+ <name>Seam Remoting Parent</name>
+
+ <modules>
+ <module>core</module>
+ <module>docs</module>
+ <module>examples/helloworld</module>
+ <module>examples/model</module>
+ <module>dist</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>1.0.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.2.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>1.0-SP1</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.10</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Snapshots repo to get parent -->
+ <repositories>
+ <repository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>JBoss (Nexus) Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Seam/modules/remoting/trunk</url>
+ </scm>
+
+</project>
14 years, 8 months
Seam SVN: r12092 - tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/jsf.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-03-03 08:29:21 -0500 (Wed, 03 Mar 2010)
New Revision: 12092
Modified:
tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/jsf/DelegatingFacesContext.java
Log:
ported fix of JBSEAM-4566
Modified: tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/jsf/DelegatingFacesContext.java
===================================================================
--- tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/jsf/DelegatingFacesContext.java 2010-03-03 13:17:57 UTC (rev 12091)
+++ tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/jsf/DelegatingFacesContext.java 2010-03-03 13:29:21 UTC (rev 12092)
@@ -1,6 +1,7 @@
package org.jboss.seam.jsf;
import java.util.Iterator;
+import java.util.Map;
import javax.el.ELContext;
import javax.faces.application.Application;
@@ -43,6 +44,10 @@
{
return delegate.getApplication();
}
+
+ public Map<String, Object> getAttributes() {
+ return delegate.getExternalContext().getApplicationMap();
+ }
@Override
public Iterator getClientIdsWithMessages()
14 years, 8 months
Seam SVN: r12091 - branches/community/Seam_2_2/src/main/org/jboss/seam/jsf.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-03-03 08:17:57 -0500 (Wed, 03 Mar 2010)
New Revision: 12091
Modified:
branches/community/Seam_2_2/src/main/org/jboss/seam/jsf/DelegatingFacesContext.java
Log:
fixing JBSEAM-4566
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/jsf/DelegatingFacesContext.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/jsf/DelegatingFacesContext.java 2010-03-03 12:02:48 UTC (rev 12090)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/jsf/DelegatingFacesContext.java 2010-03-03 13:17:57 UTC (rev 12091)
@@ -1,6 +1,7 @@
package org.jboss.seam.jsf;
import java.util.Iterator;
+import java.util.Map;
import javax.el.ELContext;
import javax.faces.application.Application;
@@ -43,6 +44,10 @@
{
return delegate.getApplication();
}
+
+ public Map<String, Object> getAttributes() {
+ return delegate.getExternalContext().getApplicationMap();
+ }
@Override
public Iterator getClientIdsWithMessages()
14 years, 8 months
Seam SVN: r12090 - tags/JBoss_Seam_2_2_1_CR1/examples/excel/resources/WEB-INF.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-03-03 07:02:48 -0500 (Wed, 03 Mar 2010)
New Revision: 12090
Modified:
tags/JBoss_Seam_2_2_1_CR1/examples/excel/resources/WEB-INF/web.xml
Log:
merged fix for JBSEAM-4570
Modified: tags/JBoss_Seam_2_2_1_CR1/examples/excel/resources/WEB-INF/web.xml
===================================================================
--- tags/JBoss_Seam_2_2_1_CR1/examples/excel/resources/WEB-INF/web.xml 2010-03-03 12:00:28 UTC (rev 12089)
+++ tags/JBoss_Seam_2_2_1_CR1/examples/excel/resources/WEB-INF/web.xml 2010-03-03 12:02:48 UTC (rev 12090)
@@ -55,7 +55,14 @@
<param-name>facelets.DEVELOPMENT</param-name>
<param-value>true</param-value>
</context-param>
+
+ <!-- JSF2 requires to set this parameter, otherwise embedded text UI component won't be rendered -->
+ <context-param>
+ <param-name>com.sun.faces.allowTextChildren</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
-</web-app>
\ No newline at end of file
+</web-app>
14 years, 8 months
Seam SVN: r12089 - branches/community/Seam_2_2/examples/excel/resources/WEB-INF.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-03-03 07:00:28 -0500 (Wed, 03 Mar 2010)
New Revision: 12089
Modified:
branches/community/Seam_2_2/examples/excel/resources/WEB-INF/web.xml
Log:
JBSEAM-4570 - added work around into web.xml
Modified: branches/community/Seam_2_2/examples/excel/resources/WEB-INF/web.xml
===================================================================
--- branches/community/Seam_2_2/examples/excel/resources/WEB-INF/web.xml 2010-03-03 09:36:35 UTC (rev 12088)
+++ branches/community/Seam_2_2/examples/excel/resources/WEB-INF/web.xml 2010-03-03 12:00:28 UTC (rev 12089)
@@ -55,6 +55,13 @@
<param-name>facelets.DEVELOPMENT</param-name>
<param-value>true</param-value>
</context-param>
+
+ <!-- JSF2 requires to set this parameter, otherwise embedded text UI component won't be rendered -->
+ <context-param>
+ <param-name>com.sun.faces.allowTextChildren</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
14 years, 8 months
Seam SVN: r12088 - in tags/JBoss_Seam_2_2_1_CR1: examples/itext/view and 1 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-03-03 04:36:35 -0500 (Wed, 03 Mar 2010)
New Revision: 12088
Modified:
tags/JBoss_Seam_2_2_1_CR1/doc/Seam_Reference_Guide/en-US/Itext.xml
tags/JBoss_Seam_2_2_1_CR1/examples/itext/view/chapters.xhtml
tags/JBoss_Seam_2_2_1_CR1/src/pdf/org/jboss/seam/pdf/ui/UIChapter.java
Log:
merging rev.12087 - fix for JBSEAM-4575
Modified: tags/JBoss_Seam_2_2_1_CR1/doc/Seam_Reference_Guide/en-US/Itext.xml
===================================================================
--- tags/JBoss_Seam_2_2_1_CR1/doc/Seam_Reference_Guide/en-US/Itext.xml 2010-03-03 09:04:21 UTC (rev 12087)
+++ tags/JBoss_Seam_2_2_1_CR1/doc/Seam_Reference_Guide/en-US/Itext.xml 2010-03-03 09:36:35 UTC (rev 12088)
@@ -789,7 +789,9 @@
provide the necessary structure. Sections can only be used inside of chapters, but
they may be nested arbitrarily deep. Most PDF viewers provide easy navigation
between chapters and sections in a document. </para>
-
+ <note>
+ <para>You cannot include a chapter into another chapter, this can be done only with section(s).</para>
+ </note>
<para>
<emphasis>Attributes</emphasis>
</para>
@@ -806,17 +808,21 @@
</listitem>
<listitem>
- <para><literal>number</literal> — The chapter number. Every chapter
- should be assigned a chapter number.</para>
+ <para><literal>number</literal> — The chapter/section number. Every chapter/section
+ should be assigned a number.</para>
</listitem>
<listitem>
<para><literal>numberDepth</literal> — The depth of numbering for
- section. All sections are numbered relative to their surrounding
+ chapter/section. All sections are numbered relative to their surrounding
chapter/sections. The fourth section of the first section of chapter
three would be section 3.1.4, if displayed at the default number depth of
three. To omit the chapter number, a number depth of 2 should be used. In
that case, the section number would be displayed as 1.4.</para>
+ <note>
+ <para>Chapter(s) can have a number or without it by setting numberDepth to 0.</para>
+
+ </note>
</listitem>
</itemizedlist>
<para>
Modified: tags/JBoss_Seam_2_2_1_CR1/examples/itext/view/chapters.xhtml
===================================================================
--- tags/JBoss_Seam_2_2_1_CR1/examples/itext/view/chapters.xhtml 2010-03-03 09:04:21 UTC (rev 12087)
+++ tags/JBoss_Seam_2_2_1_CR1/examples/itext/view/chapters.xhtml 2010-03-03 09:36:35 UTC (rev 12088)
@@ -13,7 +13,16 @@
<p:image alignment="center" value="/jboss.jpg" />
<p:font size="24"><p:paragraph spacingBefore="100" alignment="center">Ten Good Reasons To Use Seam</p:paragraph></p:font>
+
+ <p:chapter number="1" numberDepth="0">
+ <p:title>
+ <p:font size="18"><p:paragraph>Chapter without number</p:paragraph></p:font>
+ </p:title>
+ <p:paragraph alignment="justify" spacingBefore="5">AJAX fundamentally changes the interaction model of the web. The synchronous, coarse-grained requests used by traditional web clients let many server-side applications get away with minimal caching and no session-level concurrency. The "stateless" architecture is in many cases a viable solution. But not anymore! AJAX clients hit the server with many asynchronous, concurrent, fine-grained requests, which could easily bring your database to its knees. When state is held in memory between requests, it is highly vulnerable to concurrency-related bugs, since the Java EE platform provides no constructs for dealing with session-level concurrency.</p:paragraph>
+
+ </p:chapter>
+
<p:chapter number="1">
<p:title>
<p:font size="18"><p:paragraph>It's the quickest way to get "rich"</p:paragraph></p:font>
@@ -23,7 +32,8 @@
<p:paragraph alignment="justify" spacingBefore="5">Seam's totally unique concurrency model and state-management model was conceived and designed with AJAX in mind. </p:paragraph>
- <p:paragraph alignment="justify" spacingBefore="5">Seam 1.1 integrates open source JSF-based AJAX solutions like ICEfaces and Ajax4JSF with Seam's state and concurrency management engine. You can add AJAX to your applications with ease, without the need to learn JavaScript, and you will be protected from potential bugs and performance problems associated with the switch to AJAX. </p:paragraph>
+ <p:paragraph alignment="justify" spacingBefore="5">Seam integrates open source JSF-based AJAX solutions like ICEfaces and Ajax4JSF with Seam's state and concurrency management engine. You can add AJAX to your applications with ease, without the need to learn JavaScript, and you will be protected from potential bugs and performance problems associated with the switch to AJAX. </p:paragraph>
+
</p:chapter>
Modified: tags/JBoss_Seam_2_2_1_CR1/src/pdf/org/jboss/seam/pdf/ui/UIChapter.java
===================================================================
--- tags/JBoss_Seam_2_2_1_CR1/src/pdf/org/jboss/seam/pdf/ui/UIChapter.java 2010-03-03 09:04:21 UTC (rev 12087)
+++ tags/JBoss_Seam_2_2_1_CR1/src/pdf/org/jboss/seam/pdf/ui/UIChapter.java 2010-03-03 09:36:35 UTC (rev 12088)
@@ -36,7 +36,7 @@
chapterTitle = (String) valueBinding(context, "chapterTitle", chapterTitle);
section = new Chapter("", number);
- section.setNumberDepth(numberDepth);
+ if (numberDepth != null) section.setNumberDepth(numberDepth);
if (chapterTitle != null) {
section.setBookmarkTitle(chapterTitle);
14 years, 8 months
Seam SVN: r12087 - in branches/community/Seam_2_2: examples/itext/view and 1 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-03-03 04:04:21 -0500 (Wed, 03 Mar 2010)
New Revision: 12087
Modified:
branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Itext.xml
branches/community/Seam_2_2/examples/itext/view/chapters.xhtml
branches/community/Seam_2_2/src/pdf/org/jboss/seam/pdf/ui/UIChapter.java
Log:
JBSEAM-4575
Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Itext.xml
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Itext.xml 2010-03-03 01:33:56 UTC (rev 12086)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Itext.xml 2010-03-03 09:04:21 UTC (rev 12087)
@@ -789,7 +789,9 @@
provide the necessary structure. Sections can only be used inside of chapters, but
they may be nested arbitrarily deep. Most PDF viewers provide easy navigation
between chapters and sections in a document. </para>
-
+ <note>
+ <para>You cannot include a chapter into another chapter, this can be done only with section(s).</para>
+ </note>
<para>
<emphasis>Attributes</emphasis>
</para>
@@ -806,17 +808,21 @@
</listitem>
<listitem>
- <para><literal>number</literal> — The chapter number. Every chapter
- should be assigned a chapter number.</para>
+ <para><literal>number</literal> — The chapter/section number. Every chapter/section
+ should be assigned a number.</para>
</listitem>
<listitem>
<para><literal>numberDepth</literal> — The depth of numbering for
- section. All sections are numbered relative to their surrounding
+ chapter/section. All sections are numbered relative to their surrounding
chapter/sections. The fourth section of the first section of chapter
three would be section 3.1.4, if displayed at the default number depth of
three. To omit the chapter number, a number depth of 2 should be used. In
that case, the section number would be displayed as 1.4.</para>
+ <note>
+ <para>Chapter(s) can have a number or without it by setting numberDepth to 0.</para>
+
+ </note>
</listitem>
</itemizedlist>
<para>
Modified: branches/community/Seam_2_2/examples/itext/view/chapters.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/itext/view/chapters.xhtml 2010-03-03 01:33:56 UTC (rev 12086)
+++ branches/community/Seam_2_2/examples/itext/view/chapters.xhtml 2010-03-03 09:04:21 UTC (rev 12087)
@@ -13,7 +13,16 @@
<p:image alignment="center" value="/jboss.jpg" />
<p:font size="24"><p:paragraph spacingBefore="100" alignment="center">Ten Good Reasons To Use Seam</p:paragraph></p:font>
+
+ <p:chapter number="1" numberDepth="0">
+ <p:title>
+ <p:font size="18"><p:paragraph>Chapter without number</p:paragraph></p:font>
+ </p:title>
+ <p:paragraph alignment="justify" spacingBefore="5">AJAX fundamentally changes the interaction model of the web. The synchronous, coarse-grained requests used by traditional web clients let many server-side applications get away with minimal caching and no session-level concurrency. The "stateless" architecture is in many cases a viable solution. But not anymore! AJAX clients hit the server with many asynchronous, concurrent, fine-grained requests, which could easily bring your database to its knees. When state is held in memory between requests, it is highly vulnerable to concurrency-related bugs, since the Java EE platform provides no constructs for dealing with session-level concurrency.</p:paragraph>
+
+ </p:chapter>
+
<p:chapter number="1">
<p:title>
<p:font size="18"><p:paragraph>It's the quickest way to get "rich"</p:paragraph></p:font>
@@ -23,7 +32,8 @@
<p:paragraph alignment="justify" spacingBefore="5">Seam's totally unique concurrency model and state-management model was conceived and designed with AJAX in mind. </p:paragraph>
- <p:paragraph alignment="justify" spacingBefore="5">Seam 1.1 integrates open source JSF-based AJAX solutions like ICEfaces and Ajax4JSF with Seam's state and concurrency management engine. You can add AJAX to your applications with ease, without the need to learn JavaScript, and you will be protected from potential bugs and performance problems associated with the switch to AJAX. </p:paragraph>
+ <p:paragraph alignment="justify" spacingBefore="5">Seam integrates open source JSF-based AJAX solutions like ICEfaces and Ajax4JSF with Seam's state and concurrency management engine. You can add AJAX to your applications with ease, without the need to learn JavaScript, and you will be protected from potential bugs and performance problems associated with the switch to AJAX. </p:paragraph>
+
</p:chapter>
Modified: branches/community/Seam_2_2/src/pdf/org/jboss/seam/pdf/ui/UIChapter.java
===================================================================
--- branches/community/Seam_2_2/src/pdf/org/jboss/seam/pdf/ui/UIChapter.java 2010-03-03 01:33:56 UTC (rev 12086)
+++ branches/community/Seam_2_2/src/pdf/org/jboss/seam/pdf/ui/UIChapter.java 2010-03-03 09:04:21 UTC (rev 12087)
@@ -36,7 +36,7 @@
chapterTitle = (String) valueBinding(context, "chapterTitle", chapterTitle);
section = new Chapter("", number);
- section.setNumberDepth(numberDepth);
+ if (numberDepth != null) section.setNumberDepth(numberDepth);
if (chapterTitle != null) {
section.setBookmarkTitle(chapterTitle);
14 years, 8 months
Seam SVN: r12086 - in modules/remoting/trunk: dist and 2 other directories.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-02 20:33:56 -0500 (Tue, 02 Mar 2010)
New Revision: 12086
Modified:
modules/remoting/trunk/core/pom.xml
modules/remoting/trunk/dist/pom.xml
modules/remoting/trunk/dist/src/assemble/bin.xml
modules/remoting/trunk/examples/helloworld/pom.xml
Log:
clean up build
Modified: modules/remoting/trunk/core/pom.xml
===================================================================
--- modules/remoting/trunk/core/pom.xml 2010-03-01 14:27:54 UTC (rev 12085)
+++ modules/remoting/trunk/core/pom.xml 2010-03-03 01:33:56 UTC (rev 12086)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>seam-parent</artifactId>
- <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-remoting-parent</artifactId>
+ <groupId>org.jboss.seam.remoting</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
@@ -30,16 +30,11 @@
</repository>
</repositories>
- <properties>
- <seam.version>3.0.0-SNAPSHOT</seam.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -60,11 +55,11 @@
<scope>provided</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-api</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency-->
<dependency>
<groupId>javax.jms</groupId>
Modified: modules/remoting/trunk/dist/pom.xml
===================================================================
--- modules/remoting/trunk/dist/pom.xml 2010-03-01 14:27:54 UTC (rev 12085)
+++ modules/remoting/trunk/dist/pom.xml 2010-03-03 01:33:56 UTC (rev 12086)
@@ -13,14 +13,9 @@
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-dist</artifactId>
<packaging>pom</packaging>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<name>Seam Remoting Parent</name>
- <modules>
- <module>../core</module>
- <module>../docs</module>
- </modules>
-
<!-- Snapshots repo to get parent -->
<repositories>
<repository>
@@ -51,10 +46,6 @@
</plugins>
</build>
- <properties>
- <seam.version>3.0.0-SNAPSHOT</seam.version>
- </properties>
-
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk</developerConnection>
Modified: modules/remoting/trunk/dist/src/assemble/bin.xml
===================================================================
--- modules/remoting/trunk/dist/src/assemble/bin.xml 2010-03-01 14:27:54 UTC (rev 12085)
+++ modules/remoting/trunk/dist/src/assemble/bin.xml 2010-03-03 01:33:56 UTC (rev 12086)
@@ -16,6 +16,7 @@
<unpack>false</unpack>
</binaries>
</moduleSet>
+
<moduleSet>
<includes>
<include>org.jboss.seam.remoting:seam-remoting-reference-guide</include>
@@ -25,5 +26,15 @@
<unpack>true</unpack>
</binaries>
</moduleSet>
+
+ <moduleSet>
+ <includes>
+ <include>org.jboss.seam.remoting:seam-remoting-helloworld-example</include>
+ </includes>
+ <sources>
+ <outputDirectory>seam-remoting/examples/helloworld</outputDirectory>
+ <includeModuleDirectory>false</includeModuleDirectory>
+ </sources>
+ </moduleSet>
</moduleSets>
</assembly>
Modified: modules/remoting/trunk/examples/helloworld/pom.xml
===================================================================
--- modules/remoting/trunk/examples/helloworld/pom.xml 2010-03-01 14:27:54 UTC (rev 12085)
+++ modules/remoting/trunk/examples/helloworld/pom.xml 2010-03-03 01:33:56 UTC (rev 12086)
@@ -9,9 +9,9 @@
</parent>
<groupId>org.jboss.seam.remoting</groupId>
- <artifactId>seam-remoting-helloworld-example</artifactId>
+ <artifactId>remoting-helloworld-example</artifactId>
<packaging>war</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<name>Seam Remoting Helloworld Example</name>
<dependencies>
@@ -37,9 +37,9 @@
</dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>seam-remoting</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <groupId>org.jboss.seam.remoting</groupId>
+ <artifactId>remoting-core</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
14 years, 8 months
Seam SVN: r12085 - in branches/enterprise/JBPAPP_4_3_FP01: examples and 4 other directories.
by seam-commits@lists.jboss.org
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>duke(a)jboss.org</value>
- <value>duke(a)jboss.com</value>
- </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><mail:mailSession></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>
14 years, 8 months