Author: bpapez
Date: Mon Aug 27 12:24:37 2007
New Revision: 18270
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18270&repname=
=3Djahia
Log:
JAHIA-2154: Correctly initialize the JahiaAdministration servlet
Modified:
branches/JAHIA-4-1-BRANCH/metadata/war/web.xml
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/bin/JahiaAdministration.ja=
va
Modified: branches/JAHIA-4-1-BRANCH/metadata/war/web.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/metadata/war/web.xml&rev=3D18270&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/metadata/war/web.xml (original)
+++ branches/JAHIA-4-1-BRANCH/metadata/war/web.xml Mon Aug 27 12:24:37 2007
@@ -205,6 +205,11 @@
<param-value>/WEB-INF/etc/struts/struts-config.xml</param-value>
-->
</init-param>
+ <!-- commented out because we did provide any resource file yet -->
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>ApplicationResources</param-value>
+ </init-param> =
</servlet>
=
<!-- Axis (SOAP) Servlets -->
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/bin/JahiaAdministrat=
ion.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/bin/JahiaAdministration.java&rev=3D18270&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/bin/JahiaAdministration.ja=
va (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/bin/JahiaAdministration.ja=
va Mon Aug 27 12:24:37 2007
@@ -159,6 +159,7 @@
* Servlet configuration (inherited).
*/
public void init(ServletConfig conf) throws ServletException {
+ super.init(conf); =
// get servlet config and context...
JahiaAdministration.config =3D conf;
JahiaAdministration.context =3D conf.getServletContext();
@@ -173,15 +174,6 @@
=
} // end init
=
- /*
- * (non-Javadoc)
- * =
- * @see org.apache.struts.action.ActionServlet#destroy()
- */
- public void destroy() {
- // do nothing
- }
-
/**
* Default service inherited from HttpServlet.
* =
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
