From bfbcc897050798ed42c3f897697f03d0d9510a71 Mon Sep 17 00:00:00 2001 From: Koji Sekiguchi Date: Sat, 9 Jan 2010 01:50:48 +0000 Subject: [PATCH] fix svn properties in core package git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@897366 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/solr/core/DirectoryFactory.java | 0 src/java/org/apache/solr/core/PluginInfo.java | 214 +++++++++--------- .../solr/core/StandardDirectoryFactory.java | 0 3 files changed, 107 insertions(+), 107 deletions(-) mode change 100755 => 100644 src/java/org/apache/solr/core/DirectoryFactory.java mode change 100755 => 100644 src/java/org/apache/solr/core/StandardDirectoryFactory.java diff --git a/src/java/org/apache/solr/core/DirectoryFactory.java b/src/java/org/apache/solr/core/DirectoryFactory.java old mode 100755 new mode 100644 diff --git a/src/java/org/apache/solr/core/PluginInfo.java b/src/java/org/apache/solr/core/PluginInfo.java index d818a796c44..1c330470335 100644 --- a/src/java/org/apache/solr/core/PluginInfo.java +++ b/src/java/org/apache/solr/core/PluginInfo.java @@ -1,107 +1,107 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ -package org.apache.solr.core; - -import org.apache.solr.common.util.NamedList; -import org.apache.solr.common.util.DOMUtil; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -import java.util.*; -import static java.util.Collections.unmodifiableList; -import static java.util.Collections.unmodifiableMap; - -/** - * An Object which represents a Plugin of any type - * @version $Id$ - */ -public class PluginInfo { - public final String name, className, type; - public final NamedList initArgs; - public final Map attributes; - public final List children; - - public PluginInfo(String type, Map attrs ,NamedList initArgs, List children) { - this.type = type; - this.name = attrs.get("name"); - this.className = attrs.get("class"); - this.initArgs = initArgs; - attributes = unmodifiableMap(attrs); - this.children = children == null ? Collections.emptyList(): unmodifiableList(children); - } - - - public PluginInfo(Node node, String err, boolean requireName, boolean requireClass) { - type = node.getNodeName(); - name = DOMUtil.getAttr(node, "name", requireName ? err : null); - className = DOMUtil.getAttr(node, "class", requireClass ? err : null); - initArgs = DOMUtil.childNodesToNamedList(node); - attributes = unmodifiableMap(DOMUtil.toMap(node.getAttributes())); - children = loadSubPlugins(node); - } - - private List loadSubPlugins(Node node) { - List children = new ArrayList(); - //if there is another sub tag with a non namedlist tag that has to be another plugin - NodeList nlst = node.getChildNodes(); - for (int i = 0; i < nlst.getLength(); i++) { - Node nd = nlst.item(i); - if (nd.getNodeType() != Node.ELEMENT_NODE) continue; - if (NL_TAGS.contains(nd.getNodeName())) continue; - PluginInfo pluginInfo = new PluginInfo(nd, null, false, false); - if (pluginInfo.isEnabled()) children.add(pluginInfo); - } - return children.isEmpty() ? Collections.emptyList() : unmodifiableList(children); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder("{"); - if (type != null) sb.append("type = " + type + ","); - if (name != null) sb.append("name = " + name + ","); - if (className != null) sb.append("class = " + className + ","); - if (initArgs.size() > 0) sb.append("args = " + initArgs); - sb.append("}"); - return sb.toString(); - } - - public boolean isEnabled(){ - String enable = attributes.get("enable"); - return enable == null || Boolean.parseBoolean(enable); - } - - public boolean isDefault() { - return Boolean.parseBoolean(attributes.get("default")); - } - - public PluginInfo getChild(String type){ - List l = getChildren(type); - return l.isEmpty() ? null:l.get(0); - } - - /**Filter children by type - * @param type The type name. must not be null - * @return The mathcing children - */ - public List getChildren(String type){ - if(children.isEmpty()) return children; - List result = new ArrayList(); - for (PluginInfo child : children) if(type.equals(child.type)) result.add(child); - return result; - } - private static final HashSet NL_TAGS = new HashSet(Arrays.asList("lst","str","int","bool","arr","float","double")); -} +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ +package org.apache.solr.core; + +import org.apache.solr.common.util.NamedList; +import org.apache.solr.common.util.DOMUtil; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import java.util.*; +import static java.util.Collections.unmodifiableList; +import static java.util.Collections.unmodifiableMap; + +/** + * An Object which represents a Plugin of any type + * @version $Id$ + */ +public class PluginInfo { + public final String name, className, type; + public final NamedList initArgs; + public final Map attributes; + public final List children; + + public PluginInfo(String type, Map attrs ,NamedList initArgs, List children) { + this.type = type; + this.name = attrs.get("name"); + this.className = attrs.get("class"); + this.initArgs = initArgs; + attributes = unmodifiableMap(attrs); + this.children = children == null ? Collections.emptyList(): unmodifiableList(children); + } + + + public PluginInfo(Node node, String err, boolean requireName, boolean requireClass) { + type = node.getNodeName(); + name = DOMUtil.getAttr(node, "name", requireName ? err : null); + className = DOMUtil.getAttr(node, "class", requireClass ? err : null); + initArgs = DOMUtil.childNodesToNamedList(node); + attributes = unmodifiableMap(DOMUtil.toMap(node.getAttributes())); + children = loadSubPlugins(node); + } + + private List loadSubPlugins(Node node) { + List children = new ArrayList(); + //if there is another sub tag with a non namedlist tag that has to be another plugin + NodeList nlst = node.getChildNodes(); + for (int i = 0; i < nlst.getLength(); i++) { + Node nd = nlst.item(i); + if (nd.getNodeType() != Node.ELEMENT_NODE) continue; + if (NL_TAGS.contains(nd.getNodeName())) continue; + PluginInfo pluginInfo = new PluginInfo(nd, null, false, false); + if (pluginInfo.isEnabled()) children.add(pluginInfo); + } + return children.isEmpty() ? Collections.emptyList() : unmodifiableList(children); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("{"); + if (type != null) sb.append("type = " + type + ","); + if (name != null) sb.append("name = " + name + ","); + if (className != null) sb.append("class = " + className + ","); + if (initArgs.size() > 0) sb.append("args = " + initArgs); + sb.append("}"); + return sb.toString(); + } + + public boolean isEnabled(){ + String enable = attributes.get("enable"); + return enable == null || Boolean.parseBoolean(enable); + } + + public boolean isDefault() { + return Boolean.parseBoolean(attributes.get("default")); + } + + public PluginInfo getChild(String type){ + List l = getChildren(type); + return l.isEmpty() ? null:l.get(0); + } + + /**Filter children by type + * @param type The type name. must not be null + * @return The mathcing children + */ + public List getChildren(String type){ + if(children.isEmpty()) return children; + List result = new ArrayList(); + for (PluginInfo child : children) if(type.equals(child.type)) result.add(child); + return result; + } + private static final HashSet NL_TAGS = new HashSet(Arrays.asList("lst","str","int","bool","arr","float","double")); +} diff --git a/src/java/org/apache/solr/core/StandardDirectoryFactory.java b/src/java/org/apache/solr/core/StandardDirectoryFactory.java old mode 100755 new mode 100644