Seam SVN: r8241 - in trunk/examples/seamspace/src/org/jboss/seam/example/seamspace: test and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-05-20 23:47:56 -0400 (Tue, 20 May 2008)
New Revision: 8241
Modified:
trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/ProfileAction.java
trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java
trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java
trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/RegisterTest.java
trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/testng.xml
Log:
fixed warnings, re-enabled tests
Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/ProfileAction.java
===================================================================
--- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/ProfileAction.java 2008-05-21 03:47:34 UTC (rev 8240)
+++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/ProfileAction.java 2008-05-21 03:47:56 UTC (rev 8241)
@@ -10,7 +10,6 @@
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
-import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.Factory;
import org.jboss.seam.annotations.In;
@@ -33,10 +32,10 @@
private Member authenticatedMember;
@Out(required = false)
- List newMembers;
+ List<Member> newMembers;
@Out(required = false)
- List memberBlogs;
+ List<MemberBlog> memberBlogs;
@In
private EntityManager entityManager;
@@ -65,7 +64,8 @@
/**
* Returns the 5 latest blog entries for a member
*/
- public List getLatestBlogs()
+ @SuppressWarnings("unchecked")
+ public List<MemberBlog> getLatestBlogs()
{
return entityManager.createQuery(
"from MemberBlog b where b.member = :member order by b.entryDate desc")
@@ -77,6 +77,7 @@
/**
* Used to read all blog entries for a member
*/
+ @SuppressWarnings("unchecked")
@Factory("memberBlogs")
public void getMemberBlogs()
{
@@ -91,6 +92,7 @@
.getResultList();
}
+ @SuppressWarnings("unchecked")
@Factory("newMembers")
public void newMembers()
{
@@ -107,7 +109,8 @@
}
}
- public List getFriends()
+ @SuppressWarnings("unchecked")
+ public List<Member> getFriends()
{
return entityManager.createQuery(
"select f.friend from MemberFriend f where f.member = :member and authorized = true")
@@ -115,7 +118,8 @@
.getResultList();
}
- public List getFriendComments()
+ @SuppressWarnings("unchecked")
+ public List<FriendComment> getFriendComments()
{
return entityManager.createQuery(
"from FriendComment c where c.member = :member order by commentDate desc")
Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java
===================================================================
--- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java 2008-05-21 03:47:34 UTC (rev 8240)
+++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java 2008-05-21 03:47:56 UTC (rev 8241)
@@ -103,16 +103,12 @@
entityManager.persist(newMember);
new RunAsOperation() {
- @Override
- public String[] getRoles() {
- return new String[] { "admin" };
- }
-
public void execute() {
identityManager.createUser(username, password);
identityManager.grantRole(username, "user");
}
- }.run();
+ }.addRole("admin")
+ .run();
newAccount.setMember(newMember);
newAccount = entityManager.merge(newAccount);
Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java
===================================================================
--- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java 2008-05-21 03:47:34 UTC (rev 8240)
+++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java 2008-05-21 03:47:56 UTC (rev 8241)
@@ -5,7 +5,7 @@
public class BlogTest extends SeamTest
{
- //@Test
+ @Test
public void testCreateBlog() throws Exception
{
// Log in first
Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/RegisterTest.java
===================================================================
--- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/RegisterTest.java 2008-05-21 03:47:34 UTC (rev 8240)
+++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/RegisterTest.java 2008-05-21 03:47:56 UTC (rev 8241)
@@ -8,7 +8,7 @@
public class RegisterTest extends SeamTest
{
- //@Test
+ @Test
public void testRegister() throws Exception
{
String cid = new FacesRequest()
Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/testng.xml
===================================================================
--- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/testng.xml 2008-05-21 03:47:34 UTC (rev 8240)
+++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/testng.xml 2008-05-21 03:47:56 UTC (rev 8241)
@@ -2,7 +2,7 @@
<suite name="SeamSpace" verbose="2" parallel="false">
- <!--test name="SeamSpace: Register">
+ <test name="SeamSpace: Register">
<classes>
<class name="org.jboss.seam.example.seamspace.test.RegisterTest"/>
</classes>
@@ -12,6 +12,6 @@
<classes>
<class name="org.jboss.seam.example.seamspace.test.BlogTest"/>
</classes>
- </test-->
+ </test>
</suite>
\ No newline at end of file
16 years, 6 months
Seam SVN: r8240 - trunk/src/main/org/jboss/seam/security.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-05-20 23:47:34 -0400 (Tue, 20 May 2008)
New Revision: 8240
Modified:
trunk/src/main/org/jboss/seam/security/RunAsOperation.java
Log:
change way roles are added to RunAsOperation
Modified: trunk/src/main/org/jboss/seam/security/RunAsOperation.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/RunAsOperation.java 2008-05-20 19:17:15 UTC (rev 8239)
+++ trunk/src/main/org/jboss/seam/security/RunAsOperation.java 2008-05-21 03:47:34 UTC (rev 8240)
@@ -2,6 +2,8 @@
import java.security.Principal;
import java.security.acl.Group;
+import java.util.HashSet;
+import java.util.Set;
import javax.security.auth.Subject;
@@ -16,10 +18,13 @@
private Principal principal;
private Subject subject;
+ private Set<String> roles;
+
public RunAsOperation()
{
principal = new SimplePrincipal(null);
subject = new Subject();
+ roles = new HashSet<String>();
}
public abstract void execute();
@@ -34,38 +39,29 @@
return subject;
}
- public String[] getRoles()
+ public RunAsOperation addRole(String role)
{
- return null;
+ roles.add(role);
+ return this;
}
- private boolean addRole(String role)
- {
- for ( Group sg : getSubject().getPrincipals(Group.class) )
- {
- if ( Identity.ROLES_GROUP.equals( sg.getName() ) )
- {
- return sg.addMember(new SimplePrincipal(role));
- }
- }
-
- SimpleGroup roleGroup = new SimpleGroup(Identity.ROLES_GROUP);
- roleGroup.addMember(new SimplePrincipal(role));
- getSubject().getPrincipals().add(roleGroup);
-
- return true;
- }
-
public void run()
- {
- String[] roles = getRoles();
- if (roles != null)
+ {
+ for (String role : roles)
{
- for (String role : getRoles())
+ for ( Group sg : getSubject().getPrincipals(Group.class) )
{
- addRole(role);
+ if ( Identity.ROLES_GROUP.equals( sg.getName() ) )
+ {
+ sg.addMember(new SimplePrincipal(role));
+ break;
+ }
}
- }
+
+ SimpleGroup roleGroup = new SimpleGroup(Identity.ROLES_GROUP);
+ roleGroup.addMember(new SimplePrincipal(role));
+ getSubject().getPrincipals().add(roleGroup);
+ }
Identity.instance().runAs(this);
}
16 years, 6 months
Seam SVN: r8239 - trunk.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-05-20 15:17:15 -0400 (Tue, 20 May 2008)
New Revision: 8239
Modified:
trunk/build.xml
Log:
JBSEAM-3012 - fixed the extra directory that was being created.
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-05-20 19:16:16 UTC (rev 8238)
+++ trunk/build.xml 2008-05-20 19:17:15 UTC (rev 8239)
@@ -69,7 +69,7 @@
<property name="dist.src.debug.dir" value="${dist.dir}/src/debug" />
<property name="dist.src.wicket.dir" value="${dist.dir}/src/wicket" />
<property name="dist.src.jbas5.dir" value="${dist.dir}/src/interop/jbas5" />
- <property name="dist.src.jbas5.dir" value="${dist.dir}/src/interop/jul" />
+ <property name="dist.src.jul.dir" value="${dist.dir}/src/interop/jul" />
<property name="dist.src.gen.dir" value="${dist.dir}/src/gen" />
<property name="dist.src.remoting.dir" value="${dist.dir}/src/remoting" />
<property name="dist.src.test.dir" value="${dist.dir}/src/test" />
16 years, 6 months
Seam SVN: r8238 - trunk/build.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-05-20 15:16:16 -0400 (Tue, 20 May 2008)
New Revision: 8238
Modified:
trunk/build/ci.build.xml
Log:
JBSEAM-3012 - refdoc is handled as part od the dist target and does not need to be executed.
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-05-20 18:13:37 UTC (rev 8237)
+++ trunk/build/ci.build.xml 2008-05-20 19:16:16 UTC (rev 8238)
@@ -57,11 +57,7 @@
<target name="snapshot">
<build target="cleanall" />
<build target="dist" />
- <build target="refdoc">
- <properties>
- <property name="dist.ref.dir" value="${dist.ref.dir}" />
- </properties>
- </build>
+
<ant target="deploySeamSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
<property name="qualifier" value="-SNAPSHOT" />
</ant>
16 years, 6 months
Seam SVN: r8237 - in trunk: src/main/META-INF and 1 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-20 14:13:37 -0400 (Tue, 20 May 2008)
New Revision: 8237
Added:
trunk/src/main/org/jboss/seam/bpm/PageflowDeploymentHandler.java
Modified:
trunk/doc/Seam_Reference_Guide/en-US/Jbpm.xml
trunk/src/main/META-INF/seam-deployment.properties
trunk/src/main/org/jboss/seam/bpm/Jbpm.java
Log:
JBSEAM-979
Modified: trunk/doc/Seam_Reference_Guide/en-US/Jbpm.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Jbpm.xml 2008-05-20 16:16:05 UTC (rev 8236)
+++ trunk/doc/Seam_Reference_Guide/en-US/Jbpm.xml 2008-05-20 18:13:37 UTC (rev 8237)
@@ -40,7 +40,7 @@
</itemizedlist>
<para>
- Don't get these two things confused ! They operate at very different levels
+ Don't get these two things confused! They operate at very different levels
or granularity. <emphasis>Pageflow</emphasis>, <emphasis>conversation</emphasis>
and <emphasis>task</emphasis> all refer to a single
interaction with a single user. A business process spans many tasks.
@@ -358,11 +358,19 @@
<section>
<title>Installing pageflows</title>
+
+ <para>
+ We need to install the Seam jBPM-related components, and place the
+ pageflow definitions (using the standard <literal>.jpdl.xml</literal>
+ extension) inside a Seam archive (an archive which
+ contains a <literal>seam.properties</literal> file):
+ </para>
+ <programlisting role="XML"><![CDATA[<bpm:jbpm />]]></programlisting>
+
<para>
- We need to install the Seam jBPM-related components, and tell them
- where to find our pageflow definition. We can specify this
- Seam configuration in <literal>components.xml</literal>.
+ We can also explicitly tell Seam where to find our pageflow
+ definition. We specify this in <literal>components.xml</literal>:
</para>
<programlisting role="XML"><![CDATA[<bpm:jbpm>
@@ -370,11 +378,6 @@
<value>pageflow.jpdl.xml</value>
</bpm:pageflow-definitions>
</bpm:jbpm>]]></programlisting>
-
- <para>
- The first line installs jBPM, the second points to a jPDL-based
- pageflow definition.
- </para>
</section>
Modified: trunk/src/main/META-INF/seam-deployment.properties
===================================================================
--- trunk/src/main/META-INF/seam-deployment.properties 2008-05-20 16:16:05 UTC (rev 8236)
+++ trunk/src/main/META-INF/seam-deployment.properties 2008-05-20 18:13:37 UTC (rev 8237)
@@ -0,0 +1 @@
+org.jboss.seam.deployment.deploymentHandlers=org.jboss.seam.bpm.PageflowDeploymentHandler
\ No newline at end of file
Modified: trunk/src/main/org/jboss/seam/bpm/Jbpm.java
===================================================================
--- trunk/src/main/org/jboss/seam/bpm/Jbpm.java 2008-05-20 16:16:05 UTC (rev 8236)
+++ trunk/src/main/org/jboss/seam/bpm/Jbpm.java 2008-05-20 18:13:37 UTC (rev 8237)
@@ -4,10 +4,12 @@
import java.io.InputStream;
import java.io.StringReader;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import javax.naming.NamingException;
@@ -27,6 +29,8 @@
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Init;
import org.jboss.seam.core.ResourceLoader;
+import org.jboss.seam.deployment.DeploymentStrategy;
+import org.jboss.seam.deployment.StandardDeploymentStrategy;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.util.Naming;
@@ -145,7 +149,7 @@
return pageflowProcessDefinitions.containsKey(pageflowName);
}
- public ProcessDefinition getPageflowDefinitionFromResource(String resourceName)
+ public static ProcessDefinition getPageflowDefinitionFromResource(String resourceName)
{
InputStream resource = ResourceLoader.instance().getResourceAsStream(resourceName);
if (resource==null)
@@ -228,14 +232,16 @@
}
private void installPageflowDefinitions() {
+ Set<String> mergedPageflowDefinitions = ((PageflowDeploymentHandler) ((DeploymentStrategy) Contexts.getEventContext().get(StandardDeploymentStrategy.NAME)).getDeploymentHandlers().get(PageflowDeploymentHandler.NAME)).getPageflowDefinitions();
if ( pageflowDefinitions!=null )
{
- for (String pageflow: pageflowDefinitions)
- {
- ProcessDefinition pd = getPageflowDefinitionFromResource(pageflow);
- pageflowProcessDefinitions.put( pd.getName(), pd );
- }
+ mergedPageflowDefinitions.addAll(Arrays.asList(pageflowDefinitions));
}
+ for (String pageflow: mergedPageflowDefinitions)
+ {
+ ProcessDefinition pd = getPageflowDefinitionFromResource(pageflow);
+ pageflowProcessDefinitions.put( pd.getName(), pd );
+ }
}
private void installProcessDefinitions()
Added: trunk/src/main/org/jboss/seam/bpm/PageflowDeploymentHandler.java
===================================================================
--- trunk/src/main/org/jboss/seam/bpm/PageflowDeploymentHandler.java (rev 0)
+++ trunk/src/main/org/jboss/seam/bpm/PageflowDeploymentHandler.java 2008-05-20 18:13:37 UTC (rev 8237)
@@ -0,0 +1,61 @@
+package org.jboss.seam.bpm;
+
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.jboss.seam.deployment.AbstractDeploymentHandler;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+import org.jboss.seam.util.Resources;
+import org.jboss.seam.util.XML;
+
+
+public class PageflowDeploymentHandler extends AbstractDeploymentHandler
+{
+
+ private static LogProvider log = Logging.getLogProvider(PageflowDeploymentHandler.class);
+
+ public static final String NAME = "org.jboss.seam.bpm.PageflowDeploymentHandler";
+
+ private Set<String> pageflowDefinitions;
+
+ public PageflowDeploymentHandler()
+ {
+ pageflowDefinitions = new HashSet<String>();
+ }
+
+ public String getName()
+ {
+ return NAME;
+ }
+
+ public void handle(String name, ClassLoader classLoader)
+ {
+ if (name.endsWith(".jpdl.xml"))
+ {
+ InputStream inputStream = Resources.getResourceAsStream(name, null);
+ try
+ {
+ Element root = XML.getRootElementSafely(inputStream);
+ if ("pageflow-definition".equals(root.getName()))
+ {
+ pageflowDefinitions.add(name);
+ }
+ }
+ catch (DocumentException e)
+ {
+ log.debug("Unable to parse " + name, e);
+ }
+ }
+ }
+
+ public Set<String> getPageflowDefinitions()
+ {
+ return Collections.unmodifiableSet(pageflowDefinitions);
+ }
+
+}
Property changes on: trunk/src/main/org/jboss/seam/bpm/PageflowDeploymentHandler.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 6 months
Seam SVN: r8236 - trunk/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-20 12:16:05 -0400 (Tue, 20 May 2008)
New Revision: 8236
Modified:
trunk/doc/Seam_Reference_Guide/en-US/Components.xml
trunk/doc/Seam_Reference_Guide/en-US/Persistence.xml
Log:
Document default flush mode
Modified: trunk/doc/Seam_Reference_Guide/en-US/Components.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Components.xml 2008-05-20 16:06:25 UTC (rev 8235)
+++ trunk/doc/Seam_Reference_Guide/en-US/Components.xml 2008-05-20 16:16:05 UTC (rev 8236)
@@ -1074,6 +1074,13 @@
is long-running, default to <literal>conversationIsLongRunning</literal>.
</para>
</listitem>
+ <listitem>
+ <para>
+ <literal>org.jboss.seam.core.manager.defaultFlushMode</literal> —
+ set the flush mode set by default on any Seam Managed Persistence Context.
+ By default <literal>AUTO</literal>.
+ </para>
+ </listitem>
</itemizedlist>
</listitem>
</varlistentry>
Modified: trunk/doc/Seam_Reference_Guide/en-US/Persistence.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Persistence.xml 2008-05-20 16:06:25 UTC (rev 8235)
+++ trunk/doc/Seam_Reference_Guide/en-US/Persistence.xml 2008-05-20 16:16:05 UTC (rev 8236)
@@ -471,6 +471,16 @@
</para>
<programlisting role="XML"><![CDATA[<begin-conversation flush-mode="MANUAL" />]]></programlisting>
+
+ <para>
+ You can set any Seam Managed Persistence Context to use manual flush
+ mode:
+ </para>
+
+ <programlisting><![CDATA[<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:core="http://jboss.com/products/seam/core">
+ <core:manager conversation-timeout="120000" default-flush-mode="manual" />
+</components>]]></programlisting>
</section>
16 years, 6 months
Seam SVN: r8235 - trunk/src/main/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-20 12:06:25 -0400 (Tue, 20 May 2008)
New Revision: 8235
Modified:
trunk/src/main/org/jboss/seam/core-2.1.xsd
Log:
Only uppercase will work
Modified: trunk/src/main/org/jboss/seam/core-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/core-2.1.xsd 2008-05-20 16:03:03 UTC (rev 8234)
+++ trunk/src/main/org/jboss/seam/core-2.1.xsd 2008-05-20 16:06:25 UTC (rev 8235)
@@ -45,9 +45,6 @@
<xs:attribute name="default-flush-mode">
<xs:simpleType>
<xs:restriction base="xs:token">
- <xs:enumeration value="manual"/>
- <xs:enumeration value="auto"/>
- <xs:enumeration value="commit"/>
<xs:enumeration value="MANUAL"/>
<xs:enumeration value="AUTO"/>
<xs:enumeration value="COMMIT"/>
16 years, 6 months
Seam SVN: r8234 - in trunk/src/main/org/jboss/seam: core and 1 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-20 12:03:03 -0400 (Tue, 20 May 2008)
New Revision: 8234
Modified:
trunk/src/main/org/jboss/seam/core-2.1.xsd
trunk/src/main/org/jboss/seam/core/Manager.java
trunk/src/main/org/jboss/seam/persistence/PersistenceContexts.java
Log:
JBSEAM-2512
Modified: trunk/src/main/org/jboss/seam/core/Manager.java
===================================================================
--- trunk/src/main/org/jboss/seam/core/Manager.java 2008-05-20 15:58:34 UTC (rev 8233)
+++ trunk/src/main/org/jboss/seam/core/Manager.java 2008-05-20 16:03:03 UTC (rev 8234)
@@ -17,6 +17,7 @@
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.FlushModeType;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
@@ -68,7 +69,9 @@
private String URIEncoding = DEFAULT_ENCODING;
+ private FlushModeType defaultFlushMode;
+
// DONT BREAK, icefaces uses this
public String getCurrentConversationId()
{
@@ -865,6 +868,16 @@
{
this.concurrentRequestTimeout = requestWait;
}
+
+ public FlushModeType getDefaultFlushMode()
+ {
+ return defaultFlushMode;
+ }
+
+ public void setDefaultFlushMode(FlushModeType defaultFlushMode)
+ {
+ this.defaultFlushMode = defaultFlushMode;
+ }
@Override
public String toString()
Modified: trunk/src/main/org/jboss/seam/core-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/core-2.1.xsd 2008-05-20 15:58:34 UTC (rev 8233)
+++ trunk/src/main/org/jboss/seam/core-2.1.xsd 2008-05-20 16:03:03 UTC (rev 8234)
@@ -42,6 +42,18 @@
<xs:attribute name="conversation-id-parameter" type="components:string"/>
<xs:attribute name="parent-conversation-id-parameter" type="components:string"/>
<xs:attribute name="uri-encoding" type="components:string" />
+ <xs:attribute name="default-flush-mode">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="manual"/>
+ <xs:enumeration value="auto"/>
+ <xs:enumeration value="commit"/>
+ <xs:enumeration value="MANUAL"/>
+ <xs:enumeration value="AUTO"/>
+ <xs:enumeration value="COMMIT"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:attributeGroup>
<xs:element name="resource-loader">
Modified: trunk/src/main/org/jboss/seam/persistence/PersistenceContexts.java
===================================================================
--- trunk/src/main/org/jboss/seam/persistence/PersistenceContexts.java 2008-05-20 15:58:34 UTC (rev 8233)
+++ trunk/src/main/org/jboss/seam/persistence/PersistenceContexts.java 2008-05-20 16:03:03 UTC (rev 8234)
@@ -9,6 +9,7 @@
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.FlushModeType;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Name;
@@ -16,6 +17,7 @@
import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.AbstractMutable;
+import org.jboss.seam.core.Manager;
/**
* Maintains the set of persistence contexts that have been
@@ -32,9 +34,26 @@
{
private static final long serialVersionUID = -4897350516435283182L;
private Set<String> set = new HashSet<String>();
- private FlushModeType flushMode = FlushModeType.AUTO;
- private FlushModeType actualFlushMode = FlushModeType.AUTO;
+ private FlushModeType flushMode;
+ private FlushModeType actualFlushMode;
+ @Create
+ public void create()
+ {
+ FlushModeType defaultFlushMode = Manager.instance().getDefaultFlushMode();
+ if (defaultFlushMode != null)
+ {
+ flushMode = defaultFlushMode;
+ actualFlushMode = defaultFlushMode;
+ }
+ else
+ {
+ flushMode = FlushModeType.AUTO;
+ actualFlushMode = FlushModeType.AUTO;
+ }
+ }
+
+
public FlushModeType getFlushMode()
{
return flushMode;
16 years, 6 months
Seam SVN: r8233 - in trunk/examples/wiki: src/etc/META-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-05-20 11:58:34 -0400 (Tue, 20 May 2008)
New Revision: 8233
Modified:
trunk/examples/wiki/build.xml
trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml
Log:
JBSEAM-3009 update for CI builds
Modified: trunk/examples/wiki/build.xml
===================================================================
--- trunk/examples/wiki/build.xml 2008-05-20 15:31:54 UTC (rev 8232)
+++ trunk/examples/wiki/build.xml 2008-05-20 15:58:34 UTC (rev 8233)
@@ -127,6 +127,7 @@
<target name="clean" description="Cleans up all build artifacts">
<delete dir="${tmp.dir}"/>
+ <delete dir="lacewikiIndex"/>
</target>
<target name="upgradehibernate"
Modified: trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml
===================================================================
--- trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml 2008-05-20 15:31:54 UTC (rev 8232)
+++ trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml 2008-05-20 15:58:34 UTC (rev 8233)
@@ -32,7 +32,7 @@
<!-- Search engine -->
<property name="hibernate.search.default.directory_provider"
value="org.hibernate.search.store.FSDirectoryProvider"/>
- <property name="hibernate.search.default.indexBase" value="build/lacewikiIndex"/>
+ <property name="hibernate.search.default.indexBase" value="lacewikiIndex"/>
<property name="hibernate.search.worker.batch_size" value="50"/>
<!-- Run the Hibernate bytecode instrumentation at deployment time, for lazy loading of @ToOne and byte[] properties -->
16 years, 6 months
Seam SVN: r8232 - trunk/src/main/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-05-20 11:31:54 -0400 (Tue, 20 May 2008)
New Revision: 8232
Modified:
trunk/src/main/org/jboss/seam/security-2.1.xsd
Log:
removed security-rules attribute from Identity
Modified: trunk/src/main/org/jboss/seam/security-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/security-2.1.xsd 2008-05-20 15:12:06 UTC (rev 8231)
+++ trunk/src/main/org/jboss/seam/security-2.1.xsd 2008-05-20 15:31:54 UTC (rev 8232)
@@ -24,7 +24,6 @@
<xs:attribute name="remember-me" type="components:boolean"/>
<xs:attribute name="authenticate-every-request" type="components:boolean"/>
<xs:attribute name="jaas-config-name" type="components:string"/>
- <xs:attribute name="security-rules" type="components:string"/>
</xs:attributeGroup>
<xs:attributeGroup name="attlist.faces-security-events">
16 years, 6 months