You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/07/16 05:22:25 UTC
svn commit: r1752890 - in /ofbiz/trunk: build.gradle common.gradle
settings.gradle
Author: jleroux
Date: Sat Jul 16 05:22:24 2016
New Revision: 1752890
URL: http://svn.apache.org/viewvc?rev=1752890&view=rev
Log:
A patch from Michael Brohl for "iterateOverActiveComponents exists twice" https://issues.apache.org/jira/browse/OFBIZ-7749 reported by Pierre Smits
Currently the iterateOverActiveComponents function or tasks exists both in build.gradle and settings.gradle. Do we need both?
This patch introduces a new Gradle file which holds the shared method iterateOverActiveComponents which is used by build.gradle and settings.gradle. Thanks Pierre for the trigger to learn some Gradle stuff
Added:
ofbiz/trunk/common.gradle
Modified:
ofbiz/trunk/build.gradle
ofbiz/trunk/settings.gradle
Modified: ofbiz/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.gradle?rev=1752890&r1=1752889&r2=1752890&view=diff
==============================================================================
--- ofbiz/trunk/build.gradle (original)
+++ ofbiz/trunk/build.gradle Sat Jul 16 05:22:24 2016
@@ -25,6 +25,8 @@ import org.apache.tools.ant.filters.Repl
apply plugin: 'java'
apply plugin: 'eclipse'
+apply from: 'common.gradle'
+
// java settings
def jvmArguments = ['-Xms128M', '-Xmx512M']
ext.ofbizMainClass = 'org.ofbiz.base.start.Start'
@@ -796,28 +798,6 @@ def getDirectoryInActiveComponentsIfExis
return dirInComponents
}
-def iterateOverActiveComponents(applyFunction) {
- def frameworkComponents = new XmlParser().parse("${rootDir}/framework/component-load.xml")
- def applicationsComponents = new XmlParser().parse("${rootDir}/applications/component-load.xml")
- def specialpurposeComponents = new XmlParser().parse("${rootDir}/specialpurpose/component-load.xml")
-
- applyFunction file("${rootDir}/framework/start")
-
- frameworkComponents.children().each { component ->
- applyFunction file("${rootDir}/framework/"+component.@"component-location")
- }
- applicationsComponents.children().each { component ->
- applyFunction file("${rootDir}/applications/"+component.@"component-location")
- }
- specialpurposeComponents.children().each { component ->
- applyFunction file("${rootDir}/specialpurpose/"+component.@"component-location")
- }
-
- file("${rootDir}/hot-deploy").eachDir { component ->
- applyFunction(component)
- }
-}
-
def deleteAllInDirWithExclusions(dirName, exclusions) {
ant.delete (includeEmptyDirs: 'true', verbose: 'on') {
fileset(dir: dirName, includes: '**/*', erroronmissingdir: "false") {
Added: ofbiz/trunk/common.gradle
URL: http://svn.apache.org/viewvc/ofbiz/trunk/common.gradle?rev=1752890&view=auto
==============================================================================
--- ofbiz/trunk/common.gradle (added)
+++ ofbiz/trunk/common.gradle Sat Jul 16 05:22:24 2016
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+def iterateOverActiveComponents(applyFunction) {
+ def frameworkComponents = new XmlParser().parse("${rootDir}/framework/component-load.xml")
+ def applicationsComponents = new XmlParser().parse("${rootDir}/applications/component-load.xml")
+ def specialpurposeComponents = new XmlParser().parse("${rootDir}/specialpurpose/component-load.xml")
+
+ applyFunction file("${rootDir}/framework/start")
+
+ frameworkComponents.children().each { component ->
+ applyFunction file("${rootDir}/framework/"+component.@"component-location")
+ }
+ applicationsComponents.children().each { component ->
+ applyFunction file("${rootDir}/applications/"+component.@"component-location")
+ }
+ specialpurposeComponents.children().each { component ->
+ applyFunction file("${rootDir}/specialpurpose/"+component.@"component-location")
+ }
+
+ file("${rootDir}/hot-deploy").eachDir { component ->
+ applyFunction(component)
+ }
+}
+
+ext{
+ iterateOverActiveComponents = this.&iterateOverActiveComponents
+}
\ No newline at end of file
Modified: ofbiz/trunk/settings.gradle
URL: http://svn.apache.org/viewvc/ofbiz/trunk/settings.gradle?rev=1752890&r1=1752889&r2=1752890&view=diff
==============================================================================
--- ofbiz/trunk/settings.gradle (original)
+++ ofbiz/trunk/settings.gradle Sat Jul 16 05:22:24 2016
@@ -16,27 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-def iterateOverActiveComponents(applyFunction) {
- def frameworkComponents = new XmlParser().parse("${rootDir}/framework/component-load.xml")
- def applicationsComponents = new XmlParser().parse("${rootDir}/applications/component-load.xml")
- def specialpurposeComponents = new XmlParser().parse("${rootDir}/specialpurpose/component-load.xml")
- applyFunction file("${rootDir}/framework/start")
-
- frameworkComponents.children().each { component ->
- applyFunction file("${rootDir}/framework/"+component.@"component-location")
- }
- applicationsComponents.children().each { component ->
- applyFunction file("${rootDir}/applications/"+component.@"component-location")
- }
- specialpurposeComponents.children().each { component ->
- applyFunction file("${rootDir}/specialpurpose/"+component.@"component-location")
- }
-
- file("${rootDir}/hot-deploy").eachDir { component ->
- applyFunction(component)
- }
-}
+apply from: 'common.gradle'
iterateOverActiveComponents { File component ->
def osName = System.getProperty('os.name').toLowerCase()