You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mb...@apache.org on 2023/08/01 08:49:09 UTC
[ofbiz-framework] branch trunk updated (5be826024c -> 3e077e5f17)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
from 5be826024c Improved: Refactor groovy folder structure and add package declaration
new 12f6964841 Fixed: Corrects wrong groovy file reference (OFBIZ-12813)
new 88071b0eaf Fixed: Corrects path reference for groovy files (OFBIZ-12813)
new 870f673e2c Improved: Reword comment (OFBIZ-12813)
new 3e077e5f17 Fixed: Corrects groovy source folder location in build.gradle (OFBIZ-12813)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
applications/party/widget/partymgr/CommunicationEventScreens.xml | 2 +-
build.gradle | 4 ++--
.../base/src/test/groovy/org/apache/ofbizbase/test/SimpleTests.groovy | 2 +-
.../java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
[ofbiz-framework] 01/04: Fixed: Corrects wrong groovy file reference (OFBIZ-12813)
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 12f69648418b3c63467e39c1a759ca6241e8094b
Author: Michael Brohl <mi...@ecomify.de>
AuthorDate: Mon Jul 31 17:12:33 2023 +0200
Fixed: Corrects wrong groovy file reference (OFBIZ-12813)
---
applications/party/widget/partymgr/CommunicationEventScreens.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/applications/party/widget/partymgr/CommunicationEventScreens.xml b/applications/party/widget/partymgr/CommunicationEventScreens.xml
index 73a8307fd3..1d24800ff7 100644
--- a/applications/party/widget/partymgr/CommunicationEventScreens.xml
+++ b/applications/party/widget/partymgr/CommunicationEventScreens.xml
@@ -965,7 +965,7 @@ under the License.
</condition>
<actions>
<set field="fromPartyId" from-field="communicationEvent.partyIdFrom"/>
- <script location="component://projectmgr/groovyScripts/GetLastRequestAssignment.groovy"/>
+ <script location="component://projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/GetLastRequestAssignment.groovy"/>
</actions>
<widgets>
<screenlet title="${uiLabelMap.OrderRequest}">
[ofbiz-framework] 02/04: Fixed: Corrects path reference for groovy files (OFBIZ-12813)
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 88071b0eaf1d14db93c7b29d2a70bfb81d35ef38
Author: Michael Brohl <mi...@ecomify.de>
AuthorDate: Mon Jul 31 17:16:07 2023 +0200
Fixed: Corrects path reference for groovy files (OFBIZ-12813)
---
.../java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java
index a89963d321..53d5167c49 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java
@@ -203,7 +203,7 @@ public class LabelReferences {
private void getLabelsFromGroovyFiles() throws IOException {
for (Path rootFolder : this.rootFolders) {
List<File> groovyFiles =
- FileUtil.findFiles("groovy", rootFolder.resolve("groovyScripts").toString(), null, null);
+ FileUtil.findFiles("groovy", rootFolder.resolve("src/main/groovy").toString(), null, null);
for (File file : groovyFiles) {
String inFile = FileUtil.readString("UTF-8", file);
findUiLabelMapInPattern(inFile, UILABEL_MAP, file.getPath());
[ofbiz-framework] 04/04: Fixed: Corrects groovy source folder location in build.gradle (OFBIZ-12813)
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 3e077e5f17b839d8cca88643e605975c2fc552c7
Author: Michael Brohl <mi...@ecomify.de>
AuthorDate: Mon Jul 31 17:47:23 2023 +0200
Fixed: Corrects groovy source folder location in build.gradle
(OFBIZ-12813)
---
build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 8fce176ecc..a31dea061a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -357,7 +357,7 @@ sourceSets {
groovyScripts {
groovy {
- srcDirs += getDirectoryInActiveComponentsIfExists('groovyScripts')
+ srcDirs += getDirectoryInActiveComponentsIfExists('src/main/groovy')
compileClasspath += sourceSets.main.compileClasspath
compileClasspath += sourceSets.main.output
}
@@ -809,7 +809,7 @@ task createPlugin(group: ofbizPlugin, description: 'create a new plugin componen
def pluginDir = "${pluginsDir}/${pluginId}"
['config', 'dtd', 'entitydef', 'lib', 'patches/test', 'patches/qa',
- 'patches/production', 'groovyScripts', 'minilang', 'servicedef', 'src/main/java', 'src/test/java', 'testdef',
+ 'patches/production', 'src/main/groovy', 'minilang', 'servicedef', 'src/main/java', 'src/test/java', 'testdef',
'widget', "webapp/${webappName}/error", "webapp/${webappName}/WEB-INF"].each {
mkdir pluginDir + '/' + it
}
[ofbiz-framework] 03/04: Improved: Reword comment (OFBIZ-12813)
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 870f673e2c1e9a8e45ed48694a6f3f28b83bc5d6
Author: Michael Brohl <mi...@ecomify.de>
AuthorDate: Mon Jul 31 17:34:49 2023 +0200
Improved: Reword comment (OFBIZ-12813)
---
.../base/src/test/groovy/org/apache/ofbizbase/test/SimpleTests.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/framework/base/src/test/groovy/org/apache/ofbizbase/test/SimpleTests.groovy b/framework/base/src/test/groovy/org/apache/ofbizbase/test/SimpleTests.groovy
index aa36b768e9..f6e214d884 100644
--- a/framework/base/src/test/groovy/org/apache/ofbizbase/test/SimpleTests.groovy
+++ b/framework/base/src/test/groovy/org/apache/ofbizbase/test/SimpleTests.groovy
@@ -22,7 +22,7 @@ package org.apache.ofbizbase.test
import org.apache.ofbiz.testtools.GroovyScriptTestCase
/**
- * Class validating groovyScripts test engine.
+ * Class validating groovy scripts test engine.
*/
class SimpleTests extends GroovyScriptTestCase {