Revision: 18273
Author: wko
Date: 2009-05-27 11:36:32 +0200 (Wed, 27 May 2009)
Log Message:
-----------
HSTTWO-598: Setting up log dir for site apps
Modified Paths:
--------------
ecm/site-toolkit/trunk/applications/site/pom.xml
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/pa-web.xml
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/web.xml
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/build.properties-sample
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/pom.xml
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/pa-web.xml
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/portal-pages/hstdemo.psml
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml
Added Paths:
-----------
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/classes/
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/classes/log4j.properties
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/logs/
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/logs/README
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/classes/
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/classes/log4j.properties
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/logs/
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/logs/README
Removed Paths:
-------------
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/log4j.properties
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/log4j.xml
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/log4j.properties
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/log4j.xml
Modified: ecm/site-toolkit/trunk/applications/site/pom.xml
===================================================================
--- ecm/site-toolkit/trunk/applications/site/pom.xml 2009-05-27 09:30:53 UTC
(rev 18272)
+++ ecm/site-toolkit/trunk/applications/site/pom.xml 2009-05-27 09:36:32 UTC
(rev 18273)
@@ -153,6 +153,7 @@
<build>
<defaultGoal>package</defaultGoal>
+ <finalName>site</finalName>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -300,9 +301,9 @@
<unwar src="../cms/target/cms-${project.version}.war"
dest="${tomcat.hst.cms.webapp}" overwrite="true" />
<echo>Replacing site web application into tomcat.</echo>
- <delete
dir="${tomcat.server.home}/webapps/${project.artifactId}" />
- <mkdir
dir="${tomcat.server.home}/webapps/${project.artifactId}" />
- <unwar
src="${project.build.directory}/${project.artifactId}-${project.version}.war"
dest="${tomcat.server.home}/webapps/${project.artifactId}" overwrite="true" />
+ <delete
dir="${tomcat.server.home}/webapps/${project.build.finalName}" />
+ <mkdir
dir="${tomcat.server.home}/webapps/${project.build.finalName}" />
+ <unwar
src="${project.build.directory}/${project.build.finalName}.war"
dest="${tomcat.server.home}/webapps/${project.build.finalName}"
overwrite="true" />
</tasks>
</configuration>
@@ -399,17 +400,17 @@
<unwar src="../cms/target/cms-${project.version}.war"
dest="${jetspeed.hst.cms.webapp}" overwrite="true" />
<echo>Replacing site portlet application into
jetspeed.</echo>
- <delete
dir="${jetspeed.server.home}/webapps/${project.artifactId}" />
- <delete
file="${jetspeed.server.home}/webapps/${project.artifactId}.war" />
- <delete
file="${jetspeed.portal.webapp}/WEB-INF/deploy/${project.artifactId}.war" />
- <copy
file="${project.build.directory}/${project.artifactId}-${project.version}.war"
tofile="${jetspeed.portal.webapp}/WEB-INF/deploy/${project.artifactId}.war"
overwrite="true" />
+ <delete
dir="${jetspeed.server.home}/webapps/${project.build.finalName}" />
+ <delete
file="${jetspeed.server.home}/webapps/${project.build.finalName}.war" />
+ <delete
file="${jetspeed.portal.webapp}/WEB-INF/deploy/${project.build.finalName}.war"
/>
+ <copy
file="${project.build.directory}/${project.build.finalName}.war"
tofile="${jetspeed.portal.webapp}/WEB-INF/deploy/${project.build.finalName}.war"
overwrite="true" />
<echo>Copy core libaries into jetspeed</echo>
<copy todir="${jetspeed.portal.webapp}/WEB-INF/lib"
overwrite="true">
- <fileset
dir="${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib">
+ <fileset
dir="${project.build.directory}/${project.build.finalName}/WEB-INF/lib">
<include name="commons-proxy-*.jar" />
</fileset>
- <fileset
dir="${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib">
+ <fileset
dir="${project.build.directory}/${project.build.finalName}/WEB-INF/lib">
<exclude name="commons-*.jar" />
<exclude name="hst-client-*.jar" />
<exclude name="jstl-*.jar" />
@@ -427,7 +428,7 @@
<echo>Copy hst configuration into jetspeed</echo>
<copy todir="${jetspeed.portal.webapp}/WEB-INF"
overwrite="true">
- <fileset
dir="${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF">
+ <fileset
dir="${project.build.directory}/${project.build.finalName}/WEB-INF">
<include name="hst*.properties" />
<include name="hst*.xml" />
</fileset>
Copied:
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/classes/log4j.properties
(from rev 18268,
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/log4j.properties)
===================================================================
---
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/classes/log4j.properties
(rev 0)
+++
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/classes/log4j.properties
2009-05-27 09:36:32 UTC (rev 18273)
@@ -0,0 +1,37 @@
+#
+# Copyright 2008 Hippo
+#
+# Licensed 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.
+#
+
+log4j.rootLogger = WARN, site
+
+log4j.category.org.hippoecm.hst = DEBUG, site
+log4j.additivity.org.hippoecm.hst = false
+
+#
+# site.log
+#
+log4j.appender.site = org.apache.log4j.FileAppender
+log4j.appender.site.file = ${site.webapp.root}/WEB-INF/logs/site.log
+log4j.appender.site.layout = org.apache.log4j.PatternLayout
+log4j.appender.site.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.site.append = false
+
+#
+# Console
+#
+log4j.appender.console = org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout = org.apache.log4j.PatternLayout
+# Pattern to output the caller's file name and line number.
+log4j.appender.console.layout.ConversionPattern = %d [%t] %-5p %c - %m%n
Property changes on:
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/classes/log4j.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Deleted:
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/log4j.properties
===================================================================
---
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/log4j.properties
2009-05-27 09:30:53 UTC (rev 18272)
+++
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/log4j.properties
2009-05-27 09:36:32 UTC (rev 18273)
@@ -1,38 +0,0 @@
-#
-# Copyright 2008 Hippo
-#
-# Licensed 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.
-#
-
-log4j.rootLogger = WARN, site
-
-log4j.category.org.hippoecm.hst = DEBUG, site
-log4j.additivity.org.hippoecm.hst = false
-
-#
-# site.log
-#
-log4j.appender.site = org.apache.log4j.FileAppender
-log4j.appender.site.file = ${site.root}/logs/site.log
-log4j.appender.site.layout = org.apache.log4j.PatternLayout
-log4j.appender.site.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.site.append = false
-
-#
-# Console
-#
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-# Pattern to output the caller's file name and line number.
-log4j.appender.console.layout.ConversionPattern=%5p: %m%n
-
Deleted:
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/log4j.xml
===================================================================
--- ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/log4j.xml
2009-05-27 09:30:53 UTC (rev 18272)
+++ ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/log4j.xml
2009-05-27 09:36:32 UTC (rev 18273)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright 2007 Hippo
-
- Licensed 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 log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
-
- <!-- ======================================================================
-->
- <!-- A P P E N D E R S
-->
- <!-- ======================================================================
-->
-
- <!-- console -->
- <appender name="console" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p
[%C.%M():%L] %m%n"/>
- </layout>
- </appender>
-
- <!-- log4j.log -->
- <appender name="root" class="org.apache.log4j.FileAppender">
- <param name="File" value="target/log4j.log"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p
[%C.%M():%L] %m%n"/>
- </layout>
- </appender>
-
- <!-- ======================================================================
-->
- <!-- L O G G E R S
-->
- <!-- ======================================================================
-->
-
- <category additivity="false" name="org.apache.jackrabbit.core">
- <level value="warn"/>
- <appender-ref ref="root"/>
- </category>
-
- <category additivity="false" name="org.hippoecm.repository">
- <level value="warn"/>
- <appender-ref ref="console"/>
- </category>
-
-
- <category additivity="false"
name="org.hippoecm.repository.LocalHippoRepository">
- <level value="info"/>
- <appender-ref ref="console"/>
- </category>
-
-
- <category additivity="false" name="org.hippoecm.hst">
- <level value="debug"/>
- <appender-ref ref="console"/>
- </category>
-
- <!-- <category additivity="false" name="org.hippoecm.hst.core.linking">
- <level value="debug"/>
- <appender-ref ref="console"/>
- </category>-->
-
-
-
- <root>
- <level value="warn"/>
- <appender-ref ref="console"/>
- <appender-ref ref="root"/>
- </root>
-
-</log4j:configuration>
Added:
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/logs/README
===================================================================
---
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/logs/README
(rev 0)
+++
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/logs/README
2009-05-27 09:36:32 UTC (rev 18273)
@@ -0,0 +1,17 @@
+#
+# Copyright 2008 Hippo
+#
+# Licensed 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.
+#
+
+The directory containing this file is used for log4j log directory.
Property changes on:
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/logs/README
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified:
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/pa-web.xml
===================================================================
--- ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/pa-web.xml
2009-05-27 09:30:53 UTC (rev 18272)
+++ ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/pa-web.xml
2009-05-27 09:36:32 UTC (rev 18273)
@@ -21,7 +21,7 @@
<!-- Spring Log4j Web Configuration Init Parameters -->
<context-param>
<param-name>log4jConfigLocation</param-name>
- <param-value>/WEB-INF/log4j.xml</param-value>
+ <param-value>/WEB-INF/classes/log4j.properties</param-value>
</context-param>
<context-param>
@@ -31,7 +31,7 @@
<context-param>
<param-name>webAppRootKey</param-name>
- <param-value>site.root</param-value>
+ <param-value>site.webapp.root</param-value>
</context-param>
<!-- Spring Web Application context configuration -->
Modified:
ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/web.xml
===================================================================
--- ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/web.xml
2009-05-27 09:30:53 UTC (rev 18272)
+++ ecm/site-toolkit/trunk/applications/site/src/main/webapp/WEB-INF/web.xml
2009-05-27 09:36:32 UTC (rev 18273)
@@ -21,7 +21,7 @@
<!-- Spring Log4j Web Configuration Init Parameters -->
<context-param>
<param-name>log4jConfigLocation</param-name>
- <param-value>/WEB-INF/log4j.xml</param-value>
+ <param-value>/WEB-INF/classes/log4j.properties</param-value>
</context-param>
<context-param>
@@ -31,7 +31,7 @@
<context-param>
<param-name>webAppRootKey</param-name>
- <param-value>site.root</param-value>
+ <param-value>site.webapp.root</param-value>
</context-param>
<!-- Spring Web Application context configuration -->
Modified:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
2009-05-27 09:30:53 UTC (rev 18272)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
2009-05-27 09:36:32 UTC (rev 18273)
@@ -47,6 +47,7 @@
<exclude>**/WEB-INF/jsp/tracetool*.jsp</exclude>
</excludes>
<includes>
+ <include>**/README</include>
<include>**/*.jsp</include>
<include>**/*.xml</include>
<include>**/*.properties</include>
Modified:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/build.properties-sample
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/build.properties-sample
2009-05-27 09:30:53 UTC (rev 18272)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/build.properties-sample
2009-05-27 09:36:32 UTC (rev 18273)
@@ -14,13 +14,13 @@
# limitations under the License.
#
-# Tomcat deployment properties. Use these with `tomcat' profile. E.g. `mvn -P
tomcat clean install -DskipTests'
+# Tomcat deployment properties. Use these with `tomcat' profile. E.g. `mvn -P
tomcat clean install'
tomcat.server.home = /home/hstdev/tomcat-6.0.18
tomcat.hst.shared.lib = ${tomcat.server.home}/lib
tomcat.hst.cms.webapp = ${tomcat.server.home}/webapps/cms
-# Jetspeed deployment properties. Use these with `jetspeed' profile. E.g. `mvn
-P jetspeed clean install -DskipTests'
+# Jetspeed deployment properties. Use these with `jetspeed' profile. E.g. `mvn
-P jetspeed clean install'
jetspeed.server.home = /home/hstdev/tomcat-6.0.18
jetspeed.hst.shared.lib = ${jetspeed.server.home}/lib
Modified:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/pom.xml
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/pom.xml
2009-05-27 09:30:53 UTC (rev 18272)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/pom.xml
2009-05-27 09:36:32 UTC (rev 18273)
@@ -148,6 +148,7 @@
<build>
<defaultGoal>package</defaultGoal>
+ <finalName>site</finalName>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -286,11 +287,11 @@
<unwar
src="../cms/target/${rootArtifactId}-cms-${dollar}{project.version}.war"
dest="${dollar}{tomcat.hst.cms.webapp}" overwrite="true" />
<echo>Replacing site web application into tomcat.</echo>
- <delete
dir="${dollar}{tomcat.server.home}/webapps/${dollar}{project.artifactId}" />
- <mkdir
dir="${dollar}{tomcat.server.home}/webapps/${dollar}{project.artifactId}" />
- <unwar
src="${dollar}{project.build.directory}/${dollar}{project.artifactId}-${dollar}{project.version}.war"
dest="${dollar}{tomcat.server.home}/webapps/${dollar}{project.artifactId}"
overwrite="true" />
+ <delete
dir="${dollar}{tomcat.server.home}/webapps/${dollar}{project.build.finalName}"
/>
+ <mkdir
dir="${dollar}{tomcat.server.home}/webapps/${dollar}{project.build.finalName}"
/>
+ <unwar
src="${dollar}{project.build.directory}/${dollar}{project.build.finalName}.war"
dest="${dollar}{tomcat.server.home}/webapps/${dollar}{project.build.finalName}"
overwrite="true" />
<delete>
- <fileset
dir="${dollar}{tomcat.server.home}/webapps/${dollar}{project.artifactId}/WEB-INF/lib">
+ <fileset
dir="${dollar}{tomcat.server.home}/webapps/${dollar}{project.build.finalName}/WEB-INF/lib">
<include name="jcr-*.jar" />
</fileset>
</delete>
@@ -401,17 +402,17 @@
<unwar
src="../cms/target/${rootArtifactId}-cms-${dollar}{project.version}.war"
dest="${dollar}{jetspeed.hst.cms.webapp}" overwrite="true" />
<echo>Replacing site portlet application into
jetspeed.</echo>
- <delete
dir="${dollar}{jetspeed.server.home}/webapps/${dollar}{project.artifactId}" />
- <delete
file="${dollar}{jetspeed.server.home}/webapps/${dollar}{project.artifactId}.war"
/>
- <delete
file="${dollar}{jetspeed.portal.webapp}/WEB-INF/deploy/${dollar}{project.artifactId}.war"
/>
- <copy
file="${dollar}{project.build.directory}/${dollar}{project.artifactId}-${dollar}{project.version}.war"
tofile="${dollar}{jetspeed.portal.webapp}/WEB-INF/deploy/${dollar}{project.artifactId}.war"
overwrite="true" />
+ <delete
dir="${dollar}{jetspeed.server.home}/webapps/${dollar}{project.build.finalName}"
/>
+ <delete
file="${dollar}{jetspeed.server.home}/webapps/${dollar}{project.build.finalName}.war"
/>
+ <delete
file="${dollar}{jetspeed.portal.webapp}/WEB-INF/deploy/${dollar}{project.build.finalName}.war"
/>
+ <copy
file="${dollar}{project.build.directory}/${dollar}{project.build.finalName}.war"
tofile="${dollar}{jetspeed.portal.webapp}/WEB-INF/deploy/${dollar}{project.build.finalName}.war"
overwrite="true" />
<echo>Copy core libaries into jetspeed</echo>
<copy
todir="${dollar}{jetspeed.portal.webapp}/WEB-INF/lib" overwrite="true">
- <fileset
dir="${dollar}{project.build.directory}/${dollar}{project.artifactId}-${dollar}{project.version}/WEB-INF/lib">
+ <fileset
dir="${dollar}{project.build.directory}/${dollar}{project.build.finalName}/WEB-INF/lib">
<include name="commons-proxy-*.jar" />
</fileset>
- <fileset
dir="${dollar}{project.build.directory}/${dollar}{project.artifactId}-${dollar}{project.version}/WEB-INF/lib">
+ <fileset
dir="${dollar}{project.build.directory}/${dollar}{project.build.finalName}/WEB-INF/lib">
<exclude name="commons-*.jar" />
<exclude name="hst-client-*.jar" />
<exclude name="jstl-*.jar" />
@@ -429,7 +430,7 @@
<echo>Copy hst configuration into jetspeed</echo>
<copy todir="${dollar}{jetspeed.portal.webapp}/WEB-INF"
overwrite="true">
- <fileset
dir="${dollar}{project.build.directory}/${dollar}{project.artifactId}-${dollar}{project.version}/WEB-INF">
+ <fileset
dir="${dollar}{project.build.directory}/${dollar}{project.build.finalName}/WEB-INF">
<include name="hst*.properties" />
<include name="hst*.xml" />
</fileset>
Added:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/classes/log4j.properties
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/classes/log4j.properties
(rev 0)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/classes/log4j.properties
2009-05-27 09:36:32 UTC (rev 18273)
@@ -0,0 +1,43 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+${symbol_pound}
+${symbol_pound} Copyright 2008 Hippo
+${symbol_pound}
+${symbol_pound} Licensed under the Apache License, Version 2.0 (the
"License");
+${symbol_pound} you may not use this file except in compliance with the
License.
+${symbol_pound} You may obtain a copy of the License at
+${symbol_pound}
+${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
+${symbol_pound}
+${symbol_pound} Unless required by applicable law or agreed to in writing,
software
+${symbol_pound} distributed under the License is distributed on an "AS IS"
+${symbol_pound} BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
+${symbol_pound} See the License for the specific language governing
permissions and
+${symbol_pound} limitations under the License.
+${symbol_pound}
+
+log4j.rootLogger = WARN, site
+
+log4j.category.org.hippoecm.hst = WARN, site
+log4j.additivity.org.hippoecm.hst = false
+
+log4j.category.${package} = DEBUG, site
+log4j.additivity.${package} = false
+
+${symbol_pound}
+${symbol_pound} site.log
+${symbol_pound}
+log4j.appender.site = org.apache.log4j.FileAppender
+log4j.appender.site.file =
${symbol_dollar}{site.webapp.root}/WEB-INF/logs/site.log
+log4j.appender.site.layout = org.apache.log4j.PatternLayout
+log4j.appender.site.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.site.append = false
+
+${symbol_pound}
+${symbol_pound} Console
+${symbol_pound}
+log4j.appender.console = org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout = org.apache.log4j.PatternLayout
+${symbol_pound} Pattern to output the caller's file name and line number.
+log4j.appender.console.layout.ConversionPattern = %d [%t] %-5p %c - %m%n
Property changes on:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/classes/log4j.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Deleted:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/log4j.properties
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/log4j.properties
2009-05-27 09:30:53 UTC (rev 18272)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/log4j.properties
2009-05-27 09:36:32 UTC (rev 18273)
@@ -1,41 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound}
-${symbol_pound} Copyright 2008 Hippo
-${symbol_pound}
-${symbol_pound} Licensed under the Apache License, Version 2.0 (the
"License");
-${symbol_pound} you may not use this file except in compliance with the
License.
-${symbol_pound} You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing,
software
-${symbol_pound} distributed under the License is distributed on an "AS IS"
-${symbol_pound} BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
-${symbol_pound} See the License for the specific language governing
permissions and
-${symbol_pound} limitations under the License.
-${symbol_pound}
-
-log4j.rootLogger = WARN, site
-
-log4j.category.org.hippoecm.hst = DEBUG, site
-log4j.additivity.org.hippoecm.hst = false
-
-${symbol_pound}
-${symbol_pound} site.log
-${symbol_pound}
-log4j.appender.site = org.apache.log4j.FileAppender
-log4j.appender.site.file = ${symbol_dollar}{site.root}/logs/site.log
-log4j.appender.site.layout = org.apache.log4j.PatternLayout
-log4j.appender.site.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.site.append = false
-
-${symbol_pound}
-${symbol_pound} Console
-${symbol_pound}
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-${symbol_pound} Pattern to output the caller's file name and line number.
-log4j.appender.console.layout.ConversionPattern=%5p: %m%n
-
Deleted:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/log4j.xml
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/log4j.xml
2009-05-27 09:30:53 UTC (rev 18272)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/log4j.xml
2009-05-27 09:36:32 UTC (rev 18273)
@@ -1,79 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright 2007 Hippo
-
- Licensed 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 log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
-
- <!-- ======================================================================
-->
- <!-- A P P E N D E R S
-->
- <!-- ======================================================================
-->
-
- <!-- console -->
- <appender name="console" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p
[%C.%M():%L] %m%n"/>
- </layout>
- </appender>
-
- <!-- log4j.log -->
- <appender name="root" class="org.apache.log4j.FileAppender">
- <param name="File" value="target/log4j.log"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p
[%C.%M():%L] %m%n"/>
- </layout>
- </appender>
-
- <!-- ======================================================================
-->
- <!-- L O G G E R S
-->
- <!-- ======================================================================
-->
-
- <category additivity="false" name="org.apache.jackrabbit.core">
- <level value="warn"/>
- <appender-ref ref="root"/>
- </category>
-
- <category additivity="false" name="org.hippoecm.repository">
- <level value="warn"/>
- <appender-ref ref="console"/>
- </category>
-
-
- <category additivity="false"
name="org.hippoecm.repository.LocalHippoRepository">
- <level value="info"/>
- <appender-ref ref="console"/>
- </category>
-
-
- <category additivity="false" name="org.hippoecm.hst">
- <level value="warn"/>
- <appender-ref ref="console"/>
- </category>
-
- <category additivity="false" name="${package}">
- <level value="warn"/>
- <appender-ref ref="console"/>
- </category>
-
- <root>
- <level value="warn"/>
- <appender-ref ref="console"/>
- <appender-ref ref="root"/>
- </root>
-
-</log4j:configuration>
Added:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/logs/README
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/logs/README
(rev 0)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/logs/README
2009-05-27 09:36:32 UTC (rev 18273)
@@ -0,0 +1,20 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+${symbol_pound}
+${symbol_pound} Copyright 2008 Hippo
+${symbol_pound}
+${symbol_pound} Licensed under the Apache License, Version 2.0 (the
"License");
+${symbol_pound} you may not use this file except in compliance with the
License.
+${symbol_pound} You may obtain a copy of the License at
+${symbol_pound}
+${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
+${symbol_pound}
+${symbol_pound} Unless required by applicable law or agreed to in writing,
software
+${symbol_pound} distributed under the License is distributed on an "AS IS"
+${symbol_pound} BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
+${symbol_pound} See the License for the specific language governing
permissions and
+${symbol_pound} limitations under the License.
+${symbol_pound}
+
+The directory containing this file is used for log4j log directory.
Property changes on:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/logs/README
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/pa-web.xml
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/pa-web.xml
2009-05-27 09:30:53 UTC (rev 18272)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/pa-web.xml
2009-05-27 09:36:32 UTC (rev 18273)
@@ -22,7 +22,7 @@
<!-- Spring Log4j Web Configuration Init Parameters -->
<context-param>
<param-name>log4jConfigLocation</param-name>
- <param-value>/WEB-INF/log4j.xml</param-value>
+ <param-value>/WEB-INF/classes/log4j.properties</param-value>
</context-param>
<context-param>
@@ -32,7 +32,7 @@
<context-param>
<param-name>webAppRootKey</param-name>
- <param-value>site.root</param-value>
+ <param-value>site.webapp.root</param-value>
</context-param>
<!-- Spring Log4j Configuring Listener -->
Modified:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/portal-pages/hstdemo.psml
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/portal-pages/hstdemo.psml
2009-05-27 09:30:53 UTC (rev 18272)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/portal-pages/hstdemo.psml
2009-05-27 09:36:32 UTC (rev 18273)
@@ -26,7 +26,7 @@
<property layout="TwoColumns" name="column" value="0" />
</fragment>
- <fragment id="hstdemo-news" type="portlet"
name="${artifactId}::SiteHomePortlet">
+ <fragment id="hstdemo-sitehome" type="portlet"
name="site::SiteHomePortlet">
<property layout="TwoColumns" name="row" value="0"/>
<property layout="TwoColumns" name="column" value="1"/>
</fragment>
Modified:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml
2009-05-27 09:30:53 UTC (rev 18272)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml
2009-05-27 09:36:32 UTC (rev 18273)
@@ -22,7 +22,7 @@
<!-- Spring Log4j Web Configuration Init Parameters -->
<context-param>
<param-name>log4jConfigLocation</param-name>
- <param-value>/WEB-INF/log4j.xml</param-value>
+ <param-value>/WEB-INF/classes/log4j.properties</param-value>
</context-param>
<context-param>
@@ -32,7 +32,7 @@
<context-param>
<param-name>webAppRootKey</param-name>
- <param-value>site.root</param-value>
+ <param-value>site.webapp.root</param-value>
</context-param>
<!-- Spring Log4j Configuring Listener -->
_______________________________________________
Hippocms-svn mailing list
[email protected]
http://lists.hippo.nl/mailman/listinfo/hippocms-svn
