From f72ff88c460fd60f3f73bf6327c7bed39b4c3de8 Mon Sep 17 00:00:00 2001
From: olivier lamy <olamy@apache.org>
Date: Tue, 15 Aug 2017 21:12:08 +1000
Subject: fixing some directories

Signed-off-by: olivier lamy <olamy@apache.org>
---
 archiva-modules/archiva-web/archiva-webapp/pom.xml |   9 +-
 .../archiva-webapp/src/main/resources/log4j2.xml   |   6 --
 .../src/test/auto-admin-creation.properties        |  22 +++++
 .../archiva-webapp/src/test/jetty-env.xml          |  48 ++++++++++
 .../archiva-webapp/src/test/jetty/jetty-env.xml    |  48 ----------
 .../archiva-webapp/src/test/log4j2-test.xml        | 101 +++++++++++++++++++++
 .../src/test/tomcat/auto-admin-creation.properties |  22 -----
 .../archiva-webapp/src/test/tomcat/log4j2-test.xml | 101 ---------------------
 8 files changed, 177 insertions(+), 180 deletions(-)
 create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/test/auto-admin-creation.properties
 create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/test/jetty-env.xml
 delete mode 100644 archiva-modules/archiva-web/archiva-webapp/src/test/jetty/jetty-env.xml
 create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
 delete mode 100644 archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/auto-admin-creation.properties
 delete mode 100644 archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml

(limited to 'archiva-modules/archiva-web/archiva-webapp')

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index ce0cda9f8..13678bfd1 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -904,8 +904,7 @@
           <webApp>
             <contextPath>/archiva</contextPath>
           </webApp>
-          <jettyXml>${basedir}/src/test/jetty/jetty-env.xml</jettyXml>
-
+          <jettyXml>${basedir}/src/test/jetty-env.xml</jettyXml>
           <systemProperties>
             <systemProperty>
               <name>plexus.home</name>
@@ -921,7 +920,7 @@
             </systemProperty>
             <systemProperty>
               <name>derby.system.home</name>
-              <value>${archivaAppServerBase}/logs</value>
+              <value>${archivaAppServerBase}/database</value>
             </systemProperty>
             <systemProperty>
               <name>java.io.tmpdir</name>
@@ -955,6 +954,10 @@
               <name>archiva.repositorySessionFactory.id</name>
               <value>${archiva.repositorySessionFactory.id}</value>
             </systemProperty>
+            <systemProperty>
+              <name>log4j.configurationFile</name>
+              <value>${basedir}/src/test/log4j2-test.xml</value>
+            </systemProperty>
             <systemProperty>
               <name>AsyncLoggerConfig.WaitStrategy</name>
               <value>Block</value>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
index f22ee0691..5496e442a 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
@@ -78,12 +78,6 @@
 
    <logger name="org.quartz" level="info"/>
 
-   <logger name="org.apache.jasper" level="info"/>
-
-   <logger name="com.opensymphony.xwork2" level="info"/>
-
-   <logger name="org.apache.struts2" level="info"/>
-
   -->
 
     <!-- WebDav objects -->
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/auto-admin-creation.properties b/archiva-modules/archiva-web/archiva-webapp/src/test/auto-admin-creation.properties
new file mode 100644
index 000000000..7c8c5815b
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/auto-admin-creation.properties
@@ -0,0 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+#
+
+redback.admin.fullname=Archiva Admin
+redback.admin.email=admin@toto.com
+redback.admin.password=admin123
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/jetty-env.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/jetty-env.xml
new file mode 100644
index 000000000..bed63bfa3
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/jetty-env.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"  encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you 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 Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<Configure id="wac" class="org.eclipse.jetty.webapp.WebAppContext">
+  <New id="derbyDs" class="org.eclipse.jetty.plus.jndi.Resource">
+    <Arg></Arg>
+    <Arg>jdbc/users</Arg>
+    <Arg>
+      <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+        <Set name="databaseName">database/users;create=true</Set>
+        <Set name="user">sa</Set>
+        <Set name="password"></Set>
+      </New>
+    </Arg>
+  </New>
+
+
+  <New id="mail" class="org.eclipse.jetty.plus.jndi.Resource">
+    <Arg>mail/Session</Arg>
+    <Arg>
+      <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
+        <Set name="properties">
+          <New class="java.util.Properties">
+            <Put name="mail.smtp.host">localhost</Put>
+          </New>
+        </Set>
+      </New>
+    </Arg>
+  </New>
+</Configure>
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/jetty/jetty-env.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/jetty/jetty-env.xml
deleted file mode 100644
index bed63bfa3..000000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/jetty/jetty-env.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"  encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you 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 Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<Configure id="wac" class="org.eclipse.jetty.webapp.WebAppContext">
-  <New id="derbyDs" class="org.eclipse.jetty.plus.jndi.Resource">
-    <Arg></Arg>
-    <Arg>jdbc/users</Arg>
-    <Arg>
-      <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-        <Set name="databaseName">database/users;create=true</Set>
-        <Set name="user">sa</Set>
-        <Set name="password"></Set>
-      </New>
-    </Arg>
-  </New>
-
-
-  <New id="mail" class="org.eclipse.jetty.plus.jndi.Resource">
-    <Arg>mail/Session</Arg>
-    <Arg>
-      <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
-        <Set name="properties">
-          <New class="java.util.Properties">
-            <Put name="mail.smtp.host">localhost</Put>
-          </New>
-        </Set>
-      </New>
-    </Arg>
-  </New>
-</Configure>
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
new file mode 100644
index 000000000..55668911a
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you 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.
+  -->
+
+
+<configuration status="debug">
+
+  <properties>
+    <property name="logsDirectory">${sys:appserver.base}/logs</property>
+  </properties>
+
+  <appenders>
+    <Console name="console" target="SYSTEM_OUT" level="info">
+      <!--PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/-->
+      <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n}" />
+    </Console>
+    <RollingRandomAccessFile name="rolling" fileName="${logsDirectory}/archiva.log"
+                     filePattern="${logsDirectory}/archiva-%d{MM-dd-yyyy}.log"
+
+                             immediateFlush="true" append="true">
+      <PatternLayout>
+        <pattern>%d [%t] %-5p %c %x - %m%n</pattern>
+      </PatternLayout>
+      <Policies>
+        <TimeBasedTriggeringPolicy />
+      </Policies>
+    </RollingRandomAccessFile>
+  </appenders>
+  <loggers>
+
+    <!-- apache httpclient debug content transfer-->
+    <!--
+    <logger name="org.apache.http.wire">
+      <level value="debug"/>
+    </logger>
+    <logger name="org.apache.http.headers" level="debug"/>
+    -->
+
+    <logger name="org.apache.archiva.indexer.search.MavenRepositorySearch" level="info"/>
+
+    <logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils" level="info"/>
+
+    <logger name="JPOX" level="error"/>
+
+    <logger name="org.apache.commons.configuration.DefaultConfigurationBuilder" level="error"/>
+
+    <logger name="org.apache.archiva.admin.repository.managed" level="info"/>
+
+    <logger name="org.springframework" level="info"/>
+
+    <logger name="org.codehaus.plexus" level="info"/>
+
+    <logger name="org.codehaus.redback" level="info"/>
+
+    <logger name="org.apache.cxf" level="info"/>
+
+    <logger name="org.quartz" level="info"/>
+
+    <logger name="org.apache.archiva.indexer.merger" level="info"/>
+
+    <logger name="org.apache.archiva.metadata.repository.stats.DefaultRepositoryStatisticsManager" level="debug" />
+
+    <logger name="org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler" level="debug"/>
+
+    <logger name="org.apache.archiva.web.security.ArchivaAuthorizer" level="debug"/>
+
+    <logger name="org.apache.archiva.redback.rest.services.DefaultRoleManagementService" level="debug"/>
+
+    <logger name="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry" level="debug"/>
+
+    <logger name="org.apache.archiva.redback.components.taskqueue.DefaultTaskQueue" level="info" />
+
+    <logger name="org.apache.archiva" level="debug" />
+    <!--
+    <logger name="org.apache.archiva.scheduler.indexing" level="debug"/>
+    -->
+
+    <root level="info" includeLocation="true">
+      <appender-ref ref="console"/>
+      <appender-ref ref="rolling"/>
+    </root>
+  </loggers>
+</configuration>
+
+
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/auto-admin-creation.properties b/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/auto-admin-creation.properties
deleted file mode 100644
index 7c8c5815b..000000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/auto-admin-creation.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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.
-#
-
-redback.admin.fullname=Archiva Admin
-redback.admin.email=admin@toto.com
-redback.admin.password=admin123
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
deleted file mode 100644
index 55668911a..000000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you 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.
-  -->
-
-
-<configuration status="debug">
-
-  <properties>
-    <property name="logsDirectory">${sys:appserver.base}/logs</property>
-  </properties>
-
-  <appenders>
-    <Console name="console" target="SYSTEM_OUT" level="info">
-      <!--PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/-->
-      <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n}" />
-    </Console>
-    <RollingRandomAccessFile name="rolling" fileName="${logsDirectory}/archiva.log"
-                     filePattern="${logsDirectory}/archiva-%d{MM-dd-yyyy}.log"
-
-                             immediateFlush="true" append="true">
-      <PatternLayout>
-        <pattern>%d [%t] %-5p %c %x - %m%n</pattern>
-      </PatternLayout>
-      <Policies>
-        <TimeBasedTriggeringPolicy />
-      </Policies>
-    </RollingRandomAccessFile>
-  </appenders>
-  <loggers>
-
-    <!-- apache httpclient debug content transfer-->
-    <!--
-    <logger name="org.apache.http.wire">
-      <level value="debug"/>
-    </logger>
-    <logger name="org.apache.http.headers" level="debug"/>
-    -->
-
-    <logger name="org.apache.archiva.indexer.search.MavenRepositorySearch" level="info"/>
-
-    <logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils" level="info"/>
-
-    <logger name="JPOX" level="error"/>
-
-    <logger name="org.apache.commons.configuration.DefaultConfigurationBuilder" level="error"/>
-
-    <logger name="org.apache.archiva.admin.repository.managed" level="info"/>
-
-    <logger name="org.springframework" level="info"/>
-
-    <logger name="org.codehaus.plexus" level="info"/>
-
-    <logger name="org.codehaus.redback" level="info"/>
-
-    <logger name="org.apache.cxf" level="info"/>
-
-    <logger name="org.quartz" level="info"/>
-
-    <logger name="org.apache.archiva.indexer.merger" level="info"/>
-
-    <logger name="org.apache.archiva.metadata.repository.stats.DefaultRepositoryStatisticsManager" level="debug" />
-
-    <logger name="org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler" level="debug"/>
-
-    <logger name="org.apache.archiva.web.security.ArchivaAuthorizer" level="debug"/>
-
-    <logger name="org.apache.archiva.redback.rest.services.DefaultRoleManagementService" level="debug"/>
-
-    <logger name="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry" level="debug"/>
-
-    <logger name="org.apache.archiva.redback.components.taskqueue.DefaultTaskQueue" level="info" />
-
-    <logger name="org.apache.archiva" level="debug" />
-    <!--
-    <logger name="org.apache.archiva.scheduler.indexing" level="debug"/>
-    -->
-
-    <root level="info" includeLocation="true">
-      <appender-ref ref="console"/>
-      <appender-ref ref="rolling"/>
-    </root>
-  </loggers>
-</configuration>
-
-
-- 
cgit v1.2.3