Seam SVN: r7957 - branches/Seam_1_2_1_AP.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-15 06:39:13 -0400 (Tue, 15 Apr 2008)
New Revision: 7957
Modified:
branches/Seam_1_2_1_AP/build.properties
Log:
Revert to r6210, there is a reason build.properties looks like that!
Modified: branches/Seam_1_2_1_AP/build.properties
===================================================================
--- branches/Seam_1_2_1_AP/build.properties 2008-04-15 10:27:19 UTC (rev 7956)
+++ branches/Seam_1_2_1_AP/build.properties 2008-04-15 10:39:13 UTC (rev 7957)
@@ -1,2 +1,2 @@
-tomcat.home= /home/mnovotny/apps/apache-tomcat-6.0.16
-jboss.home= /home/mnovotny/apps/jboss-4.2.2.GA
+tomcat.home= /var/lib/tomcat5
+jboss.home= /var/lib/jbossas
16 years, 7 months
Seam SVN: r7956 - branches/Seam_1_2_1_AP/examples/hibernate2.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-15 06:27:19 -0400 (Tue, 15 Apr 2008)
New Revision: 7956
Modified:
branches/Seam_1_2_1_AP/examples/hibernate2/build.xml
Log:
JBPAPP-781
Modified: branches/Seam_1_2_1_AP/examples/hibernate2/build.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/hibernate2/build.xml 2008-04-15 10:25:20 UTC (rev 7955)
+++ branches/Seam_1_2_1_AP/examples/hibernate2/build.xml 2008-04-15 10:27:19 UTC (rev 7956)
@@ -98,6 +98,8 @@
<include name="commons-beanutils-*.jar" />
<include name="commons-digester*.jar" />
<include name="commons-lang*.jar" />
+
+ <include name="el-ri.jar" />
<!-- do not need the following jars for 4.0.4 and 4.0.5
<include name="myfaces-api-1.1.4.jar" />
16 years, 7 months
Seam SVN: r7955 - branches/Seam_1_2_1_AP/examples/jpa.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-15 06:25:20 -0400 (Tue, 15 Apr 2008)
New Revision: 7955
Modified:
branches/Seam_1_2_1_AP/examples/jpa/build.xml
Log:
JBPAPP-775
Modified: branches/Seam_1_2_1_AP/examples/jpa/build.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/jpa/build.xml 2008-04-15 09:35:43 UTC (rev 7954)
+++ branches/Seam_1_2_1_AP/examples/jpa/build.xml 2008-04-15 10:25:20 UTC (rev 7955)
@@ -100,6 +100,7 @@
<include name="commons-beanutils-*.jar" />
<include name="commons-digester*.jar" />
<include name="commons-lang*.jar" />
+ <include name="el-ri.jar" />
<!-- do not need the following jars for 4.0.4 and 4.0.5
<include name="myfaces-api-1.1.4.jar" />
16 years, 7 months
Seam SVN: r7954 - branches/Seam_1_2_1_AP.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-15 05:35:43 -0400 (Tue, 15 Apr 2008)
New Revision: 7954
Removed:
branches/Seam_1_2_1_AP/build/
Log:
Remove build directory from SVN
16 years, 7 months
Seam SVN: r7952 - in trunk/src/main/org/jboss/seam: security/management and 3 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-04-15 01:56:52 -0400 (Tue, 15 Apr 2008)
New Revision: 7952
Modified:
trunk/src/main/org/jboss/seam/annotations/security/permission/PermissionDiscriminator.java
trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java
trunk/src/main/org/jboss/seam/security/permission/PermissionStore.java
trunk/src/main/org/jboss/seam/security/permission/acl/JpaAclPermissionStore.java
trunk/src/main/org/jboss/seam/security/permission/dynamic/JpaDynamicPermissionStore.java
Log:
grant/revoke permissions
Modified: trunk/src/main/org/jboss/seam/annotations/security/permission/PermissionDiscriminator.java
===================================================================
--- trunk/src/main/org/jboss/seam/annotations/security/permission/PermissionDiscriminator.java 2008-04-15 02:35:05 UTC (rev 7951)
+++ trunk/src/main/org/jboss/seam/annotations/security/permission/PermissionDiscriminator.java 2008-04-15 05:56:52 UTC (rev 7952)
@@ -21,5 +21,6 @@
@Inherited
public @interface PermissionDiscriminator
{
-
+ String userValue() default "user";
+ String roleValue() default "role";
}
Modified: trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-04-15 02:35:05 UTC (rev 7951)
+++ trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-04-15 05:56:52 UTC (rev 7952)
@@ -630,7 +630,7 @@
}
}
- protected Object lookupUser(String username)
+ public Object lookupUser(String username)
{
try
{
@@ -648,7 +648,7 @@
}
}
- protected Object lookupRole(String role)
+ public Object lookupRole(String role)
{
try
{
Modified: trunk/src/main/org/jboss/seam/security/permission/PermissionStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/PermissionStore.java 2008-04-15 02:35:05 UTC (rev 7951)
+++ trunk/src/main/org/jboss/seam/security/permission/PermissionStore.java 2008-04-15 05:56:52 UTC (rev 7952)
@@ -1,6 +1,7 @@
package org.jboss.seam.security.permission;
import java.util.List;
+import java.util.Set;
/**
* Permission store interface.
@@ -11,6 +12,7 @@
{
List<Permission> listPermissions(Object target);
List<Permission> listPermissions(Object target, String action);
+ List<Permission> listPermissions(Set<Object> targets);
boolean grantPermission(Permission permission);
boolean revokePermission(Permission permission);
}
Modified: trunk/src/main/org/jboss/seam/security/permission/acl/JpaAclPermissionStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/acl/JpaAclPermissionStore.java 2008-04-15 02:35:05 UTC (rev 7951)
+++ trunk/src/main/org/jboss/seam/security/permission/acl/JpaAclPermissionStore.java 2008-04-15 05:56:52 UTC (rev 7952)
@@ -2,6 +2,7 @@
import java.io.Serializable;
import java.util.List;
+import java.util.Set;
import org.jboss.seam.security.permission.Permission;
import org.jboss.seam.security.permission.PermissionStore;
@@ -34,6 +35,12 @@
return null;
}
+ public List<Permission> listPermissions(Set<Object> targets)
+ {
+ // TODO implement this
+ return null;
+ }
+
public List<Permission> listPermissions(Object target, String action)
{
return null;
Modified: trunk/src/main/org/jboss/seam/security/permission/dynamic/JpaDynamicPermissionStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/dynamic/JpaDynamicPermissionStore.java 2008-04-15 02:35:05 UTC (rev 7951)
+++ trunk/src/main/org/jboss/seam/security/permission/dynamic/JpaDynamicPermissionStore.java 2008-04-15 05:56:52 UTC (rev 7952)
@@ -4,11 +4,15 @@
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.Serializable;
+import java.security.Principal;
import java.util.List;
+import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
+import javax.persistence.Query;
+import org.jboss.seam.Component;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Name;
@@ -23,8 +27,9 @@
import org.jboss.seam.core.Expressions.ValueExpression;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
+import org.jboss.seam.security.Role;
import org.jboss.seam.security.management.BeanProperty;
-import org.jboss.seam.security.management.IdentityManagementException;
+import org.jboss.seam.security.management.JpaIdentityStore;
import org.jboss.seam.security.permission.Permission;
import org.jboss.seam.security.permission.PermissionStore;
@@ -45,7 +50,7 @@
private Class userPermissionClass;
private Class rolePermissionClass;
-
+
private BeanProperty userProperty;
private BeanProperty roleProperty;
@@ -56,6 +61,9 @@
private BeanProperty roleTargetProperty;
private BeanProperty roleActionProperty;
+ private String selectUserPermissionQuery;
+ private String selectRolePermissionQuery;
+
@Create
public void init()
{
@@ -71,9 +79,10 @@
}
initProperties();
+ buildQueries();
}
- private void initProperties()
+ protected void initProperties()
{
userProperty = BeanProperty.scanForProperty(userPermissionClass, PermissionUser.class);
targetProperty = BeanProperty.scanForProperty(userPermissionClass, PermissionTarget.class);
@@ -99,27 +108,120 @@
if (userProperty == null)
{
- throw new IdentityManagementException("Invalid userPermissionClass " + userPermissionClass.getName() +
+ throw new RuntimeException("Invalid userPermissionClass " + userPermissionClass.getName() +
" - required annotation @PermissionUser not found on any Field or Method.");
}
- // TODO additional validation checks for both permission classes
+ if (rolePermissionClass != null)
+ {
+ if (roleProperty == null)
+ {
+ throw new RuntimeException("Invalid rolePermissionClass " + rolePermissionClass.getName() +
+ " - required annotation @PermissionRole not found on any Field or Method.");
+ }
+
+ if (roleTargetProperty == null)
+ {
+ throw new RuntimeException("Invalid rolePermissionClass " + rolePermissionClass.getName() +
+ " - required annotation @PermissionTarget not found on any Field or Method.");
+ }
+
+ if (roleActionProperty == null)
+ {
+ throw new RuntimeException("Invalid rolePermissionClass " + rolePermissionClass.getName() +
+ " - required annotation @PermissionAction not found on any Field or Method.");
+ }
+ }
+ else if (discriminatorProperty == null)
+ {
+ throw new RuntimeException("Invalid userPermissionClass " + rolePermissionClass.getName() +
+ " - no rolePermissionClass set and @PermissionDiscriminator annotation not found on " +
+ "any Field or Method");
+ }
}
+ protected void buildQueries()
+ {
+ StringBuffer query = new StringBuffer();
+ query.append("select p from ");
+ query.append(userPermissionClass.getName());
+ query.append(" p where ");
+ query.append(targetProperty.getName());
+ query.append(" = :target and ");
+ query.append(actionProperty.getName());
+ query.append(" = :action and ");
+ query.append(userProperty.getName());
+ query.append(" = :recipient");
+
+ if (rolePermissionClass == null)
+ {
+ query.append(" and ");
+ query.append(discriminatorProperty.getName());
+ query.append(" = :discriminator");
+ }
+
+ selectUserPermissionQuery = query.toString();
+
+ if (rolePermissionClass != null)
+ {
+ query.setLength(0);
+ query.append("select p from ");
+ query.append(rolePermissionClass.getName());
+ query.append(" p where ");
+ query.append(roleTargetProperty.getName());
+ query.append(" = :target and ");
+ query.append(roleActionProperty.getName());
+ query.append(" = :action and ");
+ query.append(roleProperty.getName());
+ query.append(" = :recipient");
+
+ selectRolePermissionQuery = query.toString();
+ }
+ else
+ {
+ selectRolePermissionQuery = selectUserPermissionQuery;
+ }
+ }
+
public boolean grantPermission(Permission permission)
{
+ boolean recipientIsRole = permission.getRecipient() instanceof Role;
+
try
{
+ if (recipientIsRole)
+ {
+ if (rolePermissionClass != null)
+ {
+ Object instance = rolePermissionClass.newInstance();
+ roleTargetProperty.setValue(instance, permission.getTarget().toString());
+ roleActionProperty.setValue(instance, permission.getAction());
+ roleProperty.setValue(instance, permission.getRecipient().getName());
+ lookupEntityManager().persist(instance);
+ return true;
+ }
+
+ if (discriminatorProperty == null)
+ {
+ throw new RuntimeException("Could not grant permission, rolePermissionClass not set");
+ }
+ }
+
if (userPermissionClass == null)
{
- throw new RuntimeException("Could not grant permission, permissionClass not set");
+ throw new RuntimeException("Could not grant permission, userPermissionClass not set");
}
Object instance = userPermissionClass.newInstance();
-// instance.setTarget(permission.getTarget());
-// instance.setAction(permission.getAction());
-// instance.setAccount(permission.getRecipient());
-
+ targetProperty.setValue(instance, permission.getTarget().toString());
+ actionProperty.setValue(instance, permission.getAction());
+ userProperty.setValue(instance, permission.getRecipient().getName());
+
+ if (discriminatorProperty != null)
+ {
+ discriminatorProperty.setValue(instance, getDiscriminatorValue(recipientIsRole));
+ }
+
lookupEntityManager().persist(instance);
return true;
@@ -130,21 +232,32 @@
}
}
+ private String getDiscriminatorValue(boolean isRole)
+ {
+ PermissionDiscriminator discriminator = (PermissionDiscriminator) discriminatorProperty.getAnnotation();
+ return isRole ? discriminator.roleValue() : discriminator.userValue();
+ }
+
public boolean revokePermission(Permission permission)
{
+ boolean recipientIsRole = permission.getRecipient() instanceof Role;
+
+ EntityManager em = lookupEntityManager();
+
+ Query qry = em.createQuery(recipientIsRole ? selectRolePermissionQuery :
+ selectUserPermissionQuery)
+ .setParameter("target", permission.getTarget())
+ .setParameter("action", permission.getAction())
+ .setParameter("recipient", resolvePrincipal(permission.getRecipient()));
+
+ if (discriminatorProperty != null)
+ {
+ qry.setParameter("discriminator", getDiscriminatorValue(recipientIsRole));
+ }
+
try
{
- EntityManager em = lookupEntityManager();
-
- Object instance = em.createQuery(
- "from " + userPermissionClass.getName() +
- " where target = :target and action = :action and account = :account " +
- " and accountType = :accountType")
- .setParameter("target", permission.getTarget())
- .setParameter("action", "action")
- .setParameter("account", permission.getRecipient())
- .getSingleResult();
-
+ Object instance = qry.getSingleResult();
em.remove(instance);
return true;
}
@@ -153,6 +266,34 @@
return false;
}
}
+
+ /**
+ * If the user or role properties in the entity class refer to other entities, then this method
+ * uses JpaIdentityStore to lookup that user or role entity.
+ *
+ * @param recipient
+ * @return
+ */
+ protected Object resolvePrincipal(Principal recipient)
+ {
+ boolean recipientIsRole = recipient instanceof Role;
+
+ JpaIdentityStore identityStore = (JpaIdentityStore) Component.getInstance(JpaIdentityStore.class, true);
+
+ if (identityStore != null)
+ {
+ if (recipientIsRole && roleProperty != null && roleProperty.getPropertyClass().equals(identityStore.getRoleClass()))
+ {
+ return identityStore.lookupRole(recipient.getName());
+ }
+ else if (userProperty.getPropertyClass().equals(identityStore.getUserClass()))
+ {
+ return identityStore.lookupUser(recipient.getName());
+ }
+ }
+
+ return recipient.getName();
+ }
public List<Permission> listPermissions(Object target, String action)
{
@@ -171,6 +312,12 @@
.setParameter("target", target)
.getResultList();
}
+
+ public List<Permission> listPermissions(Set<Object> targets)
+ {
+ // TODO implement this method
+ return null;
+ }
private EntityManager lookupEntityManager()
{
16 years, 7 months
Seam SVN: r7951 - trunk/src/main/org/jboss/seam/security/management/action.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-04-14 22:35:05 -0400 (Mon, 14 Apr 2008)
New Revision: 7951
Modified:
trunk/src/main/org/jboss/seam/security/management/action/UserSearch.java
Log:
removed @Synchronized
Modified: trunk/src/main/org/jboss/seam/security/management/action/UserSearch.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/action/UserSearch.java 2008-04-15 01:09:35 UTC (rev 7950)
+++ trunk/src/main/org/jboss/seam/security/management/action/UserSearch.java 2008-04-15 02:35:05 UTC (rev 7951)
@@ -8,7 +8,6 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Synchronized;
import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.seam.annotations.datamodel.DataModelSelection;
@@ -16,7 +15,6 @@
@Name("org.jboss.seam.security.management.userSearch")
@Scope(SESSION)
-@Synchronized
public class UserSearch implements Serializable
{
private static final long serialVersionUID = 8592034786339372510L;
16 years, 7 months
Seam SVN: r7950 - in branches/Seam_2_0/seam-gen: build-scripts and 1 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-14 21:09:35 -0400 (Mon, 14 Apr 2008)
New Revision: 7950
Added:
branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-war.list
branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-war.list
Modified:
branches/Seam_2_0/seam-gen/build-scripts/build-war.xml
branches/Seam_2_0/seam-gen/build.xml
branches/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml
Log:
JBSEAM-2897 - first cut at externalizing JAR includes that are packaged with deployable archive
Modified: branches/Seam_2_0/seam-gen/build-scripts/build-war.xml
===================================================================
--- branches/Seam_2_0/seam-gen/build-scripts/build-war.xml 2008-04-15 01:09:20 UTC (rev 7949)
+++ branches/Seam_2_0/seam-gen/build-scripts/build-war.xml 2008-04-15 01:09:35 UTC (rev 7950)
@@ -179,16 +179,8 @@
<copy todir="${war.dir}/WEB-INF/lib">
<fileset dir="${lib.dir}">
- <include name="richfaces*.jar" />
- <include name="oscache*.jar" />
- <include name="jsf-facelets.jar" />
- <include name="jboss-seam-*.jar" />
- <exclude name="jboss-seam-gen.jar" />
- <include name="drools-*.jar"/>
- <include name="core.jar"/>
- <include name="janino*.jar"/>
- <include name="antlr-*.jar"/>
- <include name="mvel*.jar"/>
+ <includesfile name="deployed-jars.list"/>
+ <exclude name="jboss-seam-gen.jar"/>
<include name="groovy-*.jar" if="groovy.present"/>
</fileset>
</copy>
@@ -207,16 +199,6 @@
</fileset>
</copy>
- <copy todir="${war.dir}/WEB-INF/lib">
- <fileset dir="${lib.dir}">
- <include name="jboss-seam.jar" />
- <include name="jbpm*.jar" />
- <include name="jboss-el.jar" />
- <include name="commons-digester.jar" />
- <include name="commons-beanutils.jar" />
- </fileset>
- </copy>
-
</target>
<target name="archive" depends="war"
Added: branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-war.list
===================================================================
--- branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-war.list (rev 0)
+++ branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-war.list 2008-04-15 01:09:35 UTC (rev 7950)
@@ -0,0 +1,16 @@
+antlr-runtime.jar
+commons-beanutils.jar
+commons-digester.jar
+core.jar
+drools-compiler.jar
+drools-core.jar
+janino.jar
+jboss-el.jar
+jboss-seam.jar
+jboss-seam-*.jar
+jbpm-jpdl.jar
+jsf-facelets.jar
+mvel.jar
+richfaces-api.jar
+richfaces-impl.jar
+richfaces-ui.jar
Modified: branches/Seam_2_0/seam-gen/build.xml
===================================================================
--- branches/Seam_2_0/seam-gen/build.xml 2008-04-15 01:09:20 UTC (rev 7949)
+++ branches/Seam_2_0/seam-gen/build.xml 2008-04-15 01:09:35 UTC (rev 7950)
@@ -651,6 +651,8 @@
file="${base.dir}/resources/WEB-INF/components-war.xml">
<filterset refid="project"/>
</copy>
+ <copy tofile="${project.home}/deployed-jars.list"
+ file="${base.dir}/build-scripts/deployed-jars-war.list"/>
<copy tofile="${project.home}/build.xml"
file="${base.dir}/build-scripts/build-war.xml">
<filterset refid="project"/>
@@ -696,6 +698,9 @@
<target name="file-copy" depends="file-copy-war,file-copy-ear,setup-filters">
+ <copy tofile="${project.home}/seam-gen.properties"
+ file="./build.properties"/>
+
<copy todir="${project.home}/resources">
<fileset dir="${base.dir}/resources/">
<exclude name="datasource-ds.xml"/>
@@ -801,6 +806,7 @@
<copy todir="${project.home}">
<fileset dir="${base.dir}/build-scripts">
<exclude name="build*.xml"/>
+ <exclude name="*.list"/>
<exclude name="debug-jboss.launch"/>
</fileset>
<filterset refid="project"/>
Modified: branches/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml 2008-04-15 01:09:20 UTC (rev 7949)
+++ branches/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml 2008-04-15 01:09:35 UTC (rev 7950)
@@ -179,14 +179,9 @@
<copy todir="${war.dir}/WEB-INF/lib">
<fileset dir="${lib.dir}">
- <include name="oscache*.jar" />
- <include name="jboss-seam-*.jar" />
+ <includesfile name="deployed-jars.list"/>
<exclude name="jboss-seam-gen.jar" />
- <include name="drools-*.jar"/>
- <include name="core.jar"/>
- <include name="janino*.jar"/>
- <include name="antlr-*.jar"/>
- <include name="mvel*.jar"/>
+ <exclude name="icefaces-ahs.jar"/>
<include name="groovy-*.jar" if="groovy.present"/>
</fileset>
</copy>
@@ -205,20 +200,6 @@
</fileset>
</copy>
- <copy todir="${war.dir}/WEB-INF/lib">
- <fileset dir="${lib.dir}">
- <include name="jboss-seam.jar" />
- <include name="jbpm*.jar" />
- <include name="jboss-el.jar" />
- <include name="commons-digester.jar" />
- <include name="commons-beanutils.jar" />
- <include name="icefaces*.jar" />
- <include name="backport-util-concurrent.jar" />
- <include name="commons-fileupload.jar"/>
- <exclude name="icefaces-ahs.jar"/>
- </fileset>
- </copy>
-
</target>
<target name="archive" depends="war"
Added: branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-war.list
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-war.list (rev 0)
+++ branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-war.list 2008-04-15 01:09:35 UTC (rev 7950)
@@ -0,0 +1,17 @@
+antlr-runtime.jar
+backport-util-concurrent.jar
+commons-beanutils.jar
+commons-digester.jar
+commons-fileupload.jar
+core.jar
+drools-compiler.jar
+drools-core.jar
+icefaces.jar
+icefaces-comps.jar
+icefaces-facelets.jar
+janino.jar
+jboss-el.jar
+jboss-seam.jar
+jboss-seam-*.jar
+jbpm-jpdl.jar
+mvel.jar
16 years, 7 months
Seam SVN: r7949 - in trunk/seam-gen: build-scripts and 1 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-14 21:09:20 -0400 (Mon, 14 Apr 2008)
New Revision: 7949
Added:
trunk/seam-gen/build-scripts/deployed-jars-war.list
trunk/seam-gen/icefaces/build-scripts/deployed-jars-war.list
Modified:
trunk/seam-gen/build-scripts/build-war.xml
trunk/seam-gen/build.xml
trunk/seam-gen/icefaces/build-scripts/build-war.xml
Log:
JBSEAM-2897 - first cut at externalizing JAR includes that are packaged with deployable archive (WAR only)
Modified: trunk/seam-gen/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/build-scripts/build-war.xml 2008-04-15 00:47:12 UTC (rev 7948)
+++ trunk/seam-gen/build-scripts/build-war.xml 2008-04-15 01:09:20 UTC (rev 7949)
@@ -179,16 +179,8 @@
<copy todir="${war.dir}/WEB-INF/lib">
<fileset dir="${lib.dir}">
- <include name="richfaces*.jar" />
- <include name="oscache*.jar" />
- <include name="jsf-facelets.jar" />
- <include name="jboss-seam-*.jar" />
- <exclude name="jboss-seam-gen.jar" />
- <include name="drools-*.jar"/>
- <include name="core.jar"/>
- <include name="janino*.jar"/>
- <include name="antlr-*.jar"/>
- <include name="mvel*.jar"/>
+ <includesfile name="deployed-jars.list"/>
+ <exclude name="jboss-seam-gen.jar"/>
<include name="groovy-*.jar" if="groovy.present"/>
</fileset>
</copy>
@@ -207,16 +199,6 @@
</fileset>
</copy>
- <copy todir="${war.dir}/WEB-INF/lib">
- <fileset dir="${lib.dir}">
- <include name="jboss-seam.jar" />
- <include name="jbpm*.jar" />
- <include name="jboss-el.jar" />
- <include name="commons-digester.jar" />
- <include name="commons-beanutils.jar" />
- </fileset>
- </copy>
-
</target>
<target name="archive" depends="war"
Added: trunk/seam-gen/build-scripts/deployed-jars-war.list
===================================================================
--- trunk/seam-gen/build-scripts/deployed-jars-war.list (rev 0)
+++ trunk/seam-gen/build-scripts/deployed-jars-war.list 2008-04-15 01:09:20 UTC (rev 7949)
@@ -0,0 +1,16 @@
+antlr-runtime.jar
+commons-beanutils.jar
+commons-digester.jar
+core.jar
+drools-compiler.jar
+drools-core.jar
+janino.jar
+jboss-el.jar
+jboss-seam.jar
+jboss-seam-*.jar
+jbpm-jpdl.jar
+jsf-facelets.jar
+mvel14.jar
+richfaces-api.jar
+richfaces-impl.jar
+richfaces-ui.jar
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-04-15 00:47:12 UTC (rev 7948)
+++ trunk/seam-gen/build.xml 2008-04-15 01:09:20 UTC (rev 7949)
@@ -652,6 +652,8 @@
file="${base.dir}/resources/WEB-INF/components-war.xml">
<filterset refid="project"/>
</copy>
+ <copy tofile="${project.home}/deployed-jars.list"
+ file="${base.dir}/build-scripts/deployed-jars-war.list"/>
<copy tofile="${project.home}/build.xml"
file="${base.dir}/build-scripts/build-war.xml">
<filterset refid="project"/>
@@ -697,6 +699,9 @@
<target name="file-copy" depends="file-copy-war,file-copy-ear,setup-filters">
+ <copy tofile="${project.home}/seam-gen.properties"
+ file="./build.properties"/>
+
<copy todir="${project.home}/resources">
<fileset dir="${base.dir}/resources/">
<exclude name="datasource-ds.xml"/>
@@ -802,6 +807,7 @@
<copy todir="${project.home}">
<fileset dir="${base.dir}/build-scripts">
<exclude name="build*.xml"/>
+ <exclude name="*.list"/>
<exclude name="debug-jboss.launch"/>
</fileset>
<filterset refid="project"/>
Modified: trunk/seam-gen/icefaces/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-04-15 00:47:12 UTC (rev 7948)
+++ trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-04-15 01:09:20 UTC (rev 7949)
@@ -179,14 +179,9 @@
<copy todir="${war.dir}/WEB-INF/lib">
<fileset dir="${lib.dir}">
- <include name="oscache*.jar" />
- <include name="jboss-seam-*.jar" />
+ <includesfile name="deployed-jars.list"/>
<exclude name="jboss-seam-gen.jar" />
- <include name="drools-*.jar"/>
- <include name="core.jar"/>
- <include name="janino*.jar"/>
- <include name="antlr-*.jar"/>
- <include name="mvel*.jar"/>
+ <exclude name="icefaces-ahs.jar"/>
<include name="groovy-*.jar" if="groovy.present"/>
</fileset>
</copy>
@@ -205,20 +200,6 @@
</fileset>
</copy>
- <copy todir="${war.dir}/WEB-INF/lib">
- <fileset dir="${lib.dir}">
- <include name="jboss-seam.jar" />
- <include name="jbpm*.jar" />
- <include name="jboss-el.jar" />
- <include name="commons-digester.jar" />
- <include name="commons-beanutils.jar" />
- <include name="icefaces*.jar" />
- <include name="backport-util-concurrent.jar" />
- <include name="commons-fileupload.jar"/>
- <exclude name="icefaces-ahs.jar"/>
- </fileset>
- </copy>
-
</target>
<target name="archive" depends="war"
Added: trunk/seam-gen/icefaces/build-scripts/deployed-jars-war.list
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/deployed-jars-war.list (rev 0)
+++ trunk/seam-gen/icefaces/build-scripts/deployed-jars-war.list 2008-04-15 01:09:20 UTC (rev 7949)
@@ -0,0 +1,17 @@
+antlr-runtime.jar
+backport-util-concurrent.jar
+commons-beanutils.jar
+commons-digester.jar
+commons-fileupload.jar
+core.jar
+drools-compiler.jar
+drools-core.jar
+icefaces.jar
+icefaces-comps.jar
+icefaces-facelets.jar
+janino.jar
+jboss-el.jar
+jboss-seam.jar
+jboss-seam-*.jar
+jbpm-jpdl.jar
+mvel14.jar
16 years, 7 months
Seam SVN: r7948 - trunk/seam-gen.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-14 20:47:12 -0400 (Mon, 14 Apr 2008)
New Revision: 7948
Modified:
trunk/seam-gen/
Log:
ignore icefaces-staging
Property changes on: trunk/seam-gen
___________________________________________________________________
Name: svn:ignore
- build.properties
+ build.properties
icefaces-staging
16 years, 7 months
Seam SVN: r7947 - trunk/examples/booking/view.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-04-14 20:13:15 -0400 (Mon, 14 Apr 2008)
New Revision: 7947
Modified:
trunk/examples/booking/view/hotelview.xhtml
Log:
typo
Modified: trunk/examples/booking/view/hotelview.xhtml
===================================================================
--- trunk/examples/booking/view/hotelview.xhtml 2008-04-14 19:12:12 UTC (rev 7946)
+++ trunk/examples/booking/view/hotelview.xhtml 2008-04-15 00:13:15 UTC (rev 7947)
@@ -37,7 +37,7 @@
<s:decorate template="display.xhtml">
<ui:define name="label">Nightly rate:</ui:define>
- <h:outputText value="#{hotel.name}">
+ <h:outputText value="#{hotel.price}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
</s:decorate>
16 years, 7 months