Seam SVN: r9376 - trunk/src/main/org/jboss/seam/security/management.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-10-21 22:32:14 -0400 (Tue, 21 Oct 2008)
New Revision: 9376
Modified:
trunk/src/main/org/jboss/seam/security/management/IdentityManager.java
trunk/src/main/org/jboss/seam/security/management/IdentityStore.java
Log:
don't authenticate empty usernames
Modified: trunk/src/main/org/jboss/seam/security/management/IdentityManager.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/IdentityManager.java 2008-10-21 22:53:06 UTC (rev 9375)
+++ trunk/src/main/org/jboss/seam/security/management/IdentityManager.java 2008-10-22 02:32:14 UTC (rev 9376)
@@ -4,10 +4,12 @@
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.Serializable;
+import java.security.Principal;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import org.apache.wicket.util.string.Strings;
import org.jboss.seam.Component;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
@@ -252,6 +254,12 @@
return roleIdentityStore.getImpliedRoles(name);
}
+ public List<Principal> listMembers(String role)
+ {
+ Identity.instance().checkPermission(ROLE_PERMISSION_NAME, PERMISSION_READ);
+ return roleIdentityStore.listMembers(role);
+ }
+
public List<String> getRoleGroups(String name)
{
return roleIdentityStore.getRoleGroups(name);
@@ -259,6 +267,7 @@
public boolean authenticate(String username, String password)
{
+ if (Strings.isEmpty(username)) return false;
return identityStore.authenticate(username, password);
}
Modified: trunk/src/main/org/jboss/seam/security/management/IdentityStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/IdentityStore.java 2008-10-21 22:53:06 UTC (rev 9375)
+++ trunk/src/main/org/jboss/seam/security/management/IdentityStore.java 2008-10-22 02:32:14 UTC (rev 9376)
@@ -1,5 +1,6 @@
package org.jboss.seam.security.management;
+import java.security.Principal;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -209,6 +210,11 @@
* Returns a list of all the groups that the specified role is a member of.
*/
List<String> getRoleGroups(String name);
+
+ /**
+ * Lists the members of the specified role.
+ */
+ List<Principal> listMembers(String role);
/**
* Authenticates the specified user, using the specified password.
16 years, 1 month
Seam SVN: r9375 - trunk/ui/src/main/java/org/jboss/seam/ui.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-21 18:53:06 -0400 (Tue, 21 Oct 2008)
New Revision: 9375
Modified:
trunk/ui/src/main/java/org/jboss/seam/ui/EntityConverter.java
Log:
minor
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/EntityConverter.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/EntityConverter.java 2008-10-21 15:31:58 UTC (rev 9374)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/EntityConverter.java 2008-10-21 22:53:06 UTC (rev 9375)
@@ -9,8 +9,6 @@
import javax.faces.context.FacesContext;
import javax.faces.convert.ConverterException;
-import org.hibernate.loader.entity.EntityLoader;
-import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
16 years, 1 month
Seam SVN: r9374 - in tags/JBoss_Seam_2_1_0_GA/seam-gen: icefaces/build-scripts and 1 other directories.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-21 11:31:58 -0400 (Tue, 21 Oct 2008)
New Revision: 9374
Modified:
tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build-war.xml
tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build.xml
tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build-war.xml
tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build.xml
tags/JBoss_Seam_2_1_0_GA/seam-gen/view/view.xhtml.ftl
Log:
merge 9372 and 9373 into 2.1.0.GA
Modified: tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build-war.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build-war.xml 2008-10-21 15:15:27 UTC (rev 9373)
+++ tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build-war.xml 2008-10-21 15:31:58 UTC (rev 9374)
@@ -248,9 +248,9 @@
<fail unless="jboss.home">jboss.home not set</fail>
<mkdir dir="${war.deploy.dir}"/>
- <sync todir="${war.deploy.dir}">
+ <copy todir="${war.deploy.dir}">
<fileset dir="${war.dir}"/>
- </sync>
+ </copy>
</target>
<target name="unexplode" description="Undeploy the exploded archive">
Modified: tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build.xml 2008-10-21 15:15:27 UTC (rev 9373)
+++ tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build.xml 2008-10-21 15:31:58 UTC (rev 9374)
@@ -254,15 +254,15 @@
<mkdir dir="${jar.deploy.dir}"/>
<mkdir dir="${war.deploy.dir}"/>
- <sync todir="${jar.deploy.dir}">
+ <copy todir="${jar.deploy.dir}">
<fileset dir="${jar.dir}"/>
- </sync>
- <sync todir="${war.deploy.dir}">
+ </copy>
+ <copy todir="${war.deploy.dir}">
<fileset dir="${war.dir}"/>
- </sync>
- <sync todir="${ear.deploy.dir}">
+ </copy>
+ <copy todir="${ear.deploy.dir}">
<fileset dir="${ear.dir}"/>
- </sync>
+ </copy>
</target>
<target name="unexplode" description="Undeploy the exploded archive">
Modified: tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build-war.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build-war.xml 2008-10-21 15:15:27 UTC (rev 9373)
+++ tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build-war.xml 2008-10-21 15:31:58 UTC (rev 9374)
@@ -242,9 +242,9 @@
<fail unless="jboss.home">jboss.home not set</fail>
<mkdir dir="${war.deploy.dir}"/>
- <sync todir="${war.deploy.dir}">
+ <copy todir="${war.deploy.dir}">
<fileset dir="${war.dir}"/>
- </sync>
+ </copy>
</target>
<target name="unexplode" description="Undeploy the exploded archive">
Modified: tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build.xml 2008-10-21 15:15:27 UTC (rev 9373)
+++ tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build.xml 2008-10-21 15:31:58 UTC (rev 9374)
@@ -249,15 +249,15 @@
<mkdir dir="${jar.deploy.dir}"/>
<mkdir dir="${war.deploy.dir}"/>
- <sync todir="${jar.deploy.dir}">
+ <copy todir="${jar.deploy.dir}">
<fileset dir="${jar.dir}"/>
- </sync>
- <sync todir="${war.deploy.dir}">
+ </copy>
+ <copy todir="${war.deploy.dir}">
<fileset dir="${war.dir}"/>
- </sync>
- <sync todir="${ear.deploy.dir}">
+ </copy>
+ <copy todir="${ear.deploy.dir}">
<fileset dir="${ear.dir}"/>
- </sync>
+ </copy>
</target>
<target name="unexplode" description="Undeploy the exploded archive">
Modified: tags/JBoss_Seam_2_1_0_GA/seam-gen/view/view.xhtml.ftl
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/seam-gen/view/view.xhtml.ftl 2008-10-21 15:15:27 UTC (rev 9373)
+++ tags/JBoss_Seam_2_1_0_GA/seam-gen/view/view.xhtml.ftl 2008-10-21 15:31:58 UTC (rev 9374)
@@ -102,7 +102,7 @@
</#if>
</#if>
</#foreach>
- <h:column>
+ <h:column styleClass="action">
<f:facet name="header">Action</f:facet>
<s:link id="view${parentName}"
value="View"
16 years, 1 month
Seam SVN: r9373 - in trunk/seam-gen: icefaces/build-scripts and 1 other directory.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-10-21 11:15:27 -0400 (Tue, 21 Oct 2008)
New Revision: 9373
Modified:
trunk/seam-gen/build-scripts/build-war.xml
trunk/seam-gen/build-scripts/build.xml
trunk/seam-gen/icefaces/build-scripts/build-war.xml
trunk/seam-gen/icefaces/build-scripts/build.xml
Log:
back out use of sync target since it isn't working with EAR build
Modified: trunk/seam-gen/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/build-scripts/build-war.xml 2008-10-21 15:06:00 UTC (rev 9372)
+++ trunk/seam-gen/build-scripts/build-war.xml 2008-10-21 15:15:27 UTC (rev 9373)
@@ -248,9 +248,9 @@
<fail unless="jboss.home">jboss.home not set</fail>
<mkdir dir="${war.deploy.dir}"/>
- <sync todir="${war.deploy.dir}">
+ <copy todir="${war.deploy.dir}">
<fileset dir="${war.dir}"/>
- </sync>
+ </copy>
</target>
<target name="unexplode" description="Undeploy the exploded archive">
Modified: trunk/seam-gen/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/build-scripts/build.xml 2008-10-21 15:06:00 UTC (rev 9372)
+++ trunk/seam-gen/build-scripts/build.xml 2008-10-21 15:15:27 UTC (rev 9373)
@@ -254,15 +254,15 @@
<mkdir dir="${jar.deploy.dir}"/>
<mkdir dir="${war.deploy.dir}"/>
- <sync todir="${jar.deploy.dir}">
+ <copy todir="${jar.deploy.dir}">
<fileset dir="${jar.dir}"/>
- </sync>
- <sync todir="${war.deploy.dir}">
+ </copy>
+ <copy todir="${war.deploy.dir}">
<fileset dir="${war.dir}"/>
- </sync>
- <sync todir="${ear.deploy.dir}">
+ </copy>
+ <copy todir="${ear.deploy.dir}">
<fileset dir="${ear.dir}"/>
- </sync>
+ </copy>
</target>
<target name="unexplode" description="Undeploy the exploded archive">
Modified: trunk/seam-gen/icefaces/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-10-21 15:06:00 UTC (rev 9372)
+++ trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-10-21 15:15:27 UTC (rev 9373)
@@ -242,9 +242,9 @@
<fail unless="jboss.home">jboss.home not set</fail>
<mkdir dir="${war.deploy.dir}"/>
- <sync todir="${war.deploy.dir}">
+ <copy todir="${war.deploy.dir}">
<fileset dir="${war.dir}"/>
- </sync>
+ </copy>
</target>
<target name="unexplode" description="Undeploy the exploded archive">
Modified: trunk/seam-gen/icefaces/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build.xml 2008-10-21 15:06:00 UTC (rev 9372)
+++ trunk/seam-gen/icefaces/build-scripts/build.xml 2008-10-21 15:15:27 UTC (rev 9373)
@@ -249,15 +249,15 @@
<mkdir dir="${jar.deploy.dir}"/>
<mkdir dir="${war.deploy.dir}"/>
- <sync todir="${jar.deploy.dir}">
+ <copy todir="${jar.deploy.dir}">
<fileset dir="${jar.dir}"/>
- </sync>
- <sync todir="${war.deploy.dir}">
+ </copy>
+ <copy todir="${war.deploy.dir}">
<fileset dir="${war.dir}"/>
- </sync>
- <sync todir="${ear.deploy.dir}">
+ </copy>
+ <copy todir="${ear.deploy.dir}">
<fileset dir="${ear.dir}"/>
- </sync>
+ </copy>
</target>
<target name="unexplode" description="Undeploy the exploded archive">
16 years, 1 month
Seam SVN: r9372 - trunk/seam-gen/view.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-10-21 11:06:00 -0400 (Tue, 21 Oct 2008)
New Revision: 9372
Modified:
trunk/seam-gen/view/view.xhtml.ftl
Log:
center the links in the action column
Modified: trunk/seam-gen/view/view.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/view.xhtml.ftl 2008-10-21 09:52:11 UTC (rev 9371)
+++ trunk/seam-gen/view/view.xhtml.ftl 2008-10-21 15:06:00 UTC (rev 9372)
@@ -102,7 +102,7 @@
</#if>
</#if>
</#foreach>
- <h:column>
+ <h:column styleClass="action">
<f:facet name="header">Action</f:facet>
<s:link id="view${parentName}"
value="View"
16 years, 1 month
Seam SVN: r9371 - in trunk/src/main/org/jboss/seam/security/management: action and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-10-21 05:52:11 -0400 (Tue, 21 Oct 2008)
New Revision: 9371
Modified:
trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java
trunk/src/main/org/jboss/seam/security/management/action/RoleAction.java
Log:
JBSEAM-3552
Modified: trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-10-21 09:51:38 UTC (rev 9370)
+++ trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-10-21 09:52:11 UTC (rev 9371)
@@ -422,11 +422,21 @@
if (roleGroups == null)
{
// This should either be a Set, or a List...
- if (Set.class.isAssignableFrom((Class) roleGroupsProperty.getPropertyType()))
+ Class rawType = null;
+ if (roleGroupsProperty.getPropertyType() instanceof ParameterizedType)
{
+ rawType = (Class) ((ParameterizedType) roleGroupsProperty.getPropertyType()).getRawType();
+ }
+ else
+ {
+ return false;
+ }
+
+ if (Set.class.isAssignableFrom(rawType))
+ {
roleGroups = new HashSet();
}
- else if (List.class.isAssignableFrom((Class) roleGroupsProperty.getPropertyType()))
+ else if (List.class.isAssignableFrom(rawType))
{
roleGroups = new ArrayList();
}
Modified: trunk/src/main/org/jboss/seam/security/management/action/RoleAction.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/action/RoleAction.java 2008-10-21 09:51:38 UTC (rev 9370)
+++ trunk/src/main/org/jboss/seam/security/management/action/RoleAction.java 2008-10-21 09:52:11 UTC (rev 9371)
@@ -20,6 +20,7 @@
@Install(precedence = BUILT_IN)
public class RoleAction implements Serializable
{
+ private String originalRole;
private String role;
private List<String> groups;
@@ -34,12 +35,18 @@
@Begin
public void editRole(String role)
{
+ this.originalRole = role;
this.role = role;
groups = identityManager.getRoleGroups(role);
}
public String save()
{
+ if (role != null && originalRole != null && !role.equals(originalRole))
+ {
+ identityManager.deleteRole(originalRole);
+ }
+
if (identityManager.roleExists(role))
{
return saveExistingRole();
@@ -93,6 +100,13 @@
return role;
}
+ public List<String> getAssignableRoles()
+ {
+ List<String> roles = identityManager.listGrantableRoles();
+ roles.remove(role);
+ return roles;
+ }
+
public void setRole(String role)
{
this.role = role;
16 years, 1 month
Seam SVN: r9370 - trunk/examples/seamspace/view.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-10-21 05:51:38 -0400 (Tue, 21 Oct 2008)
New Revision: 9370
Modified:
trunk/examples/seamspace/view/roledetail.xhtml
Log:
JBSEAM-3552
Modified: trunk/examples/seamspace/view/roledetail.xhtml
===================================================================
--- trunk/examples/seamspace/view/roledetail.xhtml 2008-10-21 08:25:43 UTC (rev 9369)
+++ trunk/examples/seamspace/view/roledetail.xhtml 2008-10-21 09:51:38 UTC (rev 9370)
@@ -32,10 +32,10 @@
<h:outputLabel for="groups" value="Member of" styleClass="formLabel"/>
<div class="selectMany">
<h:selectManyCheckbox id="groups" value="#{roleAction.groups}" layout="pageDirection" styleClass="roles">
- <s:selectItems value="#{identityManager.listRoles()}" var="role" label="#{role}"/>
+ <s:selectItems value="#{roleAction.assignableRoles}" var="role" label="#{role}"/>
</h:selectManyCheckbox>
</div>
- <div class="validationError"><h:message for="roles"/></div>
+ <div class="validationError"><h:message for="groups"/></div>
</div>
<div class="formButtons">
16 years, 1 month
Seam SVN: r9369 - in trunk/examples/seambay: view and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-10-21 04:25:43 -0400 (Tue, 21 Oct 2008)
New Revision: 9369
Modified:
trunk/examples/seambay/src/org/jboss/seam/example/seambay/AuctionImage.java
trunk/examples/seambay/view/test.js
Log:
JBSEAM-3268
Modified: trunk/examples/seambay/src/org/jboss/seam/example/seambay/AuctionImage.java
===================================================================
--- trunk/examples/seambay/src/org/jboss/seam/example/seambay/AuctionImage.java 2008-10-20 19:08:48 UTC (rev 9368)
+++ trunk/examples/seambay/src/org/jboss/seam/example/seambay/AuctionImage.java 2008-10-21 08:25:43 UTC (rev 9369)
@@ -8,6 +8,7 @@
import javax.persistence.JoinColumn;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
+import javax.xml.bind.annotation.XmlTransient;
@Entity
public class AuctionImage implements Serializable
@@ -30,6 +31,7 @@
this.imageId = imageId;
}
+ @XmlTransient
@ManyToOne
@JoinColumn(name = "AUCTION_ID")
public Auction getAuction()
Modified: trunk/examples/seambay/view/test.js
===================================================================
--- trunk/examples/seambay/view/test.js 2008-10-20 19:08:48 UTC (rev 9368)
+++ trunk/examples/seambay/view/test.js 2008-10-21 08:25:43 UTC (rev 9369)
@@ -33,6 +33,17 @@
svc.setRequest("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
"\n xmlns:seam=\"http://seambay.example.seam.jboss.org/\">\n <soapenv:Header/>" +
"\n <soapenv:Body>\n <seam:listCategories/>\n </soapenv:Body>\n</soapenv:Envelope>");
+
+var svc = new ServiceMetadata("findAuctions", "General");
+svc.setDescription("Find Auctions");
+svc.setRequest("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
+ "\n xmlns:seam=\"http://seambay.example.seam.jboss.org/\">\n <soapenv:Header/>" +
+ "\n <soapenv:Body>" +
+ "\n <seam:findAuctions>" +
+ "\n <arg0>#{searchTerm}</arg0>" +
+ "\n </seam:findAuctions>" +
+ "\n </soapenv:Body>\n</soapenv:Envelope>");
+svc.addParameter(new ServiceParam("Search Term", "searchTerm"));
svc = new ServiceMetadata("login", "Security");
svc.setDescription("Login");
16 years, 1 month
Seam SVN: r9368 - in tags/JBoss_Seam_2_1_0_GA: src/excel/org/jboss/seam/excel/css and 1 other directories.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-20 15:08:48 -0400 (Mon, 20 Oct 2008)
New Revision: 9368
Modified:
tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/components.xml
tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/pages.xml
tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/web.xml
tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/css/Parser.java
tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java
Log:
merge 9366 and 9367 into 2.1.0.GA
Modified: tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/components.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/components.xml 2008-10-20 18:54:38 UTC (rev 9367)
+++ tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/components.xml 2008-10-20 19:08:48 UTC (rev 9368)
@@ -25,9 +25,4 @@
<component name="sampleButton" class="javax.swing.JButton">
<property name="label">A JButton!</property>
</component>
-
-<!--
- <web:rewrite-filter view-mapping="/test/*" />
--->
- <web:rewrite-filter view-mapping="*.seam" />
</components>
Modified: tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/pages.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/pages.xml 2008-10-20 18:54:38 UTC (rev 9367)
+++ tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/pages.xml 2008-10-20 19:08:48 UTC (rev 9368)
@@ -3,10 +3,4 @@
xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
- <page view-id="/foo.xhtml">
- <rewrite pattern="/foo/{id}" />
- <rewrite pattern="/foo-{conversationId}" />
- <rewrite pattern="/foo" />
- </page>
-
</pages>
Modified: tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/web.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/web.xml 2008-10-20 18:54:38 UTC (rev 9367)
+++ tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/web.xml 2008-10-20 19:08:48 UTC (rev 9368)
@@ -68,7 +68,7 @@
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.z</url-pattern>
+ <url-pattern>*.seam</url-pattern>
</servlet-mapping>
<servlet>
Modified: tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/css/Parser.java
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/css/Parser.java 2008-10-20 18:54:38 UTC (rev 9367)
+++ tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/css/Parser.java 2008-10-20 19:08:48 UTC (rev 9368)
@@ -193,6 +193,9 @@
if (firstBrace >= 0 && secondBrace >= 0 && firstBrace != secondBrace)
{
String styleName = css.substring(0, firstBrace).trim();
+ if (styleName.startsWith(".")) {
+ styleName = styleName.substring(1);
+ }
String styleString = css.substring(firstBrace + 1, secondBrace).trim();
StyleMap styleMap = parseStyleString(styleString);
styleClasses.put(styleName, styleMap);
Modified: tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java 2008-10-20 18:54:38 UTC (rev 9367)
+++ tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java 2008-10-20 19:08:48 UTC (rev 9368)
@@ -9,6 +9,7 @@
import java.net.URL;
import java.util.List;
+import javax.faces.component.UIComponent;
import javax.imageio.ImageIO;
import jxl.CellView;
@@ -504,6 +505,9 @@
*/
public void addItem(WorksheetItem item)
{
+ if (!((UIComponent)item).isRendered()) {
+ return;
+ }
switch (item.getItemType())
{
case cell:
16 years, 1 month
Seam SVN: r9367 - in trunk/src/excel/org/jboss/seam/excel: jxl and 1 other directory.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2008-10-20 14:54:38 -0400 (Mon, 20 Oct 2008)
New Revision: 9367
Modified:
trunk/src/excel/org/jboss/seam/excel/css/Parser.java
trunk/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java
Log:
minor, check for rendered attribute when adding cells and remove dot in css names.
Modified: trunk/src/excel/org/jboss/seam/excel/css/Parser.java
===================================================================
--- trunk/src/excel/org/jboss/seam/excel/css/Parser.java 2008-10-20 16:37:25 UTC (rev 9366)
+++ trunk/src/excel/org/jboss/seam/excel/css/Parser.java 2008-10-20 18:54:38 UTC (rev 9367)
@@ -193,6 +193,9 @@
if (firstBrace >= 0 && secondBrace >= 0 && firstBrace != secondBrace)
{
String styleName = css.substring(0, firstBrace).trim();
+ if (styleName.startsWith(".")) {
+ styleName = styleName.substring(1);
+ }
String styleString = css.substring(firstBrace + 1, secondBrace).trim();
StyleMap styleMap = parseStyleString(styleString);
styleClasses.put(styleName, styleMap);
Modified: trunk/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java
===================================================================
--- trunk/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java 2008-10-20 16:37:25 UTC (rev 9366)
+++ trunk/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java 2008-10-20 18:54:38 UTC (rev 9367)
@@ -9,6 +9,7 @@
import java.net.URL;
import java.util.List;
+import javax.faces.component.UIComponent;
import javax.imageio.ImageIO;
import jxl.CellView;
@@ -504,6 +505,9 @@
*/
public void addItem(WorksheetItem item)
{
+ if (!((UIComponent)item).isRendered()) {
+ return;
+ }
switch (item.getItemType())
{
case cell:
16 years, 1 month