June 2010 - seam-commits - Jboss List Archives

Seam SVN: r13294 - modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2010-06-23 23:08:28 -0400 (Wed, 23 Jun 2010) New Revision: 13294 Added: modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectCredential.java modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectCredentialType.java Modified: modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectType.java Log: added credential classes Added: modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectCredential.java =================================================================== --- modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectCredential.java (rev 0) +++ modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectCredential.java 2010-06-24 03:08:28 UTC (rev 13294) @@ -0,0 +1,71 @@ +package org.jboss.seam.security.examples.idmconsole.model; + +import java.io.Serializable; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; + +import org.jboss.seam.security.annotations.management.IdentityProperty; +import org.jboss.seam.security.annotations.management.PropertyType; + +/** + * Holds credential values + * + * @author Shane Bryzak + */ +@Entity +public class IdentityObjectCredential implements Serializable +{ + private static final long serialVersionUID = 1359292319831314803L; + + private Long id; + private IdentityObject identityObject; + private IdentityObjectCredentialType type; + private String value; + + @Id @GeneratedValue + public Long getId() + { + return id; + } + + public void setId(Long id) + { + this.id = id; + } + + @ManyToOne + public IdentityObject getIdentityObject() + { + return identityObject; + } + + public void setIdentityObject(IdentityObject identityObject) + { + this.identityObject = identityObject; + } + + @ManyToOne @IdentityProperty(PropertyType.TYPE) + public IdentityObjectCredentialType getType() + { + return type; + } + + public void setType(IdentityObjectCredentialType type) + { + this.type = type; + } + + @IdentityProperty(PropertyType.VALUE) + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } +} Added: modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectCredentialType.java =================================================================== --- modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectCredentialType.java (rev 0) +++ modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectCredentialType.java 2010-06-24 03:08:28 UTC (rev 13294) @@ -0,0 +1,46 @@ +package org.jboss.seam.security.examples.idmconsole.model; + +import java.io.Serializable; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +import org.jboss.seam.security.annotations.management.IdentityProperty; +import org.jboss.seam.security.annotations.management.PropertyType; + +/** + * Lookup table containing credential types + * + * @author Shane Bryzak + */ +@Entity +public class IdentityObjectCredentialType implements Serializable +{ + private static final long serialVersionUID = 282711089697868242L; + + private Long id; + private String name; + + @Id @GeneratedValue + public Long getId() + { + return id; + } + + public void setId(Long id) + { + this.id = id; + } + + @IdentityProperty(PropertyType.NAME) + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } +} Modified: modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectType.java =================================================================== --- modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectType.java 2010-06-24 01:28:26 UTC (rev 13293) +++ modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectType.java 2010-06-24 03:08:28 UTC (rev 13294) @@ -10,9 +10,9 @@ import org.jboss.seam.security.annotations.management.PropertyType; /** - * + * A lookup table containing identity object types + * * @author Shane Bryzak - * */ @Entity public class IdentityObjectType implements Serializable

13 years, 10 months

1
0
0 / 0

Seam SVN: r13293 - in modules/security/trunk/impl: src/main/java/org/jboss/seam/security/management and 1 other directories.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2010-06-23 21:28:26 -0400 (Wed, 23 Jun 2010) New Revision: 13293 Modified: modules/security/trunk/impl/pom.xml modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStoreSessionImpl.java modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/IdentitySessionProducer.java Log: dependency exclusions, fix config issues Modified: modules/security/trunk/impl/pom.xml =================================================================== --- modules/security/trunk/impl/pom.xml 2010-06-23 23:51:37 UTC (rev 13292) +++ modules/security/trunk/impl/pom.xml 2010-06-24 01:28:26 UTC (rev 13293) @@ -52,22 +52,26 @@ <scope>provided</scope> </dependency> -  - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.seam.drools</groupId> <artifactId>seam-drools-api</artifactId> + + <exclusions> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -79,6 +83,12 @@ <dependency> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-core</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java =================================================================== --- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2010-06-23 23:51:37 UTC (rev 13292) +++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2010-06-24 01:28:26 UTC (rev 13293) @@ -149,7 +149,17 @@ { this.configurationContext = configurationContext; - //configurationContext.getStoreConfigurationMetaData().getOptionSingleValue(optionName) + String clsName = configurationContext.getStoreConfigurationMetaData() + .getOptionSingleValue(OPTION_IDENTITY_CLASS_NAME); + + try + { + identityClass = Class.forName(clsName); + } + catch (ClassNotFoundException e) + { + throw new IdentityException("Error bootstrapping JpaIdentityStore - no identity entity class found: " + clsName); + } if (identityClass == null) { @@ -203,7 +213,7 @@ Property<Object> p = findNamedProperty(identityClass, "username", "userName", "name"); if (p != null) { - modelProperties.put(PROPERTY_IDENTITY_NAME, props.get(0)); + modelProperties.put(PROPERTY_IDENTITY_NAME, p); } else { @@ -826,18 +836,18 @@ return createIdentityObject(invocationCtx, name, identityObjectType, null); } - protected Object lookupIdentityType(String identityType) throws IdentityException + protected Object lookupIdentityType(String identityType, EntityManager em) throws IdentityException { try { Property<Object> typeNameProp = modelProperties.get(PROPERTY_IDENTITY_TYPE_NAME); - Object val = null; /*entityManagerInstance.get().createQuery( + Object val = em.createQuery( "select t from " + typeNameProp.getDeclaringClass().getName() + " t where t." + typeNameProp.getName() + " = :identityType") .setParameter("identityType", identityType) - .getSingleResult();*/ + .getSingleResult(); return val; } catch (NoResultException ex) @@ -864,7 +874,8 @@ } else { - typeProp.setValue(identityInstance, lookupIdentityType(identityObjectType.getName())); + typeProp.setValue(identityInstance, lookupIdentityType(identityObjectType.getName(), + getEntityManager(invocationCtx))); } //beanManager.fireEvent(new PrePersistUserEvent(identityInstance)); @@ -945,19 +956,23 @@ // TODO Auto-generated method stub return null; } + + public EntityManager getEntityManager(IdentityStoreInvocationContext invocationContext) + { + return ((JpaIdentityStoreSessionImpl) invocationContext.getIdentityStoreSession()).getEntityManager(); + } - public IdentityObject findIdentityObject( - IdentityStoreInvocationContext invocationContext, String id) + public IdentityObject findIdentityObject(IdentityStoreInvocationContext invocationContext, String id) throws IdentityException { try { - Object identity = null; /*entityManagerInstance.get().createQuery("select i from " + + Object identity = getEntityManager(invocationContext).createQuery("select i from " + identityClass.getName() + " i where i." + modelProperties.get(PROPERTY_IDENTITY_ID).getName() + " = :id") .setParameter("id", id) - .getSingleResult();*/ + .getSingleResult(); IdentityObjectType type = modelProperties.containsKey(PROPERTY_IDENTITY_TYPE_NAME) ? new IdentityObjectTypeImpl( @@ -990,17 +1005,17 @@ try { Object identityType = modelProperties.containsKey(PROPERTY_IDENTITY_TYPE_NAME) ? - lookupIdentityType(identityObjectType.getName()) : + lookupIdentityType(identityObjectType.getName(), getEntityManager(invocationContext)) : identityObjectType.getName(); - Object identity = null; //entityManagerInstance.get().createQuery("select i from " + - /*identityClass.getName() + " i where i." + + Object identity = getEntityManager(invocationContext).createQuery("select i from " + + identityClass.getName() + " i where i." + modelProperties.get(PROPERTY_IDENTITY_NAME).getName() + " = :name and i." + modelProperties.get(PROPERTY_IDENTITY_TYPE).getName() + " = :type") .setParameter("name", name) .setParameter("type", identityType) - .getSingleResult();*/ + .getSingleResult(); return new IdentityObjectImpl( modelProperties.get(PROPERTY_IDENTITY_ID).getValue(identity).toString(), Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStoreSessionImpl.java =================================================================== --- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStoreSessionImpl.java 2010-06-23 23:51:37 UTC (rev 13292) +++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStoreSessionImpl.java 2010-06-24 01:28:26 UTC (rev 13293) @@ -20,6 +20,11 @@ this.em = em; } + public EntityManager getEntityManager() + { + return em; + } + public void clear() throws IdentityException { em.clear(); Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/IdentitySessionProducer.java =================================================================== --- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/IdentitySessionProducer.java 2010-06-23 23:51:37 UTC (rev 13292) +++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/IdentitySessionProducer.java 2010-06-24 01:28:26 UTC (rev 13293) @@ -50,9 +50,13 @@ IdentityStoreConfigurationMetaDataImpl store = new IdentityStoreConfigurationMetaDataImpl(); store.setId("jpa"); store.setClassName("org.jboss.seam.security.management.JpaIdentityStore"); + + // temporary hack Map<String,List<String>> options = new HashMap<String,List<String>>(); options.put(JpaIdentityStore.OPTION_IDENTITY_CLASS_NAME, createOptionList("org.jboss.seam.security.examples.idmconsole.model.IdentityObject")); + + store.setOptions(options); stores.add(store); metadata.setIdentityStores(stores);

13 years, 10 months

1
0
0 / 0

Seam SVN: r13292 - in modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management: picketlink and 1 other directory.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2010-06-23 19:51:37 -0400 (Wed, 23 Jun 2010) New Revision: 13292 Added: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStoreSessionImpl.java Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/IdentitySessionProducer.java Log: integrate picketlink identity store changes Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java =================================================================== --- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2010-06-23 13:56:27 UTC (rev 13291) +++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2010-06-23 23:51:37 UTC (rev 13292) @@ -9,10 +9,6 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; import javax.persistence.Entity; import javax.persistence.EntityManager; import javax.persistence.Id; @@ -20,8 +16,6 @@ import org.jboss.seam.security.annotations.management.IdentityProperty; import org.jboss.seam.security.annotations.management.PropertyType; -import org.jboss.seam.security.events.PrePersistUserEvent; -import org.jboss.seam.security.events.UserCreatedEvent; import org.jboss.weld.extensions.util.properties.Property; import org.jboss.weld.extensions.util.properties.query.AnnotatedPropertyCriteria; import org.jboss.weld.extensions.util.properties.query.NamedPropertyCriteria; @@ -57,15 +51,14 @@ private Logger log = LoggerFactory.getLogger(JpaIdentityStore.class); + public static final String OPTION_IDENTITY_CLASS_NAME = "identityEntityClassName"; + private static final String DEFAULT_USER_IDENTITY_TYPE = "USER"; private static final String DEFAULT_ROLE_IDENTITY_TYPE = "ROLE"; private static final String DEFAULT_GROUP_IDENTITY_TYPE = "GROUP"; private static final String DEFAULT_RELATIONSHIP_TYPE_MEMBERSHIP = "MEMBERSHIP"; private static final String DEFAULT_RELATIONSHIP_TYPE_ROLE = "ROLE"; - - private static final String DEFAULT_ATTRIBUTE_USER_ENABLED = "ENABLED"; - private static final String DEFAULT_ATTRIBUTE_PASSWORD_SALT = "PASSWORD_SALT"; // Property keys @@ -96,6 +89,8 @@ //@Inject CredentialProcessor credentialEncoder; private String id; + + private IdentityStoreConfigurationContext configurationContext; // Entity classes @@ -152,6 +147,10 @@ public void bootstrap(IdentityStoreConfigurationContext configurationContext) throws IdentityException { + this.configurationContext = configurationContext; + + //configurationContext.getStoreConfigurationMetaData().getOptionSingleValue(optionName) + if (identityClass == null) { throw new IdentityException( @@ -165,6 +164,7 @@ configureCredentials(); configureRelationships(); configureAttributes(); + configureRoleTypeNames(); } protected void configureIdentityId() throws IdentityException @@ -1253,7 +1253,14 @@ public IdentityStoreSession createIdentityStoreSession() throws IdentityException { - // TODO Auto-generated method stub - return null; + return createIdentityStoreSession(null); } + + public IdentityStoreSession createIdentityStoreSession( + Map<String, Object> sessionOptions) throws IdentityException + { + EntityManager em = (EntityManager) sessionOptions.get("ENTITY_MANAGER"); + + return new JpaIdentityStoreSessionImpl(em); + } } Added: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStoreSessionImpl.java =================================================================== --- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStoreSessionImpl.java (rev 0) +++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStoreSessionImpl.java 2010-06-23 23:51:37 UTC (rev 13292) @@ -0,0 +1,73 @@ +package org.jboss.seam.security.management; + +import javax.persistence.EntityManager; + +import org.picketlink.idm.common.exception.IdentityException; +import org.picketlink.idm.spi.store.IdentityStoreSession; + +/** + * JPA-specific implementation of IdentityStoreSession, based on an EntityManager. + * + * @author Shane Bryzak + * + */ +public class JpaIdentityStoreSessionImpl implements IdentityStoreSession +{ + private EntityManager em; + + public JpaIdentityStoreSessionImpl(EntityManager em) + { + this.em = em; + } + + public void clear() throws IdentityException + { + em.clear(); + } + + public void close() throws IdentityException + { + em.close(); + } + + public void commitTransaction() + { + em.getTransaction().commit(); + } + + public Object getSessionContext() throws IdentityException + { + return em; + } + + public boolean isOpen() + { + return em.isOpen(); + } + + public boolean isTransactionActive() + { + return em.getTransaction().isActive(); + } + + public boolean isTransactionSupported() + { + return true; + } + + public void rollbackTransaction() + { + em.getTransaction().rollback(); + } + + public void save() throws IdentityException + { + em.flush(); + } + + public void startTransaction() + { + em.getTransaction().begin(); + } + +} Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/IdentitySessionProducer.java =================================================================== --- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/IdentitySessionProducer.java 2010-06-23 13:56:27 UTC (rev 13291) +++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/picketlink/IdentitySessionProducer.java 2010-06-23 23:51:37 UTC (rev 13292) @@ -1,15 +1,21 @@ package org.jboss.seam.security.management.picketlink; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Instance; import javax.enterprise.inject.Produces; import javax.inject.Inject; +import javax.persistence.EntityManager; +import org.jboss.seam.security.management.JpaIdentityStore; import org.picketlink.idm.api.IdentitySession; import org.picketlink.idm.api.IdentitySessionFactory; +import org.picketlink.idm.api.event.EventListener; import org.picketlink.idm.common.exception.IdentityConfigurationException; import org.picketlink.idm.common.exception.IdentityException; import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl; @@ -26,7 +32,7 @@ * @author Shane Bryzak */ @ApplicationScoped -public class IdentitySessionProducer +public class IdentitySessionProducer implements EventListener { private IdentitySessionFactory factory; @@ -35,7 +41,7 @@ @Inject IdentityConfigurationMetaData config; @Inject - public void init() throws IdentityConfigurationException + public void init() throws IdentityConfigurationException, IdentityException { IdentityConfigurationMetaDataImpl metadata = new IdentityConfigurationMetaDataImpl(); @@ -43,13 +49,16 @@ List<IdentityStoreConfigurationMetaData> stores = new ArrayList<IdentityStoreConfigurationMetaData>(); IdentityStoreConfigurationMetaDataImpl store = new IdentityStoreConfigurationMetaDataImpl(); store.setId("jpa"); - store.setClassName("org.jboss.seam.security.management.JpaIdentityStore"); + store.setClassName("org.jboss.seam.security.management.JpaIdentityStore"); + Map<String,List<String>> options = new HashMap<String,List<String>>(); + options.put(JpaIdentityStore.OPTION_IDENTITY_CLASS_NAME, + createOptionList("org.jboss.seam.security.examples.idmconsole.model.IdentityObject")); + store.setOptions(options); stores.add(store); metadata.setIdentityStores(stores); // Create the default realm RealmConfigurationMetaDataImpl realm = new RealmConfigurationMetaDataImpl(); - realm.setIdentityRepositoryIdRef("jpa"); realm.setId("default"); List<RealmConfigurationMetaData> realms = new ArrayList<RealmConfigurationMetaData>(); realms.add(realm); @@ -57,14 +66,28 @@ IdentityConfigurationImpl config = new IdentityConfigurationImpl(); config.configure(metadata); + config.register(this, "identitySessionProducer"); factory = config.buildIdentitySessionFactory(); } + private List<String> createOptionList(String... values) + { + List<String> vals = new ArrayList<String>(); + for (String v : values) vals.add(v); + return vals; + } + + @Inject Instance<EntityManager> entityManagerInstance; + @Produces @RequestScoped IdentitySession createIdentitySession() throws IdentityException { - return factory.createIdentitySession(getDefaultRealm()); + Map<String,Object> sessionOptions = new HashMap<String,Object>(); + sessionOptions.put("ENTITY_MANAGER", entityManagerInstance.get()); + IdentitySession session = factory.createIdentitySession(getDefaultRealm(), sessionOptions); + session.registerListener(this); + return session; } public String getDefaultRealm()

13 years, 10 months

1
0
0 / 0

Seam SVN: r13291 - in branches/community/Seam_2_2/examples: metawidget/booking/resources/WEB-INF and 2 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2010-06-23 09:56:27 -0400 (Wed, 23 Jun 2010) New Revision: 13291 Modified: branches/community/Seam_2_2/examples/build.xml branches/community/Seam_2_2/examples/metawidget/booking/resources/WEB-INF/metawidget.xml branches/community/Seam_2_2/examples/metawidget/dvdstore/resources/WEB-INF/metawidget.xml branches/community/Seam_2_2/examples/metawidget/groovybooking/resources/WEB-INF/metawidget.xml Log: JBSEAM-4567 - upgraded metawidget to 0.95 Modified: branches/community/Seam_2_2/examples/build.xml =================================================================== --- branches/community/Seam_2_2/examples/build.xml 2010-06-23 10:19:19 UTC (rev 13290) +++ branches/community/Seam_2_2/examples/build.xml 2010-06-23 13:56:27 UTC (rev 13291) @@ -618,14 +618,14 @@ <target name="getmetawidget-war" if="metawidget-war.lib"> <copyInlineDependencies id="metawidget" scope="runtime" todir="${lib.dir}"> - <dependency groupId="org.metawidget" artifactId="metawidget" version="0.75"/> + <dependency groupId="org.metawidget" artifactId="metawidget" version="0.95"/> </copyInlineDependencies> </target> <target name="getmetawidget-ear" if="metawidget-ear.lib"> <copyInlineDependencies id="metawidget" scope="runtime" todir="${lib.dir}"> - <dependency groupId="org.metawidget" artifactId="metawidget-frontend" version="0.75"/> - <dependency groupId="org.metawidget" artifactId="metawidget-backend" version="0.75"/> + <dependency groupId="org.metawidget" artifactId="metawidget-frontend" version="0.95"/> + <dependency groupId="org.metawidget" artifactId="metawidget-backend" version="0.95"/> </copyInlineDependencies> </target> Modified: branches/community/Seam_2_2/examples/metawidget/booking/resources/WEB-INF/metawidget.xml =================================================================== --- branches/community/Seam_2_2/examples/metawidget/booking/resources/WEB-INF/metawidget.xml 2010-06-23 10:19:19 UTC (rev 13290) +++ branches/community/Seam_2_2/examples/metawidget/booking/resources/WEB-INF/metawidget.xml 2010-06-23 13:56:27 UTC (rev 13291) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <metawidget xmlns="http://metawidget.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://metawidget.org http://metawidget.org/metawidget-1.0.xsd" version="1.0"> + xsi:schemaLocation="http://metawidget.org http://metawidget.org/xsd/metawidget-1.0.xsd" version="1.0"> <htmlMetawidget xmlns="java:org.metawidget.faces.component.html"> <rendererType> @@ -11,29 +11,43 @@ <string>divStyleClasses</string> <string>entry,label,required,input,error errors</string> </parameter> - <widgetBuilder> - <compositeWidgetBuilder xmlns="urn:java:org.metawidget.widgetbuilder.composite" config="CompositeWidgetBuilderConfig"> - <widgetBuilders> - <list> - <richFacesWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder.richfaces"/> - <htmlWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder"/> - </list> - </widgetBuilders> - </compositeWidgetBuilder> - </widgetBuilder> + <inspector> <compositeInspector xmlns="java:org.metawidget.inspector.composite" config="CompositeInspectorConfig"> <inspectors> - <list> + <array> + <propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype"/> <metawidgetAnnotationInspector xmlns="java:org.metawidget.inspector.annotation"/> - <propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype"/> <facesInspector xmlns="java:org.metawidget.inspector.faces"/> <jpaInspector xmlns="java:org.metawidget.inspector.jpa"/> <hibernateValidatorInspector xmlns="java:org.metawidget.inspector.hibernate.validator"/> - </list> + </array> </inspectors> </compositeInspector> </inspector> + + <widgetBuilder> + <compositeWidgetBuilder xmlns="java:org.metawidget.widgetbuilder.composite" config="CompositeWidgetBuilderConfig"> + <widgetBuilders> + <array> + <overriddenWidgetBuilder xmlns="java:org.metawidget.faces.component.widgetbuilder"/> + <readOnlyWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder"/> + <richFacesWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder.richfaces"/> + <htmlWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder"/> + </array> + </widgetBuilders> + </compositeWidgetBuilder> + </widgetBuilder> + + <widgetProcessors> + <array> + <requiredAttributeProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + <standardBindingProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + <readableIdProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + <standardConverterProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + </array> + </widgetProcessors> + </htmlMetawidget> </metawidget> \ No newline at end of file Modified: branches/community/Seam_2_2/examples/metawidget/dvdstore/resources/WEB-INF/metawidget.xml =================================================================== --- branches/community/Seam_2_2/examples/metawidget/dvdstore/resources/WEB-INF/metawidget.xml 2010-06-23 10:19:19 UTC (rev 13290) +++ branches/community/Seam_2_2/examples/metawidget/dvdstore/resources/WEB-INF/metawidget.xml 2010-06-23 13:56:27 UTC (rev 13291) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <metawidget xmlns="http://metawidget.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://metawidget.org http://metawidget.org/metawidget-1.0.xsd" version="1.0"> + xsi:schemaLocation="http://metawidget.org http://metawidget.org/xsd/metawidget-1.0.xsd" version="1.0"> <htmlMetawidget xmlns="java:org.metawidget.faces.component.html"> <parameter> @@ -11,28 +11,30 @@ <parameter> <string>messageStyleClass</string> <string>cntError</string> - </parameter> + </parameter> + <inspector> <compositeInspector xmlns="java:org.metawidget.inspector.composite" config="CompositeInspectorConfig"> <inspectors> - <list> + <array> + <propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype"/> <metawidgetAnnotationInspector xmlns="java:org.metawidget.inspector.annotation"/> - <propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype"/> <facesInspector xmlns="java:org.metawidget.inspector.faces"/> <jpaInspector xmlns="java:org.metawidget.inspector.jpa"/> <hibernateValidatorInspector xmlns="java:org.metawidget.inspector.hibernate.validator"/> - <jbpmInspector xmlns="java:org.metawidget.inspector.jbpm" config="JbpmInspectorConfig"> + <pageflowInspector xmlns="java:org.metawidget.inspector.jbpm" config="org.metawidget.inspector.impl.BaseXmlInspectorConfig"> <inputStreams> - <list> + <array> <resource>checkout.jpdl.xml</resource> <resource>newuser.jpdl.xml</resource> - </list> + </array> </inputStreams> - </jbpmInspector> - </list> + </pageflowInspector> + </array> </inspectors> </compositeInspector> </inspector> + </htmlMetawidget> </metawidget> \ No newline at end of file Modified: branches/community/Seam_2_2/examples/metawidget/groovybooking/resources/WEB-INF/metawidget.xml =================================================================== --- branches/community/Seam_2_2/examples/metawidget/groovybooking/resources/WEB-INF/metawidget.xml 2010-06-23 10:19:19 UTC (rev 13290) +++ branches/community/Seam_2_2/examples/metawidget/groovybooking/resources/WEB-INF/metawidget.xml 2010-06-23 13:56:27 UTC (rev 13291) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <metawidget xmlns="http://metawidget.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://metawidget.org http://metawidget.org/metawidget-1.0.xsd" version="1.0"> + xsi:schemaLocation="http://metawidget.org http://metawidget.org/xsd/metawidget-1.0.xsd" version="1.0"> <htmlMetawidget xmlns="java:org.metawidget.faces.component.html"> <rendererType> @@ -11,49 +11,63 @@ <string>divStyleClasses</string> <string>entry,label,required,output,error errors</string> </parameter> - <widgetBuilder> - <compositeWidgetBuilder xmlns="urn:java:org.metawidget.widgetbuilder.composite" config="CompositeWidgetBuilderConfig"> - <widgetBuilders> - <list> - <richFacesWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder.richfaces"/> - <htmlWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder"/> - </list> - </widgetBuilders> - </compositeWidgetBuilder> - </widgetBuilder> + <inspector> <compositeInspector xmlns="java:org.metawidget.inspector.composite" config="CompositeInspectorConfig"> <inspectors> - <list> + <array> + <propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype" config="org.metawidget.inspector.impl.BaseObjectInspectorConfig"> + <propertyStyle> + <groovyPropertyStyle xmlns="java:org.metawidget.inspector.impl.propertystyle.groovy"/> + </propertyStyle> + </propertyTypeInspector> <metawidgetAnnotationInspector xmlns="java:org.metawidget.inspector.annotation" config="org.metawidget.inspector.impl.BaseObjectInspectorConfig"> <propertyStyle> - <class>org.metawidget.inspector.impl.propertystyle.groovy.GroovyPropertyStyle</class> + <groovyPropertyStyle xmlns="java:org.metawidget.inspector.impl.propertystyle.groovy"/> </propertyStyle> </metawidgetAnnotationInspector> - <propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype" config="org.metawidget.inspector.impl.BaseObjectInspectorConfig"> + <facesInspector xmlns="java:org.metawidget.inspector.faces" config="FacesInspectorConfig"> <propertyStyle> - <class>org.metawidget.inspector.impl.propertystyle.groovy.GroovyPropertyStyle</class> + <groovyPropertyStyle xmlns="java:org.metawidget.inspector.impl.propertystyle.groovy"/> </propertyStyle> - </propertyTypeInspector> - <facesInspector xmlns="java:org.metawidget.inspector.faces" config="org.metawidget.inspector.impl.BaseObjectInspectorConfig"> - <propertyStyle> - <class>org.metawidget.inspector.impl.propertystyle.groovy.GroovyPropertyStyle</class> - </propertyStyle> </facesInspector> <jpaInspector xmlns="java:org.metawidget.inspector.jpa" config="JpaInspectorConfig"> <propertyStyle> - <class>org.metawidget.inspector.impl.propertystyle.groovy.GroovyPropertyStyle</class> + <groovyPropertyStyle xmlns="java:org.metawidget.inspector.impl.propertystyle.groovy"/> </propertyStyle> </jpaInspector> <hibernateValidatorInspector xmlns="java:org.metawidget.inspector.hibernate.validator" config="org.metawidget.inspector.impl.BaseObjectInspectorConfig"> <propertyStyle> - <class>org.metawidget.inspector.impl.propertystyle.groovy.GroovyPropertyStyle</class> + <groovyPropertyStyle xmlns="java:org.metawidget.inspector.impl.propertystyle.groovy"/> </propertyStyle> </hibernateValidatorInspector> - </list> + </array> </inspectors> </compositeInspector> </inspector> + + <widgetBuilder> + <compositeWidgetBuilder xmlns="java:org.metawidget.widgetbuilder.composite" config="CompositeWidgetBuilderConfig"> + <widgetBuilders> + <array> + <overriddenWidgetBuilder xmlns="java:org.metawidget.faces.component.widgetbuilder"/> + <readOnlyWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder"/> + <richFacesWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder.richfaces"/> + <htmlWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder"/> + </array> + </widgetBuilders> + </compositeWidgetBuilder> + </widgetBuilder> + + <widgetProcessors> + <array> + <requiredAttributeProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + <standardBindingProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + <readableIdProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + <standardConverterProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + </array> + </widgetProcessors> + </htmlMetawidget> </metawidget> \ No newline at end of file

13 years, 10 months

1
0
0 / 0

Seam SVN: r13290 - branches/community/Seam_2_1/build.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2010-06-23 06:19:19 -0400 (Wed, 23 Jun 2010) New Revision: 13290 Modified: branches/community/Seam_2_1/build/root.pom.xml Log: fixed build dependencies Modified: branches/community/Seam_2_1/build/root.pom.xml =================================================================== --- branches/community/Seam_2_1/build/root.pom.xml 2010-06-23 08:23:04 UTC (rev 13289) +++ branches/community/Seam_2_1/build/root.pom.xml 2010-06-23 10:19:19 UTC (rev 13290) @@ -346,6 +346,10 @@ <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> </exclusion> + <exclusion> + <groupId>com.sun.xml.stream</groupId> + <artifactId>sjsxp</artifactId> + </exclusion> </exclusions> </dependency> @@ -376,6 +380,10 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> </exclusions> </dependency> @@ -644,7 +652,7 @@ <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> - <version>1.0.1B</version> + <version>1.1</version> </dependency> <dependency>

13 years, 10 months

1
0
0 / 0

Seam SVN: r13289 - branches/community/Seam_2_2/examples/restbay/src/org/jboss/seam/example/restbay/resteasy.

by seam-commits＠lists.jboss.org

Author: jharting Date: 2010-06-23 04:23:04 -0400 (Wed, 23 Jun 2010) New Revision: 13289 Modified: branches/community/Seam_2_2/examples/restbay/src/org/jboss/seam/example/restbay/resteasy/SecuredResource.java Log: minor Modified: branches/community/Seam_2_2/examples/restbay/src/org/jboss/seam/example/restbay/resteasy/SecuredResource.java =================================================================== --- branches/community/Seam_2_2/examples/restbay/src/org/jboss/seam/example/restbay/resteasy/SecuredResource.java 2010-06-22 16:43:19 UTC (rev 13288) +++ branches/community/Seam_2_2/examples/restbay/src/org/jboss/seam/example/restbay/resteasy/SecuredResource.java 2010-06-23 08:23:04 UTC (rev 13289) @@ -52,9 +52,8 @@ @Transactional public boolean synchronizationsLookup() { - //Synchronizations ejb = (Synchronizations) Component.getInstance("org.jboss.seam.transaction.synchronizations", ScopeType.EVENT); - //return ejb.isAwareOfContainerTransactions(); - return true; + Synchronizations ejb = (Synchronizations) Component.getInstance("org.jboss.seam.transaction.synchronizations", ScopeType.EVENT); + return ejb.isAwareOfContainerTransactions(); } @GET

13 years, 10 months

1
0
0 / 0

Seam SVN: r13288 - branches/community/Seam_2_2/src/main/org/jboss/seam.

by seam-commits＠lists.jboss.org

Author: denis.forveille Date: 2010-06-22 12:43:19 -0400 (Tue, 22 Jun 2010) New Revision: 13288 Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/Component.java Log: JBSEAM-4669. Remove the synchonized keyword on getInstanceFromFactory to avoid systemwide java deadlocks. Check JBSEAM-2419 for workarounds to solve the race condition in creating factories Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/Component.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/Component.java 2010-06-22 13:26:45 UTC (rev 13287) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/Component.java 2010-06-22 16:43:19 UTC (rev 13288) @@ -2051,7 +2051,8 @@ return getInstanceFromFactory(name, null); } - private static synchronized Object getInstanceFromFactory(String name, ScopeType scope) + // JBSEAM-4669: Removed the "synchronized" keyword + private static Object getInstanceFromFactory(String name, ScopeType scope) { Init init = Init.instance(); if (init==null) //for unit tests, yew!

13 years, 10 months

1
0
0 / 0

Seam SVN: r13287 - modules/jms/trunk.

by seam-commits＠lists.jboss.org

Author: mgencur(a)redhat.com Date: 2010-06-22 09:26:45 -0400 (Tue, 22 Jun 2010) New Revision: 13287 Modified: modules/jms/trunk/pom.xml Log: repair the cargo settings so that it can stop jboss 6 M3 container properly Modified: modules/jms/trunk/pom.xml =================================================================== --- modules/jms/trunk/pom.xml 2010-06-22 12:16:16 UTC (rev 13286) +++ modules/jms/trunk/pom.xml 2010-06-22 13:26:45 UTC (rev 13287) @@ -82,7 +82,7 @@ <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> - <version>1.0-beta-2</version> + <version>1.0.1</version> <executions> <execution> <id>start-container</id> @@ -103,7 +103,7 @@ <configuration> <wait>false</wait> <container> - <containerId>jboss5x</containerId> + <containerId>jboss6x</containerId> <home>${env.JBOSS_HOME}</home> <timeout>300000</timeout>  </container> @@ -112,7 +112,7 @@ <home>${env.JBOSS_HOME}/server/default</home> <properties> <cargo.jboss.configuration>default</cargo.jboss.configuration> - <cargo.rmi.port>1099</cargo.rmi.port> + <cargo.rmi.port>1090</cargo.rmi.port> </properties> </configuration> </configuration>

13 years, 10 months

1
0
0 / 0

Seam SVN: r13286 - branches/enterprise/JBPAPP_5_0_1_JBPAPP-4507/ui/src/main/java/org/jboss/seam/ui/component.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2010-06-22 08:16:16 -0400 (Tue, 22 Jun 2010) New Revision: 13286 Modified: branches/enterprise/JBPAPP_5_0_1_JBPAPP-4507/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java Log: JBPAPP-4507 Modified: branches/enterprise/JBPAPP_5_0_1_JBPAPP-4507/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java =================================================================== --- branches/enterprise/JBPAPP_5_0_1_JBPAPP-4507/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2010-06-22 10:26:14 UTC (rev 13285) +++ branches/enterprise/JBPAPP_5_0_1_JBPAPP-4507/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2010-06-22 12:16:16 UTC (rev 13286) @@ -144,6 +144,122 @@ this.localInputStream = localInputStream; } + /** + * {@inheritDoc} + * + * @see javax.faces.component.UIOutput#getLocalValue() + */ + @Override + public Object getLocalValue() { + return new LocalUploadValue(localContentType, localFileName, localFileSize, + localInputStream); + } + + /** + * {@inheritDoc} + * + * @see javax.faces.component.UIInput#setValue(java.lang.Object) + */ + @Override + public void setValue(Object value) { + // Check if the local values get restored + if (value != null && value instanceof LocalUploadValue) { + LocalUploadValue localValue = (LocalUploadValue) value; + localFileName = localValue.getFileName(); + localFileSize = localValue.getFileSize(); + localContentType = localValue.getContentType(); + localInputStream = localValue.getInputStream(); + } else { + super.setValue(value); + } + } + + /** + * {@inheritDoc} + * + * @see javax.faces.component.UIInput#isLocalValueSet() + */ + @Override + public boolean isLocalValueSet() { + return localContentType != null || localFileName != null || localFileSize != null + || localInputStream != null; + } + + /** + * Helper class to store the local values. + */ + protected class LocalUploadValue { + + /** Stores the local content type. */ + private String contentType; + + /** Stores the local file name. */ + private String fileName; + + /** Stores the local file size. */ + private Integer fileSize; + + /** Stores the local stream information. */ + private InputStream inputStream; + + /** + * Constructor for this class. + * + * @param contentType + * The local content type to save + * @param fileName + * The local file name to save + * @param fileSize + * The local file size to save + * @param inputStream + * The local input stream to save + */ + public LocalUploadValue(String contentType, String fileName, Integer fileSize, + InputStream inputStream) { + super(); + this.contentType = contentType; + this.fileName = fileName; + this.fileSize = fileSize; + this.inputStream = inputStream; + } + + /** + * Returns the contentType value. + * + * @return the contentType value + */ + public String getContentType() { + return contentType; + } + + /** + * Returns the fileName value. + * + * @return the fileName value + */ + public String getFileName() { + return fileName; + } + + /** + * Returns the fileSize value. + * + * @return the fileSize value + */ + public Integer getFileSize() { + return fileSize; + } + + /** + * Returns the inputStream value. + * + * @return the inputStream value + */ + public InputStream getInputStream() { + return inputStream; + } + } + public abstract void setAccept(String accept); public abstract String getAccept();

13 years, 10 months

1
0
0 / 0

Seam SVN: r13285 - branches/enterprise.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2010-06-22 06:26:14 -0400 (Tue, 22 Jun 2010) New Revision: 13285 Added: branches/enterprise/JBPAPP_5_0_1_JBPAPP-4507/ Removed: branches/enterprise/JBPAPP_5_0_JBPAPP-4507/ Log: fixed branch name Copied: branches/enterprise/JBPAPP_5_0_1_JBPAPP-4507 (from rev 13284, branches/enterprise/JBPAPP_5_0_JBPAPP-4507)

13 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits June 2010