Author: brett
Date: Wed Dec 16 22:25:29 2009
New Revision: 891457
URL: http://svn.apache.org/viewvc?rev=891457&view=rev
Log:
[MRM-1025] remove straggling references to old JNDI name
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-mysql.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-postgres.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-mysql.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-mysql.xml?rev=891457&r1=891456&r2=891457&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-mysql.xml
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-mysql.xml
Wed Dec 16 22:25:29 2009
@@ -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>
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-postgres.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-postgres.xml?rev=891457&r1=891456&r2=891457&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-postgres.xml
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env-postgres.xml
Wed Dec 16 22:25:29 2009
@@ -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>
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml?rev=891457&r1=891456&r2=891457&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
Wed Dec 16 22:25:29 2009
@@ -162,12 +162,6 @@
<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>
<res-auth>Container</res-auth>
