ref #10072 update log4j.properties to log4j2.xml in launchers in vaadin

diff --git a/.gitattributes b/.gitattributes
index b4727e6ce39fc441ee3ddd038a3e0564ae45de60..338d1c231264b038f3ff6f7ede0fc90202fc234c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -67,7 +67,7 @@ src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/IDistributionTable
 src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/css/d3.conceptrelationshiptree.css -text
 src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/extlib/d3.min.js -text
 src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/lib/d3.conceptrelationshiptree_connector.js -text
-src/main/resources/log4j.properties -text
+src/main/resources/log4j2.xml -text
 src/main/resources/test.txt -text
 src/main/webapp/META-INF/MANIFEST.MF -text
 src/main/webapp/META-INF/context.xml -text
@@ -175,7 +175,7 @@ src/test/resources/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenterTest.xml -te
 src/test/resources/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelperTest.xml -text
 src/test/resources/h2/cdmTest.h2.db -text
 src/test/resources/h2/cdmTest.trace.db -text
-src/test/resources/log4j.properties -text
+src/test/resources/log4j2.xml -text
 src/test/resources/override.properties -text
 src/test/resources/unitils.properties -text
 src/test/resources/webapp/WEB-INF/applicationContext.xml -text

diff --git a/ide/eclipse/Jetty Launcher/cdm-vaadin - profile.launch b/ide/eclipse/Jetty Launcher/cdm-vaadin - profile.launch
index fd4c652e85d53da53587e1c26da1bcff84a56ccb..82465f66c5dd583bd7108a452cc5cecb4266423b 100644 (file)
--- a/ide/eclipse/Jetty Launcher/cdm-vaadin - profile.launch
+++ b/ide/eclipse/Jetty Launcher/cdm-vaadin - profile.launch
@@ -54,5 +54,5 @@
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="net.sourceforge.eclipsejetty.launcher.JettyLaunchClassPathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.sourceforge.eclipsejetty.starter.jetty9.Jetty9LauncherMain"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdm-vaadin"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlog4j.configDebug=false&#13;&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j.properties&#13;&#10;&#13;&#10;-agentlib:yjpagent"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlog4j.configDebug=false&#13;&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j2.xml&#13;&#10;&#13;&#10;-agentlib:yjpagent"/>
 </launchConfiguration>

diff --git a/ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch b/ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch
index 47c6c87184602cb72a0b194c2f1b2c09418bde65..ade407fa91e9e2baf089e4f2b81d18412a89cce1 100644 (file)
--- a/ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch
+++ b/ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch
@@ -56,5 +56,5 @@
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="net.sourceforge.eclipsejetty.launcher.JettyLaunchClassPathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.sourceforge.eclipsejetty.starter.jetty9.Jetty9LauncherMain"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdm-vaadin"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlog4j.configDebug=false&#13;&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j.properties&#13;&#10;&#13;&#10;-Dcdm.forceSchemaUpdate=false&#10;&#10;-Dcdm.mailAddress.support=ProjektAdmin@bgbm.org"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlog4j.configDebug=false&#13;&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j2.xml&#13;&#10;&#13;&#10;-Dcdm.forceSchemaUpdate=false&#10;&#10;-Dcdm.mailAddress.support=ProjektAdmin@bgbm.org"/>
 </launchConfiguration>

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index bda9070b65e2bb26ef474ff0d3b5098d68c09acf..b3cb4033a06ceaadd5dc7dff91bb4b356c4065bb 100644 (file)
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -26,7 +26,6 @@
         </listener-class>
     </listener>
 
-
     <servlet>
         <description>CDM Remote API</description>
         <servlet-name>cdm-vaadin</servlet-name>
@@ -75,6 +74,5 @@
       <filter-name>springSecurityFilterChain</filter-name>
       <url-pattern>/*</url-pattern>
     </filter-mapping>
- 
-    
-</web-app>
+
+</web-app>
\ No newline at end of file