This reverts commit
64e760caf2a5d223cca7598b3ff8941ac37c7a96. Unfortunately some projects don't follow the convention of installing their CSS xml files under etc/opendaylight/karaf.
Change-Id: I6194035399eddc1d66cadaa7f9b0964b9a46d92b
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.io.Files;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.io.Files;
import java.util.LinkedHashSet;
import java.util.List;
import javax.xml.bind.JAXBException;
import java.util.LinkedHashSet;
import java.util.List;
import javax.xml.bind.JAXBException;
public class AbstractFeatureWrapper implements Feature {
private static final Logger LOG = LoggerFactory.getLogger(AbstractFeatureWrapper.class);
public class AbstractFeatureWrapper implements Feature {
private static final Logger LOG = LoggerFactory.getLogger(AbstractFeatureWrapper.class);
- private static final String CONFIG_FILE_PATH_SUFFIX = "opendaylight" + File.separator + "karaf";
protected static final String CONFIG_FILE_SUFFIX = "xml";
protected Feature feature = null;
protected static final String CONFIG_FILE_SUFFIX = "xml";
protected Feature feature = null;
}
private static boolean isConfigXMLFile(String fullName) {
}
private static boolean isConfigXMLFile(String fullName) {
- String path = new File(fullName).getPath();
- return path.contains(CONFIG_FILE_PATH_SUFFIX) &&
- Files.getFileExtension(fullName).equals(CONFIG_FILE_SUFFIX);
+ return Files.getFileExtension(fullName).equals(CONFIG_FILE_SUFFIX);
}
protected Optional<FeatureConfigSnapshotHolder> getFeatureConfigSnapshotHolder(final ConfigFileInfo c) {
}
protected Optional<FeatureConfigSnapshotHolder> getFeatureConfigSnapshotHolder(final ConfigFileInfo c) {