Return-Path:
Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org
Received: (qmail 67777 invoked from network); 6 Feb 2009 10:49:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
by minotaur.apache.org with SMTP; 6 Feb 2009 10:49:29 -0000
Received: (qmail 47522 invoked by uid 500); 6 Feb 2009 10:49:22 -0000
Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org
Received: (qmail 47445 invoked by uid 500); 6 Feb 2009 10:49:21 -0000
Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help:
List-Unsubscribe:
List-Post:
List-Id:
Reply-To: dev@jackrabbit.apache.org
Delivered-To: mailing list commits@jackrabbit.apache.org
Received: (qmail 47417 invoked by uid 99); 6 Feb 2009 10:49:21 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Feb 2009 02:49:21 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Feb 2009 10:49:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
id 7E6842388892; Fri, 6 Feb 2009 10:48:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r741524 -
/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp
Date: Fri, 06 Feb 2009 10:48:57 -0000
To: commits@jackrabbit.apache.org
From: mreutegg@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090206104857.7E6842388892@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
Author: mreutegg
Date: Fri Feb 6 10:48:56 2009
New Revision: 741524
URL: http://svn.apache.org/viewvc?rev=741524&view=rev
Log:
JCR-1970: populate.jsp uses Java 1.5 method
Modified:
jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp
Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp?rev=741524&r1=741523&r2=741524&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp Fri Feb 6 10:48:56 2009
@@ -13,30 +13,30 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
---%><%@ page import="org.apache.jackrabbit.j2ee.RepositoryAccessServlet,
- org.apache.jackrabbit.util.Text,
- javax.jcr.Node,
- javax.jcr.Repository,
- javax.jcr.Session,
- javax.jcr.SimpleCredentials,
- javax.swing.text.AttributeSet,
- javax.swing.text.html.HTML,
- javax.swing.text.html.HTMLDocument,
- javax.swing.text.html.HTMLEditorKit,
- java.io.FilterInputStream,
- java.io.IOException,
- java.io.InputStream,
- java.io.InputStreamReader,
- java.net.URL,
- java.net.URLConnection,
- java.net.URLDecoder,
- java.net.URLEncoder,
- java.util.ArrayList,
- java.util.Arrays,
- java.util.Calendar,
- java.util.Collections,
- java.util.Iterator,
- java.util.List"
+--%><%@ page import="java.io.FilterInputStream,
+ java.io.IOException,
+ java.io.InputStream,
+ java.io.InputStreamReader,
+ java.net.URL,
+ java.net.URLConnection,
+ java.net.URLDecoder,
+ java.net.URLEncoder,
+ java.util.ArrayList,
+ java.util.Arrays,
+ java.util.Calendar,
+ java.util.Collections,
+ java.util.Iterator,
+ java.util.List,
+ javax.jcr.Node,
+ javax.jcr.Repository,
+ javax.jcr.Session,
+ javax.jcr.SimpleCredentials,
+ javax.swing.text.AttributeSet,
+ javax.swing.text.html.HTML,
+ javax.swing.text.html.HTMLDocument,
+ javax.swing.text.html.HTMLEditorKit,
+ org.apache.jackrabbit.j2ee.RepositoryAccessServlet,
+ org.apache.jackrabbit.util.Text"
%><%@ page contentType="text/html;charset=UTF-8" %><%
Repository rep;
Session jcrSession;
@@ -66,9 +66,9 @@
}
String[] types = request.getParameterValues("filetype");
if (types != null) {
- for (int i = 0; i < types.length; i++) {
- filetypes.add(types[i]);
- }
+ filetypes.addAll(Arrays.asList(types));
+ } else {
+ filetypes = DEFAULT_TYPES;
}
if (seedWord != null && numDocs > 0 && filetypes.size() > 0) { %>
@@ -147,7 +147,7 @@
String type = (String) filetypes.get(typeIdx);
int offset = 0;
while (n < numDocs * (typeIdx + 1) / filetypes.size()) {
- final URL[] urls = new Search(type, seedWord, offset).getURLs(out);
+ final URL[] urls = new Search(type, seedWord, offset).getURLs();
if (urls.length == 0) {
break;
}
@@ -185,7 +185,6 @@
try {
String info = fileName + " (" + host + ")";
URLConnection con = currentURL.openConnection();
- con.setReadTimeout(10000); // 10 seconds
InputStream in = con.getInputStream();
try {
synchronized (fOut) {
@@ -261,7 +260,7 @@