You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mt...@apache.org on 2019/12/18 11:12:02 UTC
[ofbiz-framework] branch trunk updated: Reverted: "Improved: Use ‘depends-on’ attribute instead of “component-load.xml”" (OFBIZ-11296)
This is an automated email from the ASF dual-hosted git repository.
mthl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new aae1c8a Reverted: "Improved: Use ‘depends-on’ attribute instead of “component-load.xml”" (OFBIZ-11296)
aae1c8a is described below
commit aae1c8a8f5fed7de717290c938297be62c0460fa
Author: Mathieu Lirzin <ma...@nereide.fr>
AuthorDate: Wed Dec 18 12:09:20 2019 +0100
Reverted: "Improved: Use ‘depends-on’ attribute instead of “component-load.xml”"
(OFBIZ-11296)
This reverts commit eeabe69813a1d9f42911dec70a912574046ef49b.
---
applications/accounting/ofbiz-component.xml | 1 -
applications/commonext/ofbiz-component.xml | 3 ---
.../ofbiz-component.xml => component-load.xml} | 25 ++++++++++++++--------
applications/content/ofbiz-component.xml | 1 -
applications/humanres/ofbiz-component.xml | 1 -
applications/manufacturing/ofbiz-component.xml | 1 -
applications/marketing/ofbiz-component.xml | 1 -
applications/order/ofbiz-component.xml | 1 -
applications/party/ofbiz-component.xml | 1 -
applications/product/ofbiz-component.xml | 1 -
applications/securityext/ofbiz-component.xml | 1 -
applications/workeffort/ofbiz-component.xml | 1 -
framework/catalina/ofbiz-component.xml | 1 -
framework/common/ofbiz-component.xml | 1 -
.../component-load.xml | 25 ++++++++++++++--------
framework/datafile/ofbiz-component.xml | 1 -
framework/entity/ofbiz-component.xml | 1 -
framework/entityext/ofbiz-component.xml | 1 -
framework/minilang/ofbiz-component.xml | 1 -
framework/security/ofbiz-component.xml | 1 -
framework/service/ofbiz-component.xml | 1 -
framework/testtools/ofbiz-component.xml | 1 -
framework/webapp/ofbiz-component.xml | 2 +-
framework/webtools/ofbiz-component.xml | 1 -
framework/widget/ofbiz-component.xml | 1 -
25 files changed, 33 insertions(+), 43 deletions(-)
diff --git a/applications/accounting/ofbiz-component.xml b/applications/accounting/ofbiz-component.xml
index 48828ed..31692c8 100644
--- a/applications/accounting/ofbiz-component.xml
+++ b/applications/accounting/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="accounting"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="manufacturing"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/applications/commonext/ofbiz-component.xml b/applications/commonext/ofbiz-component.xml
index ca14df6..60c7bbc 100644
--- a/applications/commonext/ofbiz-component.xml
+++ b/applications/commonext/ofbiz-component.xml
@@ -21,9 +21,6 @@ under the License.
<ofbiz-component name="commonext"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <!-- Common component used by most other components must be last because it
- uses info from most other "application" components. -->
- <depends-on component-name="marketing"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/applications/securityext/ofbiz-component.xml b/applications/component-load.xml
similarity index 50%
copy from applications/securityext/ofbiz-component.xml
copy to applications/component-load.xml
index 6fc94f9..7d2a71a 100644
--- a/applications/securityext/ofbiz-component.xml
+++ b/applications/component-load.xml
@@ -18,12 +18,19 @@ specific language governing permissions and limitations
under the License.
-->
-<ofbiz-component name="securityext"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="party"/>
- <resource-loader name="main" type="component"/>
- <classpath type="dir" location="config"/>
-
- <service-resource type="model" loader="main" location="servicedef/services.xml"/>
-</ofbiz-component>
+<component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
+ <load-component component-location="datamodel"/>
+ <load-component component-location="party"/>
+ <load-component component-location="securityext"/>
+ <load-component component-location="content"/>
+ <load-component component-location="workeffort"/>
+ <load-component component-location="product"/>
+ <load-component component-location="manufacturing"/>
+ <load-component component-location="accounting"/>
+ <load-component component-location="humanres"/>
+ <load-component component-location="order"/>
+ <load-component component-location="marketing"/>
+<!-- common component used by most other components last because it uses info from most components-->
+ <load-component component-location="commonext"/>
+</component-loader>
diff --git a/applications/content/ofbiz-component.xml b/applications/content/ofbiz-component.xml
index 7682d2b..03d7cf8 100644
--- a/applications/content/ofbiz-component.xml
+++ b/applications/content/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="content"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="securityext"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/applications/humanres/ofbiz-component.xml b/applications/humanres/ofbiz-component.xml
index 117aeff..9526ef5 100644
--- a/applications/humanres/ofbiz-component.xml
+++ b/applications/humanres/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="humanres"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="accounting"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/applications/manufacturing/ofbiz-component.xml b/applications/manufacturing/ofbiz-component.xml
index 10e4024..737d5b3 100644
--- a/applications/manufacturing/ofbiz-component.xml
+++ b/applications/manufacturing/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="manufacturing"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="product"/>
<resource-loader name="main" type="component"/>
<!-- place the config directory on the classpath to access configuration files -->
diff --git a/applications/marketing/ofbiz-component.xml b/applications/marketing/ofbiz-component.xml
index 3347407..b5cdcea 100644
--- a/applications/marketing/ofbiz-component.xml
+++ b/applications/marketing/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="marketing"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="order"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/applications/order/ofbiz-component.xml b/applications/order/ofbiz-component.xml
index d6c67d9..7222034 100644
--- a/applications/order/ofbiz-component.xml
+++ b/applications/order/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="order"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="humanres"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/applications/party/ofbiz-component.xml b/applications/party/ofbiz-component.xml
index 145719a..d393aec 100644
--- a/applications/party/ofbiz-component.xml
+++ b/applications/party/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="party"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="datamodel"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/applications/product/ofbiz-component.xml b/applications/product/ofbiz-component.xml
index 6659dec..9a203d0 100644
--- a/applications/product/ofbiz-component.xml
+++ b/applications/product/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="product"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="workeffort"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/applications/securityext/ofbiz-component.xml b/applications/securityext/ofbiz-component.xml
index 6fc94f9..20d308e 100644
--- a/applications/securityext/ofbiz-component.xml
+++ b/applications/securityext/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="securityext"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="party"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/applications/workeffort/ofbiz-component.xml b/applications/workeffort/ofbiz-component.xml
index 729d7b5..b5a0e00 100644
--- a/applications/workeffort/ofbiz-component.xml
+++ b/applications/workeffort/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="workeffort"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="content"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/framework/catalina/ofbiz-component.xml b/framework/catalina/ofbiz-component.xml
index 8d71e84..f9eaf36 100644
--- a/framework/catalina/ofbiz-component.xml
+++ b/framework/catalina/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="catalina"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="service"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
diff --git a/framework/common/ofbiz-component.xml b/framework/common/ofbiz-component.xml
index cf237ec..4a5ac2b 100644
--- a/framework/common/ofbiz-component.xml
+++ b/framework/common/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="common"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="minilang"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/applications/securityext/ofbiz-component.xml b/framework/component-load.xml
similarity index 52%
copy from applications/securityext/ofbiz-component.xml
copy to framework/component-load.xml
index 6fc94f9..a7f7779 100644
--- a/applications/securityext/ofbiz-component.xml
+++ b/framework/component-load.xml
@@ -18,12 +18,19 @@ specific language governing permissions and limitations
under the License.
-->
-<ofbiz-component name="securityext"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="party"/>
- <resource-loader name="main" type="component"/>
- <classpath type="dir" location="config"/>
-
- <service-resource type="model" loader="main" location="servicedef/services.xml"/>
-</ofbiz-component>
+<component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
+ <load-component component-location="base"/>
+ <load-component component-location="entity"/>
+ <load-component component-location="security"/>
+ <load-component component-location="datafile"/>
+ <load-component component-location="minilang"/>
+ <load-component component-location="common"/>
+ <load-component component-location="service"/>
+ <load-component component-location="catalina"/>
+ <load-component component-location="entityext"/>
+ <load-component component-location="webapp"/>
+ <load-component component-location="widget"/>
+ <load-component component-location="testtools"/>
+ <load-component component-location="webtools"/>
+</component-loader>
diff --git a/framework/datafile/ofbiz-component.xml b/framework/datafile/ofbiz-component.xml
index 3492033..435d2f6 100644
--- a/framework/datafile/ofbiz-component.xml
+++ b/framework/datafile/ofbiz-component.xml
@@ -21,6 +21,5 @@ under the License.
<ofbiz-component name="datafile"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="security"/>
<resource-loader name="main" type="component"/>
</ofbiz-component>
diff --git a/framework/entity/ofbiz-component.xml b/framework/entity/ofbiz-component.xml
index 5c41d46..54f0890 100644
--- a/framework/entity/ofbiz-component.xml
+++ b/framework/entity/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="entity"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="base"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/framework/entityext/ofbiz-component.xml b/framework/entityext/ofbiz-component.xml
index 414684c..3ea4508 100644
--- a/framework/entityext/ofbiz-component.xml
+++ b/framework/entityext/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="entityext"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="catalina"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/framework/minilang/ofbiz-component.xml b/framework/minilang/ofbiz-component.xml
index 2343665..2dfefdf 100644
--- a/framework/minilang/ofbiz-component.xml
+++ b/framework/minilang/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="minilang"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="datafile"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/framework/security/ofbiz-component.xml b/framework/security/ofbiz-component.xml
index 3ecacb2..b3c015b 100644
--- a/framework/security/ofbiz-component.xml
+++ b/framework/security/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="entity"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/framework/service/ofbiz-component.xml b/framework/service/ofbiz-component.xml
index 1a979f6..1735f9d 100644
--- a/framework/service/ofbiz-component.xml
+++ b/framework/service/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="service"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="common"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/framework/testtools/ofbiz-component.xml b/framework/testtools/ofbiz-component.xml
index 5262d3a..23c9223 100644
--- a/framework/testtools/ofbiz-component.xml
+++ b/framework/testtools/ofbiz-component.xml
@@ -22,7 +22,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<!-- define resource loaders; most common is to use the component resource loader -->
- <depends-on component-name="widget"/>
<resource-loader name="main" type="component"/>
<!-- service resources: model(s), eca(s) and group definitions -->
diff --git a/framework/webapp/ofbiz-component.xml b/framework/webapp/ofbiz-component.xml
index ab27ca2..32fe616 100644
--- a/framework/webapp/ofbiz-component.xml
+++ b/framework/webapp/ofbiz-component.xml
@@ -21,7 +21,7 @@ under the License.
<ofbiz-component name="webapp"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="entityext"/>
+
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/framework/webtools/ofbiz-component.xml b/framework/webtools/ofbiz-component.xml
index 43799e3..662e606 100644
--- a/framework/webtools/ofbiz-component.xml
+++ b/framework/webtools/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="webtools"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="testtools"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
diff --git a/framework/widget/ofbiz-component.xml b/framework/widget/ofbiz-component.xml
index 3a4dd5d..c7f8186 100644
--- a/framework/widget/ofbiz-component.xml
+++ b/framework/widget/ofbiz-component.xml
@@ -21,7 +21,6 @@ under the License.
<ofbiz-component name="widget"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
- <depends-on component-name="webapp"/>
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>