Author: bpapez
Date: Mon Aug 27 12:24:46 2007
New Revision: 18271
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18271&repname=
=3Djahia
Log:
JAHIA-2154: Correctly initialize the JahiaAdministration servlet
Modified:
trunk/core/src/java/org/jahia/bin/JahiaAdministration.java
trunk/core/src/webapp/WEB-INF/web.xml
Modified: trunk/core/src/java/org/jahia/bin/JahiaAdministration.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/bin/JahiaAdministration.java&rev=3D18271&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
--- trunk/core/src/java/org/jahia/bin/JahiaAdministration.java (original)
+++ trunk/core/src/java/org/jahia/bin/JahiaAdministration.java Mon Aug 27 1=
2:24:46 2007
@@ -166,7 +166,7 @@
public void init( ServletConfig aConfig )
throws ServletException
{
-
+ super.init(aConfig);
// get servlet config and context...
JahiaAdministration.config =3D aConfig;
JahiaAdministration.context =3D aConfig.getServletContext();
@@ -179,14 +179,8 @@
" missing in web.xml deployment descriptor file, =
use default /Jahia/... ");
contentServletPath =3D "/Jahia/";
}
- super.init(aConfig);
-
} // end init
=
- public void destroy() {
- // do not call super.destroy() to prevent ServletException
- }
-
/**
* Default service inherited from HttpServlet.
*
Modified: trunk/core/src/webapp/WEB-INF/web.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/web.xml&rev=3D18271&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
--- trunk/core/src/webapp/WEB-INF/web.xml (original)
+++ trunk/core/src/webapp/WEB-INF/web.xml Mon Aug 27 12:24:46 2007
@@ -510,8 +510,15 @@
<param-value>/Jahia/</param-value>
</init-param>
<init-param>
- <param-name>config</param-name>
- <param-value>/WEB-INF/etc/struts/struts-config.xml</param-value>
+ <param-name>config</param-name>
+ <!-- <param-value>/WEB-INF/etc/struts/struts-config.xml</param=
-value>-->
+ <param-value>
+ /WEB-INF/etc/struts/struts-config.xml,/WEB-INF/etc/struts/=
struts-config-corporateportal.xml,/WEB-INF/etc/struts/struts-config-corpora=
teportalv2.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>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
