March 2010 - seam-commits - Jboss List Archives

Seam SVN: r12184 - modules/remoting/trunk/docs.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2010-03-12 04:07:07 -0500 (Fri, 12 Mar 2010) New Revision: 12184 Modified: modules/remoting/trunk/docs/pom.xml Log: [maven-release-plugin] rollback the release of 3.0.0-Beta1 Modified: modules/remoting/trunk/docs/pom.xml =================================================================== --- modules/remoting/trunk/docs/pom.xml 2010-03-12 09:01:15 UTC (rev 12183) +++ modules/remoting/trunk/docs/pom.xml 2010-03-12 09:07:07 UTC (rev 12184) @@ -37,6 +37,13 @@ <defaultGoal>process-classes</defaultGoal> <plugins> <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + + <plugin> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> </plugin>

14 years, 9 months

1
0
0 / 0

Seam SVN: r12183 - modules/remoting/tags.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2010-03-12 04:01:15 -0500 (Fri, 12 Mar 2010) New Revision: 12183 Removed: modules/remoting/tags/3.0.0-Beta1/ Log: rollback release

14 years, 9 months

1
0
0 / 0

Seam SVN: r12182 - in modules/faces/trunk: src/main/java and 8 other directories.

by seam-commits＠lists.jboss.org

Author: lincolnthree Date: 2010-03-11 18:09:39 -0500 (Thu, 11 Mar 2010) New Revision: 12182 Added: modules/faces/trunk/src/main/java/META-INF/ modules/faces/trunk/src/main/java/META-INF/MANIFEST.MF modules/faces/trunk/src/main/java/javax/ modules/faces/trunk/src/main/java/javax/faces/ modules/faces/trunk/src/main/java/javax/faces/bean/ modules/faces/trunk/src/main/java/javax/faces/bean/FlashScoped.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/FlashScopedContext.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/FlashScopedExtension.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/ViewScopedContext.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/ViewScopedExtension.java Removed: modules/faces/trunk/src/main/java/org/jboss/seam/faces/scopes/ Modified: modules/faces/trunk/pom.xml modules/faces/trunk/src/main/resources/META-INF/faces-config.xml modules/faces/trunk/src/main/resources/META-INF/seam-faces.taglib.xml modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Log: * FlashScope is functional (perhaps barely, but functional) Modified: modules/faces/trunk/pom.xml =================================================================== --- modules/faces/trunk/pom.xml 2010-03-11 15:47:36 UTC (rev 12181) +++ modules/faces/trunk/pom.xml 2010-03-11 23:09:39 UTC (rev 12182) @@ -10,8 +10,8 @@ </parent> <artifactId>seam-faces</artifactId> + <version>3.0.0-SNAPSHOT</version> <packaging>jar</packaging> - <version>3.0.0-SNAPSHOT</version> <name>Seam Faces Module</name>  Added: modules/faces/trunk/src/main/java/META-INF/MANIFEST.MF =================================================================== --- modules/faces/trunk/src/main/java/META-INF/MANIFEST.MF (rev 0) +++ modules/faces/trunk/src/main/java/META-INF/MANIFEST.MF 2010-03-11 23:09:39 UTC (rev 12182) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: modules/faces/trunk/src/main/java/javax/faces/bean/FlashScoped.java =================================================================== --- modules/faces/trunk/src/main/java/javax/faces/bean/FlashScoped.java (rev 0) +++ modules/faces/trunk/src/main/java/javax/faces/bean/FlashScoped.java 2010-03-11 23:09:39 UTC (rev 12182) @@ -0,0 +1,25 @@ +package javax.faces.bean; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.annotation.ElementType; + +import javax.enterprise.context.NormalScope; + +/** + * Defines a CDI bean as Flash scoped. A bean put in the JSF2 flash will survive + * one page transition, or navigation, then be cleared. + * + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + */ +@NormalScope +@Inherited +@Documented +(a)Target(ElementType.TYPE) +@Retention(value = RetentionPolicy.RUNTIME) +public @interface FlashScoped { + +} Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/FlashScopedContext.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/FlashScopedContext.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/FlashScopedContext.java 2010-03-11 23:09:39 UTC (rev 12182) @@ -0,0 +1,165 @@ +package org.jboss.seam.faces.context; + +import java.lang.annotation.Annotation; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; + +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import javax.faces.bean.FlashScoped; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.faces.context.Flash; +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; + +/** + * This class provides the contexts lifecycle for the new JSF2 Flash Context + * + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + */ +public class FlashScopedContext implements Context, PhaseListener +{ + private final static String COMPONENT_MAP_NAME = "org.jboss.seam.faces.flash.componentInstanceMap"; + private final static String CREATIONAL_MAP_NAME = "org.jboss.seam.faces.flash.creationalInstanceMap"; + private final ThreadLocal<Map<Contextual<?>, Object>> lastComponentInstanceMap = new ThreadLocal<Map<Contextual<?>, Object>>(); + private final ThreadLocal<Map<Contextual<?>, CreationalContext<?>>> lastCreationalContextMap = new ThreadLocal<Map<Contextual<?>, CreationalContext<?>>>(); + + @SuppressWarnings("unchecked") + public <T> T get(final Contextual<T> component) + { + assertActive(); + Map<Contextual<?>, Object> componentInstanceMap = getComponentInstanceMap(); + T instance = (T) componentInstanceMap.get(component); + return instance; + } + + @SuppressWarnings("unchecked") + public <T> T get(final Contextual<T> component, final CreationalContext<T> creationalContext) + { + assertActive(); + + T instance = get(component); + + if (instance == null) + { + Map<Contextual<?>, CreationalContext<?>> creationalContextMap = getCreationalContextMap(); + Map<Contextual<?>, Object> componentInstanceMap = getComponentInstanceMap(); + + synchronized (componentInstanceMap) + { + instance = (T) componentInstanceMap.get(component); + if (instance == null) + { + instance = component.create(creationalContext); + + if (instance != null) + { + componentInstanceMap.put(component, instance); + creationalContextMap.put(component, creationalContext); + } + } + } + } + + return instance; + } + + public Class<? extends Annotation> getScope() + { + return FlashScoped.class; + } + + private Flash getFlash() + { + FacesContext currentInstance = FacesContext.getCurrentInstance(); + if (currentInstance != null) + { + ExternalContext externalContext = currentInstance.getExternalContext(); + return externalContext.getFlash(); + } + return null; + } + + public boolean isActive() + { + return getFlash() != null; + } + + private void assertActive() + { + if (!isActive()) + { + throw new ContextNotActiveException( + "WebBeans context with scope annotation @FlashScoped is not active with respect to the current thread"); + } + } + + @SuppressWarnings("unchecked") + private Map<Contextual<?>, Object> getComponentInstanceMap() + { + Flash flash = getFlash(); + ConcurrentHashMap<Contextual<?>, Object> map = (ConcurrentHashMap<Contextual<?>, Object>) flash + .get(COMPONENT_MAP_NAME); + if (map == null) + { + map = new ConcurrentHashMap<Contextual<?>, Object>(); + flash.put(COMPONENT_MAP_NAME, map); + } + return map; + } + + @SuppressWarnings("unchecked") + private Map<Contextual<?>, CreationalContext<?>> getCreationalContextMap() + { + Flash flash = getFlash(); + Map<Contextual<?>, CreationalContext<?>> map = (ConcurrentHashMap<Contextual<?>, CreationalContext<?>>) flash + .get(CREATIONAL_MAP_NAME); + if (map == null) + { + map = new ConcurrentHashMap<Contextual<?>, CreationalContext<?>>(); + flash.put(CREATIONAL_MAP_NAME, map); + } + return map; + } + + public void beforePhase(final PhaseEvent event) + { + this.lastComponentInstanceMap.set(getComponentInstanceMap()); + this.lastCreationalContextMap.set(getCreationalContextMap()); + } + + @SuppressWarnings("unchecked") + public void afterPhase(final PhaseEvent event) + { + // TODO verify that this is actually destroying the beans we want to be + // destroyed... flash is confusing, tests will make sense of it + Map<Contextual<?>, Object> componentInstanceMap = lastComponentInstanceMap.get(); + Map<Contextual<?>, CreationalContext<?>> creationalContextMap = lastCreationalContextMap.get(); + + if (componentInstanceMap != null) + { + for (Entry<Contextual<?>, Object> componentEntry : componentInstanceMap.entrySet()) + { + Contextual contextual = componentEntry.getKey(); + Object instance = componentEntry.getValue(); + CreationalContext creational = creationalContextMap.get(contextual); + + contextual.destroy(instance, creational); + } + } + + this.lastComponentInstanceMap.remove(); + this.lastCreationalContextMap.remove(); + } + + public PhaseId getPhaseId() + { + return PhaseId.RENDER_RESPONSE; + } + +} Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/FlashScopedExtension.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/FlashScopedExtension.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/FlashScopedExtension.java 2010-03-11 23:09:39 UTC (rev 12182) @@ -0,0 +1,32 @@ +/* + * To change this template, choose Tools | Templates and open the template in + * the editor. + */ + +package org.jboss.seam.faces.context; + +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.AfterBeanDiscovery; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; +import javax.enterprise.inject.spi.Extension; +import javax.faces.bean.FlashScoped; + +/** + * An extension to provide @FlashScoped CDI / JSF2 integration. + * + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + */ +public class FlashScopedExtension implements Extension +{ + + public void addScope(@Observes final BeforeBeanDiscovery event) + { + event.addScope(FlashScoped.class, true, true); + } + + public void registerContext(@Observes final AfterBeanDiscovery event) + { + event.addContext(new FlashScopedContext()); + } + +} Copied: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/ViewScopedContext.java (from rev 12181, modules/faces/trunk/src/main/java/org/jboss/seam/faces/scopes/ViewScopedContext.java) =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/ViewScopedContext.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/ViewScopedContext.java 2010-03-11 23:09:39 UTC (rev 12182) @@ -0,0 +1,228 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law + * or agreed to in writing, software distributed under the License is + * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.jboss.seam.faces.context; + +import java.lang.annotation.Annotation; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; + +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; + +import javax.faces.bean.ViewScoped; +import javax.faces.component.UIViewRoot; +import javax.faces.context.FacesContext; +import javax.faces.event.PreDestroyViewMapEvent; +import javax.faces.event.SystemEvent; +import javax.faces.event.SystemEventListener; + +/** + * This class provides the contexts lifecycle for the new JSF-2 @ViewScoped + * Context + * + * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a> + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + */ +public class ViewScopedContext implements Context, SystemEventListener +{ + + private final static String COMPONENT_MAP_NAME = "org.jboss.seam.faces.viewscope.componentInstanceMap"; + private final static String CREATIONAL_MAP_NAME = "org.jboss.seam.faces.viewscope.creationalInstanceMap"; + + private boolean isJsfSubscribed = false; + + @SuppressWarnings("unchecked") + public <T> T get(final Contextual<T> component) + { + assertActive(); + + if (!isJsfSubscribed) + { + FacesContext.getCurrentInstance().getApplication().subscribeToEvent(PreDestroyViewMapEvent.class, this); + + isJsfSubscribed = true; + } + + Map<String, Object> viewMap = getViewMap(); + + ConcurrentHashMap<Contextual<?>, Object> componentInstanceMap = (ConcurrentHashMap<Contextual<?>, Object>) viewMap + .get(COMPONENT_MAP_NAME); + + if (componentInstanceMap == null) + { + return null; + } + + T instance = (T) componentInstanceMap.get(component); + + return instance; + } + + @SuppressWarnings("unchecked") + public <T> T get(final Contextual<T> component, final CreationalContext<T> creationalContext) + { + assertActive(); + + Map<String, Object> viewMap = getViewMap(); + + ConcurrentHashMap<Contextual<?>, Object> componentInstanceMap = (ConcurrentHashMap<Contextual<?>, Object>) viewMap + .get(COMPONENT_MAP_NAME); + + if (componentInstanceMap == null) + { + // TODO we now need to start being carefull with reentrancy... + componentInstanceMap = new ConcurrentHashMap<Contextual<?>, Object>(); + viewMap.put(COMPONENT_MAP_NAME, componentInstanceMap); + } + + ConcurrentHashMap<Contextual<?>, CreationalContext<?>> creationalContextMap = (ConcurrentHashMap<Contextual<?>, CreationalContext<?>>) viewMap + .get(CREATIONAL_MAP_NAME); + if (creationalContextMap == null) + { + // TODO we now need to start being carefull with reentrancy... + creationalContextMap = new ConcurrentHashMap<Contextual<?>, CreationalContext<?>>(); + viewMap.put(CREATIONAL_MAP_NAME, creationalContextMap); + } + + T instance = (T) componentInstanceMap.get(component); + if (instance != null) + { + return instance; + } + + if (creationalContext == null) + { + return null; + } + + synchronized (componentInstanceMap) + { + // just to make sure... + T i = (T) componentInstanceMap.get(component); + if (i != null) + { + return i; + } + + instance = component.create(creationalContext); + + if (instance != null) + { + componentInstanceMap.put(component, instance); + creationalContextMap.put(component, creationalContext); + } + } + + return instance; + } + + public Class<? extends Annotation> getScope() + { + return ViewScoped.class; + } + + /** + * The view context is active if a valid ViewRoot could be detected. + */ + public boolean isActive() + { + return getViewRoot() != null; + } + + private void assertActive() + { + if (!isActive()) + { + throw new ContextNotActiveException( + "WebBeans context with scope annotation @ViewScoped is not active with respect to the current thread"); + } + } + + public boolean isListenerForSource(final Object source) + { + if (source instanceof UIViewRoot) + { + return true; + } + + return false; + } + + /** + * We get PreDestroyViewMapEvent events from the JSF servlet and destroy our + * contextual instances. This should (theoretically!) also get fired if the + * webapp closes, so there should be no need to manually track all view + * scopes and destroy them at a shutdown. + * + * @see javax.faces.event.SystemEventListener#processEvent(javax.faces.event.SystemEvent) + */ + @SuppressWarnings("unchecked") + public void processEvent(final SystemEvent event) + { + if (event instanceof PreDestroyViewMapEvent) + { + // better use the viewmap we get from the event to prevent + // concurrent modification problems + Map<String, Object> viewMap = ((UIViewRoot) event.getSource()).getViewMap(); + + ConcurrentHashMap<Contextual<?>, Object> componentInstanceMap = (ConcurrentHashMap<Contextual<?>, Object>) viewMap + .get(COMPONENT_MAP_NAME); + + ConcurrentHashMap<Contextual<?>, CreationalContext<?>> creationalContextMap = (ConcurrentHashMap<Contextual<?>, CreationalContext<?>>) viewMap + .get(CREATIONAL_MAP_NAME); + + if (componentInstanceMap != null) + { + for (Entry<Contextual<?>, Object> componentEntry : componentInstanceMap.entrySet()) + { + // there is no nice way to explain the Java Compiler that we + // are handling the same type T, + // therefore we need completely drop the type information :( + Contextual contextual = componentEntry.getKey(); + Object instance = componentEntry.getValue(); + CreationalContext creational = creationalContextMap.get(contextual); + + contextual.destroy(instance, creational); + } + } + } + } + + protected UIViewRoot getViewRoot() + { + FacesContext context = FacesContext.getCurrentInstance(); + + if (context != null) + { + return context.getViewRoot(); + } + + return null; + } + + protected Map<String, Object> getViewMap() + { + UIViewRoot viewRoot = getViewRoot(); + + if (viewRoot != null) + { + return viewRoot.getViewMap(true); + } + + return null; + } +} \ No newline at end of file Copied: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/ViewScopedExtension.java (from rev 12181, modules/faces/trunk/src/main/java/org/jboss/seam/faces/scopes/ViewScopedExtension.java) =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/ViewScopedExtension.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/ViewScopedExtension.java 2010-03-11 23:09:39 UTC (rev 12182) @@ -0,0 +1,32 @@ +/* + * To change this template, choose Tools | Templates and open the template in + * the editor. + */ + +package org.jboss.seam.faces.context; + +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.AfterBeanDiscovery; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; +import javax.enterprise.inject.spi.Extension; +import javax.faces.bean.ViewScoped; + +/** + * An extension to provide @ViewScoped CDI / JSF2 integration. + * + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + */ +public class ViewScopedExtension implements Extension +{ + + public void addScope(@Observes final BeforeBeanDiscovery event) + { + event.addScope(ViewScoped.class, true, true); + } + + public void registerContext(@Observes final AfterBeanDiscovery event) + { + event.addContext(new ViewScopedContext()); + } + +} Modified: modules/faces/trunk/src/main/resources/META-INF/faces-config.xml =================================================================== --- modules/faces/trunk/src/main/resources/META-INF/faces-config.xml 2010-03-11 15:47:36 UTC (rev 12181) +++ modules/faces/trunk/src/main/resources/META-INF/faces-config.xml 2010-03-11 23:09:39 UTC (rev 12182) @@ -12,7 +12,13 @@ <name>webbeans</name> </after> </ordering> - + + + <lifecycle> + <phase-listener>org.jboss.seam.faces.context.FlashScopedContext</phase-listener> + </lifecycle> + +  </lifecycle> <component> @@ -43,6 +47,7 @@ <component-type>org.jboss.seam.faces.RestrictView</component-type> <component-class>org.jboss.seam.faces.component.UIRestrictView</component-class> </component> + --> <component> <component-type>org.jboss.seam.faces.ViewAction</component-type> Modified: modules/faces/trunk/src/main/resources/META-INF/seam-faces.taglib.xml =================================================================== --- modules/faces/trunk/src/main/resources/META-INF/seam-faces.taglib.xml 2010-03-11 15:47:36 UTC (rev 12181) +++ modules/faces/trunk/src/main/resources/META-INF/seam-faces.taglib.xml 2010-03-11 23:09:39 UTC (rev 12182) @@ -5,21 +5,6 @@ <namespace>http://jboss.com/products/seam/faces</namespace> <tag> - <tag-name>import</tag-name> - <component> - <component-type>org.jboss.seam.faces.Import</component-type> - </component> - </tag> - - <tag> - <tag-name>restrictView</tag-name> - <component> - <component-type>org.jboss.seam.faces.RestrictView</component-type> - <handler-class>org.jboss.seam.faces.facelets.DeferredValueExpressionHandler</handler-class> - </component> - </tag> - - <tag> <tag-name>viewAction</tag-name> <component> <component-type>org.jboss.seam.faces.ViewAction</component-type> Modified: modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension =================================================================== --- modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-03-11 15:47:36 UTC (rev 12181) +++ modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-03-11 23:09:39 UTC (rev 12182) @@ -1 +1,2 @@ -org.jboss.seam.faces.scopes.ViewScopedExtension \ No newline at end of file +org.jboss.seam.faces.context.ViewScopedExtension +org.jboss.seam.faces.context.FlashScopedExtension \ No newline at end of file

14 years, 9 months

1
0
0 / 0

Seam SVN: r12181 - in modules/faces/trunk: src/main/java/org/jboss/seam/faces and 5 other directories.

by seam-commits＠lists.jboss.org

Author: lincolnthree Date: 2010-03-11 10:47:36 -0500 (Thu, 11 Mar 2010) New Revision: 12181 Added: modules/faces/trunk/faces-config.NavData modules/faces/trunk/src/main/java/org/jboss/seam/faces/SeamFacesException.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/scopes/ modules/faces/trunk/src/main/java/org/jboss/seam/faces/scopes/ViewScopedContext.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/scopes/ViewScopedExtension.java modules/faces/trunk/src/main/resources/META-INF/services/ modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Removed: modules/faces/trunk/src/main/java/org/jboss/seam/faces/DataModels.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/Faces.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/FacesManagedCookie.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/RedirectException.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/Validation.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/component/UIImport.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/component/UIRestrictView.java Modified: modules/faces/trunk/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java Log: First working version with @ViewScoped Added: modules/faces/trunk/faces-config.NavData =================================================================== --- modules/faces/trunk/faces-config.NavData (rev 0) +++ modules/faces/trunk/faces-config.NavData 2010-03-11 15:47:36 UTC (rev 12181) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scene Scope="Project" version="2"> + <Scope Scope="Faces Configuration Only"/> + <Scope Scope="Project"/> + <Scope Scope="All Faces Configurations"/> +</Scene> Deleted: modules/faces/trunk/src/main/java/org/jboss/seam/faces/DataModels.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/DataModels.java 2010-03-11 15:47:25 UTC (rev 12180) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/DataModels.java 2010-03-11 15:47:36 UTC (rev 12181) @@ -1,60 +0,0 @@ -package org.jboss.seam.faces; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.faces.model.DataModel; - -import org.jboss.seam.faces.model.ArrayDataModel; -import org.jboss.seam.faces.model.ListDataModel; -import org.jboss.seam.faces.model.MapDataModel; -import org.jboss.seam.faces.model.SetDataModel; - -//import org.jboss.seam.framework.Query; -/** - * Wraps a collection as a JSF {@link DataModel}. May be overridden - * and extended if you don't like the built in collections - * which are supported: list, map, set, array. - * - * @author pmuir - */ -public class DataModels -{ - /** - * Wrap the value in a DataModel - * - * This implementation supports {@link List}, {@link Map}, {@link Set} and - * arrays - */ - public DataModel getDataModel(Object value) - { - if (value instanceof List) - { - return new ListDataModel((List) value); - } - else if (value instanceof Object[]) - { - return new ArrayDataModel((Object[]) value); - } - else if (value instanceof Map) - { - return new MapDataModel((Map) value); - } - else if (value instanceof Set) - { - return new SetDataModel((Set) value); - } - else - { - throw new IllegalArgumentException("unknown collection type: " + value.getClass()); - } - } - /** - * Wrap the the Seam Framework {@link Query} in a JSF DataModel - */ -// public DataModel getDataModel(Query query) -// { -// return getDataModel( query.getResultList() ); -// } -} Deleted: modules/faces/trunk/src/main/java/org/jboss/seam/faces/Faces.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/Faces.java 2010-03-11 15:47:25 UTC (rev 12180) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/Faces.java 2010-03-11 15:47:36 UTC (rev 12181) @@ -1,28 +0,0 @@ -package org.jboss.seam.faces; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.Qualifier; - -/** - * Binding type for JSF-specific beans. - * - * @author Dan Allen - */ -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -@Inherited -public @interface Faces -{ -} Deleted: modules/faces/trunk/src/main/java/org/jboss/seam/faces/FacesManagedCookie.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/FacesManagedCookie.java 2010-03-11 15:47:25 UTC (rev 12180) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/FacesManagedCookie.java 2010-03-11 15:47:36 UTC (rev 12181) @@ -1,60 +0,0 @@ -package org.jboss.seam.faces; - -import javax.faces.context.FacesContext; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; - - -/** - * Selector implementation for JSF environments - * - * @author Shane Bryzak - */ -public class FacesManagedCookie //extends ManagedCookie -{ - private static final long serialVersionUID = 7212365784926629129L; - -// @Override -// public void clearCookieValue() -// { -// Cookie cookie = getCookie(); -// if ( cookie!=null ) -// { -// HttpServletResponse response = (HttpServletResponse) FacesContext.getCurrentInstance().getExternalContext().getResponse(); -// cookie.setValue(null); -// cookie.setPath(getCookiePath()); -// cookie.setMaxAge(0); -// response.addCookie(cookie); -// } -// } -// -// @Override -// public Cookie getCookie() -// { -// FacesContext ctx = FacesContext.getCurrentInstance(); -// if (ctx != null) -// { -// return (Cookie) ctx.getExternalContext().getRequestCookieMap() -// .get( getCookieName() ); -// } -// else -// { -// return null; -// } -// } -// -// @Override -// public void setCookieValueIfEnabled(String value) -// { -// FacesContext ctx = FacesContext.getCurrentInstance(); -// -// if ( isCookieEnabled() && ctx != null) -// { -// HttpServletResponse response = (HttpServletResponse) ctx.getExternalContext().getResponse(); -// Cookie cookie = new Cookie( getCookieName(), value ); -// cookie.setMaxAge( getCookieMaxAge() ); -// cookie.setPath(getCookiePath()); -// response.addCookie(cookie); -// } -// } -} Deleted: modules/faces/trunk/src/main/java/org/jboss/seam/faces/RedirectException.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/RedirectException.java 2010-03-11 15:47:25 UTC (rev 12180) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/RedirectException.java 2010-03-11 15:47:36 UTC (rev 12181) @@ -1,17 +0,0 @@ -package org.jboss.seam.faces; - -import java.io.IOException; - -public class RedirectException extends RuntimeException -{ - - public RedirectException(IOException ioe) - { - super(ioe); - } - - public RedirectException(String message) - { - super(message); - } -} Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/SeamFacesException.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/SeamFacesException.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/SeamFacesException.java 2010-03-11 15:47:36 UTC (rev 12181) @@ -0,0 +1,22 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.jboss.seam.faces; + +/** + * + * @author lbaxter + */ +public class SeamFacesException extends RuntimeException{ + + public SeamFacesException(String string) + { + } + + public SeamFacesException() + { + } + +} Deleted: modules/faces/trunk/src/main/java/org/jboss/seam/faces/Validation.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/Validation.java 2010-03-11 15:47:25 UTC (rev 12180) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/Validation.java 2010-03-11 15:47:36 UTC (rev 12181) @@ -1,52 +0,0 @@ -package org.jboss.seam.faces; - -import javax.inject.Inject; -import javax.inject.Named; -import javax.enterprise.inject.spi.BeanManager; -import javax.faces.context.FacesContext; - -import org.jboss.seam.faces.events.ValidationFailedEvent; - -/** - * Allows the application to determine whether the JSF validation - * phase completed successfully, or if a validation failure - * occurred. This functionality is actually provided by JSF 2 now. - * What this class does is raise a {@link ValidationFailedEvent} - * so that observers can react accordingly. - * - * @author Gavin king - */ -@Named -public class Validation -{ - private boolean succeeded; - private boolean failed; - - @Inject BeanManager manager; - - public void afterProcessValidations(FacesContext facesContext) - { - failed = facesContext.isValidationFailed(); - if (failed) - { - manager.fireEvent(new ValidationFailedEvent()); - } - succeeded = !failed; - } - - public boolean isSucceeded() - { - return succeeded; - } - - public boolean isFailed() - { - return failed; - } - - public void fail() - { - failed = true; - succeeded = false; - } -} Deleted: modules/faces/trunk/src/main/java/org/jboss/seam/faces/component/UIImport.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/component/UIImport.java 2010-03-11 15:47:25 UTC (rev 12180) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/component/UIImport.java 2010-03-11 15:47:36 UTC (rev 12181) @@ -1,65 +0,0 @@ -package org.jboss.seam.faces.component; - -import javax.faces.component.UIComponentBase; - -/** - * @author Dan Allen - */ -public class UIImport extends UIComponentBase -{ - - // ------------------------------------------------------ Manifest Constants - - /** - * - * The standard component type for this component. - * - */ - public static final String COMPONENT_TYPE = "org.jboss.seam.faces.Import"; - - /** - * - * The standard component type for this component. - * - */ - public static final String COMPONENT_FAMILY = "org.jboss.seam.faces.Import"; - - /** - * Properties that are tracked by state saving. - */ - enum PropertyKeys { - namespaces - } - - // ------------------------------------------------------------ Constructors - - /** - * - * Create a new {@link UIImport} instance with default property values. - * - */ - public UIImport() - { - super(); - setRendererType(null); - } - - // -------------------------------------------------------------- Properties - - @Override - public String getFamily() - { - return COMPONENT_FAMILY; - } - - public Object getNamespaces() - { - return getStateHelper().eval(PropertyKeys.namespaces); - } - - public void setNamespaces(Object namespaces) - { - getStateHelper().put(PropertyKeys.namespaces, namespaces); - } - -} Deleted: modules/faces/trunk/src/main/java/org/jboss/seam/faces/component/UIRestrictView.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/component/UIRestrictView.java 2010-03-11 15:47:25 UTC (rev 12180) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/component/UIRestrictView.java 2010-03-11 15:47:36 UTC (rev 12181) @@ -1,69 +0,0 @@ -package org.jboss.seam.faces.component; - -import javax.el.ValueExpression; -import javax.faces.component.UIComponentBase; - -/** - * - * TODO add login-required attribute. If require fails, we only force them to login - * if that helps them get to the page. - * - * @author Dan Allen - */ -public class UIRestrictView extends UIComponentBase -{ - - // ------------------------------------------------------ Manifest Constants - - /** - * - * The standard component type for this component. - * - */ - public static final String COMPONENT_TYPE = "org.jboss.seam.faces.RestrictView"; - - /** - * - * The standard component type for this component. - * - */ - public static final String COMPONENT_FAMILY = "org.jboss.seam.faces.RestrictView"; - - /** - * Properties that are tracked by state saving. - */ - enum PropertyKeys { - require - } - - // ------------------------------------------------------------ Constructors - - /** - * - * Create a new {@link UIRestrictView} instance with default property values. - * - */ - public UIRestrictView() - { - super(); - setRendererType(null); - } - - // -------------------------------------------------------------- Properties - - @Override - public String getFamily() - { - return COMPONENT_FAMILY; - } - - public ValueExpression getRequire() - { - return (ValueExpression) getStateHelper().get(PropertyKeys.require); - } - - public void setRequire(ValueExpression require) - { - getStateHelper().put(PropertyKeys.require, require); - } -} Modified: modules/faces/trunk/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java 2010-03-11 15:47:25 UTC (rev 12180) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java 2010-03-11 15:47:36 UTC (rev 12181) @@ -1,6 +1,7 @@ package org.jboss.seam.faces.international; import java.util.Locale; +import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.faces.context.FacesContext; @@ -23,7 +24,7 @@ return facesContext != null && facesContext.getCurrentPhaseId() != null; } - public Locale getLocale() + public @Produces Locale getLocale() { if (facesContext.getViewRoot() != null) { Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/scopes/ViewScopedContext.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/scopes/ViewScopedContext.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/scopes/ViewScopedContext.java 2010-03-11 15:47:36 UTC (rev 12181) @@ -0,0 +1,227 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ +package org.jboss.seam.faces.scopes; + +import java.lang.annotation.Annotation; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; + +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; + +import javax.faces.bean.ViewScoped; +import javax.faces.component.UIViewRoot; +import javax.faces.context.FacesContext; +import javax.faces.event.PreDestroyViewMapEvent; +import javax.faces.event.SystemEvent; +import javax.faces.event.SystemEventListener; + +/** +* This class provides the contexts lifecycle for the +* new JSF-2 @ViewScoped Context +* +* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a> +*/ +public class ViewScopedContext implements Context, SystemEventListener +{ + + private final static String COMPONENT_MAP_NAME ="codi.componentInstanceMap"; + private final static String CREATIONAL_MAP_NAME ="codi.creationalInstanceMap"; + + private boolean isJsfSubscribed = false; + + + public <T> T get(Contextual<T> component) + { + checkActive(); + + if(!isJsfSubscribed) + { + FacesContext.getCurrentInstance().getApplication().subscribeToEvent(PreDestroyViewMapEvent.class, this); + + isJsfSubscribed = true; + } + + Map<String, Object> viewMap = getViewMap(); + + @SuppressWarnings("unchecked") + ConcurrentHashMap<Contextual<?>, Object> componentInstanceMap = (ConcurrentHashMap<Contextual<?>, Object>) viewMap.get(COMPONENT_MAP_NAME); + + if(componentInstanceMap == null) { + return null; + } + + @SuppressWarnings("unchecked") + T instance = (T) componentInstanceMap.get(component); + + return instance; + } + + public <T> T get(Contextual<T> component, CreationalContext<T> creationalContext) + { + checkActive(); + + Map<String, Object> viewMap = getViewMap(); + + @SuppressWarnings("unchecked") + ConcurrentHashMap<Contextual<?>, Object> componentInstanceMap = (ConcurrentHashMap<Contextual<?>, Object>) viewMap.get(COMPONENT_MAP_NAME); + + if(componentInstanceMap == null) + { + // TODO we now need to start being carefull with reentrancy... + componentInstanceMap = new ConcurrentHashMap<Contextual<?>, Object>(); + viewMap.put(COMPONENT_MAP_NAME, componentInstanceMap); + } + + @SuppressWarnings("unchecked") + ConcurrentHashMap<Contextual<?>, CreationalContext<?>> creationalContextMap = (ConcurrentHashMap<Contextual<?>, CreationalContext<?>>) viewMap.get(CREATIONAL_MAP_NAME); + if(creationalContextMap == null) + { + // TODO we now need to start being carefull with reentrancy... + creationalContextMap = new ConcurrentHashMap<Contextual<?>, CreationalContext<?>>(); + viewMap.put(CREATIONAL_MAP_NAME, creationalContextMap); + } + + @SuppressWarnings("unchecked") + T instance = (T) componentInstanceMap.get(component); + if (instance != null) + { + return instance; + } + + if(creationalContext == null) + { + return null; + } + + synchronized (componentInstanceMap) + { + // just to make sure... + @SuppressWarnings("unchecked") + T i = (T)componentInstanceMap.get(component); + if (i != null) + { + return i; + } + + instance = component.create(creationalContext); + + if (instance != null) + { + componentInstanceMap.put(component, instance); + creationalContextMap.put(component, creationalContext); + } + } + + return instance; + } + + public Class<? extends Annotation> getScope() + { + return ViewScoped.class; + } + + /** +* The view context is active if a valid ViewRoot could be detected. +*/ + public boolean isActive() + { + return getViewRoot() != null; + } + + private void checkActive() + { + if (!isActive()) + { + throw new ContextNotActiveException("WebBeans context with scope annotation @ViewScoped is not active with respect to the current thread"); + } + } + + public boolean isListenerForSource(Object source) { + if (source instanceof UIViewRoot) + { + return true; + } + + return false; + } + + /** +* We get PreDestroyViewMapEvent events from the JSF servlet and destroy our contextual +* instances. This should (theoretically!) also get fired if the webapp closes, so there +* should be no need to manually track all view scopes and destroy them at a shutdown. +* +* @see javax.faces.event.SystemEventListener#processEvent(javax.faces.event.SystemEvent) +*/ + @SuppressWarnings("unchecked") + public void processEvent(SystemEvent event) { + if (event instanceof PreDestroyViewMapEvent) + { + // better use the viewmap we get from the event to prevent concurrent modification problems + Map<String, Object> viewMap = ((UIViewRoot) event.getSource()).getViewMap(); + + ConcurrentHashMap<Contextual<?>, Object> componentInstanceMap + = (ConcurrentHashMap<Contextual<?>, Object>) viewMap.get(COMPONENT_MAP_NAME); + + ConcurrentHashMap<Contextual<?>, CreationalContext<?>> creationalContextMap + = (ConcurrentHashMap<Contextual<?>, CreationalContext<?>>) viewMap.get(CREATIONAL_MAP_NAME); + + if(componentInstanceMap != null) { + for ( Entry<Contextual<?>, Object> componentEntry : componentInstanceMap.entrySet()) + { + // there is no nice way to explain the Java Compiler that we are handling the same type T, + // therefore we need completely drop the type information :( + Contextual contextual = componentEntry.getKey(); + Object instance = componentEntry.getValue(); + CreationalContext creational = creationalContextMap.get(contextual); + + contextual.destroy(instance, creational); + } + } + } + } + + + protected UIViewRoot getViewRoot() + { + FacesContext context = FacesContext.getCurrentInstance(); + + if(context != null) + { + return context.getViewRoot(); + } + + return null; + } + + protected Map<String, Object> getViewMap() + { + UIViewRoot viewRoot = getViewRoot(); + + if (viewRoot != null) + { + return viewRoot.getViewMap(true); + } + + return null; + } +} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/scopes/ViewScopedExtension.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/scopes/ViewScopedExtension.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/scopes/ViewScopedExtension.java 2010-03-11 15:47:36 UTC (rev 12181) @@ -0,0 +1,30 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.jboss.seam.faces.scopes; + +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.AfterBeanDiscovery; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; +import javax.enterprise.inject.spi.Extension; +import javax.faces.bean.ViewScoped; + +/** + * + * @author lbaxter + */ +public class ViewScopedExtension implements Extension { + + public void addScope(@Observes BeforeBeanDiscovery event) + { + event.addScope(ViewScoped.class, true, true); + } + + public void registerContext(@Observes AfterBeanDiscovery event) + { + event.addContext(new ViewScopedContext()); + } + +} Added: modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension =================================================================== --- modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (rev 0) +++ modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-03-11 15:47:36 UTC (rev 12181) @@ -0,0 +1 @@ +org.jboss.seam.faces.scopes.ViewScopedExtension \ No newline at end of file

14 years, 9 months

1
0
0 / 0

Seam SVN: r12180 - modules/faces/trunk/src/main/java/org/jboss/seam/faces.

by seam-commits＠lists.jboss.org

Author: lincolnthree Date: 2010-03-11 10:47:25 -0500 (Thu, 11 Mar 2010) New Revision: 12180 Removed: modules/faces/trunk/src/main/java/org/jboss/seam/faces/annotations/ modules/faces/trunk/src/main/java/org/jboss/seam/faces/application/ modules/faces/trunk/src/main/java/org/jboss/seam/faces/databinding/ modules/faces/trunk/src/main/java/org/jboss/seam/faces/el/ modules/faces/trunk/src/main/java/org/jboss/seam/faces/events/ modules/faces/trunk/src/main/java/org/jboss/seam/faces/facelets/ modules/faces/trunk/src/main/java/org/jboss/seam/faces/lifecycle/ modules/faces/trunk/src/main/java/org/jboss/seam/faces/model/ Log: First working version with @ViewScoped

14 years, 9 months

1
0
0 / 0

Seam SVN: r12179 - in branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen: utils and 1 other directory.

by seam-commits＠lists.jboss.org

Author: jharting Date: 2010-03-11 05:56:33 -0500 (Thu, 11 Mar 2010) New Revision: 12179 Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/HotDeploymentNewFormTest.java branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewActionTest.java branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewFormTest.java branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java Log: JBPAPP-3861 Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/HotDeploymentNewFormTest.java =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/HotDeploymentNewFormTest.java 2010-03-11 10:04:56 UTC (rev 12178) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/HotDeploymentNewFormTest.java 2010-03-11 10:56:33 UTC (rev 12179) @@ -37,7 +37,14 @@ @Override protected void prepareData() { - newComponentProperties = new String[] { "hi", "HiLocal", "Hi", "hi", "hiPage" }; + if (WAR) + { + newComponentProperties = new String[] { "hi", "Hi", "hi", "hiPage" }; + } + else + { + newComponentProperties = new String[] { "hi", "HiLocal", "Hi", "hi", "hiPage" }; + } } @Override Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewActionTest.java =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewActionTest.java 2010-03-11 10:04:56 UTC (rev 12178) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewActionTest.java 2010-03-11 10:56:33 UTC (rev 12179) @@ -49,7 +49,7 @@ public void testNewComponent() { String form = "id=" + newComponentProperties[0] + "Form"; - String button = form + ":" + newComponentProperties[3]; + String button = form + ":" + newComponentProperties[newComponentProperties.length - 2]; browser.open(getComponentPath()); @@ -60,7 +60,7 @@ browser.clickAndWait(button); assertTrue(browser.isElementPresent(MESSAGES)); - assertTrue(browser.getText(MESSAGES).contains(newComponentProperties[3])); + assertTrue(browser.getText(MESSAGES).contains(newComponentProperties[newComponentProperties.length - 2])); } public void generateNewComponent() @@ -69,11 +69,18 @@ } protected void prepareData() { - newComponentProperties = new String[]{ "ping", "PingLocal", "Ping", "ping", "pingPage" }; + if (WAR) + { + newComponentProperties = new String[]{ "ping", "Ping", "ping", "pingPage" }; + } + else + { + newComponentProperties = new String[]{ "ping", "PingLocal", "Ping", "ping", "pingPage" }; + } } public String getComponentPath() { - return "/" + APP_NAME + "/" + newComponentProperties[4] + ".seam"; + return "/" + APP_NAME + "/" + newComponentProperties[newComponentProperties.length - 1] + ".seam"; } protected void deployNewComponent() { Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewFormTest.java =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewFormTest.java 2010-03-11 10:04:56 UTC (rev 12178) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewFormTest.java 2010-03-11 10:56:33 UTC (rev 12179) @@ -40,7 +40,7 @@ { String form = "id=" + newComponentProperties[0] + "Form"; - String button = form + ":" + newComponentProperties[3]; + String button = form + ":" + newComponentProperties[newComponentProperties.length - 2]; String field = form + ":" + "valueField:value"; String value = "world"; @@ -55,12 +55,19 @@ browser.clickAndWait(button); assertTrue(browser.isElementPresent(MESSAGES), "Message not found."); - assertEquals(browser.getText(MESSAGES), newComponentProperties[3] + " " + value, "Unexpected form output."); + assertEquals(browser.getText(MESSAGES), newComponentProperties[newComponentProperties.length - 2] + " " + value, "Unexpected form output."); } @Override protected void prepareData() { - newComponentProperties = new String[]{ "hello", "HelloLocal", "Hello", "hello", "helloPage" }; + if (WAR) + { + newComponentProperties = new String[]{ "hello", "Hello", "hello", "helloPage" }; + } + else + { + newComponentProperties = new String[]{ "hello", "HelloLocal", "Hello", "hello", "helloPage" }; + } } @Override Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java 2010-03-11 10:04:56 UTC (rev 12178) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java 2010-03-11 10:56:33 UTC (rev 12179) @@ -198,6 +198,7 @@ class InputStreamEater extends Thread { private static final String INPUT_CHALLENGE = "[input]"; + private static final String FALSE_INPUT_CHALLENGE = "skipping input"; private BufferedReader stream; private OutputStreamFeeder feederToNotify; private PrintStream out; @@ -219,7 +220,7 @@ while ((line = stream.readLine()) != null) { out.println(line); - if (feederToNotify != null && line.contains(INPUT_CHALLENGE)) + if (feederToNotify != null && line.contains(INPUT_CHALLENGE) && !line.contains(FALSE_INPUT_CHALLENGE)) { // notify OutputStreamFeeder to send an input feederToNotify.feed();

14 years, 9 months

1
0
0 / 0

Seam SVN: r12178 - tags/JBoss_Seam_2_2_1_CR1.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2010-03-11 05:04:56 -0500 (Thu, 11 Mar 2010) New Revision: 12178 Modified: tags/JBoss_Seam_2_2_1_CR1/changelog.txt Log: updated release notes Modified: tags/JBoss_Seam_2_2_1_CR1/changelog.txt =================================================================== --- tags/JBoss_Seam_2_2_1_CR1/changelog.txt 2010-03-11 00:43:07 UTC (rev 12177) +++ tags/JBoss_Seam_2_2_1_CR1/changelog.txt 2010-03-11 10:04:56 UTC (rev 12178) @@ -1,7 +1,6 @@ JBoss Seam Changelog ==================== - Release Notes - Seam - Version 2.2.1.CR1 ** Bug @@ -16,7 +15,6 @@ * [JBSEAM-3778] - MDB - IllegalStateException: No event context active * [JBSEAM-3844] - Hot deployment : You are trying to use a connection factory that has been shut down * [JBSEAM-3906] - Attachements are not shown in outlook - * [JBSEAM-3996] - Seam should ignore duplicate classes on classpath * [JBSEAM-4029] - NPE in JBossClusterMonitor.locateJBoss when other non-JBoss JMX servers are present * [JBSEAM-4067] - ELSupport.coerceToType modifies BigDecimal Values * [JBSEAM-4087] - Regexp Query.SUBJECT_PATTERN may be improved for JBSEAM-3032 @@ -55,7 +53,13 @@ * [JBSEAM-4537] - s:validateEquality tag doesn't work with JBossAS 6.0.0.M1 * [JBSEAM-4539] - s:selectItems part of UI example doesn't work with JBossAS 6.0.0.M1 * [JBSEAM-4549] - NPE in handleInbound()when servlet contexts are initialized + * [JBSEAM-4561] - testMultipleWindowSearch() stuck in Firefox + * [JBSEAM-4563] - Seambay example unable to commit transaction + * [JBSEAM-4566] - seam-mail does not work on JBoss AS 6 + * [JBSEAM-4575] - Seam Itext example doesn't work correctly + * [JBSEAM-4580] - Booking example in cluster throws org.jboss.serial.exception.SerializationException + ** Feature Request * [JBSEAM-1572] - Make s:decorate behave more similarly to ui:decorate (h:panelGrid-friendly) * [JBSEAM-2057] - Syntax highlighting @@ -82,6 +86,7 @@ * [JBSEAM-4036] - Wicket Example - Missing jars in tomcat.deploy ant task * [JBSEAM-4455] - Seamspace -- viewIds in s:link and s:button + ** Task * [JBSEAM-3035] - upgrade to Spring JAR to version 2.5 * [JBSEAM-3714] - Update release-process.txt to include the functional test execution

14 years, 9 months

1
0
0 / 0

Seam SVN: r12177 - in modules/remoting/trunk: core and 3 other directories.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2010-03-10 19:43:07 -0500 (Wed, 10 Mar 2010) New Revision: 12177 Modified: modules/remoting/trunk/core/pom.xml modules/remoting/trunk/docs/pom.xml modules/remoting/trunk/examples/helloworld/pom.xml modules/remoting/trunk/examples/model/pom.xml modules/remoting/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: modules/remoting/trunk/core/pom.xml =================================================================== --- modules/remoting/trunk/core/pom.xml 2010-03-11 00:42:46 UTC (rev 12176) +++ modules/remoting/trunk/core/pom.xml 2010-03-11 00:43:07 UTC (rev 12177) @@ -4,12 +4,12 @@ <parent> <artifactId>seam-remoting-parent</artifactId> <groupId>org.jboss.seam.remoting</groupId> - <version>3.0.0-Beta1</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-core</artifactId> - <version>3.0.0-Beta1</version> + <version>3.0.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Seam Remoting Core</name> Modified: modules/remoting/trunk/docs/pom.xml =================================================================== --- modules/remoting/trunk/docs/pom.xml 2010-03-11 00:42:46 UTC (rev 12176) +++ modules/remoting/trunk/docs/pom.xml 2010-03-11 00:43:07 UTC (rev 12177) @@ -9,7 +9,7 @@ <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-reference-guide</artifactId> - <version>3.0.0-Beta1</version> + <version>3.0.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>Seam Remoting Reference Guide</name> @@ -120,9 +120,9 @@ <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-B...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-Beta...</developerConnection> - <url>http://fisheye.jboss.org/browse/seam/modules/remoting/docs/tags/3.0.0-Bet...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk/docs</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk/docs</developerConnection> + <url>http://fisheye.jboss.org/browse/seam/modules/remoting/docs</url> </scm> </project> Modified: modules/remoting/trunk/examples/helloworld/pom.xml =================================================================== --- modules/remoting/trunk/examples/helloworld/pom.xml 2010-03-11 00:42:46 UTC (rev 12176) +++ modules/remoting/trunk/examples/helloworld/pom.xml 2010-03-11 00:43:07 UTC (rev 12177) @@ -5,13 +5,13 @@ <parent> <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-parent</artifactId> - <version>3.0.0-Beta1</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-helloworld-example</artifactId> <packaging>war</packaging> - <version>3.0.0-Beta1</version> + <version>3.0.0-SNAPSHOT</version> <name>Seam Remoting Helloworld Example</name> <dependencies> Modified: modules/remoting/trunk/examples/model/pom.xml =================================================================== --- modules/remoting/trunk/examples/model/pom.xml 2010-03-11 00:42:46 UTC (rev 12176) +++ modules/remoting/trunk/examples/model/pom.xml 2010-03-11 00:43:07 UTC (rev 12177) @@ -5,13 +5,13 @@ <parent> <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-parent</artifactId> - <version>3.0.0-Beta1</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-model-example</artifactId> <packaging>war</packaging> - <version>3.0.0-Beta1</version> + <version>3.0.0-SNAPSHOT</version> <name>Seam Remoting Model Example</name> <dependencies> @@ -32,7 +32,7 @@ <dependency> <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-core</artifactId> - <version>3.0.0-Beta1</version> + <version>3.0.0-SNAPSHOT</version> </dependency> <dependency> Modified: modules/remoting/trunk/pom.xml =================================================================== --- modules/remoting/trunk/pom.xml 2010-03-11 00:42:46 UTC (rev 12176) +++ modules/remoting/trunk/pom.xml 2010-03-11 00:43:07 UTC (rev 12177) @@ -1,4 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -10,7 +10,7 @@ <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-parent</artifactId> <packaging>pom</packaging> - <version>3.0.0-Beta1</version> + <version>3.0.0-SNAPSHOT</version> <name>Seam Remoting Parent</name> <modules> @@ -81,9 +81,9 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-B...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-Beta1</developerConnection> - <url>http://fisheye.jboss.org/browse/Seam/modules/remoting/tags/3.0.0-Beta1</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/Seam/modules/remoting/trunk</url> </scm> </project>

14 years, 9 months

1
0
0 / 0

Seam SVN: r12176 - modules/remoting/tags.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2010-03-10 19:42:46 -0500 (Wed, 10 Mar 2010) New Revision: 12176 Added: modules/remoting/tags/3.0.0-Beta1/ Log: [maven-scm] copy for tag 3.0.0-Beta1 Copied: modules/remoting/tags/3.0.0-Beta1 (from rev 12175, modules/remoting/trunk)

14 years, 9 months

1
0
0 / 0

Seam SVN: r12175 - in modules/remoting/trunk: core and 3 other directories.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2010-03-10 19:41:48 -0500 (Wed, 10 Mar 2010) New Revision: 12175 Modified: modules/remoting/trunk/core/pom.xml modules/remoting/trunk/docs/pom.xml modules/remoting/trunk/examples/helloworld/pom.xml modules/remoting/trunk/examples/model/pom.xml modules/remoting/trunk/pom.xml Log: [maven-release-plugin] prepare release 3.0.0-Beta1 Modified: modules/remoting/trunk/core/pom.xml =================================================================== --- modules/remoting/trunk/core/pom.xml 2010-03-11 00:38:11 UTC (rev 12174) +++ modules/remoting/trunk/core/pom.xml 2010-03-11 00:41:48 UTC (rev 12175) @@ -1,16 +1,15 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>seam-remoting-parent</artifactId> <groupId>org.jboss.seam.remoting</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0-Beta1</version> </parent> <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-core</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0-Beta1</version> <packaging>jar</packaging> <name>Seam Remoting Core</name> Modified: modules/remoting/trunk/docs/pom.xml =================================================================== --- modules/remoting/trunk/docs/pom.xml 2010-03-11 00:38:11 UTC (rev 12174) +++ modules/remoting/trunk/docs/pom.xml 2010-03-11 00:41:48 UTC (rev 12175) @@ -1,5 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -10,7 +9,7 @@ <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-reference-guide</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0-Beta1</version> <packaging>jdocbook</packaging> <name>Seam Remoting Reference Guide</name> @@ -121,9 +120,9 @@ <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk/docs</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk/docs</developerConnection> - <url>http://fisheye.jboss.org/browse/seam/modules/remoting/docs</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-B...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-Beta...</developerConnection> + <url>http://fisheye.jboss.org/browse/seam/modules/remoting/docs/tags/3.0.0-Bet...</url> </scm> </project> Modified: modules/remoting/trunk/examples/helloworld/pom.xml =================================================================== --- modules/remoting/trunk/examples/helloworld/pom.xml 2010-03-11 00:38:11 UTC (rev 12174) +++ modules/remoting/trunk/examples/helloworld/pom.xml 2010-03-11 00:41:48 UTC (rev 12175) @@ -5,13 +5,13 @@ <parent> <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0-Beta1</version> </parent> <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-helloworld-example</artifactId> <packaging>war</packaging> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0-Beta1</version> <name>Seam Remoting Helloworld Example</name> <dependencies> Modified: modules/remoting/trunk/examples/model/pom.xml =================================================================== --- modules/remoting/trunk/examples/model/pom.xml 2010-03-11 00:38:11 UTC (rev 12174) +++ modules/remoting/trunk/examples/model/pom.xml 2010-03-11 00:41:48 UTC (rev 12175) @@ -5,13 +5,13 @@ <parent> <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0-Beta1</version> </parent> <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-model-example</artifactId> <packaging>war</packaging> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0-Beta1</version> <name>Seam Remoting Model Example</name> <dependencies> @@ -32,7 +32,7 @@ <dependency> <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-core</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0-Beta1</version> </dependency> <dependency> Modified: modules/remoting/trunk/pom.xml =================================================================== --- modules/remoting/trunk/pom.xml 2010-03-11 00:38:11 UTC (rev 12174) +++ modules/remoting/trunk/pom.xml 2010-03-11 00:41:48 UTC (rev 12175) @@ -1,7 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -13,7 +10,7 @@ <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-parent</artifactId> <packaging>pom</packaging> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0-Beta1</version> <name>Seam Remoting Parent</name> <modules> @@ -84,9 +81,9 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/Seam/modules/remoting/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-B...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-Beta1</developerConnection> + <url>http://fisheye.jboss.org/browse/Seam/modules/remoting/tags/3.0.0-Beta1</url> </scm> </project>

14 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits March 2010