From: Richard Millet <richard.millet@berkeley.edu>
Date: Fri, 6 Aug 2010 02:22:08 +0000 (+0000)
Subject: CSPACE-2587: Add a separate log file for service profiling information.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=58750ce21d0dea6d997d7703999a16dff2a7888e;p=tmp%2Fjakarta-migration.git

CSPACE-2587: Add a separate log file for service profiling information.
---

diff --git a/pom.xml b/pom.xml
index b83380a45..029bc7369 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,9 @@
             <id>collectionspace-remote-repos</id>
             <name>collectionspace-remote-repos</name>
             <url>http://source.collectionspace.org:8081/artifactory/remote-repos</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>            
         </repository>
         <repository>
             <id>repo1</id>
diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index c3ab5c580..9956a7691 100644
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -139,7 +139,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="install"
+    <target name="deploy" depends="package"
     description="deploy cspace services in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.server.cspace}/deploy"/>
     </target>
diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index ec501d0ab..473e1e88a 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -28,6 +28,12 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- somewhere dependency is added 1.5.8 unnecessarily -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -41,13 +47,6 @@
             <version>1.5.8</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml
index da589861e..a8205b7f3 100644
--- a/services/authorization-mgt/service/pom.xml
+++ b/services/authorization-mgt/service/pom.xml
@@ -24,7 +24,7 @@
 
         <!-- utilities -->
 
-        <!-- slf4j not available due to classloading issues running in system classpath -->
+        <!-- slf4j not available due to classloading issues running in system classpath 
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -35,7 +35,7 @@
             <artifactId>log4j</artifactId>
             <version>1.2.14</version>
             <scope>provided</scope>
-        </dependency>
+        </dependency> -->
 
         <!-- slf4j used for testing only -->
         <dependency>
diff --git a/services/collectionobject/sample/sample/pom.xml b/services/collectionobject/sample/sample/pom.xml
index edbfb8203..c747c880b 100644
--- a/services/collectionobject/sample/sample/pom.xml
+++ b/services/collectionobject/sample/sample/pom.xml
@@ -8,6 +8,18 @@
     <version>0.9-SNAPSHOT</version>
     
     <dependencies>
+        <!-- keep slf4j dependencies on the top -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.5.2</version>
+        </dependency>
+    
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
diff --git a/services/common/pom.xml b/services/common/pom.xml
index fed04ab54..ff3e35e95 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -55,10 +55,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
diff --git a/services/common/src/main/config/log/jboss-log4j.xml b/services/common/src/main/config/log/jboss-log4j.xml
index bbad4e883..46e979dfe 100644
--- a/services/common/src/main/config/log/jboss-log4j.xml
+++ b/services/common/src/main/config/log/jboss-log4j.xml
@@ -151,7 +151,21 @@
  
    </appender>
 
-
+   <!-- collectionspace appender -->
+   <appender name="CSLOG_PERF" class="org.jboss.logging.appender.DailyRollingFileAppender">
+      <errorHandler  class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Append" value="false"/>
+     <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+      <param name="File" value="${jboss.server.log.dir}/collectionspace-perf.log"/>
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%d %-5p [%t] [%c:%L] %m%n"/>
+      </layout>
+            <!--filter class="org.jboss.logging.filter.TCLFilter">
+         <param name="AcceptOnMatch" value="true"/>
+         <param name="DeployURL" value="cspace-services.war"/>
+      </filter> 
+      <filter class="org.apache.log4j.varia.DenyAllFilter"></filter-->
+   </appender>
    
    <!-- ================ -->
    <!-- Limit categories -->
@@ -359,6 +373,10 @@
      <appender-ref ref="CSLOG"/>
    </category>
 
+   <category name="perf.collectionspace">
+     <priority value="DEBUG" />
+     <appender-ref ref="CSLOG_PERF"/>
+   </category>
    
    <!-- ======================= -->
    <!-- Setup the Root category -->
@@ -367,7 +385,6 @@
    <root>
       <appender-ref ref="CONSOLE"/>
       <appender-ref ref="FILE"/>
-      <appender-ref ref="CSLOG"/>
    </root>
 
 </log4j:configuration>