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 2009/12/21 06:09:45 UTC
svn commit: r892688 - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/
archiva-modules/archiva-web/archiva-webapp/src/main/resources/
archiva-modules/archiva-web...
Author: brett
Date: Mon Dec 21 05:09:44 2009
New Revision: 892688
URL: http://svn.apache.org/viewvc?rev=892688&view=rev
Log:
[MRM-1306] upgrade jQuery and jQuery UI versions
Merged from: r892686
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/
- copied from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/
- copied from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_diagonals-thick_18_b81900_40x40.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_diagonals-thick_18_b81900_40x40.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_diagonals-thick_20_666666_40x40.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_diagonals-thick_20_666666_40x40.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_flat_10_000000_40x100.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_flat_10_000000_40x100.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_glass_100_f6f6f6_1x400.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_glass_100_f6f6f6_1x400.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_glass_100_fdf5ce_1x400.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_glass_100_fdf5ce_1x400.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_glass_65_ffffff_1x400.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_glass_65_ffffff_1x400.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_gloss-wave_35_f6a828_500x100.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_gloss-wave_35_f6a828_500x100.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-icons_222222_256x240.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-icons_222222_256x240.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-icons_228ef1_256x240.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-icons_228ef1_256x240.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-icons_ef8c08_256x240.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-icons_ef8c08_256x240.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-icons_ffd27a_256x240.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-icons_ffd27a_256x240.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-icons_ffffff_256x240.png
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/images/ui-icons_ffffff_256x240.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/jquery-ui-1.7.2.custom.css
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/no-theme/jquery-ui-1.7.2.custom.css
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery-1.3.2.min.js
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery-1.3.2.min.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery-ui-1.7.2.custom.min.js
- copied unchanged from r892686, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery-ui-1.7.2.custom.min.js
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/ui.datepicker.css
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery/
Modified:
archiva/trunk/ (props changed)
archiva/trunk/LICENSE
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml (props changed)
Propchange: archiva/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 05:09:44 2009
@@ -1,4 +1,4 @@
-/archiva/branches/MRM-1025:882046,882457,884741,885313-885314
+/archiva/branches/MRM-1025:882046,882457,884741,885313-885314,892686
/archiva/branches/MRM-541:686983-687034
/archiva/branches/archiva-search-improvements:723609-726925
/archiva/branches/archiva-struts2:699795-705848
Modified: archiva/trunk/LICENSE
URL: http://svn.apache.org/viewvc/archiva/trunk/LICENSE?rev=892688&r1=892687&r2=892688&view=diff
==============================================================================
--- archiva/trunk/LICENSE (original)
+++ archiva/trunk/LICENSE Mon Dec 21 05:09:44 2009
@@ -203,7 +203,7 @@
-For the Java Service Wrapper (v3.2.3):
+For Java Service Wrapper v3.2.3:
Copyright (c) 1999, 2006 Tanuki Software, Inc.
@@ -259,3 +259,56 @@
END Silver Egg Techology License -------------------------------------
+
+For jQuery 1.3.2:
+
+Copyright (c) 2009 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+For JQuery UI 1.7.2:
+
+Copyright (c) 2009 Paul Bakaus, http://jqueryui.com/
+
+This software consists of voluntary contributions made by many
+individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
+contribution history, see the revision history and logs, available
+at http://jquery-ui.googlecode.com/svn/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 05:09:44 2009
@@ -1,4 +1,4 @@
-/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:882046,882457,884741,885313-885314
+/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:882046,882457,884741,885313-885314,892686
/archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:699795-705848
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 05:09:44 2009
@@ -1,4 +1,4 @@
-/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:882046,882457,884741,885313-885314
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:882046,882457,884741,885313-885314,892686
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/webwork.properties:686983-687034
/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-705848
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 05:09:44 2009
@@ -1,4 +1,4 @@
-/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:882046,882457,884741,885313-885314
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:882046,882457,884741,885313-885314,892686
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml:686983-687034
/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-705848
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=892688&r1=892687&r2=892688&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 Mon Dec 21 05:09:44 2009
@@ -27,7 +27,7 @@
<head>
<title>Administration - Proxy Connectors</title>
<s:head/>
- <script type="text/javascript" src="<c:url value='/js/jquery/jquery-1.2.6.pack.js'/>"></script>
+ <script type="text/javascript" src="<c:url value='/js/jquery-1.3.2.min.js'/>"></script>
<script type="text/javascript">
$(document).ready(function(){
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=892688&r1=892687&r2=892688&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 Mon Dec 21 05:09:44 2009
@@ -26,7 +26,7 @@
<head>
<title>Administration - Repositories</title>
<s:head/>
- <script type="text/javascript" src="<c:url value='/js/jquery/jquery-1.2.6.pack.js'/>"></script>
+ <script type="text/javascript" src="<c:url value='/js/jquery-1.3.2.min.js'/>"></script>
<script type="text/javascript">
$(document).ready(function(){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp?rev=892688&r1=892687&r2=892688&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp Mon Dec 21 05:09:44 2009
@@ -27,7 +27,7 @@
<title>Browse Repository</title>
<s:head/>
- <script type="text/javascript" src="<c:url value='/js/jquery/jquery-1.2.6.pack.js'/>"></script>
+ <script type="text/javascript" src="<c:url value='/js/jquery-1.3.2.min.js'/>"></script>
<script type="text/javascript">
$(document).ready(function(){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp?rev=892688&r1=892687&r2=892688&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp Mon Dec 21 05:09:44 2009
@@ -55,7 +55,7 @@
}
</script>
- <script type="text/javascript" src="<c:url value='/js/jquery/jquery-1.2.6.pack.js'/>"></script>
+ <script type="text/javascript" src="<c:url value='/js/jquery-1.3.2.min.js'/>"></script>
<script type="text/javascript">
$(document).ready(function(){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp?rev=892688&r1=892687&r2=892688&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp Mon Dec 21 05:09:44 2009
@@ -18,7 +18,7 @@
--%>
<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html>
<head>
@@ -26,9 +26,9 @@
<title>Reports</title>
<s:head theme="ajax" />
- <link rel="stylesheet" href="<c:url value='/css/ui.datepicker.css'/>" type="text/css" media="all"/>
- <script type="text/javascript" src="<c:url value='/js/jquery/jquery-1.2.6.pack.js'/>"></script>
- <script type="text/javascript" src="<c:url value='/js/jquery/ui.datepicker.packed.js'/>"></script>
+ <link rel="stylesheet" href="<c:url value='/css/no-theme/jquery-ui-1.7.2.custom.css'/>" type="text/css" />
+ <script type="text/javascript" src="<c:url value='/js/jquery-1.3.2.min.js'/>"></script>
+ <script type="text/javascript" src="<c:url value='/js/jquery-ui-1.7.2.custom.min.js'/>"></script>
<script type="text/javascript" charset="utf-8">
$(document).ready(function()
{
@@ -47,39 +47,20 @@
<s:form action="generateStatisticsReport" namespace="/report" validate="false">
<s:optiontransferselect label="Repositories To Be Compared" name="availableRepositories"
- list="availableRepositories" doubleName="selectedRepositories"
- doubleList="selectedRepositories" size="8" doubleSize="8"
- addAllToRightOnclick="selectAllOptions(document.getElementById('generateStatisticsReport_availableRepositories'));selectAllOptions(document.getElementById('generateStatisticsReport_selectedRepositories'));"
- addToRightOnclick="selectAllOptions(document.getElementById('generateStatisticsReport_availableRepositories'));selectAllOptions(document.getElementById('generateStatisticsReport_selectedRepositories'));"
- addAllToLeftOnclick="selectAllOptions(document.getElementById('generateStatisticsReport_availableRepositories'));selectAllOptions(document.getElementById('generateStatisticsReport_selectedRepositories'));"
- addToLeftOnclick="selectAllOptions(document.getElementById('generateStatisticsReport_availableRepositories'));selectAllOptions(document.getElementById('generateStatisticsReport_selectedRepositories'));"
+ list="availableRepositories" doubleName="selectedRepositories"
+ doubleList="selectedRepositories" size="8" doubleSize="8"
+ addAllToRightOnclick="selectAllOptions(document.getElementById('generateStatisticsReport_availableRepositories'));selectAllOptions(document.getElementById('generateStatisticsReport_selectedRepositories'));"
+ addToRightOnclick="selectAllOptions(document.getElementById('generateStatisticsReport_availableRepositories'));selectAllOptions(document.getElementById('generateStatisticsReport_selectedRepositories'));"
+ addAllToLeftOnclick="selectAllOptions(document.getElementById('generateStatisticsReport_availableRepositories'));selectAllOptions(document.getElementById('generateStatisticsReport_selectedRepositories'));"
+ addToLeftOnclick="selectAllOptions(document.getElementById('generateStatisticsReport_availableRepositories'));selectAllOptions(document.getElementById('generateStatisticsReport_selectedRepositories'));"
/>
- <s:textfield label="Row Count" name="rowCount" />
-
- <s:textfield label="Start Date" id="startDate" name="startDate"/>
- <%--
- <script type="text/javascript">
- Calendar.setup({
- inputField : "startDate",
- ifFormat : "%Y-%m-%d",
- align : "Tl",
- singleClick : true
- });
- </script>
- --%>
-
- <s:textfield label="End Date" id="endDate" name="endDate"/>
- <%--
- <script type="text/javascript">
- Calendar.setup({
- inputField : "endDate",
- ifFormat : "%Y-%m-%d",
- align : "Tl",
- singleClick : true
- });
- </script>
- --%>
+ <s:textfield label="Row Count" name="rowCount" />
+
+ <s:textfield label="Start Date" id="startDate" name="startDate"/>
+
+ <s:textfield label="End Date" id="endDate" name="endDate"/>
+
<s:submit value="View Statistics"/>
</s:form>
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 05:09:44 2009
@@ -1,4 +1,4 @@
-/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:882046,882457,884741,885313-885314
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:882046,882457,884741,885313-885314,892686
/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-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
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 21 05:09:44 2009
@@ -0,0 +1,4 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports: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-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
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 21 05:09:44 2009
@@ -0,0 +1,4 @@
+/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,892686
+/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-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
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 21 05:09:44 2009
@@ -0,0 +1,4 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports: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-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
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 21 05:09:44 2009
@@ -0,0 +1,4 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml: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/GenerateReportActionTest.xml:686983-687034
+/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