svn commit: r1865717 - in /ofbiz/ofbiz-framework/trunk: ./ framework/base/src/main/java/META-INF/ framework/base/src/main/java/org/apache/ofbiz/base/ framework/base/src/main/resources/ framework/base/src/main/resources/META-INF/ framework/base/src/main...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1865717 - in /ofbiz/ofbiz-framework/trunk: ./ framework/base/src/main/java/META-INF/ framework/base/src/main/java/org/apache/ofbiz/base/ framework/base/src/main/resources/ framework/base/src/main/resources/META-INF/ framework/base/src/main...

mthl
Author: mthl
Date: Thu Aug 22 20:38:01 2019
New Revision: 1865717

URL: http://svn.apache.org/viewvc?rev=1865717&view=rev
Log:
Improved: Separate resources from Java source files
(OFBIZ-11161)

This moves the resource files in a dedicated "src/main/resources"
directory.  This convention follows the Maven standard directory
layout which is the convention used by default in Gradle.

Added:
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/META-INF/
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/META-INF/services/
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/META-INF/services/org.apache.ofbiz.base.util.test.UtilObjectTests$TestFactoryIntf
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/apache/
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/apache/ofbiz/
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/apache/ofbiz/base/
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/apache/ofbiz/base/OfbizDslDescriptorForEclipse.dsld
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/apache/ofbiz/base/OfbizDslDescriptorForIntelliJ.gdsl
    ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/
    ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/META-INF/
    ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/META-INF/services/
    ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/META-INF/services/org.apache.ofbiz.common.authentication.api.Authenticator
    ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/org/
    ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/org/apache/
    ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/org/apache/ofbiz/
    ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/org/apache/ofbiz/common/
    ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/org/apache/ofbiz/common/JavaScriptTest.js   (with props)
    ofbiz/ofbiz-framework/trunk/framework/entity/src/main/resources/
    ofbiz/ofbiz-framework/trunk/framework/entity/src/main/resources/META-INF/
    ofbiz/ofbiz-framework/trunk/framework/entity/src/main/resources/META-INF/services/
    ofbiz/ofbiz-framework/trunk/framework/entity/src/main/resources/META-INF/services/org.apache.ofbiz.base.conversion.ConverterLoader
    ofbiz/ofbiz-framework/trunk/framework/entity/src/main/resources/META-INF/services/org.apache.ofbiz.entity.DelegatorFactory
    ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/resources/
    ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/resources/META-INF/
    ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/resources/META-INF/services/
    ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/resources/META-INF/services/org.apache.ofbiz.minilang.method.MethodOperation$Factory
    ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/resources/META-INF/services/org.apache.ofbiz.minilang.method.conditional.ConditionalFactory
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/load-data.properties   (with props)
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/rmi.properties   (with props)
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/start.properties   (with props)
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/test.properties   (with props)
Removed:
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/META-INF/
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/OfbizDslDescriptorForEclipse.dsld
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/OfbizDslDescriptorForIntelliJ.gdsl
    ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/META-INF/
    ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/JavaScriptTest.js
    ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/META-INF/
    ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/META-INF/
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/load-data.properties
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/rmi.properties
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/start.properties
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/test.properties
Modified:
    ofbiz/ofbiz-framework/trunk/build.gradle

Modified: ofbiz/ofbiz-framework/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/build.gradle?rev=1865717&r1=1865716&r2=1865717&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/build.gradle (original)
+++ ofbiz/ofbiz-framework/trunk/build.gradle Thu Aug 22 20:38:01 2019
@@ -279,10 +279,9 @@ sourceSets {
             srcDirs = getDirectoryInActiveComponentsIfExists('src/main/groovy')
         }
         resources {
-            srcDirs = getDirectoryInActiveComponentsIfExists('src/main/java')
+            srcDirs = getDirectoryInActiveComponentsIfExists('src/main/resources')
             srcDirs += getDirectoryInActiveComponentsIfExists('config')
             srcDirs += getDirectoryInActiveComponentsIfExists('dtd')
-            exclude excludedJavaSources
             exclude excludedConfigFiles
             // Below are necessary for unit tests run by Gradle and integration tests
             exclude { FileTreeElement elem -> elem.getName().contains('Labels.xml') }
@@ -305,7 +304,7 @@ sourceSets {
             srcDirs = getDirectoryInActiveComponentsIfExists('src/test/groovy')
         }
         resources {
-            srcDirs = getDirectoryInActiveComponentsIfExists('src/test/java')
+            srcDirs = getDirectoryInActiveComponentsIfExists('src/test/resources')
         }
     }
 }

Added: ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/META-INF/services/org.apache.ofbiz.base.util.test.UtilObjectTests$TestFactoryIntf
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/META-INF/services/org.apache.ofbiz.base.util.test.UtilObjectTests%24TestFactoryIntf?rev=1865717&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/META-INF/services/org.apache.ofbiz.base.util.test.UtilObjectTests$TestFactoryIntf (added)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/META-INF/services/org.apache.ofbiz.base.util.test.UtilObjectTests$TestFactoryIntf Thu Aug 22 20:38:01 2019
@@ -0,0 +1,2 @@
+org.apache.ofbiz.base.util.test.UtilObjectTests$FirstTestFactory
+org.apache.ofbiz.base.util.test.UtilObjectTests$SecondTestFactory

Added: ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/apache/ofbiz/base/OfbizDslDescriptorForEclipse.dsld
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/apache/ofbiz/base/OfbizDslDescriptorForEclipse.dsld?rev=1865717&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/apache/ofbiz/base/OfbizDslDescriptorForEclipse.dsld (added)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/apache/ofbiz/base/OfbizDslDescriptorForEclipse.dsld Thu Aug 22 20:38:01 2019
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * 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.
+ *******************************************************************************/
+
+contribute(currentType(subType('groovy.lang.Script'))) {
+    property name : 'parameters', type : 'java.util.Map'
+    property name: 'context', type: 'java.util.Map'
+    property name: 'delegator', type: 'org.apache.ofbiz.entity.Delegator'
+    property name: 'dispatcher', type: 'org.apache.ofbiz.service.LocalDispatcher'
+    property name: 'security', type: 'org.apache.ofbiz.security.Security'
+
+    method name: 'runService', type: 'java.util.Map', params: [serviceName: 'String', inputMap: 'java.util.Map']
+    method name: 'run', type: 'java.util.Map', params: [args: 'java.util.Map']
+    method name: 'makeValue', type: 'java.util.Map', params: [entityName: 'String']
+    method name: 'findOne', type: 'java.util.Map', params: [entityName: 'String', fields: 'java.util.Map', useCache: 'boolean']
+    method name: 'select', type: 'org.apache.ofbiz.entity.util.EntityQuery', params: [entity: 'java.util.Set']
+    method name: 'select', type: 'org.apache.ofbiz.entity.util.EntityQuery', params: [entity: 'String...']
+    method name: 'from', type: 'org.apache.ofbiz.entity.util.EntityQuery', params: [entity: 'java.lang.Object']
+    method name: 'success', type: 'def', params: [message: 'String']
+    method name: 'failure', type: 'java.util.Map', params: [message: 'String']
+    method name: 'error', type: 'def', params: [message: 'String']
+    method name: 'logInfo', type: 'void', params: [message: 'String']
+    method name: 'logWarning', type: 'void', params: [message: 'String']
+    method name: 'logError', type: 'void', params: [message: 'String']
+    method name: 'logVerbose', type: 'void', params: [message: 'String']
+}

Added: ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/apache/ofbiz/base/OfbizDslDescriptorForIntelliJ.gdsl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/apache/ofbiz/base/OfbizDslDescriptorForIntelliJ.gdsl?rev=1865717&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/apache/ofbiz/base/OfbizDslDescriptorForIntelliJ.gdsl (added)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/resources/org/apache/ofbiz/base/OfbizDslDescriptorForIntelliJ.gdsl Thu Aug 22 20:38:01 2019
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * 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.
+ *******************************************************************************/
+package org.apache.ofbiz.base
+
+def groovyContext = context(filetypes: ['groovy'], scope: scriptScope())
+
+contributor(groovyContext) {
+    provider = 'OFBiz DSL'
+    property name: 'parameters', type: 'java.util.Map'
+    property name: 'context', type: 'java.util.Map'
+    property name: 'delegator', type: 'org.apache.ofbiz.entity.Delegator'
+    property name: 'dispatcher', type: 'org.apache.ofbiz.service.LocalDispatcher'
+    property name: 'security', type: 'org.apache.ofbiz.security.Security'
+
+    method name: 'runService', type: 'java.util.Map', params: [serviceName: 'String', inputMap: 'java.util.Map']
+    method name: 'run', type: 'java.util.Map', params: [args: 'java.util.Map']
+    method name: 'makeValue', type: 'java.util.Map', params: [entityName: 'String']
+    method name: 'findOne', type: 'java.util.Map', params: [entityName: 'String', fields: 'java.util.Map', useCache: 'boolean']
+
+    method name: 'select', type: 'org.apache.ofbiz.entity.util.EntityQuery', params: [entity: 'java.util.Set']
+    method name: 'select', type: 'org.apache.ofbiz.entity.util.EntityQuery', params: [entity: 'String...']
+    method name: 'from', type: 'org.apache.ofbiz.entity.util.EntityQuery', params: [entity: 'java.lang.Object']
+
+    method name: 'success', type: 'def', params: [message: 'String']
+    method name: 'failure', type: 'java.util.Map', params: [message: 'String']
+    method name: 'error', type: 'def', params: [message: 'String']
+
+    method name: 'logInfo', type: 'void', params: [message: 'String']
+    method name: 'logWarning', type: 'void', params: [message: 'String']
+    method name: 'logError', type: 'void', params: [message: 'String']
+    method name: 'logVerbose', type: 'void', params: [message: 'String']
+}
\ No newline at end of file

Added: ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/META-INF/services/org.apache.ofbiz.common.authentication.api.Authenticator
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/META-INF/services/org.apache.ofbiz.common.authentication.api.Authenticator?rev=1865717&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/META-INF/services/org.apache.ofbiz.common.authentication.api.Authenticator (added)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/META-INF/services/org.apache.ofbiz.common.authentication.api.Authenticator Thu Aug 22 20:38:01 2019
@@ -0,0 +1,19 @@
+# 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.
+
+org.apache.ofbiz.common.authentication.example.TestFailAuthenticator
+org.apache.ofbiz.common.authentication.example.TestPassAuthenticator

Added: ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/org/apache/ofbiz/common/JavaScriptTest.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/org/apache/ofbiz/common/JavaScriptTest.js?rev=1865717&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/org/apache/ofbiz/common/JavaScriptTest.js (added)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/org/apache/ofbiz/common/JavaScriptTest.js Thu Aug 22 20:38:01 2019
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+// - BSF JavaScript test script
+
+x = bsf.lookupBean("message");
+m = bsf.lookupBean("response");
+m.put("result", x);
+
+bsf.registerBean("response", m);
+console.log("BSF - JS: " + x);

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/org/apache/ofbiz/common/JavaScriptTest.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/org/apache/ofbiz/common/JavaScriptTest.js
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/src/main/resources/org/apache/ofbiz/common/JavaScriptTest.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/resources/META-INF/services/org.apache.ofbiz.base.conversion.ConverterLoader
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/resources/META-INF/services/org.apache.ofbiz.base.conversion.ConverterLoader?rev=1865717&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/resources/META-INF/services/org.apache.ofbiz.base.conversion.ConverterLoader (added)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/resources/META-INF/services/org.apache.ofbiz.base.conversion.ConverterLoader Thu Aug 22 20:38:01 2019
@@ -0,0 +1,25 @@
+# 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.
+
+org.apache.ofbiz.entity.util.Converters
+org.apache.ofbiz.base.conversion.BooleanConverters
+org.apache.ofbiz.base.conversion.CollectionConverters
+org.apache.ofbiz.base.conversion.DateTimeConverters
+org.apache.ofbiz.base.conversion.JSONConverters
+org.apache.ofbiz.base.conversion.MiscConverters
+org.apache.ofbiz.base.conversion.NetConverters
+org.apache.ofbiz.base.conversion.NumberConverters

Added: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/resources/META-INF/services/org.apache.ofbiz.entity.DelegatorFactory
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/resources/META-INF/services/org.apache.ofbiz.entity.DelegatorFactory?rev=1865717&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/resources/META-INF/services/org.apache.ofbiz.entity.DelegatorFactory (added)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/resources/META-INF/services/org.apache.ofbiz.entity.DelegatorFactory Thu Aug 22 20:38:01 2019
@@ -0,0 +1,18 @@
+# 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.
+
+org.apache.ofbiz.entity.DelegatorFactoryImpl

Added: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/resources/META-INF/services/org.apache.ofbiz.minilang.method.MethodOperation$Factory
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/resources/META-INF/services/org.apache.ofbiz.minilang.method.MethodOperation%24Factory?rev=1865717&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/resources/META-INF/services/org.apache.ofbiz.minilang.method.MethodOperation$Factory (added)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/resources/META-INF/services/org.apache.ofbiz.minilang.method.MethodOperation$Factory Thu Aug 22 20:38:01 2019
@@ -0,0 +1,104 @@
+# 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.
+
+org.apache.ofbiz.minilang.method.callops.CallClassMethod$CallClassMethodFactory
+org.apache.ofbiz.minilang.method.callops.CallObjectMethod$CallObjectMethodFactory
+org.apache.ofbiz.minilang.method.callops.CallScript$CallScriptFactory
+org.apache.ofbiz.minilang.method.callops.CallService$CallServiceFactory
+org.apache.ofbiz.minilang.method.callops.CallServiceAsynch$CallServiceAsynchFactory
+org.apache.ofbiz.minilang.method.callops.CallSimpleMapProcessor$CallSimpleMapProcessorFactory
+org.apache.ofbiz.minilang.method.callops.CallSimpleMethod$CallSimpleMethodFactory
+org.apache.ofbiz.minilang.method.callops.Return$ReturnFactory
+org.apache.ofbiz.minilang.method.callops.SetServiceFields$SetServiceFieldsFactory
+org.apache.ofbiz.minilang.method.conditional.CompareCondition$CompareConditionFactory
+org.apache.ofbiz.minilang.method.conditional.CompareFieldCondition$CompareFieldConditionFactory
+org.apache.ofbiz.minilang.method.conditional.EmptyCondition$EmptyConditionFactory
+org.apache.ofbiz.minilang.method.conditional.HasPermissionCondition$HasPermissionConditionFactory
+org.apache.ofbiz.minilang.method.conditional.MasterIf$MasterIfFactory
+org.apache.ofbiz.minilang.method.conditional.RegexpCondition$RegexpConditionFactory
+org.apache.ofbiz.minilang.method.conditional.ValidateMethodCondition$ValidateMethodConditionFactory
+org.apache.ofbiz.minilang.method.entityops.ClearCacheLine$ClearCacheLineFactory
+org.apache.ofbiz.minilang.method.entityops.ClearEntityCaches$ClearEntityCachesFactory
+org.apache.ofbiz.minilang.method.entityops.CloneValue$CloneValueFactory
+org.apache.ofbiz.minilang.method.entityops.CreateValue$CreateValueFactory
+org.apache.ofbiz.minilang.method.entityops.EntityAnd$EntityAndFactory
+org.apache.ofbiz.minilang.method.entityops.EntityCondition$EntityConditionFactory
+org.apache.ofbiz.minilang.method.entityops.EntityCount$EntityCountFactory
+org.apache.ofbiz.minilang.method.entityops.EntityData$EntityDataFactory
+org.apache.ofbiz.minilang.method.entityops.EntityOne$EntityOneFactory
+org.apache.ofbiz.minilang.method.entityops.FilterListByAnd$FilterListByAndFactory
+org.apache.ofbiz.minilang.method.entityops.FilterListByDate$FilterListByDateFactory
+org.apache.ofbiz.minilang.method.entityops.FindByAnd$FindByAndFactory
+org.apache.ofbiz.minilang.method.entityops.FindByPrimaryKey$FindByPrimaryKeyFactory
+org.apache.ofbiz.minilang.method.entityops.GetRelated$GetRelatedFactory
+org.apache.ofbiz.minilang.method.entityops.GetRelatedOne$GetRelatedOneFactory
+org.apache.ofbiz.minilang.method.entityops.MakeNextSeqId$MakeNextSeqIdFactory
+org.apache.ofbiz.minilang.method.entityops.MakeValue$MakeValueFactory
+org.apache.ofbiz.minilang.method.entityops.OrderValueList$OrderValueListFactory
+org.apache.ofbiz.minilang.method.entityops.RefreshValue$RefreshValueFactory
+org.apache.ofbiz.minilang.method.entityops.RemoveByAnd$RemoveByAndFactory
+org.apache.ofbiz.minilang.method.entityops.RemoveList$RemoveListFactory
+org.apache.ofbiz.minilang.method.entityops.RemoveRelated$RemoveRelatedFactory
+org.apache.ofbiz.minilang.method.entityops.RemoveValue$RemoveValueFactory
+org.apache.ofbiz.minilang.method.entityops.SequencedIdToEnv$SequencedIdFactory
+org.apache.ofbiz.minilang.method.entityops.SetCurrentUserLogin$SetCurrentUserLoginFactory
+org.apache.ofbiz.minilang.method.entityops.SetNonpkFields$SetNonpkFieldsFactory
+org.apache.ofbiz.minilang.method.entityops.SetPkFields$SetPkFieldsFactory
+org.apache.ofbiz.minilang.method.entityops.StoreList$StoreListFactory
+org.apache.ofbiz.minilang.method.entityops.StoreValue$StoreValueFactory
+org.apache.ofbiz.minilang.method.entityops.TransactionBegin$TransactionBeginFactory
+org.apache.ofbiz.minilang.method.entityops.TransactionCommit$TransactionCommitFactory
+org.apache.ofbiz.minilang.method.entityops.TransactionRollback$TransactionRollbackFactory
+org.apache.ofbiz.minilang.method.envops.AddError$AddErrorFactory
+org.apache.ofbiz.minilang.method.envops.Assert$AssertFactory
+org.apache.ofbiz.minilang.method.envops.Break$BreakFactory
+org.apache.ofbiz.minilang.method.envops.CheckErrors$CheckErrorsFactory
+org.apache.ofbiz.minilang.method.envops.CheckId$CheckIdFactory
+org.apache.ofbiz.minilang.method.envops.ClearField$ClearFieldFactory
+org.apache.ofbiz.minilang.method.envops.Continue$ContinueFactory
+org.apache.ofbiz.minilang.method.envops.CreateObject$CreateObjectFactory
+org.apache.ofbiz.minilang.method.envops.FieldToList$FieldToListFactory
+org.apache.ofbiz.minilang.method.envops.FirstFromList$FirstFromListFactory
+org.apache.ofbiz.minilang.method.envops.Iterate$IterateFactory
+org.apache.ofbiz.minilang.method.envops.IterateMap$IterateMapFactory
+org.apache.ofbiz.minilang.method.envops.ListToList$ListToListFactory
+org.apache.ofbiz.minilang.method.envops.Loop$LoopFactory
+org.apache.ofbiz.minilang.method.envops.MapToMap$MapToMapFactory
+org.apache.ofbiz.minilang.method.envops.Now$NowFactory
+org.apache.ofbiz.minilang.method.envops.Now$NowDateToEnvFactory
+org.apache.ofbiz.minilang.method.envops.Now$NowTimestampFactory
+org.apache.ofbiz.minilang.method.envops.OrderMapList$OrderMapListFactory
+org.apache.ofbiz.minilang.method.envops.SetCalendar$SetCalendarFactory
+org.apache.ofbiz.minilang.method.envops.SetOperation$SetOperationFactory
+org.apache.ofbiz.minilang.method.envops.StringAppend$StringAppendFactory
+org.apache.ofbiz.minilang.method.envops.StringToList$StringToListFactory
+org.apache.ofbiz.minilang.method.envops.ToString$ToStringFactory
+org.apache.ofbiz.minilang.method.envops.While$WhileFactory
+org.apache.ofbiz.minilang.method.eventops.FieldToRequest$FieldToRequestFactory
+org.apache.ofbiz.minilang.method.eventops.FieldToSession$FieldToSessionFactory
+org.apache.ofbiz.minilang.method.eventops.RequestParametersToList$RequestParametersToListFactory
+org.apache.ofbiz.minilang.method.eventops.RequestToField$RequestToFieldFactory
+org.apache.ofbiz.minilang.method.eventops.SessionToField$SessionToFieldFactory
+org.apache.ofbiz.minilang.method.eventops.WebappPropertyToField$WebappPropertyToFieldFactory
+org.apache.ofbiz.minilang.method.ifops.CheckPermission$CheckPermissionFactory
+org.apache.ofbiz.minilang.method.ifops.IfInstanceOf$IfInstanceOfFactory
+org.apache.ofbiz.minilang.method.ifops.IfNotEmpty$IfNotEmptyFactory
+org.apache.ofbiz.minilang.method.otherops.Calculate$CalculateFactory
+org.apache.ofbiz.minilang.method.otherops.Log$LogFactory
+org.apache.ofbiz.minilang.method.otherops.PropertyToField$PropertyToFieldFactory
+org.apache.ofbiz.minilang.method.otherops.Trace$TraceFactory
+org.apache.ofbiz.minilang.method.serviceops.FieldToResult$FieldToResultFactory

Added: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/resources/META-INF/services/org.apache.ofbiz.minilang.method.conditional.ConditionalFactory
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/resources/META-INF/services/org.apache.ofbiz.minilang.method.conditional.ConditionalFactory?rev=1865717&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/resources/META-INF/services/org.apache.ofbiz.minilang.method.conditional.ConditionalFactory (added)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/resources/META-INF/services/org.apache.ofbiz.minilang.method.conditional.ConditionalFactory Thu Aug 22 20:38:01 2019
@@ -0,0 +1,27 @@
+# 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.
+
+org.apache.ofbiz.minilang.method.conditional.CombinedCondition$OrConditionFactory
+org.apache.ofbiz.minilang.method.conditional.CombinedCondition$XorConditionFactory
+org.apache.ofbiz.minilang.method.conditional.CombinedCondition$AndConditionFactory
+org.apache.ofbiz.minilang.method.conditional.CombinedCondition$NotConditionFactory
+org.apache.ofbiz.minilang.method.conditional.CompareCondition$CompareConditionFactory
+org.apache.ofbiz.minilang.method.conditional.CompareFieldCondition$CompareFieldConditionFactory
+org.apache.ofbiz.minilang.method.conditional.EmptyCondition$EmptyConditionFactory
+org.apache.ofbiz.minilang.method.conditional.HasPermissionCondition$HasPermissionConditionFactory
+org.apache.ofbiz.minilang.method.conditional.RegexpCondition$RegexpConditionFactory
+org.apache.ofbiz.minilang.method.conditional.ValidateMethodCondition$ValidateMethodConditionFactory

Added: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/load-data.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/load-data.properties?rev=1865717&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/load-data.properties (added)
+++ ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/load-data.properties Thu Aug 22 20:38:01 2019
@@ -0,0 +1,27 @@
+###############################################################################
+# 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.
+###############################################################################
+
+#######################################################################
+# OFBiz Startup Application Settings
+# For more information about available properties view start.properties
+#######################################################################
+
+ofbiz.start.loaders=load-data
+ofbiz.enable.hook=false
+ofbiz.auto.shutdown=true

Propchange: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/load-data.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/load-data.properties
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/load-data.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/rmi.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/rmi.properties?rev=1865717&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/rmi.properties (added)
+++ ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/rmi.properties Thu Aug 22 20:38:01 2019
@@ -0,0 +1,25 @@
+###############################################################################
+# 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.
+###############################################################################
+
+#######################################################################
+# OFBiz Startup Application Settings
+# For more information about available properties view start.properties
+#######################################################################
+
+ofbiz.start.loaders=rmi

Propchange: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/rmi.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/rmi.properties
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/rmi.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/start.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/start.properties?rev=1865717&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/start.properties (added)
+++ ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/start.properties Thu Aug 22 20:38:01 2019
@@ -0,0 +1,62 @@
+###############################################################################
+# 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.
+###############################################################################
+
+####################################
+# OFBiz Startup Application Settings
+####################################
+
+# --- OFBiz startup loaders comma separated
+ofbiz.start.loaders=main
+
+# --- OFBiz home directory. Default is current directory
+#ofbiz.home=
+
+# --- logs directory relative to ofbiz.home. Default is runtime/logs
+#ofbiz.log.dir=
+
+# --- Derby directory relative to ofbiz.home. Default is runtime/data/derby
+#derby.system.home=
+
+# --- Container config file relative to ofbiz.home.
+#     Default is framework/base/config/ofbiz-containers.xml
+#ofbiz.container.config=
+
+# --- Network host, port and key used by the AdminClient to communicate
+#     with AdminServer for shutting down OFBiz or inquiring on status
+#     Default ofbiz.admin.host 127.0.0.1
+#     Default ofbiz.admin.port 0
+#     Default ofbiz.admin.key NA
+#ofbiz.admin.host=
+ofbiz.admin.port=10523
+ofbiz.admin.key=so3du5kasd5dn
+
+# -- Enable the JVM shutdown hook. Default is true
+#ofbiz.enable.hook=false
+
+# -- Auto-Shutdown after load. Default is false
+#ofbiz.auto.shutdown=true
+
+# --- Tells AWT to not require a head (X11). Default is true
+#java.awt.headless=false
+
+# -- The locale for this OFBiz instance. Default is en
+#ofbiz.locale.default=en_US
+
+# -- The time zone for this OFBiz instance. Default depends on JVM environment
+#ofbiz.timeZone.default=GMT

Propchange: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/start.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/start.properties
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/start.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/test.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/test.properties?rev=1865717&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/test.properties (added)
+++ ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/test.properties Thu Aug 22 20:38:01 2019
@@ -0,0 +1,27 @@
+###############################################################################
+# 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.
+###############################################################################
+
+#######################################################################
+# OFBiz Startup Application Settings
+# For more information about available properties view start.properties
+#######################################################################
+
+ofbiz.start.loaders=test
+ofbiz.enable.hook=false
+ofbiz.auto.shutdown=true

Propchange: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/test.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/test.properties
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/start/src/main/resources/org/apache/ofbiz/base/start/test.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain