Modified Logging target filename according to the system name (aplaws, librecms, scientificcms).

git-svn-id: https://svn.libreccm.org/ccm/trunk@5783 8810af33-2d31-482b-a856-94f89814c4df

ccm-core/build-hooks.xml

@@ -39,17 +39,35 @@
   <target name="clean-build-hook"/>
   <target name="clean-tests-hook"/>
 
+  <target name="package-hook">
+    <!-- Adapt the name of the logfile to the software bundle           -->
+    <replace file="${build.classes.dir}/log4j2.xml" 
+             token="libreccm" value="${this.appName}"  />
+    <!-- deploy the log4j v2 configuration file into web WEB-INF/conf   -->
+    <mkdir dir="../${package.dir}/ccm-core/web/WEB-INF/conf"/>
+    <copy todir="../${package.dir}/ccm-core/web/WEB-INF/conf"
+          file="${build.classes.dir}/log4j2.xml" />
+
+    <xslt style="${ccm.tools.xsl.dir}/build-version.xsl" 
+          in="${ccm.bundle.folder}/cfg/project.xml"
+          out="${build.classes.dir}/ccm-version.properties" 
+          classpathref="ccm.tools.classpath" force="yes" />
+  </target>
+
   <target name="deploy-hook">
     <fail message="Property this.deploy.dir not defined." 
           unless="this.deploy.dir" />
+    <!-- Adapt the name of the logfile to the software bundle           -->
+    <replace file="${build.classes.dir}/log4j2.xml" 
+             token="libreccm" value="${this.appName}"  />
     <!-- deploy the log4j v2 configuration file into the web applications
          document root tree                                               -->
     <mkdir dir="${this.deploy.dir}/WEB-INF/conf"/>
     <copy todir="${this.deploy.dir}/WEB-INF/conf"
-          file="${src.dir}/log4j2.xml" />
+          file="${build.classes.dir}/log4j2.xml" />
+<!--    <replace file="${this.deploy.dir}/WEB-INF/conf/log4j2.xml" 
+             token="libreccm" value="${this.appName}"  />  -->
 
-    <!-- project.xml moved to bundle cfg directory where it replaces
-         former application.cfg                                            -->
     <xslt style="${ccm.tools.xsl.dir}/build-version.xsl" 
           in="${ccm.bundle.folder}/cfg/project.xml"
           out="${build.classes.dir}/ccm-version.properties" 

ccm-core/src/log4j2.xml

@@ -42,7 +42,6 @@
     <!-- Set level="DEBUG" to get information about XSLT file resolution -->
     <Logger name="com.arsdigita.templating.PatternStylesheetResolver"
             level="ERROR" additivity="false" >
-      <!-- output just to libreccm specific application log, no system log -->
       <appenderRef ref="Console"/>
       <appenderRef ref="FileLog" />
     </Logger>

ccm-sci-bundle/bundles/devel/cfg/project.xml

@@ -13,7 +13,7 @@
                     name="scientificcms-dev" 
               prettyName="Scientific CMS" 
                  version="2.3.99" 
-                 release="SNAPSHOT-r5758" 
+                 release="SNAPSHOT-r5778" 
                   webxml="sci-web.xml" 
               portletxml="sci-portlet.xml" 
                   webapp="ROOT" 

tools-ng/common/xsl/build-template.xsl

@@ -1535,7 +1535,7 @@
     <!-- Package hooks -->
       <xsl:if test="$application/@buildHooks">
         <target name="package-{$name}-hook" depends="init">
-          <ant target="deploy-hook" dir="{$name}" inheritRefs="true">
+          <ant target="package-hook" dir="{$name}" inheritRefs="true">
             <xsl:attribute name="antfile">
               <xsl:value-of select="$application/@buildHooks"/>
             </xsl:attribute>