portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asfgr...@apache.org
Subject portals-pluto git commit: PLUTO-735 Update the liferay maven profile for the V3 demos and TCK tests (ChatRoomDemo)
Date Tue, 27 Nov 2018 16:49:51 GMT
Repository: portals-pluto
Updated Branches:
  refs/heads/master 1a13c9e56 -> 4db5ddd26


PLUTO-735 Update the liferay maven profile for the V3 demos and TCK tests (ChatRoomDemo)


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/4db5ddd2
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/4db5ddd2
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/4db5ddd2

Branch: refs/heads/master
Commit: 4db5ddd26fb2ce642be7b0894858e664c6076a3b
Parents: 1a13c9e
Author: Neil Griffin <neil.griffin.scm@gmail.com>
Authored: Tue Nov 27 11:49:16 2018 -0500
Committer: Neil Griffin <neil.griffin.scm@gmail.com>
Committed: Tue Nov 27 11:49:16 2018 -0500

----------------------------------------------------------------------
 ChatRoomDemo/pom.xml                            | 26 ++++++++++++++++++
 .../src/main/resources/log4j.properties         |  6 +++++
 .../src/main/webapp/WEB-INF/liferay-portlet.xml | 28 ++++++++++++++++++++
 3 files changed, 60 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/4db5ddd2/ChatRoomDemo/pom.xml
----------------------------------------------------------------------
diff --git a/ChatRoomDemo/pom.xml b/ChatRoomDemo/pom.xml
index a24a420..a4f8720 100644
--- a/ChatRoomDemo/pom.xml
+++ b/ChatRoomDemo/pom.xml
@@ -106,6 +106,28 @@
 
    <profiles>
 
+       <profile>
+           <id>liferay</id>
+           <dependencies>
+               <dependency>
+                   <groupId>org.slf4j</groupId>
+                   <artifactId>slf4j-api</artifactId>
+                   <scope>provided</scope>
+               </dependency>
+           </dependencies>
+           <build>
+               <plugins>
+                   <plugin>
+                       <artifactId>maven-war-plugin</artifactId>
+                       <configuration>
+                           <packagingExcludes>
+                               WEB-INF/classes/logging.properties
+                           </packagingExcludes>
+                       </configuration>
+                   </plugin>
+               </plugins>
+           </build>
+       </profile>
       <profile>
          <id>pluto</id>
          <activation>
@@ -138,6 +160,10 @@
                  <artifactId>maven-war-plugin</artifactId>
                  <configuration>
                    <archiveClasses>false</archiveClasses>
+                   <packagingExcludes>
+                       WEB-INF/liferay-portlet.xml,
+                       WEB-INF/classes/log4j.properties
+                   </packagingExcludes>
                  </configuration>
                </plugin>
                <!-- workaround for war processing of m-r-r-plugin causing the generated
NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF -->

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/4db5ddd2/ChatRoomDemo/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/ChatRoomDemo/src/main/resources/log4j.properties b/ChatRoomDemo/src/main/resources/log4j.properties
new file mode 100644
index 0000000..5c0bfca
--- /dev/null
+++ b/ChatRoomDemo/src/main/resources/log4j.properties
@@ -0,0 +1,6 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
+log4j.logger.basic.portlet=DEBUG

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/4db5ddd2/ChatRoomDemo/src/main/webapp/WEB-INF/liferay-portlet.xml
----------------------------------------------------------------------
diff --git a/ChatRoomDemo/src/main/webapp/WEB-INF/liferay-portlet.xml b/ChatRoomDemo/src/main/webapp/WEB-INF/liferay-portlet.xml
new file mode 100644
index 0000000..7e9254c
--- /dev/null
+++ b/ChatRoomDemo/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+    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.
+-->
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 7.1.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_7_1_0.dtd">
+
+<liferay-portlet-app>
+	<portlet>
+		<portlet-name>BeanPortletDemo</portlet-name>
+		<single-page-application>false</single-page-application>
+		<requires-namespaced-parameters>false</requires-namespaced-parameters>
+	</portlet>
+</liferay-portlet-app>


Mime
View raw message