Author: peteroyle Date: 2009-11-20 08:09:11 -0500 (Fri, 20 Nov 2009) New Revision: 11643 Added: sandbox/trunk/modules/scheduling/src/main/resources/META-INF/services/ sandbox/trunk/modules/scheduling/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/AbstractCDITest1.java Modified: sandbox/trunk/modules/scheduling/ sandbox/trunk/modules/scheduling/pom.xml sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/Every.java sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/EveryBinding.java sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/Scheduled.java sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/ScheduledBinding.java sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/quartz/QuartzStarter.java sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/util/SchedulePropertiesManager.java sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/AbstractCDITest.java sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/Frequent.java sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/TestBean.java sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/TickerPresentTest.java Log: Updated to latest spec changes. Now working again. Property changes on: sandbox/trunk/modules/scheduling ___________________________________________________________________ Name: svn:ignore + target Modified: sandbox/trunk/modules/scheduling/pom.xml =================================================================== --- sandbox/trunk/modules/scheduling/pom.xml 2009-11-19 06:36:19 UTC (rev 11642) +++ sandbox/trunk/modules/scheduling/pom.xml 2009-11-20 13:09:11 UTC (rev 11643) @@ -54,17 +54,11 @@ <artifactId>jsr250-api</artifactId> <version>1.0</version> </dependency> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>jsr299-api</artifactId> - <version>1.0.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> <!-- TODO: remove this dependency. --> <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-core</artifactId> - <version>1.0.0-SNAPSHOT</version> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <version>1.0.1-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> @@ -92,7 +86,7 @@ <artifactId>testng</artifactId> <scope>test</scope> <classifier>jdk15</classifier> - <version>5.8</version> + <version>5.10</version> <exclusions> <exclusion> <artifactId>junit</artifactId> @@ -101,14 +95,9 @@ </exclusions> </dependency> <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-logging</artifactId> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-se</artifactId> <version>1.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-se</artifactId> - <version>1.0.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> @@ -118,9 +107,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-core-test</artifactId> - <version>1.0.0-SNAPSHOT</version> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + <version>1.0.1-SNAPSHOT</version> <scope>test</scope> </dependency> </dependencies> Modified: sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/Every.java =================================================================== --- sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/Every.java 2009-11-19 06:36:19 UTC (rev 11642) +++ sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/Every.java 2009-11-20 13:09:11 UTC (rev 11643) @@ -20,7 +20,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; /** * The annotation which accompanies scheduled events which observe @@ -29,7 +29,7 @@ * observe the event fired every minute. * @author Peter Royle */ -@BindingType +@Qualifier @Retention(RetentionPolicy.RUNTIME) @Target( { ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE }) public @interface Every { Modified: sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/EveryBinding.java =================================================================== --- sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/EveryBinding.java 2009-11-19 06:36:19 UTC (rev 11642) +++ sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/EveryBinding.java 2009-11-20 13:09:11 UTC (rev 11643) @@ -16,9 +16,8 @@ */ package org.jboss.seam.scheduling.annotations; -import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.util.AnnotationLiteral; - /** * * @author Peter Royle Modified: sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/Scheduled.java =================================================================== --- sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/Scheduled.java 2009-11-19 06:36:19 UTC (rev 11642) +++ sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/Scheduled.java 2009-11-20 13:09:11 UTC (rev 11643) @@ -20,7 +20,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; /** * A binding annotation for use observing the Event.class event. @@ -50,7 +50,7 @@ * * @author Peter Royle */ -@BindingType +@Qualifier @Retention(RetentionPolicy.RUNTIME) @Target( { ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE }) public @interface Scheduled Modified: sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/ScheduledBinding.java =================================================================== --- sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/ScheduledBinding.java 2009-11-19 06:36:19 UTC (rev 11642) +++ sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/annotations/ScheduledBinding.java 2009-11-20 13:09:11 UTC (rev 11643) @@ -16,7 +16,7 @@ */ package org.jboss.seam.scheduling.annotations; -import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.util.AnnotationLiteral; /** * Modified: sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/quartz/QuartzStarter.java =================================================================== --- sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/quartz/QuartzStarter.java 2009-11-19 06:36:19 UTC (rev 11642) +++ sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/quartz/QuartzStarter.java 2009-11-20 13:09:11 UTC (rev 11643) @@ -18,7 +18,6 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.enterprise.inject.spi.ObserverMethod; import org.jboss.seam.scheduling.events.Second; import org.jboss.seam.scheduling.events.Minute; import org.jboss.seam.scheduling.events.Hour; @@ -38,9 +37,9 @@ import javax.enterprise.inject.spi.AfterBeanDiscovery; import javax.enterprise.inject.spi.AfterDeploymentValidation; import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.Extension; +import javax.enterprise.inject.spi.ObserverMethod; import org.jboss.seam.scheduling.util.SchedulePropertiesManager; -import org.jboss.webbeans.log.Log; -import org.jboss.webbeans.log.Logging; import org.jboss.seam.scheduling.annotations.EveryBinding; import org.jboss.seam.scheduling.annotations.Scheduled; import org.jboss.seam.scheduling.quartz.jobs.HourJob; @@ -57,6 +56,8 @@ import org.quartz.Trigger; import org.quartz.impl.StdSchedulerFactory; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Methods of this class are called at various stages of the JSR-299 initialisation @@ -66,7 +67,7 @@ * @author Peter Royle */ @ApplicationScoped -public class QuartzStarter +public class QuartzStarter implements Extension { /** @@ -92,9 +93,9 @@ * stored and retrieved from the job details. */ public static final String MANAGER_NAME = "manager"; - private static final String BEANMAN_CLASSNAME_WEBBEANS = "org.jboss.webbeans.BeanManagerImpl"; + private static final String BEANMAN_CLASSNAME_WEBBEANS = "org.jboss.weld.BeanManagerImpl"; private Scheduler scheduler; - private Log log = Logging.getLog(QuartzStarter.class); + private Logger log = LoggerFactory.getLogger(QuartzStarter.class); /** * Initialises the scheduler. @@ -107,7 +108,7 @@ getScheduler().start(); } catch (SchedulerException ex) { - log.fatal("Error initialising/starting scheduler", ex); + log.error("Error initialising/starting scheduler", ex); } @@ -177,14 +178,14 @@ return scheduler; } - private List<ObserverMethod<?, ?>> getRegisteredObservers( + private List<ObserverMethod<?>> getRegisteredObservers( BeanManager manager) throws SchedulerInitialisationException { // TODO(PR): can we remove this compile-time dependency on WebBeans' EventObserver<?> using reflection? Also if we could loose ConcurrentSetMultiMap that would be good. - final List<ObserverMethod<?, ?>> registeredObservers; + final List<ObserverMethod<?>> registeredObservers; if (manager.getClass().getName().equals(BEANMAN_CLASSNAME_WEBBEANS)) { try { - registeredObservers = (List<ObserverMethod<?, ?>>) manager.getClass(). + registeredObservers = (List<ObserverMethod<?>>) manager.getClass(). getDeclaredMethod("getObservers").invoke(manager); } catch (Exception ex) { throw new SchedulerInitialisationException("Error gettng list of observers from BeanManager (Web Beans implementstion)", ex); @@ -291,11 +292,11 @@ */ private void scheduleScheduledEvents(BeanManager manager, Date startTime) throws SchedulerException, SchedulerInitialisationException, ParseException { - final List<ObserverMethod<?, ?>> registeredObservers = getRegisteredObservers(manager); + final List<ObserverMethod<?>> registeredObservers = getRegisteredObservers(manager); Map<String, Set<Annotation>> schedulesFound = new HashMap<String, Set<Annotation>>(); // collect the set of unique schedule specifications - for (ObserverMethod<?, ?> obsMeth : registeredObservers) { - for (Object bindingObj : obsMeth.getObservedBindings()) { + for (ObserverMethod<?> obsMeth : registeredObservers) { + for (Object bindingObj : obsMeth.getObservedQualifiers()) { Annotation binding = (Annotation) bindingObj; Scheduled schedBinding = null; Modified: sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/util/SchedulePropertiesManager.java =================================================================== --- sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/util/SchedulePropertiesManager.java 2009-11-19 06:36:19 UTC (rev 11642) +++ sandbox/trunk/modules/scheduling/src/main/java/org/jboss/seam/scheduling/util/SchedulePropertiesManager.java 2009-11-20 13:09:11 UTC (rev 11643) @@ -19,8 +19,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.Properties; -import org.jboss.webbeans.log.Log; -import org.jboss.webbeans.log.Logging; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A singleton instance of the properties read from the /schedule.properties @@ -37,7 +37,7 @@ private Properties scheduleProperties = null; private static SchedulePropertiesManager instance = null; - private Log log = Logging.getLog(SchedulePropertiesManager.class); + private Logger log = LoggerFactory.getLogger(SchedulePropertiesManager.class); /** * Return a singleton instance of this class, creating the instance if necessary. Added: sandbox/trunk/modules/scheduling/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension =================================================================== --- sandbox/trunk/modules/scheduling/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (rev 0) +++ sandbox/trunk/modules/scheduling/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2009-11-20 13:09:11 UTC (rev 11643) @@ -0,0 +1 @@ +org.jboss.seam.scheduling.quartz.QuartzStarter \ No newline at end of file Modified: sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/AbstractCDITest.java =================================================================== --- sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/AbstractCDITest.java 2009-11-19 06:36:19 UTC (rev 11642) +++ sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/AbstractCDITest.java 2009-11-20 13:09:11 UTC (rev 11643) @@ -20,20 +20,14 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import javax.enterprise.inject.spi.Bean; -import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.CurrentManager; -import org.jboss.webbeans.bean.RIBean; -import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.seam.scheduling.util.WebBeansManagerUtils; -import org.jboss.webbeans.mock.MockDeployment; -import org.jboss.webbeans.mock.MockServletLifecycle; +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.mock.MockBeanDeploymentArchive; +import org.jboss.weld.mock.MockDeployment; +import org.jboss.weld.mock.MockServletLifecycle; +import org.jboss.weld.test.BeanManagerLocator; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; /** * @@ -61,32 +55,25 @@ @BeforeClass public void beforeClass() throws Throwable { - lifecycle = new MockServletLifecycle(); + +// BeanManagerImpl manager = (BeanManagerImpl) new StartMain(new String[] {}).go(); + + MockBeanDeploymentArchive jar = new MockBeanDeploymentArchive(); + MockDeployment deployment = new MockDeployment(jar); + lifecycle = new MockServletLifecycle(deployment, jar); lifecycle.initialize(); - MockDeployment deployment = lifecycle.getDeployment(); - final List<Class<? extends Object>> allBeansList = new ArrayList<Class<? extends Object>>(getDefaultWebBeans()); + final List<Class<?>> allBeansList = new ArrayList<Class<?>>(getDefaultWebBeans()); allBeansList.addAll(getAdditionalWebBeans()); - deployment.getArchive().setBeanClasses(allBeansList); + jar.setBeanClasses(allBeansList); lifecycle.beginApplication(); lifecycle.beginSession(); lifecycle.beginRequest(); - manager = CurrentManager.rootManager(); + manager = getCurrentManager(); } - @Test - public void testDefaultBeans() + protected BeanManagerImpl getCurrentManager() { - Map<Class<?>, Bean<?>> beans = new HashMap<Class<?>, Bean<?>>(); - for (Bean<?> bean : manager.getBeans()) { - if (bean instanceof RIBean) { - beans.put(((RIBean<?>) bean).getType(), bean); - } - } - for (Class klass : getDefaultWebBeans()) { - assert beans.containsKey(klass); - assert beans.get(klass) instanceof SimpleBean; - } - WebBeansManagerUtils.getInstanceByType(manager, TestBean.class).ping(); + return BeanManagerLocator.INSTANCE.locate(); } public List<Class<? extends Object>> getDefaultWebBeans() Added: sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/AbstractCDITest1.java =================================================================== --- sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/AbstractCDITest1.java (rev 0) +++ sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/AbstractCDITest1.java 2009-11-20 13:09:11 UTC (rev 11643) @@ -0,0 +1,95 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.seam.scheduling; + +import org.jboss.seam.scheduling.quartz.QuartzStarter; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.util.AnnotationLiteral; +import org.jboss.weld.environment.se.StartMain; +import org.jboss.weld.environment.se.events.Shutdown; +import org.jboss.weld.mock.MockServletLifecycle; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; + +/** + * + * @author pete + */ +public abstract class AbstractCDITest1 +{ + + MockServletLifecycle lifecycle; + BeanManager manager; + + public AbstractCDITest1() + { + } + + @AfterClass(alwaysRun = true) + public void afterClass() throws Exception + { + shutdownManager(manager); + + } + + @BeforeClass + public void beforeClass() throws Throwable + { + manager = new StartMain(new String[] {}).go(); + +// lifecycle = new MockServletLifecycle(); +// lifecycle.initialize(); +// MockDeployment deployment = (MockDeployment)lifecycle.getDeployment(); +// final List<Class<? extends Object>> allBeansList = new ArrayList<Class<? extends Object>>(getDefaultWebBeans()); +// allBeansList.addAll(getAdditionalWebBeans()); +// deployment.getArchive().setBeanClasses(allBeansList); +// lifecycle.beginApplication(); +// lifecycle.beginSession(); +// lifecycle.beginRequest(); +// manager = CurrentManager.rootManager(); + } + + public List<Class<? extends Object>> getDefaultWebBeans() + { + return Arrays.asList(TestBean.class, AnotherTestBean.class, QuartzStarter.class); + } + + /** + * Override in your tests to register specific beans with the manager. + * @return + */ + public List<Class<? extends Object>> getAdditionalWebBeans() + { + return Collections.EMPTY_LIST; + } + + private void shutdownManager(BeanManager manager) + { + manager.fireEvent(manager, new ShutdownAnnotation()); + } + + private static class ShutdownAnnotation extends AnnotationLiteral<Shutdown> + { + + public ShutdownAnnotation() + { + } + } +} Modified: sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/Frequent.java =================================================================== --- sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/Frequent.java 2009-11-19 06:36:19 UTC (rev 11642) +++ sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/Frequent.java 2009-11-20 13:09:11 UTC (rev 11643) @@ -20,7 +20,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; import org.jboss.seam.scheduling.annotations.Scheduled; /** @@ -33,7 +33,7 @@ * @author Peter Royle */ @Scheduled("test.one") -@BindingType +@Qualifier @Retention(RetentionPolicy.RUNTIME) @Target( { ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE }) public @interface Frequent Modified: sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/TestBean.java =================================================================== --- sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/TestBean.java 2009-11-19 06:36:19 UTC (rev 11642) +++ sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/TestBean.java 2009-11-20 13:09:11 UTC (rev 11643) @@ -17,8 +17,8 @@ package org.jboss.seam.scheduling; -import org.jboss.webbeans.log.LogProvider; -import org.jboss.webbeans.log.Logging; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -26,7 +26,7 @@ */ public class TestBean { - private static LogProvider log = Logging.getLogProvider(TestBean.class); + private static Logger log = LoggerFactory.getLogger(TestBean.class); public void ping() { log.info("Pinging " + this.getClass().getName()); Modified: sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/TickerPresentTest.java =================================================================== --- sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/TickerPresentTest.java 2009-11-19 06:36:19 UTC (rev 11642) +++ sandbox/trunk/modules/scheduling/src/test/java/org/jboss/seam/scheduling/TickerPresentTest.java 2009-11-20 13:09:11 UTC (rev 11643) @@ -24,12 +24,12 @@ import java.util.List; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jboss.seam.scheduling.util.WebBeansManagerUtils; import org.jboss.seam.scheduling.annotations.Every; import org.jboss.seam.scheduling.events.Minute; import org.quartz.SchedulerException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; @@ -47,7 +47,7 @@ private boolean secondTickObserved = false; private boolean minuteTickObserved = false; - private Log log = LogFactory.getLog(TickerPresentTest.class); + private Logger log = LoggerFactory.getLogger(TickerPresentTest.class); @Override public List<Class<? extends Object>> getAdditionalWebBeans()