- private StandardService createCatalinaServer(Bundle bundle) throws Exception {\r
- // first try to use the XML file\r
- URL xmlConfiguration = bundle.getResource(XML_CONF_LOCATION);\r
+ private StandardService createCatalinaServer(Bundle bundle)\r
+ throws Exception {\r
+ URL xmlConfiguration = null;\r
+\r
+ if (System.getProperty(CatalinaActivator.ARGEO_SERVER_TOMCAT_CONFIG) != null) {\r
+ String customConfig = System\r
+ .getProperty(CatalinaActivator.ARGEO_SERVER_TOMCAT_CONFIG);\r
+ try {\r
+ xmlConfiguration = new URL(customConfig);\r
+ } catch (MalformedURLException e) {\r
+ // within this bundle\r
+ // typically 'default-server-ssl.xml'\r
+ xmlConfiguration = bundle.getResource(customConfig);\r
+ }\r
+ } else {\r
+ // fragment\r
+ xmlConfiguration = bundle.getResource(XML_CONF_LOCATION);\r
+ }\r