Seam SVN: r12346 - modules/drools/trunk.
by seam-commits＠lists.jboss.org
Author: tsurdilovic
Date: 2010-03-31 19:14:14 -0400 (Wed, 31 Mar 2010)
New Revision: 12346
Modified:
modules/drools/trunk/pom.xml
Log:
temporarily removed dependency for drools-workflowitems
Modified: modules/drools/trunk/pom.xml
===================================================================
--- modules/drools/trunk/pom.xml 2010-03-31 23:13:43 UTC (rev 12345)
+++ modules/drools/trunk/pom.xml 2010-03-31 23:14:14 UTC (rev 12346)
@@ -100,11 +100,13 @@
<artifactId>drools-decisiontables</artifactId>
<version>5.1.0.M1</version>
</dependency>
- <dependency>
+ <!-- TODO add back and check where
+ org.apache.commons:commons-cli:2.0-SNAPSHOT -->
+ <!-- <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-workitems</artifactId>
<version>5.1.0.M1</version>
- </dependency>
+ </dependency> -->
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
14 years, 8 months
Seam SVN: r12345 - modules/drools/trunk/core.
by seam-commits＠lists.jboss.org
Author: tsurdilovic
Date: 2010-03-31 19:13:43 -0400 (Wed, 31 Mar 2010)
New Revision: 12345
Modified:
modules/drools/trunk/core/pom.xml
Log:
temporarily removed dependency for drools-workflowitems
Modified: modules/drools/trunk/core/pom.xml
===================================================================
--- modules/drools/trunk/core/pom.xml 2010-03-31 23:10:59 UTC (rev 12344)
+++ modules/drools/trunk/core/pom.xml 2010-03-31 23:13:43 UTC (rev 12345)
@@ -51,10 +51,12 @@
<groupId>org.drools</groupId>
<artifactId>drools-decisiontables</artifactId>
</dependency>
- <dependency>
+ <!-- TODO add back and check where
+ org.apache.commons:commons-cli:2.0-SNAPSHOT -->
+ <!-- <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-workitems</artifactId>
- </dependency>
+ </dependency> -->
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
14 years, 8 months
Seam SVN: r12344 - modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/classes.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-31 19:10:59 -0400 (Wed, 31 Mar 2010)
New Revision: 12344
Modified:
modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/classes/seam-beans.xml
Log:
changed extends -> specializes
Modified: modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/classes/seam-beans.xml
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/classes/seam-beans.xml 2010-03-31 23:10:31 UTC (rev 12343)
+++ modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/classes/seam-beans.xml 2010-03-31 23:10:59 UTC (rev 12344)
@@ -10,7 +10,7 @@
http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
<idm:IdentityManager>
- <s:extends/>
+ <s:specializes/>
<idm:identityStore>
<s:Inject/>
<s:type>
@@ -20,13 +20,13 @@
</idm:IdentityManager>
<idm:JpaIdentityStore>
- <s:extends/>
+ <s:specializes/>
<idm:userEntityClass>org.jboss.seam.security.examples.seamspace.model.MemberAccount</idm:userEntityClass>
<idm:roleEntityClass>org.jboss.seam.security.examples.seamspace.model.MemberRole</idm:roleEntityClass>
</idm:JpaIdentityStore>
<pm:JpaPermissionStore>
- <s:extends/>
+ <s:specializes/>
<pm:userPermissionClass>org.jboss.seam.security.examples.seamspace.model.AccountPermission</pm:userPermissionClass>
</pm:JpaPermissionStore>
14 years, 8 months
Seam SVN: r12343 - modules/security/trunk.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-31 19:10:31 -0400 (Wed, 31 Mar 2010)
New Revision: 12343
Modified:
modules/security/trunk/pom.xml
Log:
update drools version
Modified: modules/security/trunk/pom.xml
===================================================================
--- modules/security/trunk/pom.xml 2010-03-31 13:52:53 UTC (rev 12342)
+++ modules/security/trunk/pom.xml 2010-03-31 23:10:31 UTC (rev 12343)
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
- <version>5.0.1</version>
+ <version>5.1.0.M1</version>
</dependency>
<dependency>
14 years, 8 months
Seam SVN: r12342 - modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-31 09:52:53 -0400 (Wed, 31 Mar 2010)
New Revision: 12342
Added:
modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.java
Removed:
modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java
Log:
renamed ExtendsXmlItem -> SpecializesXmlItem
Deleted: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java
===================================================================
--- modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java 2010-03-31 12:11:15 UTC (rev 12341)
+++ modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java 2010-03-31 13:52:53 UTC (rev 12342)
@@ -1,24 +0,0 @@
-/*
- * Distributed under the LGPL License
- *
- */
-package org.jboss.seam.xml.model;
-
-import java.util.Collections;
-import java.util.Set;
-
-public class ExtendsXmlItem extends AbstractXmlItem
-{
-
- public ExtendsXmlItem(XmlItem parent, String document, int lineno)
- {
- super(XmlItemType.EXTENDS, parent, null, null, null, document, lineno);
-
- }
-
- public Set<XmlItemType> getAllowedItem()
- {
- return Collections.emptySet();
- }
-
-}
Copied: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.java (from rev 12338, modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java)
===================================================================
--- modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.java (rev 0)
+++ modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.java 2010-03-31 13:52:53 UTC (rev 12342)
@@ -0,0 +1,24 @@
+/*
+ * Distributed under the LGPL License
+ *
+ */
+package org.jboss.seam.xml.model;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class SpecializesXmlItem extends AbstractXmlItem
+{
+
+ public SpecializesXmlItem(XmlItem parent, String document, int lineno)
+ {
+ super(XmlItemType.SPECIALIZES, parent, null, null, null, document, lineno);
+
+ }
+
+ public Set<XmlItemType> getAllowedItem()
+ {
+ return Collections.emptySet();
+ }
+
+}
14 years, 8 months
Seam SVN: r12341 - in modules/servlet/trunk: src/main/java/org/jboss/seam/servlet and 1 other directory.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2010-03-31 08:11:15 -0400 (Wed, 31 Mar 2010)
New Revision: 12341
Modified:
modules/servlet/trunk/pom.xml
modules/servlet/trunk/src/main/java/org/jboss/seam/servlet/HttpManager.java
Log:
Don't listen on servlet context attrs, too soon
Modified: modules/servlet/trunk/pom.xml
===================================================================
--- modules/servlet/trunk/pom.xml 2010-03-31 11:59:42 UTC (rev 12340)
+++ modules/servlet/trunk/pom.xml 2010-03-31 12:11:15 UTC (rev 12341)
@@ -77,6 +77,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-extensions</artifactId>
<version>1.0.0.Alpha1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
Modified: modules/servlet/trunk/src/main/java/org/jboss/seam/servlet/HttpManager.java
===================================================================
--- modules/servlet/trunk/src/main/java/org/jboss/seam/servlet/HttpManager.java 2010-03-31 11:59:42 UTC (rev 12340)
+++ modules/servlet/trunk/src/main/java/org/jboss/seam/servlet/HttpManager.java 2010-03-31 12:11:15 UTC (rev 12341)
@@ -1,20 +1,18 @@
package org.jboss.seam.servlet;
-import javax.enterprise.context.RequestScoped;
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.inject.Inject;
-import javax.servlet.ServletContextAttributeEvent;
import javax.servlet.ServletRequestEvent;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
-import org.jboss.seam.servlet.event.qualifier.AttributeAdded;
-import org.jboss.seam.servlet.event.qualifier.AttributeRemoved;
-import org.jboss.seam.servlet.event.qualifier.AttributeReplaced;
import org.jboss.seam.servlet.event.qualifier.Created;
import org.jboss.seam.servlet.event.qualifier.Destroyed;
import org.jboss.seam.servlet.event.qualifier.Initialized;
@@ -26,8 +24,8 @@
* @author Nicklas Karlsson
*
*/
-@RequestScoped
-public class HttpManager
+@SessionScoped
+public class HttpManager implements Serializable
{
private static final long serialVersionUID = 5191073522575178427L;
@@ -50,43 +48,18 @@
request = null;
}
- protected void servletContextAttributeAdded(@Observes @AttributeAdded ServletContextAttributeEvent e)
- {
- if (BeanManager.class.getName().equals(e.getName()))
- {
- log.trace("Bean manager set in servlet context with event #0", e);
- beanManager = (BeanManager) e.getValue();
- }
- }
-
- protected void servletContextAttributeReplaced(@Observes @AttributeReplaced ServletContextAttributeEvent e)
- {
- if (BeanManager.class.getName().equals(e.getName()))
- {
- log.trace("Bean manager replaced in servlet context with event #0", e);
- beanManager = (BeanManager) e.getValue();
- }
- }
-
- protected void servletContextAttributeRemoved(@Observes @AttributeRemoved ServletContextAttributeEvent e)
- {
- if (BeanManager.class.getName().equals(e.getName()))
- {
- log.trace("Bean manager removed from servlet context with event #0", e);
- beanManager = null;
- }
- }
-
protected void sessionInitialized(@Observes @Created HttpSessionEvent e)
{
log.trace("HTTP session initalized with event #0", e);
session = e.getSession();
+ beanManager = (BeanManager) session.getServletContext().getAttribute(BeanManager.class.getName());
}
protected void sessionDestroyed(@Observes @Destroyed HttpSessionEvent e)
{
log.trace("HTTP session destroyed with event #0", e);
session = null;
+ beanManager = null;
}
/**
14 years, 8 months
Seam SVN: r12340 - in branches/enterprise/JBPAPP_4_3_FP01/build: localRepo/org and 3 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-03-31 07:59:42 -0400 (Wed, 31 Mar 2010)
New Revision: 12340
Added:
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.jar
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.jar.md5
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.jar.sha1
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.pom
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.pom.md5
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.pom.sha1
Modified:
branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/ui.pom.xml
Log:
aligning dependencies with EAP 4.3.8
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml 2010-03-31 09:11:02 UTC (rev 12339)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml 2010-03-31 11:59:42 UTC (rev 12340)
@@ -28,7 +28,7 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>hibernate-validator</groupId>
<artifactId>hibernate-validator</artifactId>
<optional>true</optional>
</dependency>
@@ -182,8 +182,8 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
+ <groupId>jboss.cache</groupId>
+ <artifactId>jboss-cache-jdk50</artifactId>
<optional>true</optional>
</dependency>
Added: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.jar
===================================================================
(Binary files differ)
Property changes on: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.jar.md5
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.jar.md5 (rev 0)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.jar.md5 2010-03-31 11:59:42 UTC (rev 12340)
@@ -0,0 +1 @@
+87832e6f14920ef53185568482e5e761
\ No newline at end of file
Added: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.jar.sha1
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.jar.sha1 (rev 0)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.jar.sha1 2010-03-31 11:59:42 UTC (rev 12340)
@@ -0,0 +1 @@
+e410497849f00e6fab5c42d666612d3fe6d1dec2
\ No newline at end of file
Added: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.pom
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.pom (rev 0)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.pom 2010-03-31 11:59:42 UTC (rev 12340)
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.5</version>
+ <packaging>jar</packaging>
+ <name>EasyMock</name>
+ <url>http://www.easymock.org</url>
+ <description>EasyMock provides an easy way to create Mock Objects for interfaces by generating them on the fly using Java's proxy mechanism</description>
+ <licenses>
+ <license>
+ <name>MIT License</name>
+ <url>http://www.easymock.org/License.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>tammo</id>
+ <name>Tammo Freese</name>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>henri</id>
+ <name>Henri Tremblay</name>
+ <url>http://www.jroller.com/Henri/</url>
+ <organization>Ossia Conseil</organization>
+ <organizationUrl>http://ossia-conseil.com</organizationUrl>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+ <issueManagement>
+ <system>SourceForge</system>
+ <url>http://sourceforge.net/tracker/?group_id=82958</url>
+ </issueManagement>
+ <mailingLists>
+ <mailingList>
+ <name>User List</name>
+ <subscribe>From Yahoo groups</subscribe>
+ <unsubscribe>easymock-unsubscribe(a)yahoogroups.com</unsubscribe>
+ <post>easymock(a)yahoogroups.com</post>
+ <archive>http://tech.groups.yahoo.com/group/easymock/</archive>
+ </mailingList>
+ </mailingLists>
+ <scm>
+ <url>http://easymock.svn.sourceforge.net/viewvc/easymock/trunk/easymock/</url>
+ <developerConnection>scm:svn:https://easymock.svn.sourceforge.net/svnroot/easymock/trunk/easymock</developerConnection>
+ <connection>scm:svn:http://easymock.svn.sourceforge.net/svnroot/easymock/trunk/easymock</connection>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.6</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.keyboardsamurais.maven</groupId>
+ <artifactId>maven-timestamp-plugin</artifactId>
+ <version>1.0</version>
+ <configuration>
+ <propertyName>date</propertyName>
+ <timestampPattern>yyyy-MM-dd</timestampPattern>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks />
+ <testSourceRoot>${basedir}/src/samples/java</testSourceRoot>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <useDefaultManifestFile>true</useDefaultManifestFile>
+ <archive>
+ <index>true</index>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.0</version>
+ <configuration>
+ <instructions>
+ <Export-Package>org.easymock.internal.*;poweruser=true;mandatory:=poweruser, org.easymock</Export-Package>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <version>2.5.0</version>
+ <configuration>
+ <licenseLocation>${basedir}/clover.license</licenseLocation>
+ <targetPercentage>100.00%</targetPercentage>
+ <generateHtml>true</generateHtml>
+ <generateXml>false</generateXml>
+ <jdk>1.5</jdk>
+ <excludes>
+ <exclude>**/org/easymock/tests/IMethods.java</exclude>
+ <exclude>**/org/easymock/tests/IVarArgs.java</exclude>
+ <exclude>**/org/easymock/tests/Util.java</exclude>
+ <exclude>**/org/easymock/samples/*.java</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>instrument</goal>
+ <goal>clover</goal>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- Run the tests with JDK 1.5 to be sure EasyMock is compliant -->
+ <jvm>${jdk1_5.jvm}</jvm>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ <configuration>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/assembly-tests.xml</descriptor>
+ <descriptor>${basedir}/src/main/assembly/assembly-samples.xml</descriptor>
+ <descriptor>${basedir}/src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-beta-5</version>
+ </extension>
+ </extensions>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <excludePackageNames>*.internal</excludePackageNames>
+ <bottom><![CDATA[<i>Copyright © 2001-2009 OFFIS, Tammo Freese, Henri Tremblay. This documentation is provided under the terms of the MIT licence.</i>]]></bottom>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <configuration>
+ <licenseLocation>${basedir}/clover.license</licenseLocation>
+ <jdk>1.5</jdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ <distributionManagement>
+ <repository>
+ <id>easymock-release</id>
+ <name>EasyMock Repository</name>
+ <url>scpexe://shell.sf.net/home/groups/e/ea/easymock/htdocs/maven/repository</url>
+ </repository>
+ <snapshotRepository>
+ <id>easymock-snapshot</id>
+ <name>EasyMock Snapshot Repository</name>
+ <url>scpexe://shell.sf.net/home/groups/e/ea/easymock/htdocs/maven/repository-s...</url>
+ </snapshotRepository>
+ </distributionManagement>
+</project>
Added: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.pom.md5
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.pom.md5 (rev 0)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.pom.md5 2010-03-31 11:59:42 UTC (rev 12340)
@@ -0,0 +1 @@
+2877f332e901393b22b3f8d68b396c84
\ No newline at end of file
Added: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.pom.sha1
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.pom.sha1 (rev 0)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/easymock/2.5/easymock-2.5.pom.sha1 2010-03-31 11:59:42 UTC (rev 12340)
@@ -0,0 +1 @@
+f72690639012ec7763de2b2109b5e9df8f33d477
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2010-03-31 09:11:02 UTC (rev 12339)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2010-03-31 11:59:42 UTC (rev 12340)
@@ -14,6 +14,11 @@
<name>JBoss Repository</name>
<url>http://repository.jboss.org/maven2</url>
</pluginRepository>
+ <pluginRepository>
+ <id>products.jboss</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2-brew</url>
+ </pluginRepository>
<!--
<pluginRepository> <snapshots /> <id>snapshots.jboss.org</id>
<name>JBoss Snapshot Repository</name>
@@ -37,6 +42,11 @@
<url>http://repository.jboss.org/maven2-brew</url>
</repository>
<repository>
+ <id>repository.local</id>
+ <name>Seam Local Repository</name>
+ <url>file://@local.repo@</url>
+ </repository>
+ <repository>
<snapshots />
<id>snapshots.jboss.org</id>
<name>JBoss Snapshot Repository</name>
@@ -46,7 +56,7 @@
<!-- Externalize some version numbers here -->
<properties>
- <version.richfaces>3.3.0.GA</version.richfaces>
+ <version.richfaces>3.3.1.SP1</version.richfaces>
<version.drools>4.0.7-SOA-P</version.drools>
</properties>
@@ -264,9 +274,9 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <version>1.4.1.SP13</version>
+ <groupId>jboss.cache</groupId>
+ <artifactId>jboss-cache-jdk50</artifactId>
+ <version>1.4.1.SP14-brew</version>
</dependency>
<dependency>
@@ -288,7 +298,7 @@
<dependency>
<groupId>hibernate</groupId>
<artifactId>hibernate3</artifactId>
- <version>3.2.4.SP1_CP09-brew</version>
+ <version>3.2.4.SP1_CP10-brew</version>
<exclusions>
<exclusion>
<groupId>commons-collections</groupId>
@@ -319,7 +329,7 @@
<dependency>
<groupId>hibernate-annotations</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.3.1.GA_CP02-brew</version>
+ <version>3.3.1.GA_CP03-brew</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
@@ -353,9 +363,9 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>hibernate-validator</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0.GA-brew</version>
<exclusions>
<exclusion>
<groupId>org.hibernate</groupId>
@@ -904,7 +914,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.8patch02-brew</version>
+ <version>1.8.0.8.patch03-brew</version>
</dependency>
<dependency>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/ui.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/ui.pom.xml 2010-03-31 09:11:02 UTC (rev 12339)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/ui.pom.xml 2010-03-31 11:59:42 UTC (rev 12340)
@@ -117,8 +117,8 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
+ <groupId>jboss.cache</groupId>
+ <artifactId>jboss-cache-jdk50</artifactId>
<optional>true</optional>
</dependency>
@@ -179,7 +179,7 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>hibernate-validator</groupId>
<artifactId>hibernate-validator</artifactId>
<optional>true</optional>
</dependency>
14 years, 8 months
Seam SVN: r12339 - in modules/security/trunk/examples/seamspace/src/main: webapp and 1 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-31 05:11:02 -0400 (Wed, 31 Mar 2010)
New Revision: 12339
Modified:
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/action/BlogAction.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/action/ProfileAction.java
modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/classes/seam-beans.xml
modules/security/trunk/examples/seamspace/src/main/webapp/blog.xhtml
modules/security/trunk/examples/seamspace/src/main/webapp/blogentry.xhtml
modules/security/trunk/examples/seamspace/src/main/webapp/profile.xhtml
Log:
fixed profile page, blog entry page, minor
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/action/BlogAction.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/action/BlogAction.java 2010-03-31 04:16:47 UTC (rev 12338)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/action/BlogAction.java 2010-03-31 09:11:02 UTC (rev 12339)
@@ -6,7 +6,6 @@
import javax.enterprise.context.Conversation;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Produces;
import javax.inject.Inject;
import javax.inject.Named;
import javax.persistence.EntityManager;
@@ -16,7 +15,7 @@
import org.jboss.seam.security.examples.seamspace.model.Member;
import org.jboss.seam.security.examples.seamspace.model.MemberBlog;
-@Named("blog")
+@Named
@ConversationScoped
public class BlogAction implements Serializable
{
@@ -27,21 +26,26 @@
@Inject EntityManager entityManager;
- /*@Inject*/ MemberBlog selectedBlog;
+ private MemberBlog selectedBlog;
@Inject Member authenticatedMember;
@Inject Conversation conversation;
+ public MemberBlog getSelectedBlog()
+ {
+ return selectedBlog;
+ }
+
/**
* Used to read a single blog entry for a member
*/
- public @Produces @Named("selectedBlog") MemberBlog getBlog()
+ public void loadBlog()
{
conversation.begin();
try
{
- return (MemberBlog) entityManager.createQuery(
+ selectedBlog = (MemberBlog) entityManager.createQuery(
"from MemberBlog b where b.blogId = :blogId and b.member.memberName = :memberName")
.setParameter("blogId", blogId)
.setParameter("memberName", name)
@@ -49,7 +53,7 @@
}
catch (NoResultException ex)
{
- return null;
+
}
}
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/action/ProfileAction.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/action/ProfileAction.java 2010-03-31 04:16:47 UTC (rev 12338)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/action/ProfileAction.java 2010-03-31 09:11:02 UTC (rev 12339)
@@ -2,31 +2,27 @@
import java.util.List;
-import java.util.Random;
-import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Model;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import org.jboss.seam.security.examples.seamspace.model.FriendComment;
import org.jboss.seam.security.examples.seamspace.model.Member;
+import org.jboss.seam.security.examples.seamspace.model.MemberAccount;
import org.jboss.seam.security.examples.seamspace.model.MemberBlog;
+import org.jboss.seam.security.examples.seamspace.util.Authenticated;
-@RequestScoped
-@Named
+@Model
public class ProfileAction
{
- //@RequestParameter
private String name;
- @Inject Member selectedMember;
+ private Member selectedMember;
+
+ private @Inject @Authenticated MemberAccount authenticatedAccount;
-
- @Inject
- private Member authenticatedMember;
-
//@Out(required = false)
List<Member> newMembers;
@@ -35,25 +31,29 @@
@Inject EntityManager entityManager;
- //@Factory("selectedMember")
- public void display()
- {
- if (name == null && authenticatedMember != null)
+ public Member getSelectedMember()
+ {
+ if (selectedMember == null)
{
- selectedMember = (Member) entityManager.find(Member.class,
- authenticatedMember.getMemberId());
- }
- else if (name != null)
- {
- try
+ if (name == null && authenticatedAccount != null)
{
- selectedMember = (Member) entityManager.createQuery(
- "from Member where memberName = :memberName")
- .setParameter("memberName", name)
- .getSingleResult();
+ selectedMember = (Member) entityManager.find(Member.class,
+ authenticatedAccount.getMember().getMemberId());
}
- catch (NoResultException ex) { }
+ else if (name != null)
+ {
+ try
+ {
+ selectedMember = (Member) entityManager.createQuery(
+ "from Member where memberName = :memberName")
+ .setParameter("memberName", name)
+ .getSingleResult();
+ }
+ catch (NoResultException ex) { }
+ }
}
+
+ return selectedMember;
}
/**
@@ -76,9 +76,9 @@
//@Factory("memberBlogs")
public void getMemberBlogs()
{
- if (name == null && authenticatedMember != null)
+ if (name == null && authenticatedAccount != null)
{
- name = authenticatedMember.getMemberName();
+ name = authenticatedAccount.getMember().getMemberName();
}
memberBlogs = entityManager.createQuery(
Modified: modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/classes/seam-beans.xml
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/classes/seam-beans.xml 2010-03-31 04:16:47 UTC (rev 12338)
+++ modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/classes/seam-beans.xml 2010-03-31 09:11:02 UTC (rev 12339)
@@ -4,6 +4,7 @@
xmlns:s="urn:java:seam:core"
xmlns:security="urn:java:org.jboss.seam.security"
xmlns:idm="urn:java:org.jboss.seam.security.management"
+ xmlns:pm="urn:java:org.jboss.seam.security.permission"
xmlns:seamspace="urn:java:org.jboss.seam.security.examples.seamspace"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
@@ -24,4 +25,9 @@
<idm:roleEntityClass>org.jboss.seam.security.examples.seamspace.model.MemberRole</idm:roleEntityClass>
</idm:JpaIdentityStore>
+ <pm:JpaPermissionStore>
+ <s:extends/>
+ <pm:userPermissionClass>org.jboss.seam.security.examples.seamspace.model.AccountPermission</pm:userPermissionClass>
+ </pm:JpaPermissionStore>
+
</beans>
\ No newline at end of file
Modified: modules/security/trunk/examples/seamspace/src/main/webapp/blog.xhtml
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/webapp/blog.xhtml 2010-03-31 04:16:47 UTC (rev 12338)
+++ modules/security/trunk/examples/seamspace/src/main/webapp/blog.xhtml 2010-03-31 09:11:02 UTC (rev 12339)
@@ -2,56 +2,58 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:s="http://jboss.com/products/seam/taglib">
+ xmlns:h="http://java.sun.com/jsf/html">
<ui:composition template="template.xhtml">
<ui:define name="content">
<div class="errors"><h:messages globalOnly="true"/></div>
- <s:div rendered="#{selectedMember == null}">
- Sorry, but this member does not exist.
- </s:div>
+ <ui:fragment rendered="#{selectedMember == null}">
+ <div>Sorry, but this member does not exist.</div>
+ </ui:fragment>
- <s:div rendered="#{selectedMember != null}">
+ <ui:fragment rendered="#{selectedMember != null}">
+ <div>
+ <div id="blogMemberCard">
+ <h:link outcome="/profile.seam">
+ #{selectedMember.memberName}<br/>
+ <h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
+ </h:link>
+
+ <br style="clear:both"/>
+ </div>
+
+ <div id="blog">
+ <ui:repeat value="#{memberBlogs}" var="memberBlog">
+ <div class="blogEntry">
+ <div class="blogDate">#{memberBlog.formattedEntryDate}</div>
+ <div class="blogTitle">#{memberBlog.title}</div>
+ <div class="blogText"><s:formattedText value="#{memberBlog.text}"/></div>
+ <div class="blogFooter">
+
+ [<h:link outcome="/blogentry.seam">
+ <f:param name="name" value="#{selectedMember.memberName}"/>
+ <f:param name="blogId" value="#{memberBlog.blogId}"/>
+ #{memberBlog.commentCount} Comment#{memberBlog.commentCount != 1 ? "s" : ""}
+ </h:link>]
+
+ <ui:fragment rendered="#{s:hasPermission('blog','createComment')}">
+ <span>
+ [<h:link outcome="/comment.seam" value="Add Comment">
+ <f:param name="name" value="#{selectedMember.memberName}"/>
+ <f:param name="blogId" value="#{memberBlog.blogId}"/>
+ </h:link>]
+ </span>
+ </ui:fragment>
+ </div>
+ </div>
+ </ui:repeat>
+ </div>
+
+ </div>
+ </ui:fragment>
- <s:div id="blogMemberCard">
- <s:link view="/profile.seam" propagation="none">
- #{selectedMember.memberName}<br/>
- <h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
- </s:link>
-
- <br style="clear:both"/>
- </s:div>
-
- <s:div id="blog">
- <ui:repeat value="#{memberBlogs}" var="memberBlog">
- <div class="blogEntry">
- <div class="blogDate">#{memberBlog.formattedEntryDate}</div>
- <div class="blogTitle">#{memberBlog.title}</div>
- <div class="blogText"><s:formattedText value="#{memberBlog.text}"/></div>
- <div class="blogFooter">
-
- [<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.seam" value="Add Comment" propagation="none">
- <f:param name="name" value="#{selectedMember.memberName}"/>
- <f:param name="blogId" value="#{memberBlog.blogId}"/>
- </s:link>]
- </s:span>
- </div>
- </div>
- </ui:repeat>
- </s:div>
-
- </s:div>
-
<br class="clear"/>
</ui:define>
Modified: modules/security/trunk/examples/seamspace/src/main/webapp/blogentry.xhtml
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/webapp/blogentry.xhtml 2010-03-31 04:16:47 UTC (rev 12338)
+++ modules/security/trunk/examples/seamspace/src/main/webapp/blogentry.xhtml 2010-03-31 09:11:02 UTC (rev 12339)
@@ -2,69 +2,79 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:s="http://jboss.com/products/seam/taglib">
+ xmlns:f="http://java.sun.com/jsf/core">
<ui:composition template="template.xhtml">
<ui:define name="content">
+ <f:metadata>
+ <f:viewParam name="name" value="#{blogAction.name}"/>
+ <f:viewParam name="blogId" value="#{blogAction.blogId}"/>
+ </f:metadata>
+ <f:event type="preRenderView" listener="#{blogAction.loadBlog}"/>
+
<div class="errors"><h:messages globalOnly="true"/></div>
- <s:div rendered="#{selectedBlog == null}">
- Sorry, but this blog entry does not exist.
- </s:div>
+ <ui:fragment rendered="#{blogAction.selectedBlog == null}">
+ <div>
+ Sorry, but this blog entry does not exist.
+ </div>
+ </ui:fragment>
- <s:div rendered="#{selectedBlog != null}">
-
- <s:div id="blogMemberCard">
- <s:link view="/profile.seam" propagation="none">
- #{selectedMember.memberName}<br/>
- <h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
- </s:link>
-
- <br style="clear:both"/>
- </s:div>
-
- <s:div id="blog">
- <div class="blogEntry">
- <div class="blogDate">#{selectedBlog.formattedEntryDate}</div>
- <div class="blogTitle">#{selectedBlog.title}</div>
- <div class="blogText"><s:formattedText value="#{selectedBlog.text}"/></div>
- <div class="blogFooter">
- <s:span rendered="#{s:hasPermission(selectedBlog, 'create')}">
- [<s:link action="#{commentAction.createComment}" value="Add Comment"/>]
- </s:span>
- [<s:link view="/blog.seam" value="View all blog entries" propagation="none">
- <f:param name="name" value="#{selectedMember.memberName}"/>
- </s:link>]
+ <ui:fragment rendered="#{blogAction.selectedBlog != null}">
+ <div>
+ <div id="blogMemberCard">
+ <h:link outcome="/profile.seam">
+ #{blogAction.selectedBlog.member.memberName}<br/>
+ <h:graphicImage value="/content/images?id=#{blogAction.selectedBlog.member.picture.imageId}&width=90"/>
+ </h:link>
+
+ <br style="clear:both"/>
+ </div>
+
+ <div id="blog">
+ <div class="blogEntry">
+ <div class="blogDate">#{blogAction.selectedBlog.formattedEntryDate}</div>
+ <div class="blogTitle">#{blogAction.selectedBlog.title}</div>
+ <div class="blogText"><h:outputText value="#{blogAction.selectedBlog.text}"/></div>
+ <div class="blogFooter">
+ <ui:fragment rendered="#{identity.hasPermission(selectedBlog, 'create')}">
+ <span>
+ [<h:link action="#{commentAction.createComment}" value="Add Comment"/>]
+ </span>
+ </ui:fragment>
+ [<h:link outcome="/blog.seam" value="View all blog entries">
+ <f:param name="name" value="#{blogAction.selectedBlog.member.memberName}"/>
+ </h:link>]
+ </div>
</div>
- </div>
-
- <ui:repeat value="#{selectedBlog.sortedComments}" var="comment">
- <table class="blogComment">
- <tr>
- <td class="blogCommentor">
- <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"/>
- </s:link>
- </td>
-
- <td class="blogCommentText">
- <p><s:formattedText value="#{comment.comment}"/></p>
- <p>Posted by
- <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>
- </td>
- </tr>
- </table>
- </ui:repeat>
- </s:div>
-
- </s:div>
+
+ <ui:repeat value="#{blogAction.selectedBlog.sortedComments}" var="comment">
+ <table class="blogComment">
+ <tr>
+ <td class="blogCommentor">
+ <h:link outcome="/profile.seam">
+ <f:param name="name" value="#{comment.commentor.memberName}"/>
+ #{comment.commentor.memberName}<br/>
+ <h:graphicImage value="/content/images?id=#{comment.commentor.picture.imageId}&width=90"/>
+ </h:link>
+ </td>
+
+ <td class="blogCommentText">
+ <p><h:outputText value="#{comment.comment}"/></p>
+ <p>Posted by
+ <h:link outcome="/profile.seam" value="#{comment.commentor.memberName}">
+ <f:param name="name" value="#{comment.commentor.memberName}"/>
+ </h:link> on #{comment.formattedCommentDate}
+ </p>
+ </td>
+ </tr>
+ </table>
+ </ui:repeat>
+ </div>
+
+ </div>
+ </ui:fragment>
<br class="clear"/>
Modified: modules/security/trunk/examples/seamspace/src/main/webapp/profile.xhtml
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/webapp/profile.xhtml 2010-03-31 04:16:47 UTC (rev 12338)
+++ modules/security/trunk/examples/seamspace/src/main/webapp/profile.xhtml 2010-03-31 09:11:02 UTC (rev 12339)
@@ -9,52 +9,52 @@
<div class="errors"><h:messages globalOnly="true"/></div>
- <ui:fragment rendered="#{selectedMember == null}">
+ <ui:fragment rendered="#{profileAction.selectedMember == null}">
<div>Sorry, but this member does not exist.</div>
</ui:fragment>
- <ui:fragment rendered="#{selectedMember != null}">
+ <ui:fragment rendered="#{profileAction.selectedMember != null}">
<div id="memberCard">
- <h1>#{selectedMember.memberName}'s profile</h1>
+ <h1>#{profileAction.selectedMember.memberName}'s profile</h1>
- <ui:fragment rendered="#{selectedMember.picture ne null}">
+ <ui:fragment rendered="#{profileAction.selectedMember.picture ne null}">
<div id="memberCardPicture">
- <h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=170"/>
+ <h:graphicImage value="/content/images?id=#{profileAction.selectedMember.picture.imageId}&width=170"/>
</div>
</ui:fragment>
<div id="memberCardText">
- <span class="tagline">"#{selectedMember.tagline}"</span><br/><br/>
- #{selectedMember.gender.descr}<br/>
- #{selectedMember.age}<br/>
- #{selectedMember.location}<br/>
+ <span class="tagline">"#{profileAction.selectedMember.tagline}"</span><br/><br/>
+ #{profileAction.selectedMember.gender.descr}<br/>
+ #{profileAction.selectedMember.age}<br/>
+ #{profileAction.selectedMember.location}<br/>
</div>
<br style="clear:both"/>
View My:
<h:link outcome="/pictures.xhtml" value="Pics">
- <f:param name="name" value="#{selectedMember.memberName}"/>
+ <f:param name="name" value="#{profileAction.selectedMember.memberName}"/>
</h:link>
</div>
<div id="memberBlog">
- <div class="sectionHeader">#{selectedMember.memberName}'s latest blog entries</div>
+ <div class="sectionHeader">#{profileAction.selectedMember.memberName}'s latest blog entries</div>
- <ui:repeat value="#{profile.latestBlogs}" var="latestBlog">
+ <ui:repeat value="#{profileAction.latestBlogs}" var="latestBlog">
<div class="blogSummary">#{latestBlog.title}
(<h:link outcome="/blogentry.xhtml" value="view more">
- <f:param name="name" value="#{selectedMember.memberName}"/>
+ <f:param name="name" value="#{profileAction.selectedMember.memberName}"/>
<f:param name="blogId" value="#{latestBlog.blogId}"/>
</h:link>)
</div>
</ui:repeat>
[<h:link id="viewBlog" outcome="/blog.xhtml" value="View all blog entries" propagation="none">
- <f:param name="name" value="#{selectedMember.memberName}"/>
+ <f:param name="name" value="#{profileAction.selectedMember.memberName}"/>
</h:link>]
- <ui:fragment rendered="#{identity.hasPermission(selectedMember, 'createBlog')}">
+ <ui:fragment rendered="#{identity.hasPermission(profileAction.selectedMember, 'createBlog')}">
<span>
[<h:link id="createBlog" action="#{blog.createEntry}" value="Create new blog entry"/>]
</span>
@@ -62,7 +62,7 @@
</div>
<div id="memberFriends">
- <div class="sectionHeader">#{selectedMember.memberName}'s friends</div>
+ <div class="sectionHeader">#{profileAction.selectedMember.memberName}'s friends</div>
<ui:repeat value="#{profile.friends}" var="f">
<div class="friend">
@@ -78,7 +78,7 @@
<br class="clear"/>
- <ui:fragment rendered="#{selectedMember.memberId != authenticatedMember.memberId and identity.hasPermission(selectedMember, 'createFriendRequest')}">
+ <ui:fragment rendered="#{profileAction.selectedMember.memberId != authenticatedMember.memberId and identity.hasPermission(selectedMember, 'createFriendRequest')}">
<span>
[<h:link outcome="/friendrequest.xhtml" action="#{friendAction.createRequest}" value="Send a friend request"/>]
</span>
@@ -87,7 +87,7 @@
</div>
<div id="friendComments">
- <div class="sectionHeader">#{selectedMember.memberName}'s friend's comments</div>
+ <div class="sectionHeader">#{profileAction.selectedMember.memberName}'s friend's comments</div>
<ui:repeat value="#{profile.friendComments}" var="c">
<table class="friendComments">
@@ -108,7 +108,7 @@
</table>
</ui:repeat>
- <ui:fragment rendered="#{identity.hasPermission(selectedMember, 'createFriendComment')}">
+ <ui:fragment rendered="#{identity.hasPermission(profileAction.selectedMember, 'createFriendComment')}">
<span>
[<h:link outcome="/friendcomment.xhtml" value="Add Comment"/>]
</span>
14 years, 8 months
Seam SVN: r12338 - in modules/xml/trunk: core/src/main/java/org/jboss/seam/xml/parser/namespace and 10 other directories.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-03-31 00:16:47 -0400 (Wed, 31 Mar 2010)
New Revision: 12338
Modified:
modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/XmlItemType.java
modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
modules/xml/trunk/core/src/test/resources/META-INF/beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml
modules/xml/trunk/docs/en-US/xml-general.xml
Log:
changed <extends> to <specializes> and <override> to <overrides>
Modified: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
===================================================================
--- modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-03-31 04:16:47 UTC (rev 12338)
@@ -239,7 +239,7 @@
BeanResult<?> buildAnnotatedType(ClassXmlItem rb)
{
boolean override = !rb.getChildrenOfType(OverrideXmlItem.class).isEmpty();
- boolean extend = !rb.getChildrenOfType(ExtendsXmlItem.class).isEmpty();
+ boolean extend = !rb.getChildrenOfType(SpecializesXmlItem.class).isEmpty();
// if it is an extend we want to read the annotations from the underlying
// class
Modified: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/XmlItemType.java
===================================================================
--- modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-03-31 04:16:47 UTC (rev 12338)
@@ -6,5 +6,5 @@
public enum XmlItemType
{
- CLASS, METHOD, FIELD, ANNOTATION, VALUE, VETO, ENTRY, KEY, DEPENDENCY, PARAMETERS, PARAMETER, ARRAY, OVERRIDE, EXTENDS, TYPE;
+ CLASS, METHOD, FIELD, ANNOTATION, VALUE, VETO, ENTRY, KEY, DEPENDENCY, PARAMETERS, PARAMETER, ARRAY, OVERRIDE, SPECIALIZES, TYPE;
}
Modified: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
===================================================================
--- modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-03-31 04:16:47 UTC (rev 12338)
@@ -7,11 +7,11 @@
import org.jboss.seam.xml.model.ArrayXmlItem;
import org.jboss.seam.xml.model.ClassXmlItem;
import org.jboss.seam.xml.model.EntryXmlItem;
-import org.jboss.seam.xml.model.ExtendsXmlItem;
import org.jboss.seam.xml.model.KeyXmlItem;
import org.jboss.seam.xml.model.OverrideXmlItem;
import org.jboss.seam.xml.model.ParameterXmlItem;
import org.jboss.seam.xml.model.ParametersXmlItem;
+import org.jboss.seam.xml.model.SpecializesXmlItem;
import org.jboss.seam.xml.model.TypeXmlItem;
import org.jboss.seam.xml.model.ValueXmlItem;
import org.jboss.seam.xml.model.XmlItem;
@@ -57,13 +57,13 @@
{
return new ArrayXmlItem(parent, node.getAttributes(), node.getDocument(), node.getLineNo());
}
- else if (item.equals("override"))
+ else if (item.equals("overrides"))
{
return new OverrideXmlItem(parent, node.getDocument(), node.getLineNo());
}
- else if (item.equals("extends"))
+ else if (item.equals("specializes"))
{
- return new ExtendsXmlItem(parent, node.getDocument(), node.getLineNo());
+ return new SpecializesXmlItem(parent, node.getDocument(), node.getLineNo());
}
else if (item.equals("parameters"))
{
Modified: modules/xml/trunk/core/src/test/resources/META-INF/beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/META-INF/beans.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/test/resources/META-INF/beans.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -13,7 +13,7 @@
</test:InterceptorBinding>
<test:InterceptorBean>
- <s:override/>
+ <s:overrides/>
<s:Interceptor/>
<test:InterceptorBinding/>
<test:myMethod>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -10,7 +10,7 @@
</test:ValueProvider>
<test:ConstructedBean>
- <override/>
+ <overrides/>
<parameters><int/></parameters>
</test:ConstructedBean>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -2,7 +2,7 @@
<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:ArrayFieldValue>
- <override/>
+ <overrides/>
<test:iarray>
<value>1</value>
<value>2</value>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -3,7 +3,7 @@
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:CollectionFieldValue>
- <override/>
+ <overrides/>
<test:iset>
<value>1</value>
<value>2</value>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -2,7 +2,7 @@
<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:MapFieldValue>
- <override/>
+ <overrides/>
<test:map1>
<entry><key>1</key><value>hello</value></entry>
<entry><key>2</key><value>world</value></entry>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -3,7 +3,7 @@
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:FieldValueBean>
- <override/>
+ <overrides/>
<test:init>
<Inject/>
</test:init>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -8,7 +8,7 @@
</test:ProducerQualifier>
<test:ProducerBean>
- <override/>
+ <overrides/>
<test:value>
<Produces/>
<test:ProducerQualifier/>
@@ -17,7 +17,7 @@
</test:ProducerBean>
<test:RecieverBean>
- <override/>
+ <overrides/>
<test:value>
<test:ProducerQualifier/>
<Inject/>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -15,7 +15,7 @@
</test:QualifiedBean2>
<test:QualifierTestBean>
- <override/>
+ <overrides/>
<test:bean1>
<test:OtherQualifier value1="AA" value2="1" value="A" />
<Inject/>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -3,7 +3,7 @@
xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor">
<test:InterceptedBean>
- <override/>
+ <overrides/>
<test:method>
<test:InterceptorBinding/>
</test:method>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -40,7 +40,7 @@
</test:MethodBean>
<test:MethodTarget>
- <override/>
+ <overrides/>
<test:value1>
<Inject />
</test:value1>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -4,7 +4,7 @@
<test:Producer>
- <override/>
+ <overrides/>
<test:value>
<Produces/>
<test:ProducerQualifier value="1" />
@@ -30,7 +30,7 @@
<test:Reciever>
- <override/>
+ <overrides/>
<test:val1>
<Inject/>
<test:ProducerQualifier value="1" />
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -17,19 +17,19 @@
</test:Bean1>
<test:Bean2>
- <override/>
+ <overrides/>
<test:produceBean3>
<Produces/>
</test:produceBean3>
</test:Bean2>
<test:OverriddenBean>
- <override/>
+ <overrides/>
<Named>someBean</Named>
</test:OverriddenBean>
<test:ExtendedBean>
- <extends/>
+ <specializes/>
<test:ExtendedQualifier2/>
</test:ExtendedBean>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -4,7 +4,7 @@
<test:TypeInjectedClass>
- <override/>
+ <overrides/>
<test:value>
<Inject/>
<type>
Modified: modules/xml/trunk/docs/en-US/xml-general.xml
===================================================================
--- modules/xml/trunk/docs/en-US/xml-general.xml 2010-03-31 03:14:32 UTC (rev 12337)
+++ modules/xml/trunk/docs/en-US/xml-general.xml 2010-03-31 04:16:47 UTC (rev 12338)
@@ -132,8 +132,8 @@
<itemizedlist>
<listitem><para><literal>Beans</literal></para></listitem>
- <listitem><para><literal>extends</literal></para></listitem>
- <listitem><para><literal>override</literal></para></listitem>
+ <listitem><para><literal>specializes</literal></para></listitem>
+ <listitem><para><literal>overrides</literal></para></listitem>
<listitem><para><literal>parameters</literal></para></listitem>
<listitem><para><literal>value</literal></para></listitem>
<listitem><para><literal>key</literal></para></listitem>
@@ -175,21 +175,21 @@
<section>
<title>Overriding and extending beans</title>
<para>There may be cases where you want to modify an existing bean rather than
- adding a new one. The <literal><s:override></literal> and
- <literal><s:extends></literal> tags allow you to do this. The
- <literal><s:override></literal> tag prevents the existing bean from being
+ adding a new one. The <literal><s:overrides></literal> and
+ <literal><s:specializes></literal> tags allow you to do this. The
+ <literal><s:overrides></literal> tag prevents the existing bean from being
installed, and registers a new one with the given configuration. The
- <literal><s:extends></literal> tag allows you to add extra configuration
+ <literal><s:specializes></literal> tag allows you to add extra configuration
to an existing bean.</para>
<programlisting><![CDATA[
<test:MyBean>
- <s:extends>
+ <s:specializes>
<test:NewQualifier/>
</test:MyBean>
<test:OtherBean>
- <s:override>
+ <s:overrides>
<test:NewQualifier/>
</test:OtherBean>
]]>
14 years, 8 months
Seam SVN: r12337 - modules/security/trunk/examples/seamspace/src/main/webapp.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-30 23:14:32 -0400 (Tue, 30 Mar 2010)
New Revision: 12337
Modified:
modules/security/trunk/examples/seamspace/src/main/webapp/hashgen.xhtml
Log:
fixed hash generator page
Modified: modules/security/trunk/examples/seamspace/src/main/webapp/hashgen.xhtml
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/webapp/hashgen.xhtml 2010-03-31 02:58:12 UTC (rev 12336)
+++ modules/security/trunk/examples/seamspace/src/main/webapp/hashgen.xhtml 2010-03-31 03:14:32 UTC (rev 12337)
@@ -22,26 +22,26 @@
<div class="formRow">
<h:outputLabel for="password">Enter a password</h:outputLabel>
- <h:inputText id="password" value="#{hashgenerator.password}" required="true" styleClass="wide"/>
+ <h:inputText id="password" value="#{hashGenerator.password}" required="true" styleClass="wide"/>
<div class="validationError"><h:message for="password"/></div>
</div>
<div class="formRow">
<h:outputLabel for="salt">Password salt</h:outputLabel>
- <h:inputText id="salt" value="#{hashgenerator.passwordSalt}" required="false" styleClass="wide"/>
+ <h:inputText id="salt" value="#{hashGenerator.passwordSalt}" required="false" styleClass="wide"/>
<span>(Leave blank to generate a random salt)</span>
<div class="validationError"><h:message for="salt"/></div>
</div>
- <h:commandButton action="#{hashgenerator.generate}" value="Generate hash"/>
+ <h:commandButton action="#{hashGenerator.generate}" value="Generate hash"/>
</h:form>
<h2>Results</h2>
- <div>Generated hash (hex encoded): <pre>#{hashgenerator.passwordHash}</pre></div>
+ <div>Generated hash (hex encoded): <pre>#{hashGenerator.passwordHash}</pre></div>
- <div>Example SQL:<br/><textarea style="width:640px;height:50px">#{hashgenerator.sql}</textarea></div>
+ <div>Example SQL:<br/><textarea style="width:640px;height:50px">#{hashGenerator.sql}</textarea></div>
</ui:define>
14 years, 8 months