Author: rharo
Date: Thu Sep 15 14:27:02 2016
New Revision: 1760938
URL: http://svn.apache.org/viewvc?rev=1760938&view=rev
Log:
STANBOL-1453: Skipping Launchers Deployment
Modified:
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/NamespaceMappingUtils.java
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/NamespacePrefixService.java
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/impl/NamespacePrefixProviderImpl.java
stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/IndexReference.java
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/RegisteredSolrServerTracker.java
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrConstants.java
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/impl/OsgiResourceLoaderUtil.java
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/ConfigUtils.java
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/ManagedSolrServer.java
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/ClassPathDataFileProvider.java
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java
stanbol/trunk/launchers/full-war/pom.xml
stanbol/trunk/launchers/full/pom.xml
stanbol/trunk/launchers/mini-war/pom.xml
stanbol/trunk/launchers/mini/pom.xml
stanbol/trunk/launchers/stable-war/pom.xml
stanbol/trunk/launchers/stable/pom.xml
Modified:
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/NamespaceMappingUtils.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/NamespaceMappingUtils.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/NamespaceMappingUtils.java
(original)
+++
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/NamespaceMappingUtils.java
Thu Sep 15 14:27:02 2016
@@ -98,7 +98,7 @@ public final class NamespaceMappingUtils
}
}
/**
- * Uses the {@link NamespacePrefixService#PREFIX_VALIDATION_PATTERN} to
check
+ * Uses the NamespacePrefixService#PREFIX_VALIDATION_PATTERN to check
* if the parsed prefix is valid
* @param prefix the prefix to check
* @return <code>true</code> if valid. Othervise <code>false</code>
@@ -136,17 +136,17 @@ public final class NamespaceMappingUtils
* use <code>ReferenceCardinality.OPTIONAL_UNARY</code> to inject the
service.
* <p>
* Here is an example
- * <code><pre>
- * @Reference(cardinality=ReferenceCardinality.OPTIONAL_UNARY)
+ * <code>
+ * Reference(cardinality=ReferenceCardinality.OPTIONAL_UNARY)
* protected NamespacePrefixService nps;
- * </pre></code>
+ * </code>
* @param nps the {@link NamespacePrefixService} or <code>null</code> if
not
* available
* @param property the configuration property (used for creating {@link
ConfigurationException}s)
* @param value configured value. Might be both a '{prefix}:{localname}'
or the full URI.
* @return the full URI
* @throws ConfigurationException if the conversion was not possible
because
- * the {@link #nsPrefixService} is <code>null</code> or the prefix is
+ * the prefix is <code>null</code> or the prefix is
* unknown to the service
*/
public static String getConfiguredUri(NamespacePrefixService nps, String
property, String value) throws ConfigurationException{
@@ -178,7 +178,7 @@ public final class NamespaceMappingUtils
* @param value configured value. Might be both a '{prefix}:{localname}'
or the full URI.
* @return the full URI
* @throws IllegalArgumentException if the conversion was not possible
because
- * the {@link #nsPrefixService} is <code>null</code> or the prefix is
+ * the prefix is <code>null</code> or the prefix is
* unknown to the service
*/
public static String getConfiguredUri(NamespacePrefixService nps, String
value) throws IllegalArgumentException {
Modified:
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/NamespacePrefixService.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/NamespacePrefixService.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/NamespacePrefixService.java
(original)
+++
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/NamespacePrefixService.java
Thu Sep 15 14:27:02 2016
@@ -37,7 +37,7 @@ public interface NamespacePrefixService
* than the previous mapped namespace is returned. Parsed prefixes
* are validated using {@link NamespaceMappingUtils#checkPrefix(String)}
* and namespaces using {@link
NamespaceMappingUtils#checkNamespace(String)}
- * @param prefix the prefix. Checked against the {@link
#PREFIX_VALIDATION_PATTERN}
+ * @param prefix the prefix
* @param namespace the namespace. Parsed namespaces MUST end with '/' or
'#'
* or ':' if starting with 'urn:'. Additional validations are optional
* @return the previous mapped namespace or <code>null</code> if none
@@ -52,13 +52,13 @@ public interface NamespacePrefixService
* URI is parsed the parsed value is returned unchanged. If the parsed
* prefix is not known, than <code>null</code> is returned.<p>
* The detection if a '{prefix}:{localname}' was parsed uses the following
rules:<ul>
- * <li> shortname.indexOf(':') > 0 || shortname.charAt(0) != '/'
- * <li> {prefix} != 'urn'
- * <li> {localname}.charAt(0) != '/'
- * <ul>
+ * <li> shortname.indexOf(':') gt 0 || shortname.charAt(0) != '/' </li>
+ * <li> {prefix} != 'urn' </li>
+ * <li> {localname}.charAt(0) != '/' </li>
+ * </ul>
* In case a '{prefix}:{localname}' was detected the parsed value is
processed
* otherwise the parsed value is returned.
- * @param shortName or an URI
+ * @param shortNameOrUri Short Name or an URI
* @return in case an URI was parsed than the parsed value. Otherwise the
* full URI for the shortName or <code>null</code> if the used {prefix} is
* not defined.
Modified:
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/impl/NamespacePrefixProviderImpl.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/impl/NamespacePrefixProviderImpl.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/impl/NamespacePrefixProviderImpl.java
(original)
+++
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/impl/NamespacePrefixProviderImpl.java
Thu Sep 15 14:27:02 2016
@@ -57,7 +57,7 @@ public class NamespacePrefixProviderImpl
}
/**
* Read the mappings form the parsed map
- * @param mappings
+ * @param mappings Mappings
*/
public NamespacePrefixProviderImpl(Map<String,String> mappings){
for(Entry<String,String> mapping : mappings.entrySet()){
Modified:
stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java
(original)
+++
stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java
Thu Sep 15 14:27:02 2016
@@ -222,7 +222,7 @@ public enum DefaultNamespaceMappingsEnum
key("http://rdf.freebase.com/key/";),
/**
* The EnhancementProperties namespace as introduced by <a
- * href="https://issues.apache.org/jira/browse/STANBOL-488";>STANBOL-488</<>
+ * href="https://issues.apache.org/jira/browse/STANBOL-488";>STANBOL-488</a>
*/
ehp("http://stanbol.apache.org/ontology/enhancementproperties#";),
/*
Modified:
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/IndexReference.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/IndexReference.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/IndexReference.java
(original)
+++
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/IndexReference.java
Thu Sep 15 14:27:02 2016
@@ -143,8 +143,8 @@ public class IndexReference {
}
/**
* Checks if the referenced index could be on the parsed server
- * @param serverName
- * @return
+ * @param serverName Server Name to be checked
+ * @return True if the serverName is consistent with the parsed server
*/
public boolean checkServer(String serverName) {
return server == null || server.equals(serverName);
@@ -174,6 +174,7 @@ public class IndexReference {
* server is defined. This will track all {@link CoreContainer} instances.
* Note that the {@link CoreContainer} with the highest
* {@link Constants#SERVICE_RANKING} is expected to be the default server
+ * @return Filter string
*/
public String getServerFilter(){
StringBuilder filterString;
Modified:
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/RegisteredSolrServerTracker.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/RegisteredSolrServerTracker.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/RegisteredSolrServerTracker.java
(original)
+++
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/RegisteredSolrServerTracker.java
Thu Sep 15 14:27:02 2016
@@ -84,8 +84,7 @@ public class RegisteredSolrServerTracker
* {@link SolrCore} or {@link CoreContainer} referenced by the parsed
* {@link IndexReference}. Service Objects parsed to the
* {@link ServiceTrackerCustomizer#modifiedService(ServiceReference,
Object)}
- * and {@link ServiceTrackerCustomizer#remove(ServiceReference)} will be
- * of type {@link EmbeddedSolrServer}.
+ * will be of type {@link EmbeddedSolrServer}.
* @throws InvalidSyntaxException if the {@link Filter} could not be
* created for the parsed {@link IndexReference}.
* @throws IllegalArgumentException if the parsed {@link IndexReference}
is
Modified:
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrConstants.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrConstants.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrConstants.java
(original)
+++
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrConstants.java
Thu Sep 15 14:27:02 2016
@@ -59,7 +59,7 @@ public final class SolrConstants {
public static final String PROPERTY_SERVER_DIR =
PROPERTY_SOLR_SERVER+".dir";
/**
* the name of the solr.xml file defining the configuration for the Solr
- * Server. If not defined {@link #SOLR_XML_NAME} is used as default<p>
+ * Server. If not defined {@link #SOLR_XML_NAME} is used as default
*/
public static final String PROPERTY_SOLR_XML_NAME =
PROPERTY_SOLR_SERVER+".solrXml";
/**
Modified:
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
(original)
+++
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
Thu Sep 15 14:27:02 2016
@@ -205,8 +205,9 @@ public class SolrServerAdapter {
* Creates and Initialise a Solr {@link CoreContainer} based on the
provided
* {@link SolrServerProperties} and registers it and all its configured
* {@link SolrCore}s as OSGI services by using the provided {@link
BundleContext}.
- * @throws SAXException On any error while parsing the solr.xml file used
to
* initialise the {@link CoreContainer}
+ * @param context Bundle Context
+ * @param parsedServerProperties Solr Core properties
* @throws SolrException if the Solr {@link CoreContainer} could not be
* created.
* @throws IllegalArgumentException if any of the parsed parameters is
@@ -322,8 +323,6 @@ public class SolrServerAdapter {
/**
* Reloads a SolrCore e.g. to apply a change in its configuration
* @param name the name of the Core to reload
- * @return The ServiceReference to the SolrCore.
- * @throws SolrException if the Core could not be reloaded
*/
public void reloadCore(String name) {
//try to reload
@@ -490,6 +489,7 @@ public class SolrServerAdapter {
* <code>null</code> is parsed the {@link SolrCore} will be looked up by
* using the {@link #server}. This is mainly to do not increase the
* {@link SolrCore#getOpenCount()}.
+ * @return the registered service
*/
protected ServiceReference registerCoreService(String name,SolrCore core) {
//STANBOL-1235: we want to unregister the old before registering the
new
@@ -578,7 +578,7 @@ public class SolrServerAdapter {
}
/**
* The Name of the registered {@link CoreContainer}
- * @return
+ * @return server name
*/
public String getServerName(){
Object value =
serverRegistration.getReference().getProperty(PROPERTY_SERVER_NAME);
@@ -586,7 +586,7 @@ public class SolrServerAdapter {
}
/**
* The Directory of the registered {@link CoreContainer}
- * @return
+ * @return Server Directory name
*/
public String getServerDir(){
Object value =
serverRegistration.getReference().getProperty(PROPERTY_SERVER_DIR);
@@ -1004,7 +1004,7 @@ public class SolrServerAdapter {
* Setter for the file name of the "solr.xml". If <code>null</code> or
* an empty string is parsed the value will be reset to the default
* {@link SolrConstants#SOLR_XML_NAME}
- * @param solrXmlName
+ * @param solrXmlName Solr Config File Name
*/
public void setSorlXml(String solrXmlName){
if(solrXmlName == null || solrXmlName.isEmpty()){
Modified:
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/impl/OsgiResourceLoaderUtil.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/impl/OsgiResourceLoaderUtil.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/impl/OsgiResourceLoaderUtil.java
(original)
+++
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/impl/OsgiResourceLoaderUtil.java
Thu Sep 15 14:27:02 2016
@@ -55,6 +55,7 @@ public final class OsgiResourceLoaderUti
/**
* Finds classes by using {@link RegisteredSolrAnalyzerFactory} with a
* filter over {@link SolrConstants#PROPERTY_ANALYZER_FACTORY_NAME}.
+ * @param <T> This is the type parameter
* @param bc the {@link BundleContext} used for the search
* @param cname the cname as parsed to {@link
SolrResourceLoader#findClass(String, Class, String...)}
* @param expectedType the expected type as parsed to {@link
SolrResourceLoader#findClass(String, Class, String...)}
Modified:
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java
(original)
+++
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java
Thu Sep 15 14:27:02 2016
@@ -116,7 +116,8 @@ public abstract class AbstractAnalyzerFa
* {@link ClassLoader}. Note that only factories noted in
<code>META-INF/serivces</code>
* files embedded within the current module will be found and registered.
* This means that this code needs typically be used in the Bundle
Activator for
- * all modules providing Solr analyzer factories.
+ * all modules providing Solr analyzer factories.
+ * @param <S> the type class
* @param bc The BundleContext used to register the services
* @param classloader the classloader of the current modlue
* @param type the type of the Factories to register
Modified:
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/ConfigUtils.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/ConfigUtils.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/ConfigUtils.java
(original)
+++
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/ConfigUtils.java
Thu Sep 15 14:27:02 2016
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
/**
* This Utility provides Methods that copy a configuration from a {@link
Bundle} and copy it to a directory.
* <p>
- * This is currently used by the {@link RegisteredSolrServerProvider} to
initialise the internally managed
+ * This is currently used by the RegisteredSolrServerProvider to initialise
the internally managed
* {@link EmbeddedSolrServer} and/or to add additional cores. There are always
two variants of the methods.
* The one taking a bundle as parameter is supposed to be used when running
within an OSGI environment. The
* variant taking a Class object works outside of an OSGI environment.
Modified:
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/ManagedSolrServer.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/ManagedSolrServer.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/ManagedSolrServer.java
(original)
+++
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/ManagedSolrServer.java
Thu Sep 15 14:27:02 2016
@@ -35,11 +35,6 @@ import org.xml.sax.SAXException;
* Service that provides an managed Solr server ({@link CoreContainer}).
* This interface allows to register activate, deactivate and remove indexes
* ({@link SolrCore}s)
- * <p> TODO: Update Javadoc to new Interface!
- * Note that is only refers to the Files and not the Solr server (or
EmbeddedSolrServer). Users need to use
- * the {@link SolrServerProvider#getSolrServer(SolrServerTypeEnum, String,
String...)} to get an {@link SolrServer} instance
- * based on the directory provided by this Interface.
- * <p>
* The {@link #MANAGED_SOLR_DIR_PROPERTY} property can be used to define the
location of the internally
* managed index. Implementations need to load this property by the {@link
ComponentContext} if running within
* an OSGI container or otherwise use the system properties. In cases a
relative path is configured the
@@ -61,7 +56,7 @@ public interface ManagedSolrServer {
/**
* The name of this server
- * @return
+ * @return The name of the Server
*/
public String getServerName();
/**
@@ -89,8 +84,8 @@ public interface ManagedSolrServer {
/**
* Checks if a solrIndex with the parsed name is managed or not. Note that
* an Index might be managed, but not yet be initialised. To check if an
- * index is managed and can be used use {@link #getIndexState(String)
- * @param index the name of the Solr index to check
+ * index is managed and can be used use {@link #getIndexState(String)}
+ * @param indexName the name of the Solr index to check
* @return <code>true</code> only if a Solr index with the parsed name is
* already present within the manages Solr directory.
* @throws IllegalStateException In case the managed Solr directory can not
@@ -118,8 +113,7 @@ public interface ManagedSolrServer {
* the actual data is already available.
* <p>
*
- * @param index
- * the name of the index
+ * @param indexName the name of the index
* @return the state of the index or <code>null</code> if not {@link
#isManagedIndex(String)}
* @throws IllegalArgumentException if the parsed name is
<code>null</code> or empty
*/
@@ -127,7 +121,7 @@ public interface ManagedSolrServer {
/**
* Getter for all indexes in a specific state
- *
+ * @param state {@link ManagedIndexState} Filter
* @return A collection with the {@link IndexMetadata} of all managed
* indexes in that state. An empty collection in case no index is in the
* parsed state
@@ -138,15 +132,10 @@ public interface ManagedSolrServer {
/**
* Getter for the directory of the parsed index. Implementations need to
ensure that returned directories
* are valid Solr indices (or Solr Cores)
- * <p>
- * Directories returned by this method are typically used as second
parameter of
- * {@link SolrServerProvider#getSolrServer(SolrServerTypeEnum, String,
String...)} to create an {@link SolrServer}
- * instance.
- * <p>
* If the requested Index is currently initialising, than this method MUST
* wait until the initialisation is finished before returning.
*
- * @param name
+ * @param indexName
* the name of the requested solr index.
* @return the directory (instanceDir) of the index or <code>null</code> a
* SolrIndex with that name is not managed.
@@ -158,7 +147,7 @@ public interface ManagedSolrServer {
/**
* Creates a new Solr Index based on the data in the provided {@link
ArchiveInputStream}
*
- * @param name
+ * @param indexName
* the name of the index to create
* @param ais
* the stream providing the data for the new index
@@ -176,21 +165,21 @@ public interface ManagedSolrServer {
/**
* Creates a new {@link SolrCore} based on looking up the Index data via
the {@link DataFileProvider} service
*
- * @param coreName
+ * @param indexName
* The name of the solrIndex to create
* @param indexPath
* the name of the dataFile looked up via the {@link
DataFileProvider}
* @param properties
* Additional properties describing the index
* @return the directory (instanceDir) of the index or null if the index
data could not be found
- * @throws IllegalArgumentException
- * @throws IOException
+ * @throws IllegalArgumentException Invalid Index Name
+ * @throws IOException Data File Not Found
*/
IndexMetadata createSolrIndex(String indexName, String indexPath,
Properties properties) throws IOException;
/**
* Creates/Updates the core with the parsed name to the data parsed within
the
* {@link ArchiveInputStream}.
- * @param name The name for the Index to create/update
+ * @param indexName The name for the Index to create/update
* @param ais The {@link ArchiveInputStream} used to read the data for the
* Index to create/update
* @return The metadata for the created index
@@ -206,9 +195,9 @@ public interface ManagedSolrServer {
* Updates the data of the core with the parsed name with the data provided
* by the resource with the parsed name. The resource is loaded by using
the
* {@link DataFileProvider} infrastructure
- * @param name
- * @param resourceName
- * @param properties
+ * @param indexName the name of the index to be updated
+ * @param resourceName Resource Data name
+ * @param properties Additional Properties describing the index
* @throws IOException
*/
IndexMetadata updateIndex(String indexName,String resourceName,Properties
properties) throws IOException;
@@ -218,7 +207,8 @@ public interface ManagedSolrServer {
/**
* Removes the index with the parsed name and optionally also deletes the
* data on the file system.
- * @param name
+ * @param indexName
+ * @param deleteFiles boolean indicating if the physical files must be
deleted
*/
void removeIndex(String indexName, boolean deleteFiles);
@@ -277,4 +267,4 @@ public interface ManagedSolrServer {
* state.
*/
void swapIndexes(String indexName1, String indexName2);
-}
\ No newline at end of file
+}
Modified:
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
(original)
+++
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
Thu Sep 15 14:27:02 2016
@@ -518,15 +518,14 @@ public class ManagedSolrServerImpl imple
* the index data from the local file system if deleteFiles is enabled.
* Updates to the state of the index are stored within the parsed
* {@link IndexMetadata}.<p>
- * If the index is {@link ManagedIndexState#ACTIVE}, than the {@link
SolrCore}
- * is first {@link #deactivateCore(String, SolrServerAdapter)
deactivated}.
+ * If the index is active, than the {@link SolrCore}
+ * is first deactivated.
* @param metadata the metadata for the core. This instance is modified
* but not saved to {@link #managedCores} within this method.
* So depending if callers want to remove or only uninitialise this core
* the might want to store the updated version of this instance after this
* method completes!
* @param deleteFiles if the files on the local fileSystem should be
deleted
- * @return the parsed and modified instance of the {@link IndexMetadata}
*/
protected final void uninitialiseCore(IndexMetadata metadata,boolean
deleteFiles) {
SolrServerAdapter server = this.server;
Modified:
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/ClassPathDataFileProvider.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/ClassPathDataFileProvider.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/ClassPathDataFileProvider.java
(original)
+++
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/ClassPathDataFileProvider.java
Thu Sep 15 14:27:02 2016
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
* <li> To register server our own datafile you might want to consider to
extend
* this implementation by calling the protected constructor with two
parameters.
* and parsing the path to your data files as second parameter. Do not forget
to
- * register your DataFileProvider with the {@link ServiceLoader} utility.
+ * register your DataFileProvider with the {@link ServiceLoader} utility.</ul>
* @author Rupert Westenthaler
*
*/
@@ -66,6 +66,7 @@ public class ClassPathDataFileProvider i
* Creates a DataFileProvider that loads SolrIndexConfigurations via the
* classpath relative to {@value #INDEX_BASE_PATH}.
* @param bundleSymbolicName the symbolic name of the bundle to accept
+ * @param path classpath
* requests from or <code>null</code> to accept any request.
*/
protected ClassPathDataFileProvider(String bundleSymbolicName,String path)
{
Modified:
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java
(original)
+++
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java
Thu Sep 15 14:27:02 2016
@@ -131,7 +131,6 @@ public final class StandaloneManagedSolr
}
/**
* Shutdowns the default server
- * @return
*/
public static void shutdownManagedServer() {
shutdownManagedServer(DEFAULT_SERVER_NAME);
Modified: stanbol/trunk/launchers/full-war/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full-war/pom.xml?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
--- stanbol/trunk/launchers/full-war/pom.xml (original)
+++ stanbol/trunk/launchers/full-war/pom.xml Thu Sep 15 14:27:02 2016
@@ -113,6 +113,17 @@
<warSourceDirectory>${project.build.directory}/${project.build.finalName}/</warSourceDirectory>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!--
+ Launcher bundles should never be deployed, e.g. as SNAPSHOTS, by
default
+ unless explicitly specified in a POM because of known license issues.
+ -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: stanbol/trunk/launchers/full/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full/pom.xml?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
--- stanbol/trunk/launchers/full/pom.xml (original)
+++ stanbol/trunk/launchers/full/pom.xml Thu Sep 15 14:27:02 2016
@@ -159,6 +159,17 @@
</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!--
+ Launcher bundles should never be deployed, e.g. as SNAPSHOTS, by
default
+ unless explicitly specified in a POM because of known license issues.
+ -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: stanbol/trunk/launchers/mini-war/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini-war/pom.xml?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
--- stanbol/trunk/launchers/mini-war/pom.xml (original)
+++ stanbol/trunk/launchers/mini-war/pom.xml Thu Sep 15 14:27:02 2016
@@ -114,6 +114,17 @@
</configuration>
</plugin>
</plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!--
+ Launcher bundles should never be deployed, e.g. as SNAPSHOTS, by
default
+ unless explicitly specified in a POM because of known license issues.
+ -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</build>
<dependencies>
Modified: stanbol/trunk/launchers/mini/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini/pom.xml?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
--- stanbol/trunk/launchers/mini/pom.xml (original)
+++ stanbol/trunk/launchers/mini/pom.xml Thu Sep 15 14:27:02 2016
@@ -159,6 +159,17 @@
</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!--
+ Launcher bundles should never be deployed, e.g. as SNAPSHOTS, by
default
+ unless explicitly specified in a POM because of known license issues.
+ -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: stanbol/trunk/launchers/stable-war/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable-war/pom.xml?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
--- stanbol/trunk/launchers/stable-war/pom.xml (original)
+++ stanbol/trunk/launchers/stable-war/pom.xml Thu Sep 15 14:27:02 2016
@@ -117,6 +117,17 @@
<warSourceDirectory>${project.build.directory}/${project.build.finalName}/</warSourceDirectory>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!--
+ Launcher bundles should never be deployed, e.g. as SNAPSHOTS, by
default
+ unless explicitly specified in a POM because of known license issues.
+ -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: stanbol/trunk/launchers/stable/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable/pom.xml?rev=1760938&r1=1760937&r2=1760938&view=diff
==============================================================================
--- stanbol/trunk/launchers/stable/pom.xml (original)
+++ stanbol/trunk/launchers/stable/pom.xml Thu Sep 15 14:27:02 2016
@@ -160,6 +160,17 @@
</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!--
+ Launcher bundles should never be deployed, e.g. as SNAPSHOTS, by
default
+ unless explicitly specified in a POM because of known license issues.
+ -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
