Author: bpapez
Date: Fri Aug 24 15:48:55 2007
New Revision: 18261
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18261&repname=
=3Djahia
Log:
JAHIA-2154: Correctly initialize the JahiaAdministration servlet =
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAdministr=
ation.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/web.xml
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAdm=
inistration.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/bin/JahiaAdministration.java&rev=3D18261&re=
pname=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-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAdministr=
ation.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAdministr=
ation.java Fri Aug 24 15:48:55 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,16 +179,8 @@
" missing in web.xml deployment descriptor file, =
use default /Jahia/... ");
contentServletPath =3D "/Jahia/";
}
-//
-// super.init(aConfig);
-
} // end init
=
- //@Override
- public void destroy() {
- // do not call super.destroy() to prevent ServletException
- }
-
/**
* Default service inherited from HttpServlet.
*
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/web.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/web.xml&rev=3D18261&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-5-0-SP-BRANCH/core/src/webapp/WEB-INF/web.xml (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/web.xml Fri Aug 24=
15:48:55 2007
@@ -512,6 +512,17 @@
<param-name>content_servlet_path</param-name>
<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-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>
=
<!-- Axis (SOAP) Servlets -->
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
