Author: mthl
Date: Sat Aug 24 00:29:41 2019 New Revision: 1865796 URL: http://svn.apache.org/viewvc?rev=1865796&view=rev Log: 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. Modified: ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml ofbiz/ofbiz-framework/trunk/framework/base/ofbiz-component.xml ofbiz/ofbiz-framework/trunk/framework/datafile/ofbiz-component.xml ofbiz/ofbiz-framework/trunk/framework/entity/ofbiz-component.xml ofbiz/ofbiz-framework/trunk/framework/minilang/ofbiz-component.xml ofbiz/ofbiz-framework/trunk/framework/resources/templates/ofbiz-component.xml ofbiz/ofbiz-framework/trunk/framework/security/ofbiz-component.xml ofbiz/ofbiz-framework/trunk/framework/service/ofbiz-component.xml ofbiz/ofbiz-framework/trunk/framework/testtools/ofbiz-component.xml ofbiz/ofbiz-framework/trunk/framework/webapp/ofbiz-component.xml ofbiz/ofbiz-framework/trunk/framework/widget/ofbiz-component.xml Modified: ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml?rev=1865796&r1=1865795&r2=1865796&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml Sat Aug 24 00:29:41 2019 @@ -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"/> Modified: ofbiz/ofbiz-framework/trunk/framework/base/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/ofbiz-component.xml?rev=1865796&r1=1865795&r2=1865796&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/ofbiz-component.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/ofbiz-component.xml Sat Aug 24 00:29:41 2019 @@ -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"/> Modified: ofbiz/ofbiz-framework/trunk/framework/datafile/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/datafile/ofbiz-component.xml?rev=1865796&r1=1865795&r2=1865796&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/datafile/ofbiz-component.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/datafile/ofbiz-component.xml Sat Aug 24 00:29:41 2019 @@ -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> Modified: ofbiz/ofbiz-framework/trunk/framework/entity/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/ofbiz-component.xml?rev=1865796&r1=1865795&r2=1865796&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/ofbiz-component.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/ofbiz-component.xml Sat Aug 24 00:29:41 2019 @@ -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"/> Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/ofbiz-component.xml?rev=1865796&r1=1865795&r2=1865796&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/minilang/ofbiz-component.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/minilang/ofbiz-component.xml Sat Aug 24 00:29:41 2019 @@ -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> Modified: ofbiz/ofbiz-framework/trunk/framework/resources/templates/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/resources/templates/ofbiz-component.xml?rev=1865796&r1=1865795&r2=1865796&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/resources/templates/ofbiz-component.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/resources/templates/ofbiz-component.xml Sat Aug 24 00:29:41 2019 @@ -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"/> --> Modified: ofbiz/ofbiz-framework/trunk/framework/security/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/security/ofbiz-component.xml?rev=1865796&r1=1865795&r2=1865796&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/security/ofbiz-component.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/security/ofbiz-component.xml Sat Aug 24 00:29:41 2019 @@ -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"/> Modified: ofbiz/ofbiz-framework/trunk/framework/service/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/ofbiz-component.xml?rev=1865796&r1=1865795&r2=1865796&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/ofbiz-component.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/ofbiz-component.xml Sat Aug 24 00:29:41 2019 @@ -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"/> Modified: ofbiz/ofbiz-framework/trunk/framework/testtools/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/ofbiz-component.xml?rev=1865796&r1=1865795&r2=1865796&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/testtools/ofbiz-component.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/testtools/ofbiz-component.xml Sat Aug 24 00:29:41 2019 @@ -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> \ No newline at end of file +</ofbiz-component> Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/ofbiz-component.xml?rev=1865796&r1=1865795&r2=1865796&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/ofbiz-component.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/ofbiz-component.xml Sat Aug 24 00:29:41 2019 @@ -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"/> <!-- Modified: ofbiz/ofbiz-framework/trunk/framework/widget/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/ofbiz-component.xml?rev=1865796&r1=1865795&r2=1865796&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/ofbiz-component.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/ofbiz-component.xml Sat Aug 24 00:29:41 2019 @@ -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> |
Free forum by Nabble | Edit this page |