Author: shane.bryzak(a)jboss.com Date: 2010-07-13 07:14:54 -0400 (Tue, 13 Jul 2010) New Revision: 13364 Added: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/config/CEPRealtimeClockConfig.java Removed: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/config/CEPRealitimeClockConfig.java Modified: modules/drools/trunk/api/pom.xml modules/drools/trunk/impl/pom.xml modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/CEPRealtimeClockRuleResources.java modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml Log: update to latest xml config, fix naming typo Modified: modules/drools/trunk/api/pom.xml =================================================================== --- modules/drools/trunk/api/pom.xml 2010-07-13 10:35:08 UTC (rev 13363) +++ modules/drools/trunk/api/pom.xml 2010-07-13 11:14:54 UTC (rev 13364) @@ -31,6 +31,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>org.drools</groupId> Deleted: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/config/CEPRealitimeClockConfig.java =================================================================== --- modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/config/CEPRealitimeClockConfig.java 2010-07-13 10:35:08 UTC (rev 13363) +++ modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/config/CEPRealitimeClockConfig.java 2010-07-13 11:14:54 UTC (rev 13364) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.seam.drools.qualifiers.config; - -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; - -/** - * - * @author Tihomir Surdilovic - */ -@Qualifier -@Target( { TYPE, METHOD, FIELD, PARAMETER }) -@Documented -@Retention(RUNTIME) -@Inherited -public @interface CEPRealitimeClockConfig { - -} Copied: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/config/CEPRealtimeClockConfig.java (from rev 13361, modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/config/CEPRealitimeClockConfig.java) =================================================================== --- modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/config/CEPRealtimeClockConfig.java (rev 0) +++ modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/config/CEPRealtimeClockConfig.java 2010-07-13 11:14:54 UTC (rev 13364) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.drools.qualifiers.config; + +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; + +/** + * + * @author Tihomir Surdilovic + */ +@Qualifier +@Target( { TYPE, METHOD, FIELD, PARAMETER }) +@Documented +@Retention(RUNTIME) +@Inherited +public @interface CEPRealtimeClockConfig { + +} Modified: modules/drools/trunk/impl/pom.xml =================================================================== --- modules/drools/trunk/impl/pom.xml 2010-07-13 10:35:08 UTC (rev 13363) +++ modules/drools/trunk/impl/pom.xml 2010-07-13 11:14:54 UTC (rev 13364) @@ -35,6 +35,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>org.drools</groupId> Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/CEPRealtimeClockRuleResources.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/CEPRealtimeClockRuleResources.java 2010-07-13 10:35:08 UTC (rev 13363) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/CEPRealtimeClockRuleResources.java 2010-07-13 11:14:54 UTC (rev 13364) @@ -21,13 +21,13 @@ */ package org.jboss.seam.drools.config; -import org.jboss.seam.drools.qualifiers.config.CEPRealitimeClockConfig; +import org.jboss.seam.drools.qualifiers.config.CEPRealtimeClockConfig; /** * * @author Tihomir Surdilovic */ -@CEPRealitimeClockConfig +@CEPRealtimeClockConfig public class CEPRealtimeClockRuleResources extends RuleResources { Modified: modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml =================================================================== --- modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml 2010-07-13 10:35:08 UTC (rev 13363) +++ modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml 2010-07-13 11:14:54 UTC (rev 13364) @@ -16,13 +16,13 @@ Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:s="urn:java:seam:core" + xmlns:s="urn:java:ee" xmlns:d="urn:java:org.jboss.seam.drools:org.jboss.seam.drools.config:org.jboss.seam.drools.qualifiers.config" xmlns:drools="urn:java:org.drools:org.drools.runtime"> <s:genericBean class="org.jboss.seam.drools.config.DroolsConfig"> <d:KnowledgeBaseProducer> - <s:specializes /> + <s:modifies /> <d:produceKnowledgeBase> <s:ApplyQualifiers /> <s:parameters> @@ -35,7 +35,7 @@ </d:KnowledgeBaseProducer> <d:KnowledgeSessionProducer> - <s:specializes /> + <s:modifies /> <d:produceStatefulSession> <s:ApplyQualifiers /> <s:parameters> @@ -107,7 +107,7 @@ </d:KnowledgeSessionProducer> <d:KnowledgeAgentProducer> - <s:specializes /> + <s:modifies /> <d:produceScannedKnowledgeBase> <s:ApplyQualifiers /> <s:parameters> @@ -137,7 +137,7 @@ </d:KnowledgeAgentProducer> <d:EntryPointProducer> - <s:specializes /> + <s:modifies /> <d:produceEntryPoint> <s:ApplyQualifiers /> <s:parameters> @@ -159,7 +159,7 @@ </d:EntryPointProducer> <d:KnowledgeLoggerProducer> - <s:specializes /> + <s:modifies /> <d:produceStatefulKnowledgeLogger> <s:ApplyQualifiers /> <s:parameters> @@ -215,7 +215,7 @@ </d:KnowledgeLoggerProducer> <d:ExecutionResultsProducer> - <s:specializes /> + <s:modifies /> <d:produceStatelessExecutionResults> <s:ApplyQualifiers /> <s:parameters> @@ -255,7 +255,7 @@ </d:ExecutionResultsProducer> <d:QueryResultsProducer> - <s:specializes /> + <s:modifies /> <d:produceQueryResults> <s:ApplyQualifiers /> <s:parameters> @@ -278,20 +278,18 @@ </s:genericBean> <d:DroolsConfig> - <s:specializes /> + <s:modifies /> <d:DefaultConfig /> <s:parameters> <d:RuleResources> <d:DefaultConfig /> - <s:type> - <d:DefaultRuleResources /> - </s:type> + <s:Exact>org.jboss.seam.drools.config.DefaultRuleResources</s:Exact> </d:RuleResources> </s:parameters> </d:DroolsConfig> <d:DroolsConfig> - <s:specializes /> + <s:modifies /> <d:MVELDialectConfig /> <d:kbuilderPropertiesMap> <s:entry> @@ -302,16 +300,14 @@ <s:parameters> <d:RuleResources> <d:MVELDialectConfig /> - <s:type> - <d:MVELDialectRuleResources /> - </s:type> + <s:Exact>org.jboss.seam.drools.config.MVELDialectRuleResources</s:Exact> </d:RuleResources> </s:parameters> </d:DroolsConfig> <d:DroolsConfig> - <s:specializes /> - <d:CEPRealitimeClockConfig /> + <s:modifies /> + <d:CEPRealtimeClockConfig /> <d:kbasePropertiesMap> <s:entry> <s:key>drools.eventProcessingMode</s:key> @@ -326,16 +322,14 @@ </d:ksessionPropertiesMap> <s:parameters> <d:RuleResources> - <d:CEPRealitimeClockConfig /> - <s:type> - <d:CEPRealtimeClockRuleResources /> - </s:type> + <d:CEPRealtimeClockConfig /> + <s:Exact>org.jboss.seam.drools.config.CEPRealtimeClockRuleResources</s:Exact> </d:RuleResources> </s:parameters> </d:DroolsConfig> <d:DroolsConfig> - <s:specializes /> + <s:modifies /> <d:CEPPseudoClockConfig /> <d:kbasePropertiesMap> <s:entry> @@ -352,15 +346,13 @@ <s:parameters> <d:RuleResources> <d:CEPPseudoClockConfig /> - <s:type> - <d:CEPPseudoClockRuleResources /> - </s:type> + <s:Exact>org.jboss.seam.drools.config.CEPPseudoClockRuleResources</s:Exact> </d:RuleResources> </s:parameters> </d:DroolsConfig> <d:DroolsConfig> - <s:specializes /> + <s:modifies /> <d:AgentConfig /> <d:kagentPropertiestMap> <s:entry> @@ -389,9 +381,7 @@ <s:parameters> <d:RuleResources> <d:AgentConfig /> - <s:type> - <d:AgentRuleResources /> - </s:type> + <s:Exact>org.jboss.seam.drools.config.AgentRuleResources</s:Exact> </d:RuleResources> </s:parameters> </d:DroolsConfig>