Seam SVN: r15190 - in branches/enterprise/WFK-2_1/distribution: src/main/assembly and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-10-04 07:38:28 -0400 (Thu, 04 Oct 2012)
New Revision: 15190
Modified:
branches/enterprise/WFK-2_1/distribution/pom.xml
branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml
Log:
customized distribution assembly - removed refdoc, arquillian libs
Modified: branches/enterprise/WFK-2_1/distribution/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/distribution/pom.xml 2012-10-03 13:38:04 UTC (rev 15189)
+++ branches/enterprise/WFK-2_1/distribution/pom.xml 2012-10-04 11:38:28 UTC (rev 15190)
@@ -14,35 +14,6 @@
<build>
<plugins>
- <!-- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>../jar-dependencies</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin> -->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
- <exportAntProperties>true</exportAntProperties>
- <target>
- <property name="test.lib.dir" location="target/arquillian/" />
- <property name="version.jboss-as7" value="${version.jbossas7}" />
- <ant antfile="get-arquillian-libs.xml" target="copyarq"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -106,11 +77,6 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-resteasy</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>seam-reference-guide</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml
===================================================================
--- branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2012-10-03 13:38:04 UTC (rev 15189)
+++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2012-10-04 11:38:28 UTC (rev 15190)
@@ -77,13 +77,14 @@
<include>*.jar</include>
</includes>
</fileSet>
- <fileSet>
+<!-- <fileSet>
<directory>target/arquillian</directory>
<outputDirectory>./lib/test</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
+-->
<fileSet>
<directory>../build</directory>
<outputDirectory>./build</outputDirectory>
@@ -122,11 +123,8 @@
<include>org.jboss.seam:jboss-seam-excel:jar</include>
<include>org.jboss.seam:jboss-seam-pdf:jar</include>
<include>org.jboss.seam:jboss-seam-mail:jar</include>
- <include>org.jboss.seam:jboss-seam-rss:jar</include>
<include>org.jboss.seam:jboss-seam-resteasy:jar</include>
- <include>org.jboss.seam:jboss-seam-wicket:jar</include>
<include>org.jboss.seam:jboss-seam-remoting:jar</include>
- <include>org.jboss.seam:jboss-seam-flex:jar</include>
<include>org.jboss.seam:jboss-seam-ioc:jar</include>
</includes>
<excludes>
@@ -202,7 +200,7 @@
</includes>
</dependencySet>
- <!-- Pull in docbook artifacts -->
+ <!-- Pull in docbook artifacts
<dependencySet>
<outputDirectory>doc/reference/</outputDirectory>
<unpack>true</unpack>
@@ -219,6 +217,7 @@
<fileMode>755</fileMode>
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
+ -->
<!-- Add necessary javadoc jars -->
<dependencySet>
11 years, 6 months
Seam SVN: r15189 - branches/community/Seam_2_3/jboss-seam-gen/dist/view.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-10-03 09:38:04 -0400 (Wed, 03 Oct 2012)
New Revision: 15189
Modified:
branches/community/Seam_2_3/jboss-seam-gen/dist/view/home.xhtml
Log:
seam-gen, remove the item about testng/jboss embedded as we don't have that anymore.
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/view/home.xhtml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/view/home.xhtml 2012-10-03 10:48:23 UTC (rev 15188)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/home.xhtml 2012-10-03 13:38:04 UTC (rev 15189)
@@ -20,7 +20,6 @@
<li>Ant build script</li>
<li>Deployment to JBoss AS 7(EAR or WAR)</li>
<li>Development and production profiles</li>
- <li>Integration testing using TestNG and Embedded JBoss</li>
<li>JavaBean or EJB 3.1 Seam components</li>
<li>JPA entity classes</li>
<li>A configurable DataSource and JPA EntityManager</li>
11 years, 6 months
Seam SVN: r15188 - in branches/enterprise/WFK-2_1: bom and 4 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-10-03 06:48:23 -0400 (Wed, 03 Oct 2012)
New Revision: 15188
Removed:
branches/enterprise/WFK-2_1/examples/guice/
branches/enterprise/WFK-2_1/examples/icefaces/
branches/enterprise/WFK-2_1/examples/metawidget/
branches/enterprise/WFK-2_1/examples/remoting/progressbar/
branches/enterprise/WFK-2_1/examples/rss/
branches/enterprise/WFK-2_1/examples/wicket/
branches/enterprise/WFK-2_1/jboss-seam-flex/
branches/enterprise/WFK-2_1/jboss-seam-rss/
branches/enterprise/WFK-2_1/jboss-seam-wicket/
Modified:
branches/enterprise/WFK-2_1/bom/pom.xml
branches/enterprise/WFK-2_1/distribution/pom.xml
branches/enterprise/WFK-2_1/examples/excel/excel-tests/pom.xml
branches/enterprise/WFK-2_1/examples/pom.xml
branches/enterprise/WFK-2_1/pom.xml
Log:
removed nonwanted seam components
Modified: branches/enterprise/WFK-2_1/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/bom/pom.xml 2012-10-03 09:53:15 UTC (rev 15187)
+++ branches/enterprise/WFK-2_1/bom/pom.xml 2012-10-03 10:48:23 UTC (rev 15188)
@@ -141,30 +141,12 @@
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-flex</artifactId>
- <version>${version.seam}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-excel</artifactId>
<version>${version.seam}</version>
</dependency>
+ <!-- thirdparty dependencies -->
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-rss</artifactId>
- <version>${version.seam}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-wicket</artifactId>
- <version>${version.seam}</version>
- </dependency>
-
- <!-- thirdparty dependencies -->
- <dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.6</version>
Modified: branches/enterprise/WFK-2_1/distribution/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/distribution/pom.xml 2012-10-03 09:53:15 UTC (rev 15187)
+++ branches/enterprise/WFK-2_1/distribution/pom.xml 2012-10-03 10:48:23 UTC (rev 15188)
@@ -88,10 +88,6 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-flex</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ioc</artifactId>
</dependency>
<dependency>
@@ -112,15 +108,6 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-rss</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-wicket</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>seam-reference-guide</artifactId>
<version>${project.version}</version>
</dependency>
@@ -139,12 +126,6 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-flex</artifactId>
- <classifier>sources</classifier>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ioc</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
@@ -175,25 +156,12 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-rss</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-wicket</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
Modified: branches/enterprise/WFK-2_1/examples/excel/excel-tests/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/excel/excel-tests/pom.xml 2012-10-03 09:53:15 UTC (rev 15187)
+++ branches/enterprise/WFK-2_1/examples/excel/excel-tests/pom.xml 2012-10-03 10:48:23 UTC (rev 15188)
@@ -92,10 +92,6 @@
<artifactId>jboss-seam-pdf</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-rss</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.el</groupId>
<artifactId>jboss-el-api_2.2_spec</artifactId>
</dependency>
Modified: branches/enterprise/WFK-2_1/examples/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/pom.xml 2012-10-03 09:53:15 UTC (rev 15187)
+++ branches/enterprise/WFK-2_1/examples/pom.xml 2012-10-03 10:48:23 UTC (rev 15188)
@@ -105,16 +105,12 @@
<module>dvdstore</module>
<module>excel</module>
<module>groovybooking</module>
- <module>guice</module>
<module>hibernate</module>
- <module>icefaces</module>
<module>itext</module>
<module>jee6</module>
<module>jpa</module>
<module>mail</module>
<module>messages</module>
- <module>metawidget/booking</module>
- <module>metawidget/groovybooking</module>
<module>nestedbooking</module>
<module>numberguess</module>
<module>openid</module>
@@ -124,7 +120,6 @@
<module>remoting/gwt</module>
<module>remoting/helloworld</module>
<module>restbay</module>
- <module>rss</module>
<module>seambay</module>
<module>seamdiscs</module>
<module>seampay</module>
@@ -133,7 +128,6 @@
<module>tasks</module>
<module>todo</module>
<module>ui</module>
- <module>wicket</module>
</modules>
<build>
Modified: branches/enterprise/WFK-2_1/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/pom.xml 2012-10-03 09:53:15 UTC (rev 15187)
+++ branches/enterprise/WFK-2_1/pom.xml 2012-10-03 10:48:23 UTC (rev 15188)
@@ -419,13 +419,10 @@
<module>jboss-seam-debug</module>
<module>jboss-seam-gen</module>
<module>jboss-seam-excel</module>
- <module>jboss-seam-flex</module>
<module>jboss-seam-mail</module>
<module>jboss-seam-pdf</module>
<module>jboss-seam-remoting</module>
<module>jboss-seam-resteasy</module>
- <module>jboss-seam-rss</module>
- <module>jboss-seam-wicket</module>
<module>jboss-seam-ioc</module>
<module>functional-tests</module>
<module>seam-integration-tests</module>
11 years, 6 months
Seam SVN: r15187 - branches/enterprise/JBPAPP_5_0/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-10-03 05:53:15 -0400 (Wed, 03 Oct 2012)
New Revision: 15187
Modified:
branches/enterprise/JBPAPP_5_0/build/root.pom.xml
Log:
JBPAPP-8042
Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2012-10-03 09:49:22 UTC (rev 15186)
+++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2012-10-03 09:53:15 UTC (rev 15187)
@@ -217,7 +217,7 @@
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
- <version>3.2.12</version>
+ <version>3.2.13</version>
<exclusions>
<exclusion>
<groupId>org.hibernate</groupId>
11 years, 6 months
Seam SVN: r15186 - in branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui: component and 4 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-10-03 05:49:22 -0400 (Wed, 03 Oct 2012)
New Revision: 15186
Modified:
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/DocumentStoreUtils.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIAction.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UICache.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationId.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorateAware.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDefaultAction.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDownload.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFragment.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILabel.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILink.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIMessage.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIResource.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelection.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISpan.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIStyle.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UITaskId.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicBooleanConverter.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicIntegerConverter.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicLongConverter.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/DateTimeConverter.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/NoSelectionConverter.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageBlur.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageSize.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageType.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/CommandButtonParameterComponentHandler.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/DecorateHandler.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/validator/EqualityValidator.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/validator/ModelValidator.java
Log:
JBSEAM-4958
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/DocumentStoreUtils.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/DocumentStoreUtils.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/DocumentStoreUtils.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -19,6 +19,12 @@
import org.jboss.seam.navigation.Pages;
import org.jboss.seam.ui.component.UIResource;
+/**
+ * Helper class for DocumentStore
+ *
+ * @author mnovotny
+ *
+ */
public class DocumentStoreUtils
{
private static final int BUFFER_SIZE = 32768;
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIAction.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIAction.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIAction.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -27,7 +27,7 @@
import org.jboss.seam.navigation.Pages;
import org.jboss.seam.navigation.SafeActions;
-/*
+/**
* This is a support component and is not processed by the CDK (doesn't appear in faces-config)
*
*/
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UICache.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UICache.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UICache.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -32,7 +32,7 @@
/**
- * JSF component class
+ * JSF component class for Seam UICache
*
*/
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Cache",value="Cache the rendered page fragment using the installed cache provider."),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationId.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationId.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationId.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -35,10 +35,10 @@
/**
- * JSF component class
+ * JSF component class which addd the conversation id to JSF link or button (e.g. <h:commandLink/>, <s:button/>)
*
*/
-@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.ConversationId",value="Add the conversation id to JSF link or button (e.g. <h:commandLink />, <s:button />)."),
+@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.ConversationId",value="Add the conversation id to JSF link or button (e.g. <h:commandLink/>, <s:button/>)."),
family="org.jboss.seam.ui.ConversationId", type="org.jboss.seam.ui.ConversationId",generate="org.jboss.seam.ui.component.html.HtmlConversationId",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="conversationId"),
attributes = {"javax.faces.component.UIParameter.xml", "conversationId.xml"})
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -31,7 +31,8 @@
import org.richfaces.cdk.annotations.Tag;
/**
- * JSF component class
+ * JSF component class for customization of the conversation propagation in a command link or a button
+ *
*
*/
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.ConversationPropagation",value="Customize the conversation propagation for a command link or button (or similar JSF control)."),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -13,6 +13,11 @@
import org.richfaces.cdk.annotations.Tag;
+/**
+ * "Decorates" a JSF input field when validation fails or when required="true" is set
+ * @author mnovotny
+ *
+ */
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Decorate",value="\"Decorate\" a JSF input field when validation fails or when required=\"true\" is set."),
family="org.jboss.seam.ui.Decorate", type="org.jboss.seam.ui.Decorate",generate="org.jboss.seam.ui.component.html.HtmlDecorate",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="decorate", handler="org.jboss.seam.ui.handler.DecorateHandler"),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorateAware.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorateAware.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorateAware.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -3,7 +3,8 @@
/**
* Component that is aware of being used from a facet by s:decorate
*/
-public interface UIDecorateAware {
+public interface UIDecorateAware
+{
/**
* Method called by DecorateRendererBase when it's about to render a subtree containing this component.
*/
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDefaultAction.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDefaultAction.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDefaultAction.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -11,10 +11,12 @@
import org.richfaces.cdk.annotations.Tag;
/**
+ * Simulates pressing the action source when 'enter' is pressed
+ *
* @author mnovotny
*
*/
-@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.DefaultAction",value="Simulate pressing the action source when 'enter' is pressed."),
+@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.DefaultAction",value="Simulates pressing the action source when 'enter' is pressed."),
family="org.jboss.seam.ui.DefaultAction", type="org.jboss.seam.ui.DefaultAction",generate="org.jboss.seam.ui.component.html.HtmlDefaultAction",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="defaultAction"),
renderer = @JsfRenderer(type="org.jboss.seam.ui.DefaultActionRenderer", family="org.jboss.seam.ui.DefaultActionRenderer"))
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDownload.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDownload.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDownload.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -7,11 +7,12 @@
import org.richfaces.cdk.annotations.Tag;
/**
+ * JSF Component for Link which is able to download a file
*
* @author Daniel Roth
*
*/
-@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Download",value="Link for downloading a file"),
+@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Download",value="JSF Component for Link which is able to download a file"),
family="org.jboss.seam.ui.Download", type="org.jboss.seam.ui.Download",generate="org.jboss.seam.ui.component.html.HtmlDownload",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="download"),
renderer = @JsfRenderer(type="org.jboss.seam.ui.DownloadRenderer", family="org.jboss.seam.ui.DownloadRenderer"),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -10,7 +10,7 @@
import org.richfaces.cdk.annotations.Tag;
/**
- * JSF component class
+ * JSF component class for creating SelectItem from an enum value
*
*/
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.EnumItem",value="Creates a SelectItem from an enum value."),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -9,7 +9,7 @@
import org.richfaces.cdk.annotations.Tag;
/**
- * UIComponent for validator
+ * JSF Component for validation of all child JSF input fields against the bound properties using Bean Validation
*
* @author Daniel Roth
*/
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -15,7 +15,8 @@
import org.richfaces.cdk.annotations.Tag;
/**
- * JSF component class
+ * JSF component class which renders a file upload control.
+ * This control must be used within a form with an encoding type of multipart/form-data
*
*/
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.FileUpload",value="Renders a file upload control. This control must be used within a form with an encoding type of multipart/form-data"),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -39,10 +39,10 @@
import antlr.RecognitionException;
/**
- * JSF component class
+ * JSF component class which outputs Seam Text. Parse errors generate WARN level log messages.
*
*/
-@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.FormattedText",value="Output Seam Text. Parse errors generate WARN level log messages."),
+@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.FormattedText",value="Outputs Seam Text. Parse errors generate WARN level log messages."),
family="org.jboss.seam.ui.FormattedText", type="org.jboss.seam.ui.FormattedText",generate="org.jboss.seam.ui.component.html.HtmlFormattedText",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="formattedText"),
renderer = @JsfRenderer(type="org.jboss.seam.ui.FormattedTextRenderer", family="org.jboss.seam.ui.FormattedTextRenderer"),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFragment.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFragment.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFragment.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -30,7 +30,7 @@
import org.richfaces.cdk.annotations.Tag;
/**
- * JSF component class
+ * JSF component class which surrounds a page fragment and allows you to apply render/not render without any html output
*
*/
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Fragment",value="Surround a page fragment, allows you to apply render/not render without any html output."),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILabel.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILabel.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILabel.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -8,7 +8,13 @@
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.Tag;
-@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Label",value="A label associated with the nearest JSF input component"),
+/**
+ * JSF Component which renders a label associated with the nearest JSF input component
+ *
+ * @author mnovotny
+ *
+ */
+@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Label",value="A label associated with the nearest JSF input component."),
family="javax.faces.Output", type="org.jboss.seam.ui.Label",generate="org.jboss.seam.ui.component.html.HtmlLabel",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="label"),
attributes = {"label.xml" })
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILink.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILink.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILink.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -29,7 +29,8 @@
/**
- * JSF component class
+ * JSF component class which renders a link that supports invocation of an action with control over conversation propagation.
+ * It does not submit the form.
*
*/
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Link",value="A link that supports invocation of an action with control over conversation propagation. Does not submit the form."),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIMessage.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIMessage.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIMessage.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -30,7 +30,8 @@
import org.richfaces.cdk.annotations.Tag;
/**
- * JSF component class
+ *
+ * JSF component class which decorates a JSF input field with the validation error message.
*
*/
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Message",value="Decorate a JSF input field with the validation error message."),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIResource.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIResource.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIResource.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -13,6 +13,8 @@
import org.richfaces.cdk.annotations.Tag;
/**
+ * JSF Component which can use a data in form as inputstream,
+ * java.util.File or byte[] and a content-type, this tag sends the data to the browser
* @author Daniel Roth
*/
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Resource",value="Given a data in form of an inputstream, java.util.File or byte[] and a content-type, this tag sends the data to the browser"),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -20,8 +20,13 @@
import org.jboss.seam.core.PropagationType;
import org.jboss.seam.navigation.Pages;
import org.jboss.seam.ui.util.ViewUrlBuilder;
-import org.jboss.seam.ui.util.cdk.MethodBindingToMethodExpression;
+/**
+ * Parent of all Seam command like JSF components
+ *
+ * @author mnovotny
+ *
+ */
public abstract class UISeamCommandBase extends UIOutput implements ActionSource2
{
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -23,7 +23,9 @@
/**
- * @auth Pete Muir
+ * JSF Component which creates a List<SelectItem> from a List, Set, DataModel or Array.
+ *
+ * @author Pete Muir
*
*/
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.SelectItems",value="Creates a List<SelectItem> from a List, Set, DataModel or Array."),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelection.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelection.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelection.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -32,10 +32,10 @@
import org.richfaces.cdk.annotations.Tag;
/**
- * JSF component class
+ * JSF component class which inserts a parameter that can be bound to a data model
*
*/
-@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Selection", value=""),
+@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Selection", value="It inserts a parameter that can be bound to a data model"),
family="org.jboss.seam.ui.Selection", type="org.jboss.seam.ui.Selection",generate="org.jboss.seam.ui.component.html.HtmlSelection",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="selection"),
attributes = {"selection.xml" })
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISpan.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISpan.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISpan.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -6,7 +6,12 @@
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Tag;
-@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Span",value="Render a HTML <span>"),
+/**
+ * Renders a HTML <span>
+ * @author mnovotny
+ *
+ */
+@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Span",value="Render a HTML <span>"),
family="org.jboss.seam.ui.Span", type="org.jboss.seam.ui.Span",generate="org.jboss.seam.ui.component.html.HtmlSpan",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="span"),
renderer = @JsfRenderer(type="org.jboss.seam.ui.SpanRenderer", family="org.jboss.seam.ui.SpanRenderer"),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIStyle.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIStyle.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIStyle.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -8,7 +8,12 @@
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Tag;
-@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Div",value="<![CDATA[Render a HTML <div>.]]>"),
+/**
+ * JSF Component which renders a HTML <div>
+ * @author mnovotny
+ *
+ */
+@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.Div",value="Render a HTML <div>"),
family="org.jboss.seam.ui.Div", type="org.jboss.seam.ui.Div",generate="org.jboss.seam.ui.component.html.HtmlDiv",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="div"),
renderer = @JsfRenderer(type="org.jboss.seam.ui.DivRenderer", family="org.jboss.seam.ui.DivRenderer"))
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UITaskId.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UITaskId.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UITaskId.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -31,7 +31,7 @@
import org.richfaces.cdk.annotations.Tag;
/**
- * JSF component class
+ * JSF component class for adding of task id to an output link (or similar JSF control), when the task is available via #{task}.
*
*/
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.TaskId",value="Add the task id to an output link (or similar JSF control), when the task is available via #{task}."),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -8,10 +8,10 @@
import org.richfaces.cdk.annotations.Tag;
/**
- * JSF component class
+ * JSF component class which validates all child JSF input fields against the bound properties using Bean validation
*
*/
-@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.ValidateAll",value="<![CDATA[Validate all child JSF input fields against the bound propertys using Hibernate Validator.]]>"),
+@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.ValidateAll",value="Validate all child JSF input fields against the bound propertys using Hibernate Validator."),
family="org.jboss.seam.ui.ValidateAll", type="org.jboss.seam.ui.ValidateAll",generate="org.jboss.seam.ui.component.html.HtmlValidateAll",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="validateAll"),
renderer = @JsfRenderer(type="org.jboss.seam.ui.ValidateAllRenderer", family="org.jboss.seam.ui.ValidateAllRenderer"))
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicBooleanConverter.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicBooleanConverter.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicBooleanConverter.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -10,6 +10,7 @@
import javax.faces.convert.FacesConverter;
/**
+ * Converter for java.util.concurrent.atomic.AtomicBoolean
* @author Dennis Byrne
*/
@FacesConverter(value="org.jboss.seam.ui.AtomicBooleanConverter")
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicIntegerConverter.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicIntegerConverter.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicIntegerConverter.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -9,6 +9,7 @@
import javax.faces.convert.FacesConverter;
/**
+ * Converter for java.util.concurrent.atomic.AtomicInteger
* @author Dennis Byrne
*/
@FacesConverter(value="org.jboss.seam.ui.AtomicIntegerConverter")
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicLongConverter.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicLongConverter.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicLongConverter.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -9,6 +9,8 @@
import javax.faces.convert.FacesConverter;
/**
+ * Converter for java.util.concurrent.atomic.AtomicLong
+ *
* @author Dennis Byrne
*/
@FacesConverter(value="org.jboss.seam.ui.AtomicLongConverter")
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/DateTimeConverter.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/DateTimeConverter.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/DateTimeConverter.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -26,7 +26,12 @@
import javax.faces.convert.FacesConverter;
import org.jboss.seam.contexts.Contexts;
-
+/**
+ * Extended DateTimeConverter which set Timezone from Seam web application config
+ *
+ * @author mnovotny
+ *
+ */
@FacesConverter("org.jboss.seam.ui.DateTimeConverter")
public class DateTimeConverter extends javax.faces.convert.DateTimeConverter{
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -8,6 +8,12 @@
import javax.faces.convert.ConverterException;
import javax.faces.convert.FacesConverter;
+/**
+ * Converter for Enums
+ *
+ * @author mnovotny
+ *
+ */
@FacesConverter(value="org.jboss.seam.ui.EnumConverter")
public class EnumConverter implements javax.faces.convert.Converter
{
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/NoSelectionConverter.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/NoSelectionConverter.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/NoSelectionConverter.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -6,6 +6,12 @@
import javax.faces.convert.ConverterException;
import javax.faces.convert.FacesConverter;
+/**
+ * Converter for no selection value item
+ *
+ * @author mnovotny
+ *
+ */
@FacesConverter(value="org.jboss.sema.ui.NoSelectionConverter")
public class NoSelectionConverter implements Converter
{
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -11,6 +11,12 @@
import org.jboss.seam.ui.util.cdk.RendererBase;
import org.richfaces.cdk.annotations.JsfRenderer;
+/**
+ * Renderer for image based components
+ *
+ * @author mnovotny
+ *
+ */
@JsfRenderer(type="org.jboss.seam.ui.graphicImage.GraphicImageRenderer", family="org.jboss.seam.ui.GraphicImageRenderer")
public class GraphicImageRendererBase extends RendererBase
{
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -8,6 +8,11 @@
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Tag;
+/**
+ * Outputs an image to the view. You can specify the file as a path, a java.io.File, java.io.InputStream, java.net.URL or byte[]
+ * @author mnovotny
+ *
+ */
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.graphicImage.GraphicImage",value="Output an image to the view. You can specify the file as a path, a java.io.File, java.io.InputStream, java.net.URL or byte[]"),
family="org.jboss.seam.ui.graphicImage.GraphicImage", type="org.jboss.seam.ui.graphicImage.GraphicImage",generate="org.jboss.seam.ui.component.html.HtmlGraphicImage",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="graphicImage"),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageBlur.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageBlur.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageBlur.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -9,6 +9,12 @@
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.Tag;
+/**
+ * JSF Component which nestes in a <s:graphicImage>.Transforms an image by applying a blur.
+ *
+ * @author mnovotny
+ *
+ */
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.graphicImage.TransformImageBlur",value="Nested in a s:graphicImage. Transform an image by applying a blur."),
family="org.jboss.seam.ui.graphicImage.TransformImageBlur", type="org.jboss.seam.ui.graphicImage.TransformImageBlur",generate="org.jboss.seam.ui.component.html.HtmlTransformImageBlur",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="transformImageBlur"),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageSize.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageSize.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageSize.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -9,6 +9,13 @@
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.Tag;
+/**
+ *
+ * JSF Component which nestes in a <s:graphicImage>.Transforms an image by altering the size.
+ *
+ * @author mnovotny
+ *
+ */
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.graphicImage.TransformImageSize",value="Nested in a s:graphicImage. Transform an image by altering the size."),
family="org.jboss.seam.ui.graphicImage.TransformImageSize", type="org.jboss.seam.ui.graphicImage.TransformImageSize",generate="org.jboss.seam.ui.component.html.HtmlTransformImageSize",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="transformImageSize"),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageType.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageType.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageType.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -9,6 +9,12 @@
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.Tag;
+/**
+ * JSF Component which nestes in a <s:graphicImage>.Transform an image by changing it's type.
+ *
+ * @author mnovotny
+ *
+ */
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.graphicImage.TransformImageType",value="Nested in a s:graphicImage. Transform an image by changing it's type."),
family="org.jboss.seam.ui.graphicImage.TransformImageType", type="org.jboss.seam.ui.graphicImage.TransformImageType",generate="org.jboss.seam.ui.component.html.HtmlTransformImageType",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="transformImageType"),
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/CommandButtonParameterComponentHandler.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/CommandButtonParameterComponentHandler.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/CommandButtonParameterComponentHandler.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -9,7 +9,7 @@
import static org.jboss.seam.ui.util.cdk.RendererBase.getUtils;
/**
- * If user didn't specify id on button, do it for them (we need one rendered)
+ * Command button based parameter handler. If user didn't specify id on button, do it for them (we need one rendered)
*
* @author Pete Muir
*
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/DecorateHandler.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/DecorateHandler.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/DecorateHandler.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -9,6 +9,12 @@
import javax.faces.view.facelets.ComponentHandler;
import javax.faces.view.facelets.FaceletContext;
+/**
+ * Decorating handler
+ *
+ * @author mnovotny
+ *
+ */
public class DecorateHandler extends ComponentHandler
{
private com.sun.faces.facelets.tag.ui.DecorateHandler delegate;
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/validator/EqualityValidator.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/validator/EqualityValidator.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/validator/EqualityValidator.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -22,7 +22,7 @@
import org.jboss.seam.ui.component.UIDecorate;
/**
- * Validate two fields are equal
+ * Validates two fields are equal
*
* @author pmuir
* @author Daniel Roth
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/validator/ModelValidator.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/validator/ModelValidator.java 2012-10-03 08:55:42 UTC (rev 15185)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/validator/ModelValidator.java 2012-10-03 09:49:22 UTC (rev 15186)
@@ -15,7 +15,7 @@
import javax.validation.ConstraintViolation;
/**
- * Validates using Hibernate Validator model-based annotations.
+ * Validates model using Bean Validation annotations .
*
* @author Gavin King
* @author Jacob Hookom
11 years, 6 months
Seam SVN: r15185 - branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-10-03 04:55:42 -0400 (Wed, 03 Oct 2012)
New Revision: 15185
Modified:
branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/bookingExp.html
branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/confirmExp.html
branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/introExp.html
branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/loginExp.html
branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/mainExp.html
branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/registerExp.html
branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/workspaceExp.html
Log:
jee6 example exp/ html files validation fixes
Modified: branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/bookingExp.html
===================================================================
--- branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/bookingExp.html 2012-10-02 15:20:45 UTC (rev 15184)
+++ branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/bookingExp.html 2012-10-03 08:55:42 UTC (rev 15185)
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
@@ -15,9 +15,9 @@
<h2>Conversations</h2>
<img src="../img/header_line.gif" />
- <form>
- <input type="button" value="Close Window" onclick="window.close()"/>
- </form>
+ <form>
+ <input type="button" value="Close Window" onclick="window.close()"/>
+ </form>
<p>
The hotel booking "wizard" is implemented by a conversation-scoped
Modified: branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/confirmExp.html
===================================================================
--- branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/confirmExp.html 2012-10-02 15:20:45 UTC (rev 15184)
+++ branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/confirmExp.html 2012-10-03 08:55:42 UTC (rev 15185)
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
Modified: branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/introExp.html
===================================================================
--- branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/introExp.html 2012-10-02 15:20:45 UTC (rev 15184)
+++ branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/introExp.html 2012-10-03 08:55:42 UTC (rev 15185)
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
@@ -15,13 +15,11 @@
<h2>What is JBoss Seam</h2>
<img src="../img/header_line.gif" />
- <p>
- <center>
+ <center>
<form>
- <INPUT type="button" value="Close Window" onclick="window.close()">
+ <input type="button" value="Close Window" onclick="window.close()"></input>
</form>
- </center>
- </p>
+ </center>
<p>
EJB 3.0 and JSF are perhaps the most exciting new developments in the Java EE 5 platform.
@@ -58,15 +56,13 @@
-->
</p>
- <p>
- <center>
- <form>
- <INPUT type="button" value="Close Window" onclick="window.close()">
- </form>
- </center>
- </p>
+ <center>
+ <form>
+ <input type="button" value="Close Window" onclick="window.close()" />
+ </form>
+ </center>
- </div>
+ </div>
</div>
</body>
Modified: branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/loginExp.html
===================================================================
--- branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/loginExp.html 2012-10-02 15:20:45 UTC (rev 15184)
+++ branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/loginExp.html 2012-10-03 08:55:42 UTC (rev 15185)
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
@@ -14,11 +14,11 @@
<div class="numbox">2</div>
<h2>What happens when you login?</h2>
<img src="../img/header_line.gif" />
-
+ <center>
<form>
<input type="button" value="Close Window" onclick="window.close()"/>
</form>
-
+ </center>
<p>
The login page is defined using pure XHTML with JSF controls.
The form uses JSF EL value binding and method binding
@@ -30,7 +30,7 @@
<code class="block">
<div>
- <h:outputLabel for="username">Login Name</h:outputLabel>
+ <h:outputLabel for="username">Login Name</h:outputLabel>
<h:inputText id="username" value="#{identity.username}" />
</div>
<div>
Modified: branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/mainExp.html
===================================================================
--- branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/mainExp.html 2012-10-02 15:20:45 UTC (rev 15184)
+++ branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/mainExp.html 2012-10-03 08:55:42 UTC (rev 15185)
@@ -91,7 +91,7 @@
public boolean isNextPageAvailable()
{
- return hotels!=null && hotels.size()==pageSize;
+ return hotels!=null && hotels.size()==pageSize;
}
public int getPageSize() {
@@ -137,7 +137,7 @@
<code class="block">
<h:outputText value="No Hotels Found"
rendered="#{hotels != null and hotels.rowCount==0}"/>
-<h:dataTable value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}">
+<h:dataTable value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}">
<h:column>
<f:facet name="header">Name</f:facet>
#{hot.name}
@@ -202,11 +202,11 @@
}
}
</code>
-
+ <center>
<form>
- <input type="button" value="Close Window" onclick="window.close()"/>
+ <input type="button" value="Close Window" onclick="window.close()"></input>
</form>
-
+ </center>
</div>
</div>
Modified: branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/registerExp.html
===================================================================
--- branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/registerExp.html 2012-10-02 15:20:45 UTC (rev 15184)
+++ branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/registerExp.html 2012-10-03 08:55:42 UTC (rev 15185)
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
Modified: branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/workspaceExp.html
===================================================================
--- branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/workspaceExp.html 2012-10-02 15:20:45 UTC (rev 15184)
+++ branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/exp/workspaceExp.html 2012-10-03 08:55:42 UTC (rev 15185)
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
@@ -15,13 +15,11 @@
<h2>The Workspace List</h2>
<img src="../img/header_line.gif" />
- <p>
- <center>
+ <center>
<form>
- <INPUT type="button" value="Close Window" onclick="window.close()">
+ <input type="button" value="Close Window" onclick="window.close()"/>
</form>
- </center>
- </p>
+ </center>
<p>
The workspace list allows the user to switch between multiple
@@ -79,14 +77,12 @@
workspace list in your application.
</p>
- <p>
- <form>
- <input type="button" value="Close Window" onclick="window.close()"/>
- </form>
- </p>
+ <form>
+ <input type="button" value="Close Window" onclick="window.close()" />
+ </form>
- </div>
</div>
+</div>
</body>
</html>
11 years, 6 months
Seam SVN: r15182 - in branches/community/Seam_2_3/jboss-seam/src: test/java/org/jboss/seam/test/unit and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-10-02 09:19:22 -0400 (Tue, 02 Oct 2012)
New Revision: 15182
Modified:
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/framework/Query.java
branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/QueryTest.java
Log:
JBSEAM-4529
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/framework/Query.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/framework/Query.java 2012-10-02 12:52:29 UTC (rev 15181)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/framework/Query.java 2012-10-02 13:19:22 UTC (rev 15182)
@@ -33,6 +33,8 @@
private static final Pattern WHERE_PATTERN = Pattern.compile("\\s(where)\\s", Pattern.CASE_INSENSITIVE);
private static final Pattern ORDER_PATTERN = Pattern.compile("\\s(order)(\\s)+by\\s", Pattern.CASE_INSENSITIVE);
private static final Pattern GROUP_PATTERN = Pattern.compile("\\s(group)(\\s)+by\\s", Pattern.CASE_INSENSITIVE);
+ private static final Pattern JOIN_FETCH_PATTERN = Pattern.compile("join fetch", Pattern.CASE_INSENSITIVE);
+ private static final String JOIN_OPERATOR="join";
private static final Pattern ORDER_COLUMN_PATTERN = Pattern.compile("^\\w+(\\.\\w+)*$");
@@ -319,9 +321,9 @@
throw new IllegalStateException("invalid select clause for query");
}
}
-
+ String fromToWherePart=JOIN_FETCH_PATTERN.matcher(ejbql.substring(fromLoc, whereLoc)).replaceAll(JOIN_OPERATOR);
return new StringBuilder(ejbql.length() + 15).append("select count(").append(subject).append(") ").
- append(ejbql.substring(fromLoc, whereLoc).replace("join fetch", "join")).
+ append(fromToWherePart).
append(ejbql.substring(whereLoc, groupLoc)).toString().trim();
}
Modified: branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/QueryTest.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/QueryTest.java 2012-10-02 12:52:29 UTC (rev 15181)
+++ branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/QueryTest.java 2012-10-02 13:19:22 UTC (rev 15182)
@@ -40,7 +40,7 @@
assertEquals(query.getCountEjbql(), "select count(distinct p) from Person p");
query.setUseWildcardAsCountQuerySubject(true);
- query.setEjbql("select v from Vehicle v join fetch v.person");
+ query.setEjbql("select v from Vehicle v JOIN FETCH v.person");
query.setOrderColumn("make");
query.parseEjbql();
// TODO this should eventually become count(v)
11 years, 6 months
Seam SVN: r15181 - branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/transaction.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-10-02 08:52:29 -0400 (Tue, 02 Oct 2012)
New Revision: 15181
Modified:
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/transaction/Transaction.java
Log:
JBSEAM-5047 - fixed catching of NamingException in tomcat.
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/transaction/Transaction.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/transaction/Transaction.java 2012-10-02 12:52:19 UTC (rev 15180)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/transaction/Transaction.java 2012-10-02 12:52:29 UTC (rev 15181)
@@ -81,7 +81,7 @@
{
return (javax.transaction.UserTransaction) context.lookup("java:comp/UserTransaction");
}
- catch (NameNotFoundException nnfe)
+ catch (NamingException ne)
{
try
{
@@ -96,7 +96,7 @@
}
catch (Exception e)
{
- throw nnfe;
+ throw ne;
}
}
}
11 years, 6 months