This is an automated email from the ASF dual-hosted git repository.
mariofusco pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git
The following commit(s) were added to refs/heads/main by this push:
new 5619e815ec [incubator-kie-drools-6160] Clean up leftover of .rf
support (#6189)
5619e815ec is described below
commit 5619e815ecec601efd20c758d79369214feb1110
Author: Toshiya Kobayashi <[email protected]>
AuthorDate: Wed Dec 11 16:24:31 2024 +0900
[incubator-kie-drools-6160] Clean up leftover of .rf support (#6189)
---
.../drools/base/definitions/ProcessPackage.java | 3 +-
.../impl/CompositeKnowledgeBuilderImpl.java | 3 -
.../builder/impl/KnowledgeBuilderImpl.java | 15 -
.../resources/META-INF/drools-processes-5.0.xsd | 623 ---------------------
.../drools/modelcompiler/CanonicalKieModule.java | 2 +-
.../integrationtests/FakeDRFAssemblerService.java | 50 --
.../mvel/integrationtests/KieBuilderTest.java | 2 +-
.../PackageInMultipleResourcesTest.java | 72 ---
....kie.api.internal.assembler.KieAssemblerService | 20 -
.../mvel/integrationtests/rf_test_ruleflow.rf | 64 ---
.../test_modifyWithRuleflowAndSubnetwork.rf | 42 --
.../testcoverage/functional/ResourcesTest.java | 2 +-
.../org/drools/testcoverage/functional/sample.rf | 97 ----
.../src/main/java/org/kie/api/io/ResourceType.java | 6 -
14 files changed, 4 insertions(+), 997 deletions(-)
diff --git
a/drools-base/src/main/java/org/drools/base/definitions/ProcessPackage.java
b/drools-base/src/main/java/org/drools/base/definitions/ProcessPackage.java
index 92e579ca67..3424ce3a14 100644
--- a/drools-base/src/main/java/org/drools/base/definitions/ProcessPackage.java
+++ b/drools-base/src/main/java/org/drools/base/definitions/ProcessPackage.java
@@ -41,7 +41,6 @@ public class ProcessPackage implements
ResourceTypePackage<Process> {
rtp = new ProcessPackage();
// register the same instance for all types. There is no
distinction
rtps.put(ResourceType.BPMN2, rtp);
- rtps.put(ResourceType.DRF, rtp);
rtps.put(ResourceType.CMMN, rtp);
}
return rtp;
@@ -55,7 +54,7 @@ public class ProcessPackage implements
ResourceTypePackage<Process> {
/**
* The ResourceType for {@link ProcessPackage} is always BPMN2,
- * but there is no distinction between DRF, and CMMN as they all live under
+ * but there is no distinction between CMMN as they all live under
* the same package.
*/
@Override
diff --git
a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/CompositeKnowledgeBuilderImpl.java
b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/CompositeKnowledgeBuilderImpl.java
index 1c53ddae0b..2cb56df7f9 100644
---
a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/CompositeKnowledgeBuilderImpl.java
+++
b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/CompositeKnowledgeBuilderImpl.java
@@ -136,7 +136,6 @@ public class CompositeKnowledgeBuilderImpl implements
CompositeKnowledgeBuilder
private void buildResources() {
buildResourceType(ResourceBuilder.DSL_RESOURCE_BUILDER,
ResourceType.DSL);
- buildResourceType(ResourceBuilder.DRF_RESOURCE_BUILDER,
ResourceType.DRF);
buildResourceType(ResourceBuilder.XSD_RESOURCE_BUILDER,
ResourceType.XSD);
}
@@ -277,8 +276,6 @@ public class CompositeKnowledgeBuilderImpl implements
CompositeKnowledgeBuilder
ResourceBuilder BPMN2_RESOURCE_BUILDER = ( kBuilder, resourceDescr )
-> kBuilder.addKnowledgeResource( resourceDescr.resource, ResourceType.BPMN2,
resourceDescr.configuration );
ResourceBuilder CMMN_RESOURCE_BUILDER = ( kBuilder, resourceDescr ) ->
kBuilder.addKnowledgeResource( resourceDescr.resource, ResourceType.CMMN,
resourceDescr.configuration );
-
- ResourceBuilder DRF_RESOURCE_BUILDER = ( kBuilder, resourceDescr ) ->
kBuilder.addKnowledgeResource( resourceDescr.resource, ResourceType.DRF,
resourceDescr.configuration );
}
}
diff --git
a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/KnowledgeBuilderImpl.java
b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/KnowledgeBuilderImpl.java
index cd19e2ded4..8b332a20d7 100644
---
a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/KnowledgeBuilderImpl.java
+++
b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/KnowledgeBuilderImpl.java
@@ -340,16 +340,6 @@ public class KnowledgeBuilderImpl implements
InternalKnowledgeBuilder, TypeDecla
}
}
- /**
- * Add a ruleflow (.rfm) asset to this package.
- */
- public void addRuleFlow(Reader processSource) {
- addKnowledgeResource(
- new ReaderResource(processSource, ResourceType.DRF),
- ResourceType.DRF,
- null);
- }
-
@Deprecated
public void addProcessFromXml(Resource resource) {
addKnowledgeResource(
@@ -362,11 +352,6 @@ public class KnowledgeBuilderImpl implements
InternalKnowledgeBuilder, TypeDecla
return processBuilder;
}
- @Deprecated
- public void addProcessFromXml( Reader processSource) {
- addProcessFromXml(new ReaderResource(processSource, ResourceType.DRF));
- }
-
public void addKnowledgeResource(Resource resource,
ResourceType type,
ResourceConfiguration configuration) {
diff --git
a/drools-compiler/src/main/resources/META-INF/drools-processes-5.0.xsd
b/drools-compiler/src/main/resources/META-INF/drools-processes-5.0.xsd
deleted file mode 100644
index 4afa6fad70..0000000000
--- a/drools-compiler/src/main/resources/META-INF/drools-processes-5.0.xsd
+++ /dev/null
@@ -1,623 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
- -->
-
-<xs:schema xmlns:drools="http://drools.org/drools-5.0/process";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
targetNamespace="http://drools.org/drools-5.0/process";
elementFormDefault="qualified">
- <xs:element name="process">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:header"/>
- <xs:element ref="drools:nodes"/>
- <xs:element ref="drools:connections"/>
- </xs:choice>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="type" type="xs:string"/>
- <xs:attribute name="id" type="xs:string"/>
- <xs:attribute name="package-name" type="xs:string"/>
- <xs:attribute name="version" type="xs:string"/>
- <xs:attribute name="routerLayout" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="header">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:imports"/>
- <xs:element ref="drools:functionImports"/>
- <xs:element ref="drools:globals"/>
- <xs:element ref="drools:variables"/>
- <xs:element ref="drools:swimlanes"/>
- <xs:element ref="drools:exceptionHandlers"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- <xs:element name="imports">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:import"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="import">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="functionImports">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:functionImport"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="functionImport">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="globals">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:global"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="global">
- <xs:complexType>
- <xs:attribute name="identifier" type="xs:string" use="required"/>
- <xs:attribute name="type" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="variables">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:variable"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="variable">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:type"/>
- <xs:element ref="drools:value"/>
- </xs:choice>
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="type">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="className" type="xs:string" />
- </xs:complexType>
- </xs:element>
- <xs:element name="value">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string"/>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="swimlanes">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:swimlane"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="swimlane">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="exceptionHandlers">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:exceptionHandler"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="exceptionHandler">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:action"/>
- </xs:sequence>
- <xs:attribute name="faultName" type="xs:string" use="required"/>
- <xs:attribute name="type" type="xs:string" use="required"/>
- <xs:attribute name="faultVariable" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="nodes">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:start"/>
- <xs:element ref="drools:end"/>
- <xs:element ref="drools:actionNode"/>
- <xs:element ref="drools:ruleSet"/>
- <xs:element ref="drools:split"/>
- <xs:element ref="drools:join"/>
- <xs:element ref="drools:milestone"/>
- <xs:element ref="drools:subProcess"/>
- <xs:element ref="drools:workItem"/>
- <xs:element ref="drools:timerNode"/>
- <xs:element ref="drools:humanTask"/>
- <xs:element ref="drools:composite"/>
- <xs:element ref="drools:forEach"/>
- <xs:element ref="drools:eventNode"/>
- <xs:element ref="drools:fault"/>
- <xs:element ref="drools:state"/>
- <xs:element ref="drools:dynamic"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- <xs:element name="metaData">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element ref="drools:value"/>
- </xs:choice>
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="timers">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:timer"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="timer">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element ref="drools:action"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="delay" type="xs:string"/>
- <xs:attribute name="period" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="start">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- <xs:element ref="drools:triggers"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="triggers">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:trigger"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- <xs:element name="trigger">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:constraint"/>
- <xs:element ref="drools:eventFilters"/>
- <xs:element ref="drools:mapping"/>
- </xs:choice>
- <xs:attribute name="type" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="end">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- <xs:attribute name="terminate" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="actionNode">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- <xs:element ref="drools:action"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="action">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="type" type="xs:string"/>
- <xs:attribute name="dialect" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="ruleSet">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- <xs:element ref="drools:timers"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- <xs:attribute name="ruleFlowGroup" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="split">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- <xs:element ref="drools:constraints"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- <xs:attribute name="type" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="constraints">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:constraint"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="constraint">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="toNodeId" type="xs:string"/>
- <xs:attribute name="toType" type="xs:string"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="priority" type="xs:string"/>
- <xs:attribute name="type" type="xs:string"/>
- <xs:attribute name="dialect" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="join">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- <xs:attribute name="type" type="xs:string"/>
- <xs:attribute name="n" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="milestone">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- <xs:element ref="drools:constraint"/>
- <xs:element ref="drools:timers"/>
- <xs:element ref="drools:onEntry"/>
- <xs:element ref="drools:onExit"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="subProcess">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- <xs:element ref="drools:mapping"/>
- <xs:element ref="drools:timers"/>
- <xs:element ref="drools:onEntry"/>
- <xs:element ref="drools:onExit"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- <xs:attribute name="processId" type="xs:string"/>
- <xs:attribute name="waitForCompletion" type="xs:string"/>
- <xs:attribute name="independent" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="workItem">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- <xs:element ref="drools:timers"/>
- <xs:element ref="drools:work"/>
- <xs:element ref="drools:mapping"/>
- <xs:element ref="drools:onEntry"/>
- <xs:element ref="drools:onExit"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- <xs:attribute name="waitForCompletion" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="work">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:parameter"/>
- </xs:choice>
- <xs:attribute name="name" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="parameter">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:type"/>
- <xs:element ref="drools:value"/>
- </xs:choice>
- <xs:attribute name="name" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="mapping">
- <xs:complexType>
- <xs:attribute name="type" type="xs:string" use="required"/>
- <xs:attribute name="from" type="xs:string" use="required"/>
- <xs:attribute name="to" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="onEntry">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:action"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- <xs:element name="onExit">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:action"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- <xs:element name="timerNode">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- <xs:attribute name="delay" type="xs:string"/>
- <xs:attribute name="period" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="humanTask">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- <xs:element ref="drools:work"/>
- <xs:element ref="drools:mapping"/>
- <xs:element ref="drools:timers"/>
- <xs:element ref="drools:onEntry"/>
- <xs:element ref="drools:onExit"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- <xs:attribute name="waitForCompletion" type="xs:string"/>
- <xs:attribute name="swimlane" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="composite">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- <xs:element ref="drools:timers"/>
- <xs:element ref="drools:onEntry"/>
- <xs:element ref="drools:onExit"/>
- <xs:element ref="drools:variables"/>
- <xs:element ref="drools:exceptionHandlers"/>
- <xs:element ref="drools:nodes"/>
- <xs:element ref="drools:connections"/>
- <xs:element ref="drools:in-ports"/>
- <xs:element ref="drools:out-ports"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="forEach">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- <xs:element ref="drools:nodes"/>
- <xs:element ref="drools:connections"/>
- <xs:element ref="drools:in-ports"/>
- <xs:element ref="drools:out-ports"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- <xs:attribute name="variableName" type="xs:string"/>
- <xs:attribute name="collectionExpression" type="xs:string"/>
- <xs:attribute name="waitForCompletion" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="in-ports">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:in-port"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- <xs:element name="in-port">
- <xs:complexType>
- <xs:attribute name="type" type="xs:string" use="required"/>
- <xs:attribute name="nodeId" type="xs:string" use="required"/>
- <xs:attribute name="nodeInType" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="out-ports">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:out-port"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- <xs:element name="out-port">
- <xs:complexType>
- <xs:attribute name="type" type="xs:string" use="required"/>
- <xs:attribute name="nodeId" type="xs:string" use="required"/>
- <xs:attribute name="nodeOutType" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="eventNode">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- <xs:element ref="drools:eventFilters"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- <xs:attribute name="variableName" type="xs:string"/>
- <xs:attribute name="scope" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="eventFilters">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:eventFilter"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="eventFilter">
- <xs:complexType>
- <xs:attribute name="type" type="xs:string" use="required"/>
- <xs:attribute name="eventType" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="fault">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- <xs:attribute name="faultName" type="xs:string"/>
- <xs:attribute name="faultVariable" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="state">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- <xs:element ref="drools:timers"/>
- <xs:element ref="drools:onEntry"/>
- <xs:element ref="drools:onExit"/>
- <xs:element ref="drools:constraints"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="dynamic">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:metaData"/>
- <xs:element ref="drools:variables"/>
- <xs:element ref="drools:exceptionHandlers"/>
- <xs:element ref="drools:nodes"/>
- <xs:element ref="drools:connections"/>
- <xs:element ref="drools:in-ports"/>
- <xs:element ref="drools:out-ports"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="x" type="xs:string"/>
- <xs:attribute name="y" type="xs:string"/>
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="height" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="connections">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="drools:connection"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="connection">
- <xs:complexType>
- <xs:attribute name="from" type="xs:string" use="required"/>
- <xs:attribute name="to" type="xs:string" use="required"/>
- <xs:attribute name="fromType" type="xs:string"/>
- <xs:attribute name="toType" type="xs:string"/>
- <xs:attribute name="bendpoints" type="xs:string"/>
- </xs:complexType>
- </xs:element>
-</xs:schema>
diff --git
a/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/CanonicalKieModule.java
b/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/CanonicalKieModule.java
index f64be9e425..b0d5543430 100644
---
a/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/CanonicalKieModule.java
+++
b/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/CanonicalKieModule.java
@@ -371,7 +371,7 @@ public class CanonicalKieModule implements
InternalKieModule {
List<Resource> processResources = kieModule.getFileNames().stream()
.filter(fileName -> {
ResourceType resourceType =
determineResourceType(fileName);
- return resourceType == ResourceType.DRF ||
resourceType == ResourceType.BPMN2;
+ return resourceType == ResourceType.BPMN2;
})
.map(fileName -> {
final Resource processResource =
kieModule.getResource(fileName);
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/FakeDRFAssemblerService.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/FakeDRFAssemblerService.java
deleted file mode 100644
index 8519aa265d..0000000000
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/FakeDRFAssemblerService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * 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.drools.mvel.integrationtests;
-
-import java.io.StringReader;
-
-import org.drools.compiler.builder.impl.KnowledgeBuilderImpl;
-import org.kie.api.internal.assembler.KieAssemblerService;
-import org.kie.api.io.Resource;
-import org.kie.api.io.ResourceConfiguration;
-import org.kie.api.io.ResourceType;
-
-public class FakeDRFAssemblerService implements KieAssemblerService {
-
- private static final String GATEWAY_RULE = "package com.example.rules\n" +
- "import com.example.*;\n" +
- "rule
\"RuleFlow-Split-example-xxx-DROOLS_DEFAULT\" @Propagation(EAGER)\n" +
- " ruleflow-group
\"DROOLS_SYSTEM\"\n" +
- " when\n" +
- " exists String(this ==
\"Left\")\n" +
- " then\n" +
- "end";
-
- @Override
- public ResourceType getResourceType() {
- return ResourceType.DRF;
- }
-
- @Override
- public void addResourceAfterRules(Object kbuilder, Resource resource,
ResourceType type, ResourceConfiguration configuration) throws Exception {
- // Just add one fake gateway drl rule. Not for process capability
testing
- ((KnowledgeBuilderImpl) kbuilder).addPackageFromDrl(new
StringReader(GATEWAY_RULE), resource);
- }
-}
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java
index 8a38692c5d..9beb216624 100644
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java
+++
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java
@@ -497,7 +497,7 @@ public class KieBuilderTest {
public void
testAddMissingResourceToPackageBuilder(KieBaseTestConfiguration
kieBaseTestConfiguration) throws Exception {
final KnowledgeBuilder kbuilder =
KnowledgeBuilderFactory.newKnowledgeBuilder();
- assertThatThrownBy(() ->
kbuilder.add(ResourceFactory.newClassPathResource("some.rf"), ResourceType.DRL))
+ assertThatThrownBy(() ->
kbuilder.add(ResourceFactory.newClassPathResource("some.drl"),
ResourceType.DRL))
.isInstanceOf(RuntimeException.class);
assertThatThrownBy(() ->
kbuilder.add(ResourceFactory.newClassPathResource("some.bpmn"),
ResourceType.BPMN2))
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/PackageInMultipleResourcesTest.java
b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/PackageInMultipleResourcesTest.java
deleted file mode 100644
index 665f16b714..0000000000
---
a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/PackageInMultipleResourcesTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * 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.drools.mvel.integrationtests;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
-import org.drools.testcoverage.common.util.KieBaseUtil;
-import org.drools.testcoverage.common.util.TestParametersUtil2;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.kie.api.KieBase;
-import org.kie.api.definition.KiePackage;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class PackageInMultipleResourcesTest {
-
- public static Stream<KieBaseTestConfiguration> parameters() {
- return
TestParametersUtil2.getKieBaseCloudConfigurations(true).stream();
- }
-
- @ParameterizedTest(name = "KieBase type={0}")
- @MethodSource("parameters")
- public void testSamePackageRulesInDRLAndRF(KieBaseTestConfiguration
kieBaseTestConfiguration) {
- // DROOLS-6785
- KieBase kbase =
KieBaseUtil.getKieBaseFromClasspathResources(this.getClass(),
kieBaseTestConfiguration, "rf_test_rules.drl", "rf_test_rueflow.rf");
-
- KiePackage kiePackage = kbase.getKiePackage("com.example.rules");
- List<String> ruleNames = kiePackage.getRules().stream().map(rule ->
rule.getName()).collect(Collectors.toList());
-
- assertThat(ruleNames.size()).isEqualTo(3);
-
assertThat(ruleNames).contains("RuleFlow-Split-example-xxx-DROOLS_DEFAULT",
"Left Rule", "Right Rule");
- }
-
- @ParameterizedTest(name = "KieBase type={0}")
- @MethodSource("parameters")
- public void testDifferentPackagesRulesInDRLAndRF(KieBaseTestConfiguration
kieBaseTestConfiguration) {
- // DROOLS-6797
- KieBase kbase =
KieBaseUtil.getKieBaseFromClasspathResources(this.getClass(),
kieBaseTestConfiguration, "rf_test_rules_different_pkg.drl",
"rf_test_rueflow.rf");
-
- KiePackage kiePackage = kbase.getKiePackage("com.example.rules");
- List<String> ruleNames = kiePackage.getRules().stream().map(rule ->
rule.getName()).collect(Collectors.toList());
-
- assertThat(ruleNames.size()).isEqualTo(1);
-
assertThat(ruleNames).contains("RuleFlow-Split-example-xxx-DROOLS_DEFAULT");
-
- KiePackage kiePackageDiffPkg =
kbase.getKiePackage("com.example.rules.different.pkg");
- List<String> ruleNamesDiffPkg =
kiePackageDiffPkg.getRules().stream().map(rule ->
rule.getName()).collect(Collectors.toList());
-
- assertThat(ruleNamesDiffPkg.size()).isEqualTo(2);
- assertThat(ruleNamesDiffPkg).contains("Left Rule", "Right Rule");
- }
-}
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/resources/META-INF/services/org.kie.api.internal.assembler.KieAssemblerService
b/drools-test-coverage/test-compiler-integration/src/test/resources/META-INF/services/org.kie.api.internal.assembler.KieAssemblerService
deleted file mode 100644
index 1870ad6f09..0000000000
---
a/drools-test-coverage/test-compiler-integration/src/test/resources/META-INF/services/org.kie.api.internal.assembler.KieAssemblerService
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# 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.
-#
-
-org.drools.mvel.integrationtests.FakeDRFAssemblerService
\ No newline at end of file
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/integrationtests/rf_test_ruleflow.rf
b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/integrationtests/rf_test_ruleflow.rf
deleted file mode 100644
index c21ca9b59b..0000000000
---
a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/integrationtests/rf_test_ruleflow.rf
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
-
- 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.
-
--->
-
-<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://drools.org/drools-5.0/process";
- xmlns:xs="http://www.w3.org/2001/XMLSchema-instance";
- xs:schemaLocation="http://drools.org/drools-5.0/process
drools-processes-5.0.xsd"
- type="RuleFlow" name="example" id="example"
package-name="com.example.rules" version="" routerLayout="2" >
-
- <header>
- <imports>
- <import name="com.example.*" />
- </imports>
- </header>
-
- <nodes>
- <end id="115" name="End" x="156" y="444" width="123" height="44" />
- <start id="53" name="Start" x="156" y="24" width="123" height="44" />
- <ruleSet id="245" name="RFG-1" x="120" y="108" width="121" height="48"
ruleFlowGroup="RFG-1" />
- <split id="246" name="Gateway" x="156" y="192" width="49" height="49"
type="2" >
- <metaData name="UniqueId">
- <value>_jbpm-unique-3</value>
- </metaData>
- <constraints>
- <constraint toNodeId="248" toType="DROOLS_DEFAULT" name="constraint"
priority="1" type="rule" dialect="mvel" >exists Values(this ==
Values.LEFT)</constraint>
- <constraint toNodeId="249" toType="DROOLS_DEFAULT" name="constraint"
priority="1" type="rule" dialect="mvel" >exists Values(this ==
Values.RIGHT)</constraint>
- <constraint toNodeId="250" toType="DROOLS_DEFAULT" name="constraint"
type="rule" dialect="mvel" >eval(true)</constraint>
- </constraints>
- </split>
- <ruleSet id="248" name="RFG-2" x="72" y="276" width="85" height="48"
ruleFlowGroup="RFG-2" />
- <ruleSet id="249" name="RFG-3" x="204" y="276" width="85" height="48"
ruleFlowGroup="RFG-3" />
- <join id="250" name="Join" x="156" y="360" width="49" height="49" type="2"
/>
- </nodes>
-
- <connections>
- <connection from="250" to="115" />
- <connection from="53" to="245" />
- <connection from="245" to="246" />
- <connection from="246" to="248" />
- <connection from="246" to="249" />
- <connection from="248" to="250" />
- <connection from="249" to="250" />
- <connection from="246" to="250" />
- </connections>
-
-</process>
\ No newline at end of file
diff --git
a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/integrationtests/test_modifyWithRuleflowAndSubnetwork.rf
b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/integrationtests/test_modifyWithRuleflowAndSubnetwork.rf
deleted file mode 100644
index b08a8b14a9..0000000000
---
a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/integrationtests/test_modifyWithRuleflowAndSubnetwork.rf
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-
- 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.
-
--->
-
-<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://drools.org/drools-5.0/process";
- xmlns:xs="http://www.w3.org/2001/XMLSchema-instance";
- xs:schemaLocation="http://drools.org/drools-5.0/process
drools-processes-5.0.xsd"
- type="RuleFlow" name="Simple flow" id="ruleflow"
package-name="org.drools" >
-
- <header>
- </header>
-
- <nodes>
- <start id="1" name="Start" x="100" y="100" width="48" height="48" />
- <ruleSet id="2" name="Process" x="223" y="108" width="80" height="48"
ruleFlowGroup="process" />
- <end id="3" name="End" x="391" y="115" width="48" height="48" />
- </nodes>
-
- <connections>
- <connection from="1" to="2" />
- <connection from="2" to="3" />
- </connections>
-
-</process>
\ No newline at end of file
diff --git
a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java
b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java
index a042326508..b1cf2959b3 100644
---
a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java
+++
b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java
@@ -39,7 +39,7 @@ import org.kie.internal.builder.DecisionTableInputType;
import static org.assertj.core.api.Assertions.assertThat;
/**
- * Tests loading of different types of resources (DRL, DSL, DRF, BPMN2,
DTABLE).
+ * Tests loading of different types of resources (DRL, DSL, BPMN2, DTABLE).
* Packages are loaded and built using KnowledgeBuilder.
*/
public class ResourcesTest {
diff --git
a/drools-test-coverage/test-suite/src/test/resources/org/drools/testcoverage/functional/sample.rf
b/drools-test-coverage/test-suite/src/test/resources/org/drools/testcoverage/functional/sample.rf
deleted file mode 100644
index 6a511d3e50..0000000000
---
a/drools-test-coverage/test-suite/src/test/resources/org/drools/testcoverage/functional/sample.rf
+++ /dev/null
@@ -1,97 +0,0 @@
-<!--
-
- 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.
-
--->
-
-<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://drools.org/drools-5.0/process";
- xmlns:xs="http://www.w3.org/2001/XMLSchema-instance";
- xs:schemaLocation="http://drools.org/drools-5.0/process
drools-processes-5.0.xsd"
- type="RuleFlow" name="flow" id="rf"
package-name="org.jboss.qa.brms.bre.functional.flow" >
-
- <header>
- <imports>
- <import name="org.jboss.qa.brms.bre.domain.Person" />
- <import name="org.jboss.qa.brms.bre.domain.Message" />
- </imports>
- </header>
-
- <nodes>
- <start id="1" name="Start" x="7" y="246" width="49" height="48" />
- <ruleSet id="2" name="InitialNode" x="120" y="245" width="80" height="48"
ruleFlowGroup="init" />
- <join id="19" name="testConverge" x="695" y="231" width="49" height="49"
type="2" />
- <end id="21" name="End" x="918" y="229" width="48" height="48" />
- <ruleSet id="20" name="FinalNode" x="798" y="233" width="80" height="48"
ruleFlowGroup="final" />
- <end id="23" name="End" x="249" y="392" width="352" height="48" />
- <split id="22" name="testDiverge" x="244" y="248" width="49" height="49"
type="2" >
- <constraints>
- <constraint toNodeId="25" toType="DROOLS_DEFAULT" name="xor"
priority="1" type="rule" dialect="mvel" >Message ( message == "XOR"
)</constraint>
- <constraint toNodeId="26" toType="DROOLS_DEFAULT" name="or"
priority="1" type="rule" dialect="mvel" >Message ( message == "OR"
)</constraint>
- <constraint toNodeId="23" toType="DROOLS_DEFAULT" name="end"
priority="10" type="rule" dialect="mvel" >eval(true)</constraint>
- <constraint toNodeId="24" toType="DROOLS_DEFAULT" name="and"
priority="1" type="rule" dialect="mvel" >Message ( message == "AND"
)</constraint>
- </constraints>
- </split>
- <subProcess id="25" name="XORTest" x="404" y="244" width="118" height="48"
processId="rf_xor" >
- </subProcess>
- <subProcess id="24" name="ANDTest" x="406" y="308" width="116" height="48"
processId="rf_and" >
- </subProcess>
- <composite id="26" name="ORTest" x="2" y="2" width="520" height="165" >
- <nodes>
- <ruleSet id="3" name="ORTest" x="90" y="59" width="80" height="48"
ruleFlowGroup="or" />
- <split id="4" name="ORTestDiverge" x="202" y="58" width="53" height="49"
type="3" >
- <constraints>
- <constraint toNodeId="7" toType="DROOLS_DEFAULT" name="or2"
priority="1" type="rule" dialect="mvel" >Person ( id >= 5 )</constraint>
- <constraint toNodeId="6" toType="DROOLS_DEFAULT" name="or1"
priority="1" type="rule" dialect="mvel" >Person ( id <= 5 )</constraint>
- </constraints>
- </split>
- <join id="5" name="ORTestConverge" x="387" y="66" width="49" height="49"
type="3" />
- <ruleSet id="6" name="OR1" x="277" y="25" width="80" height="48"
ruleFlowGroup="or1" />
- <ruleSet id="7" name="OR2" x="280" y="110" width="80" height="48"
ruleFlowGroup="or2" />
- </nodes>
- <connections>
- <connection from="3" to="4" />
- <connection from="7" to="5" />
- <connection from="6" to="5" />
- <connection from="4" to="6" />
- <connection from="4" to="7" />
- </connections>
- <in-ports>
- <in-port type="DROOLS_DEFAULT" nodeId="3" nodeInType="DROOLS_DEFAULT"
/>
- </in-ports>
- <out-ports>
- <out-port type="DROOLS_DEFAULT" nodeId="5"
nodeOutType="DROOLS_DEFAULT" />
- </out-ports>
- </composite>
- </nodes>
-
- <connections>
- <connection from="1" to="2" />
- <connection from="24" to="19" />
- <connection from="25" to="19" />
- <connection from="26" to="19" />
- <connection from="20" to="21" />
- <connection from="19" to="20" />
- <connection from="22" to="23" />
- <connection from="2" to="22" />
- <connection from="22" to="25" />
- <connection from="22" to="24" />
- <connection from="22" to="26" />
- </connections>
-
-</process>
\ No newline at end of file
diff --git a/kie-api/src/main/java/org/kie/api/io/ResourceType.java
b/kie-api/src/main/java/org/kie/api/io/ResourceType.java
index 868e269853..5d0ed93353 100644
--- a/kie-api/src/main/java/org/kie/api/io/ResourceType.java
+++ b/kie-api/src/main/java/org/kie/api/io/ResourceType.java
@@ -135,12 +135,6 @@ public class ResourceType implements Serializable {
"src/main/resources",
"rdslr");
- /** Drools Rule Flow Language */
- public static final ResourceType DRF = addResourceTypeToRegistry("DRF",
- "Drools
Rule Flow Language",
-
"src/main/resources",
- "rf");
-
/** jBPM BPMN2 Language */
public static final ResourceType BPMN2 = addResourceTypeToRegistry("BPMN2",
"jBPM
BPMN2 Language",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
