This is an automated email from the ASF dual-hosted git repository.
jleroux 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 5be826024c Improved: Refactor groovy folder structure and add package
declaration
5be826024c is described below
commit 5be826024c310ecb9af7855e8b535daf0ff2d0a3
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Fri Jul 28 16:30:22 2023 +0200
Improved: Refactor groovy folder structure and add package declaration
Removes or renames references to groovyScripts files or folders.
EditRoutingProductLink.groovy and EditFeatureCategories.groovy files no
longer
exist, nor other types of files with names starting by such.
---
applications/manufacturing/widget/manufacturing/RoutingScreens.xml | 1 -
applications/product/widget/catalog/FeatureScreens.xml | 2 --
docs/asciidoc/developer-manual.adoc | 3 ++-
framework/testtools/dtd/test-suite.xsd | 7 ++++---
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
b/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
index c64375fd1c..fda4ecfe24 100644
--- a/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
+++ b/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
@@ -335,7 +335,6 @@ under the License.
<field-map field-name="workEffortGoodStdTypeId"
from-field="workEffortGoodStdTypeId"/>
</entity-and>
<entity-one entity-name="WorkEffortGoodStandard"
value-field="routingProductLink" auto-field-map="true"/>
- <!--<script
location="component://manufacturing/groovyScripts/routing/EditRoutingProductLink.groovy"/>-->
</actions>
<widgets>
<decorator-screen name="CommonRoutingDecorator">
diff --git a/applications/product/widget/catalog/FeatureScreens.xml
b/applications/product/widget/catalog/FeatureScreens.xml
index 81a6d7079c..35c244f802 100644
--- a/applications/product/widget/catalog/FeatureScreens.xml
+++ b/applications/product/widget/catalog/FeatureScreens.xml
@@ -221,8 +221,6 @@
<set field="tabButtonItem" value="FeatureCategory"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX_1"
type="Integer" default-value="0"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE_1"
type="Integer" default-value="10"/>
-
- <!--script
location="component://product/groovyScripts/catalog/feature/EditFeatureCategories.groovy"/-->
</actions>
<widgets>
<decorator-screen name="CommonFeatureDecorator">
diff --git a/docs/asciidoc/developer-manual.adoc
b/docs/asciidoc/developer-manual.adoc
index a770ed2043..922be6e060 100644
--- a/docs/asciidoc/developer-manual.adoc
+++ b/docs/asciidoc/developer-manual.adoc
@@ -78,13 +78,14 @@ component-name-here/
├── config/ - Properties and translation labels (i18n)
├── data/ - XML data to load into the database
├── entitydef/ - Defined database entities
-├── groovyScripts/ - A collection of scripts written in Groovy
├── minilang/ - A collection of scripts written in minilang
(deprecated)
├── ofbiz-component.xml - The OFBiz main component configuration file
├── servicedef - Defined services.
├── src/
├── docs/ - component documentation source
+ └── main/groovy/ - A collection of scripts written in Groovy
└── main/java/ - java source code
+ └── test/groovy/ - A collection of scripts written in Groovy
└── test/java/ - java unit-tests
├── testdef - Defined integration-tests
├── webapp - One or more Java webapps including the control
servlet
diff --git a/framework/testtools/dtd/test-suite.xsd
b/framework/testtools/dtd/test-suite.xsd
index e9ee0e2372..d5c1e04199 100644
--- a/framework/testtools/dtd/test-suite.xsd
+++ b/framework/testtools/dtd/test-suite.xsd
@@ -77,7 +77,7 @@ under the License.
<xs:attribute type="xs:string" name="class-name" use="required">
<xs:annotation>
<xs:documentation>
- At minimum should extend the junit.framework.TestCase
class. If you want to use a GenericDelegator or
+ At minimum should extend the junit.framework.TestCase
class. If you want to use a GenericDelegator or
LocalDispatcher you should extend the OFBizTestCase class
and use the ones provided by it.
</xs:documentation>
</xs:annotation>
@@ -99,8 +99,9 @@ under the License.
<xs:attribute type="xs:string" name="location" use="required">
<xs:annotation>
<xs:documentation>
- Give the location where is groovy file that contaions the
test suite.
- You can use a flexible url location like
component://mycomponent/groovyScripts/test/MySuiteTest.groovy
+ Give the location where is groovy file that contains the
test suite.
+ You can use a flexible url location like
+
component://service/src/test/groovy/org/apache/ofbizservice/test/TestServices.groovy
</xs:documentation>
</xs:annotation>
</xs:attribute>
