Commit aae1c8a8 authored by Mathieu Lirzin's avatar Mathieu Lirzin

Reverted: "Improved: Use ‘depends-on’ attribute instead of “component-load.xml”"

(OFBIZ-11296)

This reverts commit eeabe698.
parent 0039dcd7
......@@ -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"/>
......
......@@ -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"/>
......
<?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.
-->
<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>
......@@ -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"/>
......
......@@ -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"/>
......
......@@ -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 -->
......
......@@ -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"/>
......
......@@ -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"/>
......
......@@ -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"/>
......
......@@ -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"/>
......
......@@ -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"/>
......
......@@ -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"/>
......
......@@ -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"/>
......
......@@ -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"/>
......
<?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.
-->
<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>
......@@ -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>
......@@ -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"/>
......
......@@ -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"/>
......
......@@ -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"/>
......
......@@ -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"/>
......
......@@ -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"/>
......
......@@ -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 -->
......
......@@ -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"/>
......
......@@ -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"/>
......
......@@ -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"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment