Seam SVN: r11979 - branches/community/Seam_2_2/src/main/org/jboss/seam/framework.
by seam-commits＠lists.jboss.org
Author: smendenh(a)redhat.com
Date: 2010-01-21 16:17:58 -0500 (Thu, 21 Jan 2010)
New Revision: 11979
Modified:
branches/community/Seam_2_2/src/main/org/jboss/seam/framework/Query.java
Log:
Resolved https://jira.jboss.org/jira/browse/JBSEAM-4087 per SUBJECT_PATTERN provided in JIRA, passes all tests in QueryTest
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/framework/Query.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/framework/Query.java 2010-01-21 14:52:47 UTC (rev 11978)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/framework/Query.java 2010-01-21 21:17:58 UTC (rev 11979)
@@ -28,7 +28,7 @@
public abstract class Query<T, E>
extends PersistenceController<T> //TODO: extend MutableController!
{
- private static final Pattern SUBJECT_PATTERN = Pattern.compile("^select (\\w+((\\s+|\\.)\\w+)*)\\s+from", Pattern.CASE_INSENSITIVE);
+ private static final Pattern SUBJECT_PATTERN = Pattern.compile("^select\\s+(\\w+(?:\\s*\\.\\s*\\w+)*?)(?:\\s*,\\s*(\\w+(?:\\s*\\.\\s*\\w+)*?))*?\\s+from", Pattern.CASE_INSENSITIVE);
private static final Pattern FROM_PATTERN = Pattern.compile("(^|\\s)(from)\\s", Pattern.CASE_INSENSITIVE);
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);
14 years, 2 months
Seam SVN: r11978 - branches/community/Seam_2_2/src/main/org/jboss/seam/transaction.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-01-21 09:52:47 -0500 (Thu, 21 Jan 2010)
New Revision: 11978
Modified:
branches/community/Seam_2_2/src/main/org/jboss/seam/transaction/EjbSynchronizations.java
Log:
JBSEAM-4191
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/transaction/EjbSynchronizations.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/transaction/EjbSynchronizations.java 2010-01-21 14:48:37 UTC (rev 11977)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/transaction/EjbSynchronizations.java 2010-01-21 14:52:47 UTC (rev 11978)
@@ -37,7 +37,7 @@
@Scope(ScopeType.EVENT)
@Install(precedence=FRAMEWORK, dependencies="org.jboss.seam.transaction.ejbTransaction")
@BypassInterceptors
-(a)TransactionAttribute(TransactionAttributeType.SUPPORTS)
+(a)TransactionAttribute(TransactionAttributeType.REQUIRED)
public class EjbSynchronizations implements LocalEjbSynchronizations, SessionSynchronization
{
private static final LogProvider log = Logging.getLogProvider(EjbSynchronizations.class);
14 years, 2 months
Seam SVN: r11977 - in branches/community/Seam_2_2/src: main/org/jboss/seam/util and 2 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-01-21 09:48:37 -0500 (Thu, 21 Jan 2010)
New Revision: 11977
Added:
branches/community/Seam_2_2/src/test/unit/org/jboss/seam/test/unit/bpm/JbpmTest.java
Modified:
branches/community/Seam_2_2/src/main/org/jboss/seam/bpm/Jbpm.java
branches/community/Seam_2_2/src/main/org/jboss/seam/util/Resources.java
branches/community/Seam_2_2/src/test/unit/org/jboss/seam/test/unit/testng.xml
Log:
JBSEAM-4474
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/bpm/Jbpm.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/bpm/Jbpm.java 2010-01-21 12:48:30 UTC (rev 11976)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/bpm/Jbpm.java 2010-01-21 14:48:37 UTC (rev 11977)
@@ -3,6 +3,7 @@
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.InputStream;
+import java.io.Reader;
import java.io.StringReader;
import java.util.Arrays;
import java.util.HashMap;
@@ -17,7 +18,6 @@
import org.dom4j.Element;
import org.hibernate.HibernateException;
import org.hibernate.cfg.Environment;
-import org.hibernate.lob.ReaderInputStream;
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
@@ -225,12 +225,13 @@
*/
public ProcessDefinition getPageflowDefinitionFromXml(String pageflowDefinition)
{
- InputStream stream = null;
+ Reader reader = null;
try {
- stream = new ReaderInputStream(new StringReader(pageflowDefinition));
- return Jbpm.parseInputSource(new InputSource(stream));
+ reader = new StringReader(pageflowDefinition);
+ //stream = new ReaderInputStream(new StringReader(pageflowDefinition));
+ return Jbpm.parseReaderSource(reader);
} finally {
- Resources.closeStream(stream);
+ Resources.closeReader(reader);
}
}
@@ -241,12 +242,14 @@
*/
public ProcessDefinition getProcessDefinitionFromXml(String processDefinition)
{
- InputStream stream = null;
+ //InputStream stream = null;
+ Reader reader = null;
try {
- stream = new ReaderInputStream(new StringReader(processDefinition));
- return ProcessDefinition.parseXmlInputStream(stream);
+ //stream = new ReaderInputStream(new StringReader(processDefinition));
+ reader = new StringReader(processDefinition);
+ return ProcessDefinition.parseXmlReader(reader);
} finally {
- Resources.closeStream(stream);
+ Resources.closeReader(reader);
}
}
@@ -363,6 +366,19 @@
jbpmContext.close();
}
}
+
+ public static ProcessDefinition parseReaderSource(Reader reader)
+ {
+ JbpmContext jbpmContext = createPageflowContext();
+ try
+ {
+ return new PageflowParser(reader).readProcessDefinition();
+ }
+ finally
+ {
+ jbpmContext.close();
+ }
+ }
private static final DbSubProcessResolver DB_SUB_PROCESS_RESOLVER = new DbSubProcessResolver();
class SeamSubProcessResolver implements SubProcessResolver
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/util/Resources.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/util/Resources.java 2010-01-21 12:48:30 UTC (rev 11976)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/util/Resources.java 2010-01-21 14:48:37 UTC (rev 11977)
@@ -139,6 +139,18 @@
}
}
+ public static void closeReader(java.io.Reader reader) {
+ if (reader == null) {
+ return;
+ }
+
+ try {
+ reader.close();
+ } catch (IOException e) {
+ //
+ }
+ }
+
public static File getRealFile(ServletContext servletContext, String path)
{
String realPath = servletContext.getRealPath(path);
Added: branches/community/Seam_2_2/src/test/unit/org/jboss/seam/test/unit/bpm/JbpmTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/unit/org/jboss/seam/test/unit/bpm/JbpmTest.java (rev 0)
+++ branches/community/Seam_2_2/src/test/unit/org/jboss/seam/test/unit/bpm/JbpmTest.java 2010-01-21 14:48:37 UTC (rev 11977)
@@ -0,0 +1,57 @@
+package org.jboss.seam.test.unit.bpm;
+
+import org.jboss.seam.bpm.Jbpm;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.testng.annotations.Test;
+
+/**
+ * @author Marek Novotny
+ *
+ */
+public class JbpmTest
+{
+
+ private static final String PROCESS_DEFINITION = "<process-definition name=\"test\"> " +
+ "<start-state name=\"start\"> " +
+ " <transition to=\"decision\" /> " +
+ "</start-state> " +
+ "<decision name=\"decision\"> " +
+ " <transition to=\"done\" name=\"true\" />" +
+ " <transition to=\"done\" name=\"false\" /> " +
+ "</decision> " +
+ "<end-state name=\"done\"/> " +
+ "</process-definition>";
+
+ private static final String PAGE_FLOW_DEFINITION = "<pageflow-definition name=\"newuser\" >" +
+ "<start-state name=\"start\">" +
+ " <transition to=\"account\"/>" +
+ "</start-state>" +
+ "<page name=\"account\" view-id=\"/newuser/account.xhtml\">" +
+ " <redirect/>" +
+ " <transition name=\"next\" to=\"checkPassword\" />" +
+ "</page>" +
+ "</pageflow-definition>" ;
+
+ @Test
+ public void testGetProcessDefinitionFromXml()
+ {
+
+ Jbpm jbpm = new Jbpm();
+ ProcessDefinition pd = jbpm.getProcessDefinitionFromXml(PROCESS_DEFINITION);
+ assert "start".equals(pd.getStartState().getName());
+ assert "test".equals(pd.getName());
+
+ }
+
+ @Test
+ public void testGetPageflowDefinitionFromXml()
+ {
+
+ Jbpm jbpm = new Jbpm();
+ ProcessDefinition pd = jbpm.getPageflowDefinitionFromXml(PAGE_FLOW_DEFINITION);
+ assert "start".equals(pd.getStartState().getName());
+ assert "newuser".equals(pd.getName());
+
+ }
+
+}
Modified: branches/community/Seam_2_2/src/test/unit/org/jboss/seam/test/unit/testng.xml
===================================================================
--- branches/community/Seam_2_2/src/test/unit/org/jboss/seam/test/unit/testng.xml 2010-01-21 12:48:30 UTC (rev 11976)
+++ branches/community/Seam_2_2/src/test/unit/org/jboss/seam/test/unit/testng.xml 2010-01-21 14:48:37 UTC (rev 11977)
@@ -24,6 +24,7 @@
<class name="org.jboss.seam.test.unit.bpm.ActorTest" />
<class name="org.jboss.seam.test.unit.bpm.TaskListTest" />
<class name="org.jboss.seam.test.unit.PageflowTest"/>
+ <class name="org.jboss.seam.test.unit.bpm.JbpmTest"/>
</classes>
</test>
14 years, 2 months
Seam SVN: r11976 - branches/community/Seam_2_2/src/test/integration/src/org/jboss/seam/test/integration/i8ln.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-01-21 07:48:30 -0500 (Thu, 21 Jan 2010)
New Revision: 11976
Modified:
branches/community/Seam_2_2/src/test/integration/src/org/jboss/seam/test/integration/i8ln/LocaleTest.java
Log:
added assertion to test
Modified: branches/community/Seam_2_2/src/test/integration/src/org/jboss/seam/test/integration/i8ln/LocaleTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/integration/src/org/jboss/seam/test/integration/i8ln/LocaleTest.java 2010-01-21 09:45:17 UTC (rev 11975)
+++ branches/community/Seam_2_2/src/test/integration/src/org/jboss/seam/test/integration/i8ln/LocaleTest.java 2010-01-21 12:48:30 UTC (rev 11976)
@@ -66,9 +66,9 @@
LocaleSelector.instance().setLocaleString(Locale.FRANCE.toString());
- LocaleSelector.instance().getLanguage().equals(Locale.FRANCE.getLanguage());
- LocaleSelector.instance().getCountry().equals(Locale.FRANCE.getCountry());
- LocaleSelector.instance().getVariant().equals(Locale.FRANCE.getVariant());
+ assert LocaleSelector.instance().getLanguage().equals(Locale.FRANCE.getLanguage());
+ assert LocaleSelector.instance().getCountry().equals(Locale.FRANCE.getCountry());
+ assert LocaleSelector.instance().getVariant().equals(Locale.FRANCE.getVariant());
assert org.jboss.seam.international.Locale.instance().equals(Locale.FRANCE);
assert LocaleSelector.instance().getLocaleString().equals(Locale.FRANCE.toString());
14 years, 2 months
Seam SVN: r11975 - branches/community/Seam_2_2.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-01-21 04:45:17 -0500 (Thu, 21 Jan 2010)
New Revision: 11975
Modified:
branches/community/Seam_2_2/build.xml
Log:
fixed NPE in launching more targets after build
Modified: branches/community/Seam_2_2/build.xml
===================================================================
--- branches/community/Seam_2_2/build.xml 2010-01-21 08:29:09 UTC (rev 11974)
+++ branches/community/Seam_2_2/build.xml 2010-01-21 09:45:17 UTC (rev 11975)
@@ -189,9 +189,9 @@
<target name="initcore" depends="init">
<init classesdir="${classes.core.dir}" srcdir="${src.core.dir}" modulename="core" pom="${core.pom}" />
- <inlineDependencies id="jbosscache2" scope="compile">
+ <!-- <inlineDependencies id="jbosscache2" scope="compile">
<dependency groupId="org.jboss.cache" artifactId="jbosscache-core" version="2.2.0.CR6" />
- </inlineDependencies>
+ </inlineDependencies> -->
</target>
<target name="antlr" depends="initcore" description="Generate ANTLR parser">
@@ -216,7 +216,7 @@
</compile>
<!-- Fiddle to make sure we compile the JBossCache2 stuff with JBossCache2" -->
<path id="compile.core-jbosscache2.path">
- <path refid="compile.jbosscache2.path" />
+ <!-- <path refid="compile.jbosscache2.path" /> -->
<path refid="compile.core.path" />
<fileset dir="${classes.core.dir}" />
</path>
14 years, 2 months
Seam SVN: r11974 - branches/community/Seam_2_2/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-01-21 03:29:09 -0500 (Thu, 21 Jan 2010)
New Revision: 11974
Modified:
branches/community/Seam_2_2/build/resteasy.pom.xml
Log:
changed scope for testng dependency in RestEasy
Modified: branches/community/Seam_2_2/build/resteasy.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/resteasy.pom.xml 2010-01-20 11:33:10 UTC (rev 11973)
+++ branches/community/Seam_2_2/build/resteasy.pom.xml 2010-01-21 08:29:09 UTC (rev 11974)
@@ -70,7 +70,7 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${version.testng}</version>
- <optional>true</optional>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
14 years, 2 months
Seam SVN: r11973 - branches/community/Seam_2_2/examples/seamspace/view.
by seam-commits＠lists.jboss.org
Author: mgencur(a)redhat.com
Date: 2010-01-20 06:33:10 -0500 (Wed, 20 Jan 2010)
New Revision: 11973
Modified:
branches/community/Seam_2_2/examples/seamspace/view/blog.xhtml
branches/community/Seam_2_2/examples/seamspace/view/blogentry.xhtml
branches/community/Seam_2_2/examples/seamspace/view/comment.xhtml
branches/community/Seam_2_2/examples/seamspace/view/createBlog.xhtml
branches/community/Seam_2_2/examples/seamspace/view/home.xhtml
branches/community/Seam_2_2/examples/seamspace/view/pictures.xhtml
branches/community/Seam_2_2/examples/seamspace/view/register.xhtml
Log:
JBSEAM-4526 other files fixed as well
Modified: branches/community/Seam_2_2/examples/seamspace/view/blog.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/blog.xhtml 2010-01-20 11:00:44 UTC (rev 11972)
+++ branches/community/Seam_2_2/examples/seamspace/view/blog.xhtml 2010-01-20 11:33:10 UTC (rev 11973)
@@ -17,7 +17,7 @@
<s:div rendered="#{selectedMember != null}">
<s:div id="blogMemberCard">
- <s:link view="/profile.xhtml" propagation="none">
+ <s:link view="/profile.seam" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
</s:link>
@@ -33,14 +33,14 @@
<div class="blogText"><s:formattedText value="#{memberBlog.text}"/></div>
<div class="blogFooter">
- [<s:link view="/blogentry.xhtml" propagation="none">
+ [<s:link view="/blogentry.seam" propagation="none">
<f:param name="name" value="#{selectedMember.memberName}"/>
<f:param name="blogId" value="#{memberBlog.blogId}"/>
#{memberBlog.commentCount} Comment#{memberBlog.commentCount != 1 ? "s" : ""}
</s:link>]
<s:span rendered="#{s:hasPermission('blog','createComment')}">
- [<s:link view="/comment.xhtml" value="Add Comment" propagation="none">
+ [<s:link view="/comment.seam" value="Add Comment" propagation="none">
<f:param name="name" value="#{selectedMember.memberName}"/>
<f:param name="blogId" value="#{memberBlog.blogId}"/>
</s:link>]
Modified: branches/community/Seam_2_2/examples/seamspace/view/blogentry.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/blogentry.xhtml 2010-01-20 11:00:44 UTC (rev 11972)
+++ branches/community/Seam_2_2/examples/seamspace/view/blogentry.xhtml 2010-01-20 11:33:10 UTC (rev 11973)
@@ -17,7 +17,7 @@
<s:div rendered="#{selectedBlog != null}">
<s:div id="blogMemberCard">
- <s:link view="/profile.xhtml" propagation="none">
+ <s:link view="/profile.seam" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
</s:link>
@@ -34,7 +34,7 @@
<s:span rendered="#{s:hasPermission(selectedBlog, 'create')}">
[<s:link action="#{commentAction.createComment}" value="Add Comment"/>]
</s:span>
- [<s:link view="/blog.xhtml" value="View all blog entries" propagation="none">
+ [<s:link view="/blog.seam" value="View all blog entries" propagation="none">
<f:param name="name" value="#{selectedMember.memberName}"/>
</s:link>]
</div>
@@ -44,7 +44,7 @@
<table class="blogComment">
<tr>
<td class="blogCommentor">
- <s:link view="/profile.xhtml" propagation="none">
+ <s:link view="/profile.seam" propagation="none">
<f:param name="name" value="#{comment.commentor.memberName}"/>
#{comment.commentor.memberName}<br/>
<h:graphicImage value="/content/images?id=#{comment.commentor.picture.imageId}&width=90"/>
@@ -54,7 +54,7 @@
<td class="blogCommentText">
<p><s:formattedText value="#{comment.comment}"/></p>
<p>Posted by
- <s:link view="/profile.xhtml" value="#{comment.commentor.memberName}" propagation="none">
+ <s:link view="/profile.seam" value="#{comment.commentor.memberName}" propagation="none">
<f:param name="name" value="#{comment.commentor.memberName}"/>
</s:link> on #{comment.formattedCommentDate}
</p>
Modified: branches/community/Seam_2_2/examples/seamspace/view/comment.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/comment.xhtml 2010-01-20 11:00:44 UTC (rev 11972)
+++ branches/community/Seam_2_2/examples/seamspace/view/comment.xhtml 2010-01-20 11:33:10 UTC (rev 11973)
@@ -17,7 +17,7 @@
<s:div rendered="#{selectedMember != null}">
<s:div id="blogMemberCard">
- <s:link view="/profile.xhtml" propagation="none">
+ <s:link view="/profile.seam" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
</s:link>
Modified: branches/community/Seam_2_2/examples/seamspace/view/createBlog.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/createBlog.xhtml 2010-01-20 11:00:44 UTC (rev 11972)
+++ branches/community/Seam_2_2/examples/seamspace/view/createBlog.xhtml 2010-01-20 11:33:10 UTC (rev 11973)
@@ -17,7 +17,7 @@
<s:div rendered="#{selectedBlog != null}">
<s:div id="blogMemberCard">
- <s:link view="/profile.xhtml" propagation="none">
+ <s:link view="/profile.seam" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
</s:link>
Modified: branches/community/Seam_2_2/examples/seamspace/view/home.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/home.xhtml 2010-01-20 11:00:44 UTC (rev 11972)
+++ branches/community/Seam_2_2/examples/seamspace/view/home.xhtml 2010-01-20 11:33:10 UTC (rev 11973)
@@ -74,7 +74,7 @@
<ui:repeat value="#{newMembers}" var="newMember">
<div class="newMember">
- <s:link view="/profile.xhtml" propagation="none">
+ <s:link view="/profile.seam" propagation="none">
<f:param name="name" value="#{newMember.memberName}"/>
#{newMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{newMember.picture.imageId}&width=90"/>
Modified: branches/community/Seam_2_2/examples/seamspace/view/pictures.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/pictures.xhtml 2010-01-20 11:00:44 UTC (rev 11972)
+++ branches/community/Seam_2_2/examples/seamspace/view/pictures.xhtml 2010-01-20 11:33:10 UTC (rev 11973)
@@ -33,7 +33,7 @@
<h1>#{selectedMember.memberName}'s pictures</h1>
<div class="memberPictureCard">
- <s:link view="/profile.xhtml" propagation="none">
+ <s:link view="/profile.seam" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
</s:link>
@@ -52,7 +52,7 @@
<a href="content/images?id=#{img.imageId}" rel="lightbox[pictureset]" title="#{img.caption}">
<h:graphicImage value="/content/images?id=#{img.imageId}&width=90" border="0"/>
</a>
- <s:button view="/imagepermissions.xhtml"
+ <s:button view="/imagepermissions.seam"
action="#{permissionSearch.search(pictureSearch.lookupImage())}"
styleClass="padlock"
rendered="#{s:hasPermission(img, 'seam.grant-permission')}">
Modified: branches/community/Seam_2_2/examples/seamspace/view/register.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/register.xhtml 2010-01-20 11:00:44 UTC (rev 11972)
+++ branches/community/Seam_2_2/examples/seamspace/view/register.xhtml 2010-01-20 11:33:10 UTC (rev 11973)
@@ -12,7 +12,7 @@
<div class="errors"><h:messages globalOnly="true"/></div>
<p>
- Already a member? <s:link view="/home.xhtml" value="Click here to log in" propagation="none"/>
+ Already a member? <s:link view="/home.seam" value="Click here to log in" propagation="none"/>
</p>
<div id="register">
14 years, 3 months
Seam SVN: r11972 - branches/community/Seam_2_2/examples/seamspace/view.
by seam-commits＠lists.jboss.org
Author: mgencur(a)redhat.com
Date: 2010-01-20 06:00:44 -0500 (Wed, 20 Jan 2010)
New Revision: 11972
Modified:
branches/community/Seam_2_2/examples/seamspace/view/template.xhtml
Log:
JBSEAM-4526 fixed
Modified: branches/community/Seam_2_2/examples/seamspace/view/template.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/template.xhtml 2010-01-18 16:03:44 UTC (rev 11971)
+++ branches/community/Seam_2_2/examples/seamspace/view/template.xhtml 2010-01-20 11:00:44 UTC (rev 11972)
@@ -32,7 +32,7 @@
</s:fragment>
<s:link id="logout" action="#{identity.logout}" value="Log out" rendered="#{identity.loggedIn}"/>
- <h:outputLink id="login" value="home.xhtml" rendered="#{not identity.loggedIn}">Log in</h:outputLink>
+ <h:outputLink id="login" value="home.seam" rendered="#{not identity.loggedIn}">Log in</h:outputLink>
</div>
<br style="clear:both"/>
<h:form>
14 years, 3 months
Seam SVN: r11971 - in branches/enterprise/JBPAPP_5_0: src/main/org/jboss/seam/international and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-01-18 11:03:44 -0500 (Mon, 18 Jan 2010)
New Revision: 11971
Modified:
branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/I18n.xml
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/international/LocaleConfig.java
Log:
JBPAPP-3292
Modified: branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/I18n.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/I18n.xml 2010-01-18 15:43:02 UTC (rev 11970)
+++ branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/I18n.xml 2010-01-18 16:03:44 UTC (rev 11971)
@@ -17,6 +17,10 @@
A JEE application consists of many components and all of them must be
configured properly for your application to be localized.
</para>
+
+ <note>
+ <para> Note that all i18n features in Seam work only in JSF context.</para>
+ </note>
<para>
Starting at the bottom, the first step is to ensure that your database
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/international/LocaleConfig.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/international/LocaleConfig.java 2010-01-18 15:43:02 UTC (rev 11970)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/international/LocaleConfig.java 2010-01-18 16:03:44 UTC (rev 11971)
@@ -20,6 +20,8 @@
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.intercept.BypassInterceptors;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
import org.jboss.seam.util.Strings;
/**
@@ -48,6 +50,8 @@
private String defaultLocale;
private List<String> supportedLocales;
+
+ private static final LogProvider log = Logging.getLogProvider(LocaleConfig.class);
@Create
public void initLocaleConfig()
@@ -138,6 +142,7 @@
}
catch (IllegalStateException e)
{
+ log.warn("JSF is not properly initialized, see http://jira.jboss.org/jira/browse/JBSEAM-4401");
// just in case, for units and the like
// if we can't do it, it just wan't meant to be
return null;
14 years, 3 months
Seam SVN: r11970 - branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-01-18 10:43:02 -0500 (Mon, 18 Jan 2010)
New Revision: 11970
Modified:
branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/I18n.xml
Log:
JBSEAM-4401
Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/I18n.xml
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/I18n.xml 2010-01-18 15:15:41 UTC (rev 11969)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/I18n.xml 2010-01-18 15:43:02 UTC (rev 11970)
@@ -17,6 +17,10 @@
A JEE application consists of many components and all of them must be
configured properly for your application to be localized.
</para>
+
+ <note>
+ <para> Note that all i18n features in Seam work only in JSF context.</para>
+ </note>
<para>
Starting at the bottom, the first step is to ensure that your database
14 years, 3 months