svn commit: r1868646 - in /ofbiz/ofbiz-framework/trunk: ./ framework/webtools/config/ framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/ framework/webtools/src/main/resources/ framework/webtools/src/main/resources/org/ framework/w...

[mt...@apache.org]

Author: mthl
Date: Sun Oct 20 11:17:41 2019
New Revision: 1868646

URL: http://svn.apache.org/viewvc?rev=1868646&view=rev
Log:
Improved: Move APACHE2_HEADER_FOR_XML to “src/main/resources”
(OFBIZ-11161)

Added:
    ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/resources/
    ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/resources/org/
    ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/resources/org/apache/
    ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/resources/org/apache/ofbiz/
    ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/resources/org/apache/ofbiz/webtools/
    ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/resources/org/apache/ofbiz/webtools/labelmanager/
    ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/resources/org/apache/ofbiz/webtools/labelmanager/APACHE2_HEADER_FOR_XML
Removed:
    ofbiz/ofbiz-framework/trunk/framework/webtools/config/APACHE2_HEADER_FOR_XML
Modified:
    ofbiz/ofbiz-framework/trunk/build.gradle
    ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java

Modified: ofbiz/ofbiz-framework/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/build.gradle?rev=1868646&r1=1868645&r2=1868646&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/build.gradle (original)
+++ ofbiz/ofbiz-framework/trunk/build.gradle Sun Oct 20 11:17:41 2019
@@ -255,7 +255,6 @@ def excludedJavaSources = [
 // Files and directories present in config directories that should not be included in ofbiz.jar (see OFBIZ-8321).
 def excludedConfigFiles = [
     'README',
-    'APACHE2_HEADER_FOR_XML',
     '*.txt',
     '*.jks',
     'fop.xconf',

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java?rev=1868646&r1=1868645&r2=1868646&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java Sun Oct 20 11:17:41 2019
@@ -20,6 +20,7 @@ package org.apache.ofbiz.webtools.labelm
 
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.net.URL;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -62,8 +63,9 @@ public class SaveLabelsToXmlFile {
         List<String> localeValues = UtilGenerics.cast(context.get("localeValues"));
         List<String> localeComments = UtilGenerics.cast(context.get("localeComments"));
         String apacheLicenseText = null;
+        URL apache2Header = SaveLabelsToXmlFile.class.getResource("APACHE2_HEADER_FOR_XML");
         try {
-            apacheLicenseText = FileUtil.readString("UTF-8", FileUtil.getFile("component://webtools/config/APACHE2_HEADER_FOR_XML"));
+            apacheLicenseText = FileUtil.readString("UTF-8", FileUtil.getFile(apache2Header.getPath()));
         } catch (IOException e) {
             Debug.logWarning(e, "Unable to read Apache License text file", module);
         }

Added: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/resources/org/apache/ofbiz/webtools/labelmanager/APACHE2_HEADER_FOR_XML
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/resources/org/apache/ofbiz/webtools/labelmanager/APACHE2_HEADER_FOR_XML?rev=1868646&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/resources/org/apache/ofbiz/webtools/labelmanager/APACHE2_HEADER_FOR_XML (added)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/resources/org/apache/ofbiz/webtools/labelmanager/APACHE2_HEADER_FOR_XML Sun Oct 20 11:17:41 2019
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->