From beec96b3325ec6804a1240bc243fd35e60172993 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sat, 4 Jul 2020 20:21:49 +0700
Subject: [PATCH] IDEMPIERE-4357:ClassLocator.warn: Replicate resource by jetty
 append lib on standard web folder (#155)

---
 org.adempiere.server/pom.xml                  | 23 -------------------
 org.adempiere.ui.zk/.classpath                |  6 ++---
 org.adempiere.ui.zk/META-INF/MANIFEST.MF      |  6 ++---
 org.adempiere.ui.zk/build.properties          |  6 ++---
 org.adempiere.ui.zk/pom.xml                   |  4 ++--
 org.idempiere.webservices/.classpath          |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../Notes/HowToAddNewWebService.txt           |  2 +-
 org.idempiere.webservices/build.properties    |  4 ++--
 org.idempiere.webservices/pom.xml             |  4 ++--
 10 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/org.adempiere.server/pom.xml b/org.adempiere.server/pom.xml
index 1af86b30b1..c3de11d86e 100644
--- a/org.adempiere.server/pom.xml
+++ b/org.adempiere.server/pom.xml
@@ -12,29 +12,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>auto-clean</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>${project.basedir}/WEB-INF/lib</directory>
-							<includes>
-								<include>*.jar</include>
-							</includes>
-							<followSymlinks>false</followSymlinks>
-        				</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath
index b58918e146..db2f0ec452 100644
--- a/org.adempiere.ui.zk/.classpath
+++ b/org.adempiere.ui.zk/.classpath
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/ckez.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/daisydiff.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/owasp-java-html-sanitizer.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
@@ -7,8 +10,5 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src/"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/ckez.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/daisydiff.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/owasp-java-html-sanitizer.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 572019e01d..e07c791678 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -58,9 +58,9 @@ Import-Package: groovy.transform.stc;version="2.4.7",
  org.springframework.web.util
 DynamicImport-Package: action.images
 Bundle-ClassPath: .,
- WEB-INF/lib/ckez.jar,
- WEB-INF/lib/daisydiff.jar,
- WEB-INF/lib/owasp-java-html-sanitizer.jar
+ lib/ckez.jar,
+ lib/daisydiff.jar,
+ lib/owasp-java-html-sanitizer.jar
 Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  metainfo.zk,
  org.adempiere.webui,
diff --git a/org.adempiere.ui.zk/build.properties b/org.adempiere.ui.zk/build.properties
index a29d384432..0f79b36f56 100644
--- a/org.adempiere.ui.zk/build.properties
+++ b/org.adempiere.ui.zk/build.properties
@@ -33,9 +33,9 @@ bin.includes = META-INF/,\
                OSGI-INF/jfgchartrenderer.xml,\
                manifest.json,\
                pdf.js/,\
-               WEB-INF/lib/ckez.jar,\
-               WEB-INF/lib/daisydiff.jar,\
-               WEB-INF/lib/owasp-java-html-sanitizer.jar,\
+               lib/ckez.jar,\
+               lib/daisydiff.jar,\
+               lib/owasp-java-html-sanitizer.jar,\
                .
 src.includes = WEB-INF/tld/,\
                WEB-INF/web.xml,\
diff --git a/org.adempiere.ui.zk/pom.xml b/org.adempiere.ui.zk/pom.xml
index 6da7d58da9..03bd89e692 100644
--- a/org.adempiere.ui.zk/pom.xml
+++ b/org.adempiere.ui.zk/pom.xml
@@ -25,7 +25,7 @@
 				<configuration>
 					<filesets>
 						<fileset>
-							<directory>${project.basedir}/WEB-INF/lib</directory>
+							<directory>${project.basedir}/lib</directory>
 							<includes>
 								<include>*.jar</include>
 							</includes>
@@ -61,7 +61,7 @@
 									<version>20190503.1</version>
 								</artifactItem>
 							</artifactItems>
-							<outputDirectory>WEB-INF/lib</outputDirectory>
+							<outputDirectory>lib</outputDirectory>
 							<stripVersion>true</stripVersion>
 							<overWriteReleases>true</overWriteReleases>
 							<overWriteSnapshots>true</overWriteSnapshots>
diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath
index 83a96b9803..bd7bf76a21 100644
--- a/org.idempiere.webservices/.classpath
+++ b/org.idempiere.webservices/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/idempiere-xmlbeans.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
@@ -7,6 +8,5 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src/"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/idempiere-xmlbeans.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index bbb35e933d..8bd3753c53 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -99,7 +99,7 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  jakarta.xml.ws-api;bundle-version="2.3.2",
  jakarta.xml.soap-api;bundle-version="1.4.1"
 Bundle-ClassPath: .,
- WEB-INF/lib/idempiere-xmlbeans.jar
+ lib/idempiere-xmlbeans.jar
 Export-Package: org.compiere.model,
  org.idempiere.adInterface.x10,
  org.idempiere.adInterface.x10.impl,
diff --git a/org.idempiere.webservices/Notes/HowToAddNewWebService.txt b/org.idempiere.webservices/Notes/HowToAddNewWebService.txt
index 341baf5b71..095ecd43f3 100644
--- a/org.idempiere.webservices/Notes/HowToAddNewWebService.txt
+++ b/org.idempiere.webservices/Notes/HowToAddNewWebService.txt
@@ -12,7 +12,7 @@ the new webservice will have the following parameters:
 Note, if you need to define new datatypes you need to define them in  WEB-INF/xsd/idempiere-schema.xsd
 and generate the idempiere-xmlbeans.jar again with this command:
 
-  scomp -out ./WEB-INF/lib/idempiere-xmlbeans.jar ./WEB-INF/xsd/idempiere-schema.xsd
+  scomp -out ./lib/idempiere-xmlbeans.jar ./WEB-INF/xsd/idempiere-schema.xsd
   
 scomp will generate the corresponding classes to manipulate the xml objects from the messages
 
diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties
index 9592fe3b39..9b24693d0e 100644
--- a/org.idempiere.webservices/build.properties
+++ b/org.idempiere.webservices/build.properties
@@ -6,7 +6,7 @@ bin.includes = META-INF/,\
                WEB-INF/xsd/,\
                plugin.xml,\
                OSGI-INF/,\
-               WEB-INF/lib/idempiere-xmlbeans.jar
-src.includes = WEB-INF/lib/,\
+               lib/idempiere-xmlbeans.jar
+src.includes = lib/,\
                WEB-INF/web.xml,\
                WEB-INF/xsd/
diff --git a/org.idempiere.webservices/pom.xml b/org.idempiere.webservices/pom.xml
index 24ec97ef71..d98946f4b0 100644
--- a/org.idempiere.webservices/pom.xml
+++ b/org.idempiere.webservices/pom.xml
@@ -26,7 +26,7 @@
 				<configuration>
 					<filesets>
 						<fileset>
-							<directory>${project.basedir}/WEB-INF/lib</directory>
+							<directory>${project.basedir}/lib</directory>
 							<includes>
 								<include>*.jar</include>
 							</includes>
@@ -57,7 +57,7 @@
 						<configuration>
 							<url>${url.file.srv}/extra.jar/idempiere-xmlbeans-1.0.jar</url>
 							<unpack>false</unpack>
-							<outputDirectory>WEB-INF/lib</outputDirectory>
+							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
 							<outputFileName>idempiere-xmlbeans.jar</outputFileName>
 						</configuration>