Seam SVN: r13377 - modules/drools/trunk.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-13 13:38:39 -0400 (Tue, 13 Jul 2010)
New Revision: 13377
Modified:
modules/drools/trunk/pom.xml
Log:
update to parent 2
Modified: modules/drools/trunk/pom.xml
===================================================================
--- modules/drools/trunk/pom.xml 2010-07-13 17:37:49 UTC (rev 13376)
+++ modules/drools/trunk/pom.xml 2010-07-13 17:38:39 UTC (rev 13377)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.seam</groupId>
<artifactId>seam-parent</artifactId>
- <version>1</version>
+ <version>2</version>
</parent>
<artifactId>seam-drools-parent</artifactId>
13 years, 10 months
Seam SVN: r13376 - dist/trunk.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-13 13:37:49 -0400 (Tue, 13 Jul 2010)
New Revision: 13376
Modified:
dist/trunk/pom.xml
Log:
update to parent 2
Modified: dist/trunk/pom.xml
===================================================================
--- dist/trunk/pom.xml 2010-07-13 17:33:10 UTC (rev 13375)
+++ dist/trunk/pom.xml 2010-07-13 17:37:49 UTC (rev 13376)
@@ -11,7 +11,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>11</version>
+ <version>12</version>
</parent>
<description>
13 years, 10 months
Seam SVN: r13375 - in build/trunk: tools and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-13 13:33:10 -0400 (Tue, 13 Jul 2010)
New Revision: 13375
Modified:
build/trunk/module-archetype/pom.xml
build/trunk/tools/pom.xml
Log:
update to parent 2
Modified: build/trunk/module-archetype/pom.xml
===================================================================
--- build/trunk/module-archetype/pom.xml 2010-07-13 17:04:37 UTC (rev 13374)
+++ build/trunk/module-archetype/pom.xml 2010-07-13 17:33:10 UTC (rev 13375)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>10</version>
+ <version>12</version>
</parent>
<description>
Modified: build/trunk/tools/pom.xml
===================================================================
--- build/trunk/tools/pom.xml 2010-07-13 17:04:37 UTC (rev 13374)
+++ build/trunk/tools/pom.xml 2010-07-13 17:33:10 UTC (rev 13375)
@@ -11,7 +11,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>11</version>
+ <version>12</version>
</parent>
<description>
13 years, 10 months
Seam SVN: r13373 - build/tags.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-13 13:04:27 -0400 (Tue, 13 Jul 2010)
New Revision: 13373
Added:
build/tags/seam-parent-2/
Log:
[maven-scm] copy for tag seam-parent-2
Copied: build/tags/seam-parent-2 (from rev 13372, build/trunk/parent)
13 years, 10 months
Seam SVN: r13371 - branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-07-13 11:07:49 -0400 (Tue, 13 Jul 2010)
New Revision: 13371
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/Component.java
Log:
JBPAPP-4577 - reduced locking for fixing deadlock
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/Component.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/Component.java 2010-07-13 14:26:52 UTC (rev 13370)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/Component.java 2010-07-13 15:07:49 UTC (rev 13371)
@@ -50,6 +50,7 @@
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
+import java.util.concurrent.locks.ReentrantLock;
import javassist.util.proxy.MethodFilter;
import javassist.util.proxy.MethodHandler;
@@ -129,6 +130,8 @@
private static final LogProvider log = Logging.getLogProvider(Component.class);
+ static ReentrantLock factoryLock = new ReentrantLock();
+
private ComponentType type;
private String name;
private ScopeType scope;
@@ -2049,9 +2052,8 @@
public static Object getInstanceFromFactory(String name) {
return getInstanceFromFactory(name, null);
}
-
- private static synchronized Object getInstanceFromFactory(String name, ScopeType scope)
+ private static Object getInstanceFromFactory(String name, ScopeType scope)
{
Init init = Init.instance();
if (init==null) //for unit tests, yew!
@@ -2060,14 +2062,7 @@
}
else
{
- // check whether there has been created an instance by another thread while waiting for this function's lock
- if (scope != STATELESS) {
- Object value = (scope == null) ? Contexts.lookupInStatefulContexts(name) : scope.getContext().get(name);
- if (value != null) {
- return value;
- }
- }
-
+
Init.FactoryMethod factoryMethod = init.getFactory(name);
Init.FactoryExpression methodBinding = init.getFactoryMethodExpression(name);
Init.FactoryExpression valueBinding = init.getFactoryValueExpression(name);
@@ -2084,14 +2079,32 @@
else if ( factoryMethod!=null && getOutScope( factoryMethod.getScope(), factoryMethod.getComponent() ).isContextActive() )
{
Object factory = Component.getInstance( factoryMethod.getComponent().getName(), true );
- if (factory==null)
+ factoryLock.lock();
+ try
{
- return null;
+ // check whether there has been created an instance by another thread while waiting for this function's lock
+ if (scope != STATELESS)
+ {
+ Object value = (scope == null) ? Contexts.lookupInStatefulContexts(name) : scope.getContext().get(name);
+ if (value != null)
+ {
+ return value;
+ }
+ }
+
+ if (factory==null)
+ {
+ return null;
+ }
+ else
+ {
+ Object result = factoryMethod.getComponent().callComponentMethod( factory, factoryMethod.getMethod() );
+ return handleFactoryMethodResult( name, factoryMethod.getComponent(), result, factoryMethod.getScope() );
+ }
}
- else
+ finally
{
- Object result = factoryMethod.getComponent().callComponentMethod( factory, factoryMethod.getMethod() );
- return handleFactoryMethodResult( name, factoryMethod.getComponent(), result, factoryMethod.getScope() );
+ factoryLock.unlock();
}
}
else
13 years, 10 months
Seam SVN: r13370 - branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/security/permission.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-07-13 10:26:52 -0400 (Tue, 13 Jul 2010)
New Revision: 13370
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/security/permission/EntityIdentifierStrategy.java
Log:
JBPAPP-3855 - fixed EntityIdentifierStrategy.getIdentifier
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/security/permission/EntityIdentifierStrategy.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/security/permission/EntityIdentifierStrategy.java 2010-07-13 12:23:29 UTC (rev 13369)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/security/permission/EntityIdentifierStrategy.java 2010-07-13 14:26:52 UTC (rev 13370)
@@ -45,8 +45,8 @@
public String getIdentifier(Object target)
{
- return String.format("%s:%s", getIdentifierName(target.getClass()),
- persistenceProvider.getId(target, lookupEntityManager()).toString());
+ Object persProviderId = persistenceProvider.getId(target, lookupEntityManager());
+ return String.format("%s:%s", getIdentifierName(target.getClass()), persProviderId);
}
private String getIdentifierName(Class cls)
13 years, 10 months
Seam SVN: r13369 - in modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test: delegate and 5 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-07-13 08:23:29 -0400 (Tue, 13 Jul 2010)
New Revision: 13369
Modified:
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/cep/CEPTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/flow/FlowTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/interceptors/InterceptorsTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kbase/KBaseTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/ksession/KSessionTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/query/QueryTest-beans.xml
Log:
fix test errors
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/cep/CEPTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/cep/CEPTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/cep/CEPTest-beans.xml 2010-07-13 12:23:29 UTC (rev 13369)
@@ -26,8 +26,9 @@
<d:CEPPseudoClockRuleResources>
<s:modifies/>
- <d:resources>
- <s:value>classpath;ceptest.drl;DRL</s:value>
- </d:resources>
+ <s:Exact>org.jboss.seam.drools.config.CEPPseudoClockRuleResources</s:Exact>
+ <d:resources>
+ <s:value>classpath;ceptest.drl;DRL</s:value>
+ </d:resources>
</d:CEPPseudoClockRuleResources>
</beans>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml 2010-07-13 12:23:29 UTC (rev 13369)
@@ -26,6 +26,7 @@
<d:DefaultRuleResources>
<s:modifies/>
+ <s:Exact>org.jboss.seam.drools.config.DefaultRuleResources</s:Exact>
<d:resources>
<s:value>classpath;delegatetest.drl;DRL</s:value>
</d:resources>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/flow/FlowTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/flow/FlowTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/flow/FlowTest-beans.xml 2010-07-13 12:23:29 UTC (rev 13369)
@@ -26,6 +26,7 @@
<d:DefaultRuleResources>
<s:modifies/>
+ <s:Exact>org.jboss.seam.drools.config.DefaultRuleResources</s:Exact>
<d:resources>
<s:value>classpath;flowtest.drl;DRL</s:value>
<s:value>classpath;flowtest.rf;DRF</s:value>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/interceptors/InterceptorsTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/interceptors/InterceptorsTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/interceptors/InterceptorsTest-beans.xml 2010-07-13 12:23:29 UTC (rev 13369)
@@ -34,19 +34,20 @@
<d:DefaultRuleResources>
<s:modifies/>
- <d:resources>
- <s:value>classpath;interceptorstest.drl;DRL</s:value>
- </d:resources>
+ <s:Exact>org.jboss.seam.drools.config.DefaultRuleResources</s:Exact>
+ <d:resources>
+ <s:value>classpath;interceptorstest.drl;DRL</s:value>
+ </d:resources>
</d:DefaultRuleResources>
<d:CEPPseudoClockRuleResources>
<s:modifies/>
- <d:resources>
- <s:value>classpath;interceptorstestcep.drl;DRL</s:value>
- </d:resources>
+ <s:Exact>org.jboss.seam.drools.config.CEPPseudoClockRuleResources</s:Exact>
+ <d:resources>
+ <s:value>classpath;interceptorstestcep.drl;DRL</s:value>
+ </d:resources>
</d:CEPPseudoClockRuleResources>
-
<d:RuleResources>
<s:overrides/>
<test:InterceptorsTestConfig/>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kbase/KBaseTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kbase/KBaseTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kbase/KBaseTest-beans.xml 2010-07-13 12:23:29 UTC (rev 13369)
@@ -26,8 +26,9 @@
<d:DefaultRuleResources>
<s:modifies/>
- <d:resources>
- <s:value>classpath;kbasetest.drl;DRL;forkbasetest</s:value>
- </d:resources>
+ <s:Exact>org.jboss.seam.drools.config.DefaultRuleResources</s:Exact>
+ <d:resources>
+ <s:value>classpath;kbasetest.drl;DRL;forkbasetest</s:value>
+ </d:resources>
</d:DefaultRuleResources>
</beans>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/ksession/KSessionTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/ksession/KSessionTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/ksession/KSessionTest-beans.xml 2010-07-13 12:23:29 UTC (rev 13369)
@@ -26,13 +26,15 @@
<d:DefaultRuleResources>
<s:modifies/>
- <d:resources>
- <s:value>classpath;ksessiontest.drl;DRL</s:value>
- </d:resources>
+ <s:Exact>org.jboss.seam.drools.config.DefaultRuleResources</s:Exact>
+ <d:resources>
+ <s:value>classpath;ksessiontest.drl;DRL</s:value>
+ </d:resources>
</d:DefaultRuleResources>
<d:MVELDialectRuleResources>
<s:modifies/>
+ <s:Exact>org.jboss.seam.drools.config.MVELDialectRuleResources</s:Exact>
<d:resources>
<s:value>classpath;ksessiontest.drl;DRL</s:value>
</d:resources>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/query/QueryTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/query/QueryTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/query/QueryTest-beans.xml 2010-07-13 12:23:29 UTC (rev 13369)
@@ -26,9 +26,10 @@
<d:DefaultRuleResources>
<s:modifies/>
- <d:resources>
- <s:value>classpath;querytest.drl;DRL</s:value>
- </d:resources>
+ <s:Exact>org.jboss.seam.drools.config.DefaultRuleResources</s:Exact>
+ <d:resources>
+ <s:value>classpath;querytest.drl;DRL</s:value>
+ </d:resources>
</d:DefaultRuleResources>
</beans>
13 years, 10 months
Seam SVN: r13368 - in modules/drools/trunk/impl: src/test/resources/org/jboss/seam/drools/test/cep and 7 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-07-13 08:01:28 -0400 (Tue, 13 Jul 2010)
New Revision: 13368
Modified:
modules/drools/trunk/impl/pom.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/cep/CEPTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/flow/FlowTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/interceptors/InterceptorsTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kagent/KAgentTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kbase/KBaseTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/ksession/KSessionTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/query/QueryTest-beans.xml
Log:
update xml config for tests, hard code seam xml module version for now to keep hudson happy
Modified: modules/drools/trunk/impl/pom.xml
===================================================================
--- modules/drools/trunk/impl/pom.xml 2010-07-13 11:27:20 UTC (rev 13367)
+++ modules/drools/trunk/impl/pom.xml 2010-07-13 12:01:28 UTC (rev 13368)
@@ -76,6 +76,7 @@
<groupId>org.jboss.seam.xml</groupId>
<artifactId>seam-xml-config</artifactId>
<scope>test</scope>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/cep/CEPTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/cep/CEPTest-beans.xml 2010-07-13 11:27:20 UTC (rev 13367)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/cep/CEPTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
@@ -20,12 +20,12 @@
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"
xmlns:test="urn:java:org.jboss.seam.drools.test.cep">
<d:CEPPseudoClockRuleResources>
- <s:specializes/>
+ <s:modifies/>
<d:resources>
<s:value>classpath;ceptest.drl;DRL</s:value>
</d:resources>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml 2010-07-13 11:27:20 UTC (rev 13367)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
@@ -20,12 +20,12 @@
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"
xmlns:test="urn:java:org.jboss.seam.drools.test.delegate">
<d:DefaultRuleResources>
- <s:specializes/>
+ <s:modifies/>
<d:resources>
<s:value>classpath;delegatetest.drl;DRL</s:value>
</d:resources>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/flow/FlowTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/flow/FlowTest-beans.xml 2010-07-13 11:27:20 UTC (rev 13367)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/flow/FlowTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
@@ -20,12 +20,12 @@
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"
xmlns:test="urn:java:org.jboss.seam.drools.test.flow">
<d:DefaultRuleResources>
- <s:specializes/>
+ <s:modifies/>
<d:resources>
<s:value>classpath;flowtest.drl;DRL</s:value>
<s:value>classpath;flowtest.rf;DRF</s:value>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/interceptors/InterceptorsTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/interceptors/InterceptorsTest-beans.xml 2010-07-13 11:27:20 UTC (rev 13367)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/interceptors/InterceptorsTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
@@ -20,7 +20,7 @@
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"
xmlns:test="urn:java:org.jboss.seam.drools.test.interceptors">
@@ -33,14 +33,14 @@
</interceptors>
<d:DefaultRuleResources>
- <s:specializes/>
+ <s:modifies/>
<d:resources>
<s:value>classpath;interceptorstest.drl;DRL</s:value>
</d:resources>
</d:DefaultRuleResources>
<d:CEPPseudoClockRuleResources>
- <s:specializes/>
+ <s:modifies/>
<d:resources>
<s:value>classpath;interceptorstestcep.drl;DRL</s:value>
</d:resources>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kagent/KAgentTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kagent/KAgentTest-beans.xml 2010-07-13 11:27:20 UTC (rev 13367)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kagent/KAgentTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
@@ -20,7 +20,7 @@
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"
xmlns:test="urn:java:org.jboss.seam.drools.test.kagent">
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kbase/KBaseTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kbase/KBaseTest-beans.xml 2010-07-13 11:27:20 UTC (rev 13367)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kbase/KBaseTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
@@ -20,12 +20,12 @@
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"
xmlns:test="urn:java:org.jboss.seam.drools.test.kbase">
<d:DefaultRuleResources>
- <s:specializes/>
+ <s:modifies/>
<d:resources>
<s:value>classpath;kbasetest.drl;DRL;forkbasetest</s:value>
</d:resources>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/ksession/KSessionTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/ksession/KSessionTest-beans.xml 2010-07-13 11:27:20 UTC (rev 13367)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/ksession/KSessionTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
@@ -20,19 +20,19 @@
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"
xmlns:test="urn:java:org.jboss.seam.drools.test.ksession">
<d:DefaultRuleResources>
- <s:specializes/>
+ <s:modifies/>
<d:resources>
<s:value>classpath;ksessiontest.drl;DRL</s:value>
</d:resources>
</d:DefaultRuleResources>
<d:MVELDialectRuleResources>
- <s:specializes/>
+ <s:modifies/>
<d:resources>
<s:value>classpath;ksessiontest.drl;DRL</s:value>
</d:resources>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/query/QueryTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/query/QueryTest-beans.xml 2010-07-13 11:27:20 UTC (rev 13367)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/query/QueryTest-beans.xml 2010-07-13 12:01:28 UTC (rev 13368)
@@ -20,12 +20,12 @@
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"
xmlns:test="urn:java:org.jboss.seam.drools.test.ksession">
<d:DefaultRuleResources>
- <s:specializes/>
+ <s:modifies/>
<d:resources>
<s:value>classpath;querytest.drl;DRL</s:value>
</d:resources>
13 years, 10 months