Changeset 5953 for ComponentRegistry

Timestamp:

01/22/15 16:27:08 (9 years ago)

Author:

Twan Goosen

Message:

merged changes from trunk to 2.0 branch

Location:

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry

Files:

• . (modified) (1 prop)
• pom.xml (modified) (1 diff)
• src/main/resources/log4j.xml (modified) (3 diffs)

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/pom.xml

@@ -371 +371 @@
             <id>clarin</id>
             <properties>
+                <logging.level>warn</logging.level>
                 <serviceRootUrl>http://catalog.clarin.eu/ds/ComponentRegistry</serviceRootUrl>
                 <!-- Will be inserted in context.xml -->

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/resources/log4j.xml

@@ -23 +23 @@
         <level value="${logging.level}"/>
     </logger>
-    <logger name="clarin.cmdi.componentregistry.servlet.IsocatServlet">
+    <logger name="clarin.cmdi.componentregistry.servlet.ConceptRegistryServlet">
         <level value="${logging.level}"/>
     </logger>
@@ -32 +32 @@
         <level value="warn"/>
     </logger>
-    <logger name="org.springframework">
+<!--    <logger name="org.springframework">
         <level value="info"/>
     </logger>
@@ -40 +40 @@
     <logger name="org.springframework.web.context.ContextLoader">
         <level value="info"/>
-    </logger>
+    </logger>-->
     <root>
         <level value="info"/>