You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2011/04/12 09:16:40 UTC
svn commit: r1091315 [2/4] - in /archiva/trunk: ./ archiva-docs/
archiva-docs/src/site/apt/ archiva-modules/archiva-base/
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/
archiva-modu...
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/webwork.properties:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:1049409
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:1049409,1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:699795-700720
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:898632
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml Tue Apr 12 07:16:34 2011
@@ -45,6 +45,9 @@
<param name="enableReferrerCheck">false</param>
</interceptor-ref>
<interceptor-ref name="redbackPolicyEnforcement"/>
+ <interceptor-ref name="tokenSession">
+ <param name="excludeMethods">*</param>
+ </interceptor-ref>
<interceptor-ref name="configuration"/>
<interceptor-ref name="validation">
<param name="excludeMethods">input,back,cancel,browse</param>
@@ -62,6 +65,9 @@
<interceptor-ref name="redbackSecureActions">
<param name="enableReferrerCheck">false</param>
</interceptor-ref>
+ <interceptor-ref name="tokenSession">
+ <param name="excludeMethods">*</param>
+ </interceptor-ref>
<interceptor-ref name="validation">
<param name="excludeMethods">input,back,cancel,browse</param>
</interceptor-ref>
@@ -128,7 +134,8 @@
include a result for 'error' -->
<result name="error">/WEB-INF/jsp/generalError.jsp</result>
<result name="access_to_no_repos">/WEB-INF/jsp/accessToNoRepos.jsp</result>
-
+ <result name="invalid.token">/WEB-INF/jsp/redback/invalidToken.jsp</result>
+
</global-results>
</package>
@@ -174,6 +181,9 @@
<result name="input">/WEB-INF/jsp/deleteArtifact.jsp</result>
<result name="error">/WEB-INF/jsp/deleteArtifact.jsp</result>
<result name="success">/WEB-INF/jsp/deleteArtifact.jsp</result>
+ <interceptor-ref name="configuredArchivaStack">
+ <param name="tokenSession.includeMethods">doDelete</param>
+ </interceptor-ref>
</action>
<action name="checksumSearch" class="searchAction" method="findArtifact">
@@ -262,19 +272,25 @@
<result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
<result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
<result name="success" type="redirect-action">repositoryGroups</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
+ <interceptor-ref name="configuredPrepareParamsStack">
+ <param name="tokenSession.includeMethods">*</param>
+ </interceptor-ref>
</action>
<action name="confirmDeleteRepositoryGroup" class="deleteRepositoryGroupAction" method="confirmDelete">
<result name="input">/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
+ <interceptor-ref name="configuredPrepareParamsStack">
+ <param name="tokenSession.includeMethods">*</param>
+ </interceptor-ref>
</action>
<action name="deleteRepositoryGroup" class="deleteRepositoryGroupAction" method="delete">
<result name="input">/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp</result>
<result name="error">/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp</result>
<result name="success" type="redirect-action">repositoryGroups</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
+ <interceptor-ref name="configuredPrepareParamsStack">
+ <param name="tokenSession.includeMethods">*</param>
+ </interceptor-ref>
</action>
<action name="addRepositoryToGroup" class="repositoryGroupsAction" method="addRepositoryToGroup">
@@ -334,14 +350,18 @@
<action name="confirmDeleteRepository" class="deleteManagedRepositoryAction" method="confirmDelete">
<result name="input">/WEB-INF/jsp/admin/deleteRepository.jsp</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
+ <interceptor-ref name="configuredPrepareParamsStack">
+ <param name="tokenSession.includeMethods">*</param>
+ </interceptor-ref>
</action>
<action name="deleteRepository" class="deleteManagedRepositoryAction" method="delete">
<result name="input">/WEB-INF/jsp/admin/deleteRepository.jsp</result>
<result name="error">/WEB-INF/jsp/admin/deleteRepository.jsp</result>
<result name="success" type="redirect-action">repositories</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
+ <interceptor-ref name="configuredPrepareParamsStack">
+ <param name="tokenSession.includeMethods">*</param>
+ </interceptor-ref>
</action>
<action name="addRemoteRepository" class="addRemoteRepositoryAction" method="input">
@@ -410,7 +430,9 @@
<action name="deleteProxyConnector" class="deleteProxyConnectorAction" method="confirm">
<result name="input">/WEB-INF/jsp/admin/deleteProxyConnector.jsp</result>
<result name="success" type="redirect-action">proxyConnectors</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
+ <interceptor-ref name="configuredPrepareParamsStack">
+ <param name="tokenSession.includeMethods">*</param>
+ </interceptor-ref>
</action>
<action name="enableProxyConnector" class="enableProxyConnectorAction" method="confirm">
@@ -422,7 +444,9 @@
<action name="disableProxyConnector" class="disableProxyConnectorAction" method="confirm">
<result name="input">/WEB-INF/jsp/admin/disableProxyConnector.jsp</result>
<result name="success" type="redirect-action">proxyConnectors</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
+ <interceptor-ref name="configuredPrepareParamsStack">
+ <param name="tokenSession.includeMethods">*</param>
+ </interceptor-ref>
</action>
@@ -447,13 +471,17 @@
<action name="saveNetworkProxy" class="configureNetworkProxyAction" method="save">
<result name="input">/WEB-INF/jsp/admin/editNetworkProxy.jsp</result>
<result name="success" type="redirect-action">networkProxies</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
+ <interceptor-ref name="configuredPrepareParamsStack">
+ <param name="tokenSession.includeMethods">*</param>
+ </interceptor-ref>
</action>
<action name="deleteNetworkProxy" class="configureNetworkProxyAction" method="confirm">
<result name="input">/WEB-INF/jsp/admin/deleteNetworkProxy.jsp</result>
<result name="success" type="redirect-action">networkProxies</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
+ <interceptor-ref name="configuredPrepareParamsStack">
+ <param name="tokenSession.includeMethods">*</param>
+ </interceptor-ref>
</action>
<!-- .\ REPOSITORY SCANNING \._____________________________________ -->
@@ -463,6 +491,9 @@
<result name="success" type="redirect-action">
<param name="actionName">repositoryScanning</param>
</result>
+ <interceptor-ref name="configuredArchivaStack">
+ <param name="tokenSession.includeMethods">removeFiletypePattern,addFiletypePattern,updateKnownConsumers,updateInvalidConsumers</param>
+ </interceptor-ref>
</action>
<!-- .\ CONFIGURATION \.___________________________________________ -->
@@ -507,7 +538,9 @@
<result name="input">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
<result name="error">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
<result name="success" type="redirect-action">legacyArtifactPath</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
+ <interceptor-ref name="configuredPrepareParamsStack">
+ <param name="tokenSession.includeMethods">*</param>
+ </interceptor-ref>
</action>
</package>
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:1049409
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:1049409,1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:699795-700720
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:898632
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp Tue Apr 12 07:16:34 2011
@@ -46,6 +46,7 @@
<s:form method="post" action="deleteNetworkProxy!delete" namespace="/admin" validate="true">
<s:hidden name="proxyid"/>
+ <s:token/>
<s:submit value="Delete"/>
</s:form>
</div>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp Tue Apr 12 07:16:34 2011
@@ -47,6 +47,7 @@
<s:form method="post" action="deleteProxyConnector!delete" namespace="/admin" validate="true">
<s:hidden name="target"/>
<s:hidden name="source"/>
+ <s:token/>
<s:submit value="Delete"/>
</s:form>
</div>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp Tue Apr 12 07:16:34 2011
@@ -63,6 +63,7 @@
<s:form method="post" action="deleteRepository" namespace="/admin" validate="true" theme="simple">
<s:hidden name="repoid"/>
+ <s:token/>
<div class="buttons">
<s:submit value="Delete Configuration Only" method="deleteEntry" />
<s:submit value="Delete Configuration and Contents" method="deleteContents" />
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp Tue Apr 12 07:16:34 2011
@@ -56,6 +56,7 @@
<s:form method="post" action="deleteRepositoryGroup" namespace="/admin" validate="true" theme="simple">
<s:hidden name="repoGroupId"/>
<div class="buttons">
+ <s:token/>
<s:submit value="Confirm" method="delete"/>
<s:submit value="Cancel" method="execute"/>
</div>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/disableProxyConnector.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/disableProxyConnector.jsp?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/disableProxyConnector.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/disableProxyConnector.jsp Tue Apr 12 07:16:34 2011
@@ -43,6 +43,7 @@
<s:form method="post" action="disableProxyConnector!disable" namespace="/admin" validate="true">
<s:hidden name="target"/>
<s:hidden name="source"/>
+ <s:token/>
<s:submit value="Disable"/>
</s:form>
</div>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp Tue Apr 12 07:16:34 2011
@@ -50,6 +50,7 @@
<s:form method="post" action="saveNetworkProxy" namespace="/admin">
<s:hidden name="mode"/>
+ <s:token/>
<c:choose>
<c:when test="${mode == 'edit'}">
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp Tue Apr 12 07:16:34 2011
@@ -73,8 +73,11 @@
<div class="controls">
<%-- TODO: make some icons --%>
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
+ <s:token/>
<s:url id="deleteLegacyArtifactPath" action="deleteLegacyArtifactPath">
<s:param name="path" value="%{#attr.legacyArtifactPath.path}"/>
+ <s:param name="struts.token.name">struts.token</s:param>
+ <s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
<s:a href="%{deleteLegacyArtifactPath}">
<img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp Tue Apr 12 07:16:34 2011
@@ -71,11 +71,14 @@
<div class="controls">
<redback:ifAnyAuthorized
permissions="archiva-manage-configuration">
+ <s:token/>
<s:url id="editNetworkProxyUrl" action="editNetworkProxy">
<s:param name="proxyid" value="%{#attr.proxy.id}" />
</s:url>
<s:url id="deleteNetworkProxyUrl" action="deleteNetworkProxy" method="confirm">
<s:param name="proxyid" value="%{#attr.proxy.id}" />
+ <s:param name="struts.token.name">struts.token</s:param>
+ <s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
<s:a href="%{editNetworkProxyUrl}">
<img src="<c:url value="/images/icons/edit.png" />" />
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp Tue Apr 12 07:16:34 2011
@@ -113,6 +113,7 @@
<div class="connector ${rowColor}">
<div class="controls">
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
+ <s:token/>
<s:url id="sortDownProxyConnectorUrl" action="sortDownProxyConnector">
<s:param name="source" value="%{#attr.connector.sourceRepoId}"/>
<s:param name="target" value="%{#attr.connector.targetRepoId}"/>
@@ -128,6 +129,8 @@
<s:url id="deleteProxyConnectorUrl" action="deleteProxyConnector" method="confirmDelete">
<s:param name="source" value="%{#attr.connector.sourceRepoId}"/>
<s:param name="target" value="%{#attr.connector.targetRepoId}"/>
+ <s:param name="struts.token.name">struts.token</s:param>
+ <s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
<s:url id="enableProxyConnectorUrl" action="enableProxyConnector" method="confirmEnable">
<s:param name="source" value="%{#attr.connector.sourceRepoId}"/>
@@ -136,6 +139,8 @@
<s:url id="disableProxyConnectorUrl" action="disableProxyConnector" method="confirmDisable">
<s:param name="source" value="%{#attr.connector.sourceRepoId}"/>
<s:param name="target" value="%{#attr.connector.targetRepoId}"/>
+ <s:param name="struts.token.name">struts.token</s:param>
+ <s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
<c:if test="${connector.disabled}">
<s:a href="%{enableProxyConnectorUrl}" title="Enable Proxy Connector">
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp Tue Apr 12 07:16:34 2011
@@ -89,8 +89,11 @@
<s:url id="editRepositoryUrl" action="editRepository">
<s:param name="repoid" value="%{#attr.repository.id}"/>
</s:url>
+ <s:token/>
<s:url id="deleteRepositoryUrl" action="confirmDeleteRepository">
<s:param name="repoid" value="%{#attr.repository.id}"/>
+ <s:param name="struts.token.name">struts.token</s:param>
+ <s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
<s:a href="%{editRepositoryUrl}">
<img src="<c:url value="/images/icons/edit.png" />" alt="" width="16" height="16"/>
@@ -341,8 +344,11 @@
<img src="<c:url value="/images/icons/edit.png" />" alt="" width="16" height="16"/>
Edit
</s:a>
+ <s:token/>
<s:url id="deleteRepositoryUrl" action="confirmDeleteRemoteRepository">
<s:param name="repoid" value="%{#attr.repository.id}"/>
+ <s:param name="struts.token.name">struts.token</s:param>
+ <s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
<s:a href="%{deleteRepositoryUrl}">
<img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp Tue Apr 12 07:16:34 2011
@@ -50,6 +50,7 @@
<s:form action="addRepositoryGroup" namespace="/admin">
<span class="label">Identifier<span style="color:red">*</span>:</span>
<s:textfield size="10" label="Identifier" theme="simple" name="repositoryGroup.id"/>
+ <s:token/>
<s:submit value="Add Group" theme="simple" cssClass="button"/>
</s:form>
</redback:ifAnyAuthorized>
@@ -71,8 +72,11 @@
<div class="managedRepo">
<div style="float:right">
+ <s:token/>
<s:url id="deleteRepositoryGroupUrl" action="confirmDeleteRepositoryGroup">
<s:param name="repoGroupId" value="%{#attr.repositoryGroup.key}" />
+ <s:param name="struts.token.name">struts.token</s:param>
+ <s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
<s:a href="%{deleteRepositoryGroupUrl}" cssClass="delete">
<img src="${iconDeleteUrl}"/>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp Tue Apr 12 07:16:34 2011
@@ -40,9 +40,9 @@
<s:actionmessage />
<c:url var="iconDeleteUrl" value="/images/icons/delete.gif" />
-<c:url var="iconCreateUrl" value="/images/icons/create.png" />
-<s:url id="removeFiletypePatternUrl" action="repositoryScanning" method="removeFiletypePattern" />
-<s:url id="addFiletypePatternUrl" action="repositoryScanning" method="addFiletypePattern" />
+<c:url var="iconCreateUrl" value="/images/icons/create.png" />
+<s:url id="removeFiletypePatternUrl" action="repositoryScanning" method="removeFiletypePattern"/>
+<s:url id="addFiletypePatternUrl" action="repositoryScanning" method="addFiletypePattern"/>
<script type="text/javascript">
<!--
@@ -82,12 +82,11 @@
<s:form method="post" action="repositoryScanning"
namespace="/admin" validate="false"
id="filetypeForm" theme="simple">
+ <s:token/>
<input type="hidden" name="pattern" />
<input type="hidden" name="fileTypeId" />
</s:form>
-
- <s:url id="addFiletypePatternUrl" action="repositoryScanning" method="addFiletypePattern" />
-
+
<c:forEach items="${fileTypeIds}" var="filetypeId" varStatus="j">
<div class="filetype">
@@ -115,7 +114,7 @@
</td>
<td class="controls ${bgcolor}">
<s:a href="#" title="Remove [%{#attr.escapedPattern}] Pattern from [%{#attr.filetypeId}]"
- onclick="removeFiletypePattern( '%{#attr.filetypeId}', '%{#attr.escapedPattern}' )"
+ onclick="removeFiletypePattern( '%{#attr.filetypeId}', '%{#attr.escapedPattern}' )"
theme="simple">
<img src="${iconDeleteUrl}" />
</s:a>
@@ -157,6 +156,7 @@
<s:form method="post" action="repositoryScanning!updateKnownConsumers"
namespace="/admin" validate="false" theme="simple">
+ <s:token/>
<table class="consumers">
<tr>
<th> </th>
@@ -213,6 +213,7 @@
<s:form method="post" action="repositoryScanning!updateInvalidConsumers"
namespace="/admin" validate="false" theme="simple">
+ <s:token/>
<table class="consumers">
<tr>
<th> </th>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/deleteArtifact.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/deleteArtifact.jsp?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/deleteArtifact.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/deleteArtifact.jsp Tue Apr 12 07:16:34 2011
@@ -36,6 +36,7 @@
<div id="contentArea">
<s:form action="deleteArtifact!doDelete" namespace="/" method="post" validate="true">
<%@ include file="/WEB-INF/jsp/include/deleteArtifactForm.jspf" %>
+ <s:token/>
<s:submit/>
</s:form>
</div>
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:825850-882383,882384-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:825850-882383,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:825850-882383,885006-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:825850-882383,882384-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:825850-882383,882384-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1 +1,2 @@
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java:1066068-1091313
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java:888397-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,5 @@
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:1049409
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:1049409,1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:898632
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:721945-723577,882046,882457,884741,885313-885314,892686*
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:1049409*
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:1049409*,1066068-1091313*
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:898632
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:882046,882457,884741,885313-885314
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:1049409
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:1049409,1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:898632
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:721945-723577,882046,882457,884741,885313-885314,892686*
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:1049409*
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:1049409*,1066068-1091313*
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:898632
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml:721945-723577,882046,882457,884741,885313-885314
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml:1049409
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml:1049409,1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml:898632
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav:918857,1049409
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav:918857,1049409,1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webdav:898632
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:699795-705848
/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:721945-723577
/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:699795-705848
/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:699795-705848
/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:699795-705848
/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:825850-909464,960322