Skip to content
Permalink
Browse files

Improved: Remove redundant "dtd" directory from classpath

(OFBIZ-11161)

the "dtd" directories are already present as resources distributed
inside OFBiz jar, so there is no need to augment the classpath to find
the XML schema inside those directories.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1865796 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
mthl committed Aug 24, 2019
1 parent 9bc8ebb commit cf79277608b736eb3d3d919a03c5ec631f82ca7b
@@ -23,7 +23,6 @@ under the License.
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
<classpath type="dir" location="dtd"/>

<entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>

@@ -22,7 +22,6 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<classpath type="dir" location="dtd"/>
<classpath type="dir" location="config"/>

<test-suite loader="main" location="testdef/basetests.xml"/>
@@ -22,5 +22,4 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<classpath type="dir" location="dtd"/>
</ofbiz-component>
@@ -22,7 +22,6 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<classpath type="dir" location="dtd"/>
<classpath type="dir" location="config"/>

<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
@@ -23,7 +23,6 @@ under the License.
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
<classpath type="dir" location="dtd"/>

<test-suite loader="main" location="testdef/MinilangTests.xml"/>
</ofbiz-component>
@@ -26,8 +26,6 @@ under the License.

<!-- place the config directory on the classpath to access configuration files -->
<classpath type="dir" location="config"/>
<classpath type="dir" location="dtd"/>

<!-- entity resources: model(s), eca(s), group, and data definitions -->
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<!-- <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> -->
@@ -23,7 +23,6 @@ under the License.
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
<classpath type="dir" location="dtd"/>

<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/SecurityPermissionSeedData.xml"/>
@@ -23,7 +23,6 @@ under the License.
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
<classpath type="dir" location="dtd"/>

<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ScheduledServiceData.xml"/>
@@ -24,11 +24,8 @@
<!-- define resource loaders; most common is to use the component resource loader -->
<resource-loader name="main" type="component"/>

<!-- place the config directory on the classpath to access configuration files -->
<classpath type="dir" location="dtd"/>

<!-- service resources: model(s), eca(s) and group definitions -->
<service-resource type="model" loader="main" location="servicedef/services.xml"/>

<container name="testtools-container" loaders="test" class="org.apache.ofbiz.testtools.TestRunContainer"/>
</ofbiz-component>
</ofbiz-component>
@@ -25,7 +25,6 @@ under the License.
<resource-loader name="main" type="component"/>

<classpath type="dir" location="config"/>
<classpath type="dir" location="dtd"/>

<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<!--
@@ -23,7 +23,6 @@ under the License.
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
<classpath type="dir" location="dtd"/>

<test-suite loader="main" location="testdef/widgettests.xml"/>
</ofbiz-component>

0 comments on commit cf79277

Please sign in to comment.
You can’t perform that action at this time.