From 0b9482f8180b805edd7dd6dee4989380072eea54 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobkowiak Date: Fri, 17 Jan 2014 23:55:09 +0100 Subject: [PATCH] KARAF-2692 Signed-off-by: Krzysztof Sobkowiak --- .../completers/DataSourceNamesCompleter.java | 53 ++++++++++++++++++++++ .../resources/OSGI-INF/blueprint/jdbc-command.xml | 6 ++- .../java/org/apache/karaf/jdbc/JdbcService.java | 7 +++ .../karaf/jdbc/internal/JdbcServiceImpl.java | 18 ++++++++ 4 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 jdbc/command/src/main/java/org/apache/karaf/jdbc/command/completers/DataSourceNamesCompleter.java diff --git a/jdbc/command/src/main/java/org/apache/karaf/jdbc/command/completers/DataSourceNamesCompleter.java b/jdbc/command/src/main/java/org/apache/karaf/jdbc/command/completers/DataSourceNamesCompleter.java new file mode 100644 index 0000000..39ea61c --- /dev/null +++ b/jdbc/command/src/main/java/org/apache/karaf/jdbc/command/completers/DataSourceNamesCompleter.java @@ -0,0 +1,53 @@ +/* + * 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.karaf.jdbc.command.completers; + +import org.apache.karaf.jdbc.JdbcService; +import org.apache.karaf.shell.console.Completer; +import org.apache.karaf.shell.console.completer.StringsCompleter; + +import java.util.List; + +/** + * Completer on the JDBC datasources name + */ +public class DataSourceNamesCompleter implements Completer { + + private JdbcService jdbcService; + + @Override + public int complete(String buffer, int cursor, List candidates) { + StringsCompleter delegate = new StringsCompleter(); + try { + for (String datasourceFileName : jdbcService.datasourceFiles()) { + delegate.getStrings().add(datasourceFileName.replace("datasource-", "").replace(".xml", "")); + } + } catch (Exception e) { + // nothing to do + } + return delegate.complete(buffer, cursor, candidates); + } + + public JdbcService getJdbcService() { + return jdbcService; + } + + public void setJdbcService(JdbcService jdbcService) { + this.jdbcService = jdbcService; + } + +} diff --git a/jdbc/command/src/main/resources/OSGI-INF/blueprint/jdbc-command.xml b/jdbc/command/src/main/resources/OSGI-INF/blueprint/jdbc-command.xml index 99ad8f7..2f61171 100644 --- a/jdbc/command/src/main/resources/OSGI-INF/blueprint/jdbc-command.xml +++ b/jdbc/command/src/main/resources/OSGI-INF/blueprint/jdbc-command.xml @@ -30,7 +30,7 @@ - + @@ -80,5 +80,9 @@ + + + + \ No newline at end of file diff --git a/jdbc/core/src/main/java/org/apache/karaf/jdbc/JdbcService.java b/jdbc/core/src/main/java/org/apache/karaf/jdbc/JdbcService.java index 22393c1..0096c9d 100644 --- a/jdbc/core/src/main/java/org/apache/karaf/jdbc/JdbcService.java +++ b/jdbc/core/src/main/java/org/apache/karaf/jdbc/JdbcService.java @@ -84,5 +84,12 @@ public interface JdbcService { * @return a map of info (name/value). */ Map info(String datasource) throws Exception; + + /** + * List the JDBC datasource configuration files. + * + * @return he JDBC datasource configuration files. + */ + List datasourceFiles() throws Exception; } diff --git a/jdbc/core/src/main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java b/jdbc/core/src/main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java index da1e5c4..5d92bfe 100644 --- a/jdbc/core/src/main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java +++ b/jdbc/core/src/main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java @@ -22,6 +22,7 @@ import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference; import javax.sql.DataSource; + import java.io.*; import java.sql.*; import java.util.*; @@ -286,6 +287,23 @@ public class JdbcServiceImpl implements JdbcService { } return map; } + + @Override + public List datasourceFiles() throws Exception { + File karafBase = new File(System.getProperty("karaf.base")); + File deployFolder = new File(karafBase, "deploy"); + + String[] datasourceFileNames = deployFolder.list(new FilenameFilter() { + + @Override + public boolean accept(File dir, String name) { + // TODO Auto-generated method stub + return name.startsWith("datasource-") && name.endsWith(".xml"); + } + }); + + return Arrays.asList(datasourceFileNames); + } private ServiceReference lookupDataSource(String name) throws Exception { ServiceReference[] references = bundleContext.getServiceReferences(DataSource.class.getName(), "(|(osgi.jndi.service.name=" + name + ")(datasource=" + name + ")(name=" + name + ")(service.id=" + name + "))"); -- 1.8.3.2