[MRM-1025] remove straggling references to old JNDI name

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@891457 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-mysql.xml b/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-mysql.xml
index 989988361cf0c9daf9844441ab34482294248770..06d111b3141fd6f91c1563ed4c67c8905fe636ad 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-mysql.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-mysql.xml
@@ -106,32 +106,6 @@
 END SNIPPET: setting-up-mysql
     -->
 
-  <!-- Archiva database -->
-  <New id="archiva" class="org.mortbay.jetty.plus.naming.Resource">
-    <Arg>jdbc/archiva</Arg>
-    <Arg>
-      <New class="com.mysql.jdbc.jdbc2.optional.MysqlDataSource">
-        <Set name="serverName">localhost</Set>
-        <Set name="databaseName">archiva</Set>
-        <Set name="user">archiva</Set>
-        <Set name="password">sa</Set>
-      </New>
-    </Arg>
-  </New>
-
-  <New id="archivaShutdown" class="org.mortbay.jetty.plus.naming.Resource">
-    <Arg>jdbc/archivaShutdown</Arg>
-    <Arg>
-      <New class="com.mysql.jdbc.jdbc2.optional.MysqlDataSource">
-        <!-- <Set name="url">jdbc:mysql://localhost/archiva</Set> -->
-        <Set name="serverName">localhost</Set>
-        <Set name="databaseName">archiva</Set>
-        <Set name="user">archiva</Set>
-        <Set name="password">sa</Set>
-      </New>
-    </Arg>
-  </New>
-
   <!-- users / Security Database -->
   <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
     <Arg>jdbc/users</Arg>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-postgres.xml b/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-postgres.xml
index 8914ac44a1ee2f742bbb55b7352d23ef23233062..ca18626074b1b4106c31f2d5f557103224dd8999 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-postgres.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-postgres.xml
@@ -43,28 +43,6 @@
   </Arg>
 </New>
 
-<New id="archiva" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/archiva</Arg>
-  <Arg>
-    <New class="org.postgresql.ds.PGPoolingDataSource">
-      <Set name="serverName">localhost</Set>
-      <Set name="databaseName">archiva</Set>
-      <Set name="user">postgres</Set>
-      <Set name="password">sparky</Set>
-    </New>
-  </Arg>
-</New>
-<New id="archiva_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/archiva_shutdown</Arg>
-  <Arg>
-    <New class="org.postgresql.ds.PGPoolingDataSource">
-      <Set name="serverName">localhost</Set>
-      <Set name="databaseName">archiva</Set>
-      <Set name="user">postgres</Set>
-      <Set name="password">sparky</Set>  
-    </New>
-  </Arg>
-</New>
 <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
   <Arg>jdbc/users</Arg>
   <Arg>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
index b4fb373d0ba5ab3111c5184cd8ee65b76961c734..5be5b2b12252ba1ea917af18b25c1c6aae037547 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
@@ -161,12 +161,6 @@
                <res-auth>Container</res-auth>
                <res-sharing-scope>Shareable</res-sharing-scope>
        </resource-ref>
-       <resource-ref>
-               <res-ref-name>jdbc/archiva</res-ref-name>
-               <res-type>javax.sql.DataSource</res-type>
-               <res-auth>Container</res-auth>
-               <res-sharing-scope>Shareable</res-sharing-scope>
-       </resource-ref>
        <resource-ref>
                <res-ref-name>mail/Session</res-ref-name>
                <res-type>javax.mail.Session</res-type>