You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/07/08 07:13:49 UTC

svn commit: r1608664 - in /openmeetings: branches/3.0.x/src/main/webapp/WEB-INF/classes/ branches/3.0.x/src/screenshare/resources/ trunk/singlewebapp/openmeetings-screenshare/src/main/resources/ trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-I...

Author: solomax
Date: Tue Jul  8 05:13:49 2014
New Revision: 1608664

URL: http://svn.apache.org/r1608664
Log:
[OPENMEETINGS-1037] LDAP API log level is reduced

Modified:
    openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/logback-config.xml
    openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/logback.xsd
    openmeetings/branches/3.0.x/src/screenshare/resources/logback.xml
    openmeetings/branches/3.0.x/src/screenshare/resources/logback.xsd
    openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xml
    openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xsd
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback.xsd

Modified: openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/logback-config.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/logback-config.xml?rev=1608664&r1=1608663&r2=1608664&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/logback-config.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/logback-config.xml Tue Jul  8 05:13:49 2014
@@ -42,29 +42,15 @@
       <pattern>%5p %d{MM-dd HH:mm:ss.SSS } %F %r %L %c [%t] - %m%n</pattern>
     </layout>
   </appender>
-  <logger name="org.apache.axis2">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="com.mchange.v2">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="org.apache.axiom">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="org.apache.commons.httpclient">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="de.hunsicker.jalopy.io">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="org.apache.axis2.enterprise">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="httpclient.wire.header">
-    <level value="ERROR"/>
-  </logger>
-  <root>
-    <level value="DEBUG"/>
+  <logger name="org.apache.axis2" level="ERROR"/>
+  <logger name="com.mchange.v2" level="ERROR"/>
+  <logger name="org.apache.axiom" level="ERROR"/>
+  <logger name="org.apache.commons.httpclient" level="ERROR"/>
+  <logger name="de.hunsicker.jalopy.io" level="ERROR"/>
+  <logger name="org.apache.axis2.enterprise" level="ERROR"/>
+  <logger name="httpclient.wire.header" level="ERROR"/>
+  <logger name="org.apache.directory" level="INFO"/>
+  <root level="DEBUG">
     <appender-ref ref="FLOG2"/>
     <appender-ref ref="CONSOLE2"/>
   </root>

Modified: openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/logback.xsd
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/logback.xsd?rev=1608664&r1=1608663&r2=1608664&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/logback.xsd (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/logback.xsd Tue Jul  8 05:13:49 2014
@@ -70,22 +70,20 @@
   <xs:element name="pattern" type="xs:string"/>
   <xs:element name="logger">
     <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="level">
-          <xs:attribute name="name" use="required" type="xs:NCName"/>
-        </xs:extension>
-      </xs:complexContent>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="appender-ref"/>
+        <xs:element maxOccurs="1" minOccurs="0" ref="level"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required" type="xs:NCName"/>
+      <xs:attribute name="level" type="LoggerLevels" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="root">
     <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="level">
-          <xs:sequence>
-            <xs:element maxOccurs="unbounded" ref="appender-ref"/>
-          </xs:sequence>
-        </xs:extension>
-      </xs:complexContent>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="appender-ref"/>
+      </xs:sequence>
+      <xs:attribute name="level" type="LoggerLevels" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="appender-ref">
@@ -103,4 +101,9 @@
       <xs:attribute name="value" use="required" type="xs:NCName"/>
     </xs:complexType>
   </xs:element>
+  <xs:simpleType name="LoggerLevels">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="off|OFF|all|ALL|inherited|INHERITED|null|NULL|error|ERROR|warn|WARN|info|INFO|debug|DEBUG|trace|TRACE"/>
+    </xs:restriction>
+  </xs:simpleType>
 </xs:schema>

Modified: openmeetings/branches/3.0.x/src/screenshare/resources/logback.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/resources/logback.xml?rev=1608664&r1=1608663&r2=1608664&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/screenshare/resources/logback.xml (original)
+++ openmeetings/branches/3.0.x/src/screenshare/resources/logback.xml Tue Jul  8 05:13:49 2014
@@ -40,14 +40,9 @@
 			<pattern>%5p %d{MM-dd HH:mm:ss.SSS } %L %c{10} [%t] - %m%n</pattern>
 		</layout>
 	</appender>
-	<logger name="org.apache.openmeetings">
-		<level value="DEBUG" />
-	</logger>
-	<logger name="org.red5.server.net.rtmp.codec.RTMPProtocolDecoder">
-		<level value="OFF" />
-	</logger>
-	<root>
-		<level value="INFO" />
+	<logger name="org.apache.openmeetings" level="DEBUG"/>
+	<logger name="org.red5.server.net.rtmp.codec.RTMPProtocolDecoder" level="OFF"/>
+	<root level="INFO">
 		<appender-ref ref="FLOG2" />
 		<appender-ref ref="CONSOLE2" />
 	</root>

Modified: openmeetings/branches/3.0.x/src/screenshare/resources/logback.xsd
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/resources/logback.xsd?rev=1608664&r1=1608663&r2=1608664&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/screenshare/resources/logback.xsd (original)
+++ openmeetings/branches/3.0.x/src/screenshare/resources/logback.xsd Tue Jul  8 05:13:49 2014
@@ -70,22 +70,20 @@
   <xs:element name="pattern" type="xs:string"/>
   <xs:element name="logger">
     <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="level">
-          <xs:attribute name="name" use="required" type="xs:NCName"/>
-        </xs:extension>
-      </xs:complexContent>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="appender-ref"/>
+        <xs:element maxOccurs="1" minOccurs="0" ref="level"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required" type="xs:NCName"/>
+      <xs:attribute name="level" type="LoggerLevels" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="root">
     <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="level">
-          <xs:sequence>
-            <xs:element maxOccurs="unbounded" ref="appender-ref"/>
-          </xs:sequence>
-        </xs:extension>
-      </xs:complexContent>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="appender-ref"/>
+      </xs:sequence>
+      <xs:attribute name="level" type="LoggerLevels" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="appender-ref">
@@ -103,4 +101,9 @@
       <xs:attribute name="value" use="required" type="xs:NCName"/>
     </xs:complexType>
   </xs:element>
+  <xs:simpleType name="LoggerLevels">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="off|OFF|all|ALL|inherited|INHERITED|null|NULL|error|ERROR|warn|WARN|info|INFO|debug|DEBUG|trace|TRACE"/>
+    </xs:restriction>
+  </xs:simpleType>
 </xs:schema>

Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xml?rev=1608664&r1=1608663&r2=1608664&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xml Tue Jul  8 05:13:49 2014
@@ -40,14 +40,9 @@
 			<pattern>%5p %d{MM-dd HH:mm:ss.SSS } %L %c{10} [%t] - %m%n</pattern>
 		</layout>
 	</appender>
-	<logger name="org.apache.openmeetings">
-		<level value="DEBUG" />
-	</logger>
-	<logger name="org.red5.server.net.rtmp.codec.RTMPProtocolDecoder">
-		<level value="OFF" />
-	</logger>
-	<root>
-		<level value="INFO" />
+	<logger name="org.apache.openmeetings" level="DEBUG"/>
+	<logger name="org.red5.server.net.rtmp.codec.RTMPProtocolDecoder" level="OFF"/>
+	<root level="INFO">
 		<appender-ref ref="FLOG2" />
 		<appender-ref ref="CONSOLE2" />
 	</root>

Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xsd
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xsd?rev=1608664&r1=1608663&r2=1608664&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xsd (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xsd Tue Jul  8 05:13:49 2014
@@ -70,22 +70,20 @@
   <xs:element name="pattern" type="xs:string"/>
   <xs:element name="logger">
     <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="level">
-          <xs:attribute name="name" use="required" type="xs:NCName"/>
-        </xs:extension>
-      </xs:complexContent>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="appender-ref"/>
+        <xs:element maxOccurs="1" minOccurs="0" ref="level"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required" type="xs:NCName"/>
+      <xs:attribute name="level" type="LoggerLevels" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="root">
     <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="level">
-          <xs:sequence>
-            <xs:element maxOccurs="unbounded" ref="appender-ref"/>
-          </xs:sequence>
-        </xs:extension>
-      </xs:complexContent>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="appender-ref"/>
+      </xs:sequence>
+      <xs:attribute name="level" type="LoggerLevels" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="appender-ref">
@@ -103,4 +101,9 @@
       <xs:attribute name="value" use="required" type="xs:NCName"/>
     </xs:complexType>
   </xs:element>
+  <xs:simpleType name="LoggerLevels">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="off|OFF|all|ALL|inherited|INHERITED|null|NULL|error|ERROR|warn|WARN|info|INFO|debug|DEBUG|trace|TRACE"/>
+    </xs:restriction>
+  </xs:simpleType>
 </xs:schema>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml?rev=1608664&r1=1608663&r2=1608664&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml Tue Jul  8 05:13:49 2014
@@ -42,29 +42,15 @@
       <pattern>%5p %d{MM-dd HH:mm:ss.SSS } %F %r %L %c [%t] - %m%n</pattern>
     </layout>
   </appender>
-  <logger name="org.apache.axis2">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="com.mchange.v2">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="org.apache.axiom">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="org.apache.commons.httpclient">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="de.hunsicker.jalopy.io">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="org.apache.axis2.enterprise">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="httpclient.wire.header">
-    <level value="ERROR"/>
-  </logger>
-  <root>
-    <level value="DEBUG"/>
+  <logger name="org.apache.axis2" level="ERROR"/>
+  <logger name="com.mchange.v2" level="ERROR"/>
+  <logger name="org.apache.axiom" level="ERROR"/>
+  <logger name="org.apache.commons.httpclient" level="ERROR"/>
+  <logger name="de.hunsicker.jalopy.io" level="ERROR"/>
+  <logger name="org.apache.axis2.enterprise" level="ERROR"/>
+  <logger name="httpclient.wire.header" level="ERROR"/>
+  <logger name="org.apache.directory" level="INFO"/>
+  <root level="DEBUG">
     <appender-ref ref="FLOG2"/>
     <appender-ref ref="CONSOLE2"/>
   </root>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback.xsd
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback.xsd?rev=1608664&r1=1608663&r2=1608664&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback.xsd (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback.xsd Tue Jul  8 05:13:49 2014
@@ -70,22 +70,20 @@
   <xs:element name="pattern" type="xs:string"/>
   <xs:element name="logger">
     <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="level">
-          <xs:attribute name="name" use="required" type="xs:NCName"/>
-        </xs:extension>
-      </xs:complexContent>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="appender-ref"/>
+        <xs:element maxOccurs="1" minOccurs="0" ref="level"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required" type="xs:NCName"/>
+      <xs:attribute name="level" type="LoggerLevels" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="root">
     <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="level">
-          <xs:sequence>
-            <xs:element maxOccurs="unbounded" ref="appender-ref"/>
-          </xs:sequence>
-        </xs:extension>
-      </xs:complexContent>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="appender-ref"/>
+      </xs:sequence>
+      <xs:attribute name="level" type="LoggerLevels" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="appender-ref">
@@ -103,4 +101,9 @@
       <xs:attribute name="value" use="required" type="xs:NCName"/>
     </xs:complexType>
   </xs:element>
+  <xs:simpleType name="LoggerLevels">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="off|OFF|all|ALL|inherited|INHERITED|null|NULL|error|ERROR|warn|WARN|info|INFO|debug|DEBUG|trace|TRACE"/>
+    </xs:restriction>
+  </xs:simpleType>
 </xs:schema>