LRAC-14056 SF

shuyangzhou · Jun 19, 2023 · e5341d4 · e5341d4
1 parent 7a9e961
commit e5341d4
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 83 deletions.
diff --git a/modules/dxp/apps/osb/osb-faro/osb-faro-docker/common/resources/context.xml b/modules/dxp/apps/osb/osb-faro/osb-faro-docker/common/resources/context.xml
@@ -1,20 +1,3 @@
-<!--
-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.
--->
-
 <Context>
 	<Valve className="org.apache.catalina.valves.rewrite.RewriteValve" />
 	<WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>

diff --git a/modules/dxp/apps/osb/osb-faro/wedeploy/dev/100_liferay_image_setup.sh b/modules/dxp/apps/osb/osb-faro/wedeploy/dev/100_liferay_image_setup.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-cp -R /home/liferay/configs/* ${LIFERAY_HOME}/
+cp -R /home/liferay/configs/* ${LIFERAY_HOME}
 cp -R /home/liferay/resources/context.xml $LIFERAY_HOME/tomcat/conf
-cp -R /home/liferay/resources/log4j ${LIFERAY_HOME}/osgi/log4j/
-cp -R /home/liferay/resources/portal-log4j-ext.xml ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/classes/META-INF/
-cp -R /home/liferay/resources/rewrite.config ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/
-cp -R /home/liferay/resources/system-ext.properties ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/classes/
+cp -R /home/liferay/resources/log4j ${LIFERAY_HOME}/osgi/log4j
+cp -R /home/liferay/resources/portal-log4j-ext.xml ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/classes/META-INF
+cp -R /home/liferay/resources/rewrite.config ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF
+cp -R /home/liferay/resources/system-ext.properties ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/classes
diff --git a/modules/dxp/apps/osb/osb-faro/wedeploy/dev/resources/context.xml b/modules/dxp/apps/osb/osb-faro/wedeploy/dev/resources/context.xml
@@ -1,20 +1,3 @@
-<!--
-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.
--->
-
 <Context>
 	<Valve className="org.apache.catalina.valves.rewrite.RewriteValve" />
 	<WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>

diff --git a/modules/dxp/apps/osb/osb-faro/wedeploy/prd/100_liferay_image_setup.sh b/modules/dxp/apps/osb/osb-faro/wedeploy/prd/100_liferay_image_setup.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-cp -R /home/liferay/configs/* ${LIFERAY_HOME}/
+cp -R /home/liferay/configs/* ${LIFERAY_HOME}
 cp -R /home/liferay/resources/context.xml $LIFERAY_HOME/tomcat/conf
-cp -R /home/liferay/resources/log4j ${LIFERAY_HOME}/osgi/log4j/
-cp -R /home/liferay/resources/portal-log4j-ext.xml ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/classes/META-INF/
-cp -R /home/liferay/resources/rewrite.config ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/
-cp -R /home/liferay/resources/system-ext.properties ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/classes/
+cp -R /home/liferay/resources/log4j ${LIFERAY_HOME}/osgi/log4j
+cp -R /home/liferay/resources/portal-log4j-ext.xml ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/classes/META-INF
+cp -R /home/liferay/resources/rewrite.config ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF
+cp -R /home/liferay/resources/system-ext.properties ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/classes
diff --git a/modules/dxp/apps/osb/osb-faro/wedeploy/prd/resources/context.xml b/modules/dxp/apps/osb/osb-faro/wedeploy/prd/resources/context.xml
@@ -1,20 +1,3 @@
-<!--
-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.
--->
-
 <Context>
 	<Valve className="org.apache.catalina.valves.rewrite.RewriteValve" />
 	<WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>

diff --git a/modules/dxp/apps/osb/osb-faro/wedeploy/uat/100_liferay_image_setup.sh b/modules/dxp/apps/osb/osb-faro/wedeploy/uat/100_liferay_image_setup.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-cp -R /home/liferay/configs/* ${LIFERAY_HOME}/
+cp -R /home/liferay/configs/* ${LIFERAY_HOME}
 cp -R /home/liferay/resources/context.xml $LIFERAY_HOME/tomcat/conf
-cp -R /home/liferay/resources/log4j ${LIFERAY_HOME}/osgi/log4j/
-cp -R /home/liferay/resources/portal-log4j-ext.xml ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/classes/META-INF/
-cp -R /home/liferay/resources/rewrite.config ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/
-cp -R /home/liferay/resources/system-ext.properties ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/classes/
+cp -R /home/liferay/resources/log4j ${LIFERAY_HOME}/osgi/log4j
+cp -R /home/liferay/resources/portal-log4j-ext.xml ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/classes/META-INF
+cp -R /home/liferay/resources/rewrite.config ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF
+cp -R /home/liferay/resources/system-ext.properties ${LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/classes
diff --git a/modules/dxp/apps/osb/osb-faro/wedeploy/uat/resources/context.xml b/modules/dxp/apps/osb/osb-faro/wedeploy/uat/resources/context.xml
@@ -1,20 +1,3 @@
-<!--
-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.
--->
-
 <Context>
 	<Valve className="org.apache.catalina.valves.rewrite.RewriteValve" />
 	<WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>