Author: ate
Date: Sun Jun 24 19:06:41 2007
New Revision: 550315
URL: http://svn.apache.org/viewvc?view=rev&rev=550315
Log:
Implementing JS2-740: Allow overriding the default Spring assembly without
having to modify it
See: https://issues.apache.org/jira/browse/JS2-740
Added:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/override/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/override/README.txt
(with props)
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java?view=diff&rev=550315&r1=550314&r2=550315
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java
Sun Jun 24 19:06:41 2007
@@ -315,7 +315,7 @@
final String assemblyFileExtension =
configuration.getString("assembly.extension",".xml");
String[] bootConfigs = new String[] {"/WEB-INF/assembly/boot/*.xml"};
- String[] appConfigs = new String[]
{assemblyDir+"/*"+assemblyFileExtension};
+ String[] appConfigs = new String[]
{assemblyDir+"/*"+assemblyFileExtension,
assemblyDir+"/override/*"+assemblyFileExtension};
ServletContext servletContext = servletConfig.getServletContext();
SpringComponentManager cm = new SpringComponentManager(bootConfigs,
appConfigs, servletContext, appRoot);
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/override/README.txt
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/override/README.txt?view=auto&rev=550315
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/override/README.txt
(added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/override/README.txt
Sun Jun 24 19:06:41 2007
@@ -0,0 +1,2 @@
+Configurations from this folder are loaded after those from the parent
assembly folder.
+Use this folder to override the default assembly configuration.
Propchange:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/override/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/override/README.txt
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
