[jboss-cvs] JBossAS SVN: r97744 - projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Dec 11 11:43:45 EST 2009
Author: remy.maucherat at jboss.com
Date: 2009-12-11 11:43:45 -0500 (Fri, 11 Dec 2009)
New Revision: 97744
Modified:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspConfigMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/LocaleEncodingsMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WelcomeFileListMetaData.java
Log:
- Augment was reversing the order: the main metadata should always be placed first.
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java 2009-12-11 16:33:22 UTC (rev 97743)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java 2009-12-11 16:43:45 UTC (rev 97744)
@@ -105,6 +105,10 @@
else if (webFragmentMetaData.getUrlPatterns() != null)
{
List<String> mergedUrlPatterns = new ArrayList<String>();
+ for (String urlPattern : getUrlPatterns())
+ {
+ mergedUrlPatterns.add(urlPattern);
+ }
for (String urlPattern : webFragmentMetaData.getUrlPatterns())
{
boolean found = false;
@@ -118,10 +122,6 @@
if (!found)
mergedUrlPatterns.add(urlPattern);
}
- for (String urlPattern : getUrlPatterns())
- {
- mergedUrlPatterns.add(urlPattern);
- }
setUrlPatterns(mergedUrlPatterns);
}
// Servlet names
@@ -132,6 +132,10 @@
else if (webFragmentMetaData.getServletNames() != null)
{
List<String> mergedServletNames = new ArrayList<String>();
+ for (String servletName : getServletNames())
+ {
+ mergedServletNames.add(servletName);
+ }
for (String servletName : webFragmentMetaData.getServletNames())
{
boolean found = false;
@@ -145,10 +149,6 @@
if (!found)
mergedServletNames.add(servletName);
}
- for (String servletName : getServletNames())
- {
- mergedServletNames.add(servletName);
- }
setServletNames(mergedServletNames);
}
// Dispatchers
@@ -159,6 +159,10 @@
else if (webFragmentMetaData.getDispatchers() != null)
{
List<DispatcherType> mergedDispatchers = new ArrayList<DispatcherType>();
+ for (DispatcherType dispatcher : getDispatchers())
+ {
+ mergedDispatchers.add(dispatcher);
+ }
for (DispatcherType dispatcher : webFragmentMetaData.getDispatchers())
{
boolean found = false;
@@ -172,10 +176,6 @@
if (!found)
mergedDispatchers.add(dispatcher);
}
- for (DispatcherType dispatcher : getDispatchers())
- {
- mergedDispatchers.add(dispatcher);
- }
setDispatchers(mergedDispatchers);
}
}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java 2009-12-11 16:33:22 UTC (rev 97743)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java 2009-12-11 16:43:45 UTC (rev 97744)
@@ -111,6 +111,10 @@
else if (webFragmentMetaData.getInitParam() != null)
{
List<ParamValueMetaData> mergedInitParams = new ArrayList<ParamValueMetaData>();
+ for (ParamValueMetaData initParam : getInitParam())
+ {
+ mergedInitParams.add(initParam);
+ }
for (ParamValueMetaData initParam : webFragmentMetaData.getInitParam())
{
boolean found = false;
@@ -143,10 +147,6 @@
if (!found)
mergedInitParams.add(initParam);
}
- for (ParamValueMetaData initParam : getInitParam())
- {
- mergedInitParams.add(initParam);
- }
setInitParam(mergedInitParams);
}
// Async supported
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspConfigMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspConfigMetaData.java 2009-12-11 16:33:22 UTC (rev 97743)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspConfigMetaData.java 2009-12-11 16:43:45 UTC (rev 97744)
@@ -73,6 +73,10 @@
else if (webFragmentMetaData.getTaglibs() != null)
{
List<TaglibMetaData> mergedTaglibs = new ArrayList<TaglibMetaData>();
+ for (TaglibMetaData taglib : getTaglibs())
+ {
+ mergedTaglibs.add(taglib);
+ }
for (TaglibMetaData taglib : webFragmentMetaData.getTaglibs())
{
boolean found = false;
@@ -105,10 +109,6 @@
if (!found)
mergedTaglibs.add(taglib);
}
- for (TaglibMetaData taglib : getTaglibs())
- {
- mergedTaglibs.add(taglib);
- }
setTaglibs(mergedTaglibs);
}
@@ -121,11 +121,11 @@
{
// JSP property groups are additive
List<JspPropertyGroupMetaData> mergedPropertyGroups = new ArrayList<JspPropertyGroupMetaData>();
- for (JspPropertyGroupMetaData propertyGroup : webFragmentMetaData.getPropertyGroups())
+ for (JspPropertyGroupMetaData propertyGroup : getPropertyGroups())
{
mergedPropertyGroups.add(propertyGroup);
}
- for (JspPropertyGroupMetaData propertyGroup : getPropertyGroups())
+ for (JspPropertyGroupMetaData propertyGroup : webFragmentMetaData.getPropertyGroups())
{
mergedPropertyGroups.add(propertyGroup);
}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/LocaleEncodingsMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/LocaleEncodingsMetaData.java 2009-12-11 16:33:22 UTC (rev 97743)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/LocaleEncodingsMetaData.java 2009-12-11 16:43:45 UTC (rev 97744)
@@ -59,6 +59,10 @@
else if (webFragmentMetaData.getMappings() != null)
{
List<LocaleEncodingMetaData> mergedMappings = new ArrayList<LocaleEncodingMetaData>();
+ for (LocaleEncodingMetaData mapping : getMappings())
+ {
+ mergedMappings.add(mapping);
+ }
for (LocaleEncodingMetaData mapping : webFragmentMetaData.getMappings())
{
boolean found = false;
@@ -91,10 +95,6 @@
if (!found)
mergedMappings.add(mapping);
}
- for (LocaleEncodingMetaData mapping : getMappings())
- {
- mergedMappings.add(mapping);
- }
setMappings(mergedMappings);
}
}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingMetaData.java 2009-12-11 16:33:22 UTC (rev 97743)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingMetaData.java 2009-12-11 16:43:45 UTC (rev 97744)
@@ -83,6 +83,10 @@
else if (webFragmentMetaData.getUrlPatterns() != null)
{
List<String> mergedUrlPatterns = new ArrayList<String>();
+ for (String urlPattern : getUrlPatterns())
+ {
+ mergedUrlPatterns.add(urlPattern);
+ }
for (String urlPattern : webFragmentMetaData.getUrlPatterns())
{
boolean found = false;
@@ -96,10 +100,6 @@
if (!found)
mergedUrlPatterns.add(urlPattern);
}
- for (String urlPattern : getUrlPatterns())
- {
- mergedUrlPatterns.add(urlPattern);
- }
setUrlPatterns(mergedUrlPatterns);
}
}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java 2009-12-11 16:33:22 UTC (rev 97743)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java 2009-12-11 16:43:45 UTC (rev 97744)
@@ -238,6 +238,10 @@
else if (webFragmentMetaData.getInitParam() != null)
{
List<ParamValueMetaData> mergedInitParams = new ArrayList<ParamValueMetaData>();
+ for (ParamValueMetaData initParam : getInitParam())
+ {
+ mergedInitParams.add(initParam);
+ }
for (ParamValueMetaData initParam : webFragmentMetaData.getInitParam())
{
boolean found = false;
@@ -270,10 +274,6 @@
if (!found)
mergedInitParams.add(initParam);
}
- for (ParamValueMetaData initParam : getInitParam())
- {
- mergedInitParams.add(initParam);
- }
setInitParam(mergedInitParams);
}
// Load on startup
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java 2009-12-11 16:33:22 UTC (rev 97743)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java 2009-12-11 16:43:45 UTC (rev 97744)
@@ -540,6 +540,10 @@
else if (webFragmentMetaData.getContextParams() != null)
{
List<ParamValueMetaData> mergedContextParams = new ArrayList<ParamValueMetaData>();
+ for (ParamValueMetaData contextParam : getContextParams())
+ {
+ mergedContextParams.add(contextParam);
+ }
for (ParamValueMetaData contextParam : webFragmentMetaData.getContextParams())
{
boolean found = false;
@@ -572,10 +576,6 @@
if (!found)
mergedContextParams.add(contextParam);
}
- for (ParamValueMetaData contextParam : getContextParams())
- {
- mergedContextParams.add(contextParam);
- }
setContextParams(mergedContextParams);
}
@@ -609,6 +609,10 @@
else if (webFragmentMetaData.getFilterMappings() != null)
{
List<FilterMappingMetaData> mergedFilterMappings = new ArrayList<FilterMappingMetaData>();
+ for (FilterMappingMetaData filterMapping : getFilterMappings())
+ {
+ mergedFilterMappings.add(filterMapping);
+ }
for (FilterMappingMetaData filterMapping : webFragmentMetaData.getFilterMappings())
{
boolean found = false;
@@ -623,10 +627,6 @@
if (!found)
mergedFilterMappings.add(filterMapping);
}
- for (FilterMappingMetaData filterMapping : getFilterMappings())
- {
- mergedFilterMappings.add(filterMapping);
- }
setFilterMappings(mergedFilterMappings);
}
@@ -638,6 +638,10 @@
else if (webFragmentMetaData.getErrorPages() != null)
{
List<ErrorPageMetaData> mergedErrorPages = new ArrayList<ErrorPageMetaData>();
+ for (ErrorPageMetaData errorPage : getErrorPages())
+ {
+ mergedErrorPages.add(errorPage);
+ }
for (ErrorPageMetaData errorPage : webFragmentMetaData.getErrorPages())
{
boolean found = false;
@@ -697,10 +701,6 @@
if (!found)
mergedErrorPages.add(errorPage);
}
- for (ErrorPageMetaData errorPage : getErrorPages())
- {
- mergedErrorPages.add(errorPage);
- }
setErrorPages(mergedErrorPages);
}
@@ -723,6 +723,10 @@
else if (webFragmentMetaData.getListeners() != null)
{
List<ListenerMetaData> mergedListeners = new ArrayList<ListenerMetaData>();
+ for (ListenerMetaData listener : getListeners())
+ {
+ mergedListeners.add(listener);
+ }
for (ListenerMetaData listener : webFragmentMetaData.getListeners())
{
boolean found = false;
@@ -736,10 +740,6 @@
if (!found)
mergedListeners.add(listener);
}
- for (ListenerMetaData listener : getListeners())
- {
- mergedListeners.add(listener);
- }
setListeners(mergedListeners);
}
@@ -762,6 +762,10 @@
else if (webFragmentMetaData.getMimeMappings() != null)
{
List<MimeMappingMetaData> mergedMimeMappings = new ArrayList<MimeMappingMetaData>();
+ for (MimeMappingMetaData mimeMapping : getMimeMappings())
+ {
+ mergedMimeMappings.add(mimeMapping);
+ }
for (MimeMappingMetaData mimeMapping : webFragmentMetaData.getMimeMappings())
{
boolean found = false;
@@ -795,10 +799,6 @@
if (!found)
mergedMimeMappings.add(mimeMapping);
}
- for (MimeMappingMetaData mimeMapping : getMimeMappings())
- {
- mergedMimeMappings.add(mimeMapping);
- }
setMimeMappings(mergedMimeMappings);
}
@@ -821,6 +821,10 @@
else if (webFragmentMetaData.getServletMappings() != null)
{
List<ServletMappingMetaData> mergedServletMappings = new ArrayList<ServletMappingMetaData>();
+ for (ServletMappingMetaData servletMapping : getServletMappings())
+ {
+ mergedServletMappings.add(servletMapping);
+ }
for (ServletMappingMetaData servletMapping : webFragmentMetaData.getServletMappings())
{
boolean found = false;
@@ -835,10 +839,6 @@
if (!found)
mergedServletMappings.add(servletMapping);
}
- for (ServletMappingMetaData servletMapping : getServletMappings())
- {
- mergedServletMappings.add(servletMapping);
- }
setServletMappings(mergedServletMappings);
}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WelcomeFileListMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WelcomeFileListMetaData.java 2009-12-11 16:33:22 UTC (rev 97743)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WelcomeFileListMetaData.java 2009-12-11 16:43:45 UTC (rev 97744)
@@ -61,6 +61,10 @@
else if (webFragmentMetaData.getWelcomeFiles() != null)
{
List<String> mergedWelcomeFiles = new ArrayList<String>();
+ for (String welcomeFile : getWelcomeFiles())
+ {
+ mergedWelcomeFiles.add(welcomeFile);
+ }
for (String welcomeFile : webFragmentMetaData.getWelcomeFiles())
{
boolean found = false;
@@ -74,10 +78,6 @@
if (!found)
mergedWelcomeFiles.add(welcomeFile);
}
- for (String welcomeFile : getWelcomeFiles())
- {
- mergedWelcomeFiles.add(welcomeFile);
- }
setWelcomeFiles(mergedWelcomeFiles);
}
}
More information about the jboss-cvs-commits
mailing list