[webbeans-commits] Webbeans SVN: r2544 - in ri/tags: webbeans-core-1.0.0.PREVIEW1 and 1 other directories.

Author: pete.muir(a)jboss.org Date: 2009-04-19 19:22:09 -0400 (Sun, 19 Apr 2009) New Revision: 2544 Added: ri/tags/webbeans-core-1.0.0.PREVIEW1/ ri/tags/webbeans-core-1.0.0.PREVIEW1/pom.xml ri/tags/webbeans-core-1.0.0.PREVIEW1/src/main/java/org/jboss/webbeans/event/EventManager.java Removed: ri/tags/webbeans-core-1.0.0.PREVIEW1/pom.xml ri/tags/webbeans-core-1.0.0.PREVIEW1/src/main/java/org/jboss/webbeans/event/EventManager.java Log: [maven-release-plugin] copy for tag webbeans-core-1.0.0.PREVIEW1 Copied: ri/tags/webbeans-core-1.0.0.PREVIEW1 (from rev 2513, ri/trunk/impl) Deleted: ri/tags/webbeans-core-1.0.0.PREVIEW1/pom.xml =================================================================== --- ri/trunk/impl/pom.xml 2009-04-19 09:55:50 UTC (rev 2513) +++ ri/tags/webbeans-core-1.0.0.PREVIEW1/pom.xml 2009-04-19 23:22:09 UTC (rev 2544) @@ -1,127 +0,0 @@ -<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"> - <parent> - <artifactId>webbeans-parent</artifactId> - <groupId>org.jboss.webbeans</groupId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-core</artifactId> - <version>1.0.0-SNAPSHOT</version> - <name>Web Beans Core</name> - <dependencies> - - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>jsr299-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-spi</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-logging</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-api</artifactId> - <optional>true</optional> - <exclusions> - <exclusion> - <artifactId>jboss-jaxrpc</artifactId> - <groupId>jbossws</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-transaction-api</artifactId> - <groupId>org.jboss.javaee</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-jaxrpc</artifactId> - <groupId>jboss.jbossws</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </dependency> - - <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <optional>true</optional> - </dependency> - - </dependencies> - - <build> - <defaultGoal>install</defaultGoal> - </build> - - <profiles> - <profile> - <id>javax.xml.ws</id> - <activation> - <jdk>1.5</jdk> - </activation> - <dependencies> - <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> - -</project> Copied: ri/tags/webbeans-core-1.0.0.PREVIEW1/pom.xml (from rev 2543, ri/trunk/impl/pom.xml) =================================================================== --- ri/tags/webbeans-core-1.0.0.PREVIEW1/pom.xml (rev 0) +++ ri/tags/webbeans-core-1.0.0.PREVIEW1/pom.xml 2009-04-19 23:22:09 UTC (rev 2544) @@ -0,0 +1,133 @@ +<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"> + <parent> + <artifactId>webbeans-parent</artifactId> + <groupId>org.jboss.webbeans</groupId> + <version>1.0.0.PREVIEW1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-core</artifactId> + <version>1.0.0.PREVIEW1</version> + <name>Web Beans Core</name> + <dependencies> + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>jsr299-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-spi</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-logging</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + <optional>true</optional> + <exclusions> + <exclusion> + <artifactId>jboss-jaxrpc</artifactId> + <groupId>jbossws</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.javaee</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-jaxrpc</artifactId> + <groupId>jboss.jbossws</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </dependency> + + <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <optional>true</optional> + </dependency> + + </dependencies> + + <build> + <defaultGoal>install</defaultGoal> + </build> + + <profiles> + <profile> + <id>javax.xml.ws</id> + <activation> + <jdk>1.5</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/web... + <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/ta... + <url>http://fisheye.jboss.org/browse/WebBeans/ri/tags/webbeans-core-1.0... + </scm> +</project> Deleted: ri/tags/webbeans-core-1.0.0.PREVIEW1/src/main/java/org/jboss/webbeans/event/EventManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-04-19 09:55:50 UTC (rev 2513) +++ ri/tags/webbeans-core-1.0.0.PREVIEW1/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-04-19 23:22:09 UTC (rev 2544) @@ -1,146 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed 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.webbeans.event; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; - -import javax.event.Observer; - -import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.context.DependentContext; -import org.jboss.webbeans.log.Log; -import org.jboss.webbeans.log.Logging; -import org.jboss.webbeans.util.Reflections.HierarchyDiscovery; - -/** - * The event bus is where observers are registered and events are fired. - * - * @author David Allen - * - */ -public class EventManager -{ - private static Log log = Logging.getLog(EventManager.class); - - private final ManagerImpl manager; - - - /** - * Initializes a new instance of the EventManager. - */ - public EventManager(ManagerImpl manager) - { - this.manager = manager; - } - - /** - * Adds an observer to the event bus so that it receives event notifications. - * - * @param observer The observer that should receive events - * @param eventType The event type the observer is interested in - * @param bindings The bindings the observer wants to filter on - */ - public <T> void addObserver(Observer<T> observer, Type eventType, Annotation... bindings) - { - EventObserver<T> eventObserver = new EventObserver<T>(observer, eventType, manager, bindings); - manager.getRegisteredObservers().put(eventType, eventObserver); - log.debug("Added observer " + observer + " observing event type " + eventType); - } - - /** - * Resolves the list of observers to be notified for a given event and - * optional event bindings. - * - * @param event The event object - * @param bindings Optional event bindings - * @return A set of Observers. An empty set is returned if there are no - * matches. - */ - public <T> Set<Observer<T>> getObservers(T event, Annotation... bindings) - { - Set<Observer<T>> interestedObservers = new HashSet<Observer<T>>(); - Set<Type> types = new HierarchyDiscovery(event.getClass()).getFlattenedTypes(); - for (Type type : types) - { - for (EventObserver<?> observer : manager.getRegisteredObservers().get(type)) - { - log.debug("Checking observer " + observer + " to see if it is interested in event [" + event + "]"); - if (observer.isObserverInterested(bindings)) - { - @SuppressWarnings("unchecked") - Observer<T> o = (Observer<T>) observer.getObserver(); - interestedObservers.add(o); - log.debug("Added observer " + observer + " for event [" + event + "]"); - } - } - } - return interestedObservers; - } - - /** - * Iterates over the interested observers. If an observer is transactional - * and there is a transaction currently in progress, the event is deferred. - * In other cases, the observer is notified immediately. - * - * @param observers The interested observers - * @param event The event type - */ - public <T> void notifyObservers(Set<Observer<T>> observers, T event) - { - try - { - DependentContext.instance().setActive(true); - for (Observer<T> observer : observers) - { - observer.notify(event); - } - } - finally - { - DependentContext.instance().setActive(false); - } - } - - /** - * Removes an observer from the event bus. - * - * @param observer The observer to remove - * @param eventType The event type of the observer to remove - * @param bindings The bindings of the observer to remove - */ - public <T> void removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings) - { - Collection<EventObserver<?>> observers = manager.getRegisteredObservers().get(eventType); - EventObserver<T> eventObserver = new EventObserver<T>(observer, eventType, manager, bindings); - observers.remove(eventObserver); - } - - @Override - public String toString() - { - StringBuilder buffer = new StringBuilder(); - buffer.append("Event manager\n"); - buffer.append(manager.getRegisteredObservers().toString()); - return buffer.toString(); - } - -} Copied: ri/tags/webbeans-core-1.0.0.PREVIEW1/src/main/java/org/jboss/webbeans/event/EventManager.java (from rev 2521, ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java) =================================================================== --- ri/tags/webbeans-core-1.0.0.PREVIEW1/src/main/java/org/jboss/webbeans/event/EventManager.java (rev 0) +++ ri/tags/webbeans-core-1.0.0.PREVIEW1/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-04-19 23:22:09 UTC (rev 2544) @@ -0,0 +1,147 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed 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.webbeans.event; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +import javax.event.Observer; + +import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.context.DependentContext; +import org.jboss.webbeans.log.Log; +import org.jboss.webbeans.log.Logging; +import org.jboss.webbeans.util.Reflections.HierarchyDiscovery; + +/** + * The event bus is where observers are registered and events are fired. + * + * @author David Allen + * + */ +public class EventManager +{ + private static Log log = Logging.getLog(EventManager.class); + + private final ManagerImpl manager; + + + /** + * Initializes a new instance of the EventManager. + */ + public EventManager(ManagerImpl manager) + { + this.manager = manager; + } + + /** + * Adds an observer to the event bus so that it receives event notifications. + * + * @param observer The observer that should receive events + * @param eventType The event type the observer is interested in + * @param bindings The bindings the observer wants to filter on + */ + public <T> void addObserver(Observer<T> observer, Type eventType, Annotation... bindings) + { + EventObserver<T> eventObserver = new EventObserver<T>(observer, eventType, manager, bindings); + manager.getRegisteredObservers().put(eventType, eventObserver); + log.debug("Added observer " + observer + " observing event type " + eventType); + } + + /** + * Resolves the list of observers to be notified for a given event and + * optional event bindings. + * + * @param event The event object + * @param bindings Optional event bindings + * @return A set of Observers. An empty set is returned if there are no + * matches. + */ + public <T> Set<Observer<T>> getObservers(T event, Annotation... bindings) + { + Set<Observer<T>> interestedObservers = new HashSet<Observer<T>>(); + Set<Type> types = new HierarchyDiscovery(event.getClass()).getFlattenedTypes(); + for (Type type : types) + { + for (EventObserver<?> observer : manager.getRegisteredObservers().get(type)) + { + log.debug("Checking observer " + observer + " to see if it is interested in event [" + event + "]"); + if (observer.isObserverInterested(bindings)) + { + @SuppressWarnings("unchecked") + Observer<T> o = (Observer<T>) observer.getObserver(); + interestedObservers.add(o); + log.debug("Added observer " + observer + " for event [" + event + "]"); + } + } + } + return interestedObservers; + } + + /** + * Iterates over the interested observers. If an observer is transactional + * and there is a transaction currently in progress, the event is deferred. + * In other cases, the observer is notified immediately. + * + * @param observers The interested observers + * @param event The event type + */ + public <T> void notifyObservers(Set<Observer<T>> observers, T event) + { + try + { + DependentContext.instance().setActive(true); + for (Observer<T> observer : observers) + { + observer.notify(event); + } + } + finally + { + // TODO This breaks SE shutdown, also we need to tidy up how dependent context is activated.... + //DependentContext.instance().setActive(false); + } + } + + /** + * Removes an observer from the event bus. + * + * @param observer The observer to remove + * @param eventType The event type of the observer to remove + * @param bindings The bindings of the observer to remove + */ + public <T> void removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings) + { + Collection<EventObserver<?>> observers = manager.getRegisteredObservers().get(eventType); + EventObserver<T> eventObserver = new EventObserver<T>(observer, eventType, manager, bindings); + observers.remove(eventObserver); + } + + @Override + public String toString() + { + StringBuilder buffer = new StringBuilder(); + buffer.append("Event manager\n"); + buffer.append(manager.getRegisteredObservers().toString()); + return buffer.toString(); + } + +}