http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/indexing/solrconfig.xml ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/indexing/solrconfig.xml b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/indexing/solrconfig.xml new file mode 100644 index 0000000..da20f58 --- /dev/null +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/indexing/solrconfig.xml @@ -0,0 +1,1036 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + ~ 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. + ~ + ~ + --> +<!-- + For more details about configurations options that may appear in this + file, see http://wiki.apache.org/solr/SolrConfigXml. + + Specifically, the Solr Config can support XInclude, which may make it easier to manage + the configuration. See https://issues.apache.org/jira/browse/SOLR-1167 +--> +<config> + <!-- Set this to 'false' if you want solr to continue working after it has + encountered an severe configuration error. In a production environment, + you may want solr to keep working even if one handler is mis-configured. + + You may also set this to false using by setting the system property: + -Dsolr.abortOnConfigurationError=false + --> + <abortOnConfigurationError>false</abortOnConfigurationError> + + <!-- lib directives can be used to instruct Solr to load an Jars identified + and use them to resolve any "plugins" specified in your solrconfig.xml or + schema.xml (ie: Analyzers, Request Handlers, etc...). + + All directories and paths are resolved relative the instanceDir. + + If a "./lib" directory exists in your instanceDir, all files found in it + are included as if you had used the following syntax... + + <lib dir="./lib" /> + --> + <!-- A dir option by itself adds any files found in the directory to the + classpath, this is useful for including all jars in a directory. + --> + <lib dir="../../contrib/extraction/lib" /> + <!-- When a regex is specified in addition to a directory, only the files in that + directory which completely match the regex (anchored on both ends) + will be included. + --> + <lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar" /> + <lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar" /> + <!-- If a dir option (with or without a regex) is used and nothing is found + that matches, it will be ignored + --> + <lib dir="../../contrib/clustering/lib/downloads/" /> + <lib dir="../../contrib/clustering/lib/" /> + <lib dir="/total/crap/dir/ignored" /> + <!-- an exact path can be used to specify a specific file. This will cause + a serious error to be logged if it can't be loaded. + <lib path="../a-jar-that-does-not-exist.jar" /> + --> + + + <!-- Used to specify an alternate directory to hold all index data + other than the default ./data under the Solr home. + If replication is in use, this should match the replication configuration. --> + <!--<dataDir>./data</dataDir> --> + + + <!-- WARNING: this <indexDefaults> section only provides defaults for index writers + in general. See also the <mainIndex> section after that when changing parameters + for Solr's main Lucene index. --> + <indexDefaults> + <!-- Values here affect all index writers and act as a default unless overridden. --> + <useCompoundFile>false</useCompoundFile> + + <mergeFactor>10</mergeFactor> + <!-- If both ramBufferSizeMB and maxBufferedDocs is set, then Lucene will flush + based on whichever limit is hit first. --> + <!--<maxBufferedDocs>1000</maxBufferedDocs>--> + + <!-- Sets the amount of RAM that may be used by Lucene indexing + for buffering added documents and deletions before they are + flushed to the Directory. --> + <ramBufferSizeMB>32</ramBufferSizeMB> + <!-- <maxMergeDocs>2147483647</maxMergeDocs> --> + <maxFieldLength>10000</maxFieldLength> + <writeLockTimeout>1000</writeLockTimeout> + <commitLockTimeout>10000</commitLockTimeout> + + <!-- + Expert: Turn on Lucene's auto commit capability. This causes intermediate + segment flushes to write a new lucene index descriptor, enabling it to be + opened by an external IndexReader. This can greatly slow down indexing + speed. NOTE: Despite the name, this value does not have any relation to + Solr's autoCommit functionality + --> + <!--<luceneAutoCommit>false</luceneAutoCommit>--> + + <!-- + Expert: The Merge Policy in Lucene controls how merging is handled by + Lucene. The default in 2.3 is the LogByteSizeMergePolicy, previous + versions used LogDocMergePolicy. + + LogByteSizeMergePolicy chooses segments to merge based on their size. The + Lucene 2.2 default, LogDocMergePolicy chose when to merge based on number + of documents + + Other implementations of MergePolicy must have a no-argument constructor + --> + <!--<mergePolicy class="org.apache.lucene.index.LogByteSizeMergePolicy"/>--> + + <!-- + Expert: + The Merge Scheduler in Lucene controls how merges are performed. The + ConcurrentMergeScheduler (Lucene 2.3 default) can perform merges in the + background using separate threads. The SerialMergeScheduler (Lucene 2.2 + default) does not. + --> + <!--<mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>--> + + + <!-- + This option specifies which Lucene LockFactory implementation to use. + + single = SingleInstanceLockFactory - suggested for a read-only index + or when there is no possibility of another process trying + to modify the index. + native = NativeFSLockFactory - uses OS native file locking + simple = SimpleFSLockFactory - uses a plain file for locking + + (For backwards compatibility with Solr 1.2, 'simple' is the default + if not specified.) + --> + <lockType>native</lockType> + <!-- + Expert: + Controls how often Lucene loads terms into memory --> + <!--<termIndexInterval>256</termIndexInterval>--> + </indexDefaults> + + <mainIndex> + <!-- options specific to the main on-disk lucene index --> + <useCompoundFile>false</useCompoundFile> + <ramBufferSizeMB>32</ramBufferSizeMB> + <mergeFactor>10</mergeFactor> + <!-- Deprecated --> + <!--<maxBufferedDocs>1000</maxBufferedDocs>--> + <!--<maxMergeDocs>2147483647</maxMergeDocs>--> + + <!-- inherit from indexDefaults <maxFieldLength>10000</maxFieldLength> --> + + <!-- If true, unlock any held write or commit locks on startup. + This defeats the locking mechanism that allows multiple + processes to safely access a lucene index, and should be + used with care. + This is not needed if lock type is 'none' or 'single' + --> + <unlockOnStartup>false</unlockOnStartup> + + <!-- If true, IndexReaders will be reopened (often more efficient) instead + of closed and then opened. --> + <reopenReaders>true</reopenReaders> + + <!-- + Expert: + Controls how often Lucene loads terms into memory. Default is 128 and is likely good for most everyone. --> + <!--<termIndexInterval>256</termIndexInterval>--> + + <!-- + Custom deletion policies can specified here. The class must + implement org.apache.lucene.index.IndexDeletionPolicy. + + http://lucene.apache.org/java/2_3_2/api/org/apache/lucene/index/IndexDeletionPolicy.html + + The standard Solr IndexDeletionPolicy implementation supports deleting + index commit points on number of commits, age of commit point and + optimized status. + + The latest commit point should always be preserved regardless + of the criteria. + --> + <deletionPolicy class="solr.SolrDeletionPolicy"> + <!-- The number of commit points to be kept --> + <str name="maxCommitsToKeep">1</str> + <!-- The number of optimized commit points to be kept --> + <str name="maxOptimizedCommitsToKeep">0</str> + <!-- + Delete all commit points once they have reached the given age. + Supports DateMathParser syntax e.g. + + <str name="maxCommitAge">30MINUTES</str> + <str name="maxCommitAge">1DAY</str> + --> + </deletionPolicy> + + <!-- To aid in advanced debugging, you may turn on IndexWriter debug logging. + Setting to true will set the file that the underlying Lucene IndexWriter + will write its debug infostream to. --> + <infoStream file="INFOSTREAM.txt">false</infoStream> + + </mainIndex> + + <!-- Enables JMX if and only if an existing MBeanServer is found, use this + if you want to configure JMX through JVM parameters. Remove this to disable + exposing Solr configuration and statistics to JMX. + + If you want to connect to a particular server, specify the agentId + e.g. <jmx agentId="myAgent" /> + + If you want to start a new MBeanServer, specify the serviceUrl + e.g <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/> + + For more details see http://wiki.apache.org/solr/SolrJmx + --> + <jmx /> + + <!-- the default high-performance update handler --> + <updateHandler class="solr.DirectUpdateHandler2"> + <!-- A prefix of "solr." for class names is an alias that + causes solr to search appropriate packages, including + org.apache.solr.(search|update|request|core|analysis) + --> + + <!-- Perform a <commit/> automatically under certain conditions: + maxDocs - number of updates since last commit is greater than this + maxTime - oldest uncommited update (in ms) is this long ago + Instead of enabling autoCommit, consider using "commitWithin" + when adding documents. http://wiki.apache.org/solr/UpdateXmlMessages + <autoCommit> + <maxDocs>10000</maxDocs> + <maxTime>1000</maxTime> + </autoCommit> + --> + + + <!-- The RunExecutableListener executes an external command from a + hook such as postCommit or postOptimize. + exe - the name of the executable to run + dir - dir to use as the current working directory. default="." + wait - the calling thread waits until the executable returns. default="true" + args - the arguments to pass to the program. default=nothing + env - environment variables to set. default=nothing + --> + <!-- A postCommit event is fired after every commit or optimize command + <listener event="postCommit" class="solr.RunExecutableListener"> + <str name="exe">solr/bin/snapshooter</str> + <str name="dir">.</str> + <bool name="wait">true</bool> + <arr name="args"> <str>arg1</str> <str>arg2</str> </arr> + <arr name="env"> <str>MYVAR=val1</str> </arr> + </listener> + --> + <!-- A postOptimize event is fired only after every optimize command + <listener event="postOptimize" class="solr.RunExecutableListener"> + <str name="exe">snapshooter</str> + <str name="dir">solr/bin</str> + <bool name="wait">true</bool> + </listener> + --> + + </updateHandler> + + <!-- Use the following format to specify a custom IndexReaderFactory - allows for alternate + IndexReader implementations. + + ** Experimental Feature ** + Please note - Using a custom IndexReaderFactory may prevent certain other features + from working. The API to IndexReaderFactory may change without warning or may even + be removed from future releases if the problems cannot be resolved. + + ** Features that may not work with custom IndexReaderFactory ** + The ReplicationHandler assumes a disk-resident index. Using a custom + IndexReader implementation may cause incompatibility with ReplicationHandler and + may cause replication to not work correctly. See SOLR-1366 for details. + + <indexReaderFactory name="IndexReaderFactory" class="package.class"> + Parameters as required by the implementation + </indexReaderFactory > + --> + <!-- To set the termInfosIndexDivisor, do this: --> + <!--<indexReaderFactory name="IndexReaderFactory" class="org.apache.solr.core.StandardIndexReaderFactory"> + <int name="termInfosIndexDivisor">12</int> + </indexReaderFactory >--> + + + <query> + <!-- Maximum number of clauses in a boolean query... in the past, this affected + range or prefix queries that expanded to big boolean queries - built in Solr + query parsers no longer create queries with this limitation. + An exception is thrown if exceeded. --> + <maxBooleanClauses>1024</maxBooleanClauses> + + + <!-- There are two implementations of cache available for Solr, + LRUCache, based on a synchronized LinkedHashMap, and + FastLRUCache, based on a ConcurrentHashMap. FastLRUCache has faster gets + and slower puts in single threaded operation and thus is generally faster + than LRUCache when the hit ratio of the cache is high (> 75%), and may be + faster under other scenarios on multi-cpu systems. --> + <!-- Cache used by SolrIndexSearcher for filters (DocSets), + unordered sets of *all* documents that match a query. + When a new searcher is opened, its caches may be prepopulated + or "autowarmed" using data from caches in the old searcher. + autowarmCount is the number of items to prepopulate. For LRUCache, + the autowarmed items will be the most recently accessed items. + Parameters: + class - the SolrCache implementation LRUCache or FastLRUCache + size - the maximum number of entries in the cache + initialSize - the initial capacity (number of entries) of + the cache. (seel java.util.HashMap) + autowarmCount - the number of entries to prepopulate from + and old cache. + --> + <filterCache + class="solr.FastLRUCache" + size="512" + initialSize="512" + autowarmCount="0"/> + + <!-- Cache used to hold field values that are quickly accessible + by document id. The fieldValueCache is created by default + even if not configured here. + <fieldValueCache + class="solr.FastLRUCache" + size="512" + autowarmCount="128" + showItems="32" + /> + --> + + <!-- queryResultCache caches results of searches - ordered lists of + document ids (DocList) based on a query, a sort, and the range + of documents requested. --> + <queryResultCache + class="solr.LRUCache" + size="512" + initialSize="512" + autowarmCount="0"/> + + <!-- documentCache caches Lucene Document objects (the stored fields for each document). + Since Lucene internal document ids are transient, this cache will not be autowarmed. --> + <documentCache + class="solr.LRUCache" + size="512" + initialSize="512" + autowarmCount="0"/> + + <!-- If true, stored fields that are not requested will be loaded lazily. + This can result in a significant speed improvement if the usual case is to + not load all stored fields, especially if the skipped fields are large + compressed text fields. + --> + <enableLazyFieldLoading>true</enableLazyFieldLoading> + + <!-- Example of a generic cache. These caches may be accessed by name + through SolrIndexSearcher.getCache(),cacheLookup(), and cacheInsert(). + The purpose is to enable easy caching of user/application level data. + The regenerator argument should be specified as an implementation + of solr.search.CacheRegenerator if autowarming is desired. --> + <!-- + <cache name="myUserCache" + class="solr.LRUCache" + size="4096" + initialSize="1024" + autowarmCount="1024" + regenerator="org.mycompany.mypackage.MyRegenerator" + /> + --> + + <!-- An optimization that attempts to use a filter to satisfy a search. + If the requested sort does not include score, then the filterCache + will be checked for a filter matching the query. If found, the filter + will be used as the source of document ids, and then the sort will be + applied to that. + <useFilterForSortedQuery>true</useFilterForSortedQuery> + --> + + <!-- An optimization for use with the queryResultCache. When a search + is requested, a superset of the requested number of document ids + are collected. For example, if a search for a particular query + requests matching documents 10 through 19, and queryWindowSize is 50, + then documents 0 through 49 will be collected and cached. Any further + requests in that range can be satisfied via the cache. --> + <queryResultWindowSize>20</queryResultWindowSize> + + <!-- Maximum number of documents to cache for any entry in the + queryResultCache. --> + <queryResultMaxDocsCached>200</queryResultMaxDocsCached> + + <!-- a newSearcher event is fired whenever a new searcher is being prepared + and there is a current searcher handling requests (aka registered). + It can be used to prime certain caches to prevent long request times for + certain requests. + --> + <!-- QuerySenderListener takes an array of NamedList and executes a + local query request for each NamedList in sequence. --> + <listener event="newSearcher" class="solr.QuerySenderListener"> + <arr name="queries"> + <!-- + <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst> + <lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst> + <lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst> + --> + </arr> + </listener> + + <!-- a firstSearcher event is fired whenever a new searcher is being + prepared but there is no current registered searcher to handle + requests or to gain autowarming data from. + <listener event="firstSearcher" class="solr.QuerySenderListener"> + <arr name="queries"> + <lst> <str name="q">solr rocks</str><str name="start">0</str><str name="rows">10</str></lst> + <lst><str name="q">static firstSearcher warming query from solrconfig.xml</str></lst> + </arr> + </listener> --> + + <!-- If a search request comes in and there is no current registered searcher, + then immediately register the still warming searcher and use it. If + "false" then all requests will block until the first searcher is done + warming. --> + <useColdSearcher>false</useColdSearcher> + + <!-- Maximum number of searchers that may be warming in the background + concurrently. An error is returned if this limit is exceeded. Recommend + 1-2 for read-only slaves, higher for masters w/o cache warming. --> + <maxWarmingSearchers>2</maxWarmingSearchers> + + </query> + + <!-- + Let the dispatch filter handler /select?qt=XXX + handleSelect=true will use consistent error handling for /select and /update + handleSelect=false will use solr1.1 style error formatting + --> + <requestDispatcher handleSelect="true" > + <!--Make sure your system has some authentication before enabling remote streaming! --> + <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048000" /> + + <!-- Set HTTP caching related parameters (for proxy caches and clients). + + To get the behaviour of Solr 1.2 (ie: no caching related headers) + use the never304="true" option and do not specify a value for + <cacheControl> + --> + <!-- <httpCaching never304="true"> --> + <httpCaching lastModifiedFrom="openTime" + etagSeed="Solr"> + <!-- lastModFrom="openTime" is the default, the Last-Modified value + (and validation against If-Modified-Since requests) will all be + relative to when the current Searcher was opened. + You can change it to lastModFrom="dirLastMod" if you want the + value to exactly corrispond to when the physical index was last + modified. + + etagSeed="..." is an option you can change to force the ETag + header (and validation against If-None-Match requests) to be + differnet even if the index has not changed (ie: when making + significant changes to your config file) + + lastModifiedFrom and etagSeed are both ignored if you use the + never304="true" option. + --> + <!-- If you include a <cacheControl> directive, it will be used to + generate a Cache-Control header, as well as an Expires header + if the value contains "max-age=" + + By default, no Cache-Control header is generated. + + You can use the <cacheControl> option even if you have set + never304="true" + --> + <!-- <cacheControl>max-age=30, public</cacheControl> --> + </httpCaching> + </requestDispatcher> + + + <!-- requestHandler plugins... incoming queries will be dispatched to the + correct handler based on the path or the qt (query type) param. + Names starting with a '/' are accessed with the a path equal to the + registered name. Names without a leading '/' are accessed with: + http://host/app/select?qt=name + If no qt is defined, the requestHandler that declares default="true" + will be used. + --> + <requestHandler name="standard" class="solr.SearchHandler" default="true"> + <!-- default values for query parameters --> + <lst name="defaults"> + <str name="echoParams">explicit</str> + <!-- + <int name="rows">10</int> + <str name="fl">*</str> + <str name="version">2.1</str> + --> + </lst> + </requestHandler> + + <!-- Please refer to http://wiki.apache.org/solr/SolrReplication for details on configuring replication --> + <!-- remove the <lst name="master"> section if this is just a slave --> + <!-- remove the <lst name="slave"> section if this is just a master --> + <!-- + <requestHandler name="/replication" class="solr.ReplicationHandler" > + <lst name="master"> + <str name="replicateAfter">commit</str> + <str name="replicateAfter">startup</str> + <str name="confFiles">schema.xml,stopwords.txt</str> + </lst> + <lst name="slave"> + <str name="masterUrl">http://localhost:8983/solr/replication</str> + <str name="pollInterval">00:00:60</str> + </lst> + </requestHandler>--> + + <!-- DisMaxRequestHandler allows easy searching across multiple fields + for simple user-entered phrases. It's implementation is now + just the standard SearchHandler with a default query type + of "dismax". + see http://wiki.apache.org/solr/DisMaxRequestHandler + --> + <requestHandler name="dismax" class="solr.SearchHandler" > + <lst name="defaults"> + <str name="defType">dismax</str> + <str name="echoParams">explicit</str> + <float name="tie">0.01</float> + <str name="qf"> + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + </str> + <str name="pf"> + text^0.2 features^1.1 name^1.5 manu^1.4 manu_exact^1.9 + </str> + <str name="bf"> + popularity^0.5 recip(price,1,1000,1000)^0.3 + </str> + <str name="fl"> + id,name,price,score + </str> + <str name="mm"> + 2<-1 5<-2 6<90% + </str> + <int name="ps">100</int> + <str name="q.alt">*:*</str> + <!-- example highlighter config, enable per-query with hl=true --> + <str name="hl.fl">text features name</str> + <!-- for this field, we want no fragmenting, just highlighting --> + <str name="f.name.hl.fragsize">0</str> + <!-- instructs Solr to return the field itself if no query terms are + found --> + <str name="f.name.hl.alternateField">name</str> + <str name="f.text.hl.fragmenter">regex</str> <!-- defined below --> + </lst> + </requestHandler> + + <!-- Note how you can register the same handler multiple times with + different names (and different init parameters) + --> + <requestHandler name="partitioned" class="solr.SearchHandler" > + <lst name="defaults"> + <str name="defType">dismax</str> + <str name="echoParams">explicit</str> + <str name="qf">text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0</str> + <str name="mm">2<-1 5<-2 6<90%</str> + <!-- This is an example of using Date Math to specify a constantly + moving date range in a config... + --> + <str name="bq">incubationdate_dt:[* TO NOW/DAY-1MONTH]^2.2</str> + </lst> + <!-- In addition to defaults, "appends" params can be specified + to identify values which should be appended to the list of + multi-val params from the query (or the existing "defaults"). + + In this example, the param "fq=instock:true" will be appended to + any query time fq params the user may specify, as a mechanism for + partitioning the index, independent of any user selected filtering + that may also be desired (perhaps as a result of faceted searching). + + NOTE: there is *absolutely* nothing a client can do to prevent these + "appends" values from being used, so don't use this mechanism + unless you are sure you always want it. + --> + <lst name="appends"> + <str name="fq">inStock:true</str> + </lst> + <!-- "invariants" are a way of letting the Solr maintainer lock down + the options available to Solr clients. Any params values + specified here are used regardless of what values may be specified + in either the query, the "defaults", or the "appends" params. + + In this example, the facet.field and facet.query params are fixed, + limiting the facets clients can use. Faceting is not turned on by + default - but if the client does specify facet=true in the request, + these are the only facets they will be able to see counts for; + regardless of what other facet.field or facet.query params they + may specify. + + NOTE: there is *absolutely* nothing a client can do to prevent these + "invariants" values from being used, so don't use this mechanism + unless you are sure you always want it. + --> + <lst name="invariants"> + <str name="facet.field">cat</str> + <str name="facet.field">manu_exact</str> + <str name="facet.query">price:[* TO 500]</str> + <str name="facet.query">price:[500 TO *]</str> + </lst> + </requestHandler> + + + <!-- + Search components are registered to SolrCore and used by Search Handlers + + By default, the following components are avaliable: + + <searchComponent name="query" class="org.apache.solr.handler.component.QueryComponent" /> + <searchComponent name="facet" class="org.apache.solr.handler.component.FacetComponent" /> + <searchComponent name="mlt" class="org.apache.solr.handler.component.MoreLikeThisComponent" /> + <searchComponent name="highlight" class="org.apache.solr.handler.component.HighlightComponent" /> + <searchComponent name="stats" class="org.apache.solr.handler.component.StatsComponent" /> + <searchComponent name="debug" class="org.apache.solr.handler.component.DebugComponent" /> + + Default configuration in a requestHandler would look like: + <arr name="components"> + <str>query</str> + <str>facet</str> + <str>mlt</str> + <str>highlight</str> + <str>stats</str> + <str>debug</str> + </arr> + + If you register a searchComponent to one of the standard names, that will be used instead. + To insert components before or after the 'standard' components, use: + + <arr name="first-components"> + <str>myFirstComponentName</str> + </arr> + + <arr name="last-components"> + <str>myLastComponentName</str> + </arr> + --> + + <!-- The spell check component can return a list of alternative spelling + suggestions. --> + <searchComponent name="spellcheck" class="solr.SpellCheckComponent"> + + <str name="queryAnalyzerFieldType">textSpell</str> + + <lst name="spellchecker"> + <str name="name">default</str> + <str name="field">name</str> + <str name="spellcheckIndexDir">./spellchecker</str> + </lst> + + <!-- a spellchecker that uses a different distance measure + <lst name="spellchecker"> + <str name="name">jarowinkler</str> + <str name="field">spell</str> + <str name="distanceMeasure">org.apache.lucene.search.spell.JaroWinklerDistance</str> + <str name="spellcheckIndexDir">./spellchecker2</str> + </lst> + --> + + <!-- a file based spell checker + <lst name="spellchecker"> + <str name="classname">solr.FileBasedSpellChecker</str> + <str name="name">file</str> + <str name="sourceLocation">spellings.txt</str> + <str name="characterEncoding">UTF-8</str> + <str name="spellcheckIndexDir">./spellcheckerFile</str> + </lst> + --> + </searchComponent> + + <!-- A request handler utilizing the spellcheck component. + ############################################################################# + NOTE: This is purely as an example. The whole purpose of the + SpellCheckComponent is to hook it into the request handler that handles (i.e. + the standard or dismax SearchHandler) queries such that a separate request is + not needed to get suggestions. + + IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS NOT WHAT YOU + WANT FOR YOUR PRODUCTION SYSTEM! + ############################################################################# + --> + <requestHandler name="/spell" class="solr.SearchHandler" lazy="true"> + <lst name="defaults"> + <!-- omp = Only More Popular --> + <str name="spellcheck.onlyMorePopular">false</str> + <!-- exr = Extended Results --> + <str name="spellcheck.extendedResults">false</str> + <!-- The number of suggestions to return --> + <str name="spellcheck.count">1</str> + </lst> + <arr name="last-components"> + <str>spellcheck</str> + </arr> + </requestHandler> + + <searchComponent name="tvComponent" class="org.apache.solr.handler.component.TermVectorComponent"/> + <!-- A Req Handler for working with the tvComponent. This is purely as an example. + You will likely want to add the component to your already specified request handlers. --> + <requestHandler name="tvrh" class="org.apache.solr.handler.component.SearchHandler"> + <lst name="defaults"> + <bool name="tv">true</bool> + </lst> + <arr name="last-components"> + <str>tvComponent</str> + </arr> + </requestHandler> + + <!-- Clustering Component + http://wiki.apache.org/solr/ClusteringComponent + This relies on third party jars which are not included in the release. + To use this component (and the "/clustering" handler) + Those jars will need to be downloaded, and you'll need to set the + solr.cluster.enabled system property when running solr... + java -Dsolr.clustering.enabled=true -jar start.jar + --> + <searchComponent + name="clusteringComponent" + enable="false" + class="org.apache.solr.handler.clustering.ClusteringComponent" > + <!-- Declare an engine --> + <lst name="engine"> + <!-- The name, only one can be named "default" --> + <str name="name">default</str> + <!-- + Class name of Carrot2 clustering algorithm. Currently available algorithms are: + + * org.carrot2.clustering.lingo.LingoClusteringAlgorithm + * org.carrot2.clustering.stc.STCClusteringAlgorithm + + See http://project.carrot2.org/algorithms.html for the algorithm's characteristics. + --> + <str name="carrot.algorithm">org.carrot2.clustering.lingo.LingoClusteringAlgorithm</str> + <!-- + Overriding values for Carrot2 default algorithm attributes. For a description + of all available attributes, see: http://download.carrot2.org/stable/manual/#chapter.components. + Use attribute key as name attribute of str elements below. These can be further + overridden for individual requests by specifying attribute key as request + parameter name and attribute value as parameter value. + --> + <str name="LingoClusteringAlgorithm.desiredClusterCountBase">20</str> + </lst> + <lst name="engine"> + <str name="name">stc</str> + <str name="carrot.algorithm">org.carrot2.clustering.stc.STCClusteringAlgorithm</str> + </lst> + </searchComponent> + <requestHandler name="/clustering" + enable="false" + class="solr.SearchHandler"> + <lst name="defaults"> + <bool name="clustering">true</bool> + <str name="clustering.engine">default</str> + <bool name="clustering.results">true</bool> + <!-- The title field --> + <str name="carrot.title">name</str> + <str name="carrot.url">id</str> + <!-- The field to cluster on --> + <str name="carrot.snippet">features</str> + <!-- produce summaries --> + <bool name="carrot.produceSummary">true</bool> + <!-- the maximum number of labels per cluster --> + <!--<int name="carrot.numDescriptions">5</int>--> + <!-- produce sub clusters --> + <bool name="carrot.outputSubClusters">false</bool> + </lst> + <arr name="last-components"> + <str>clusteringComponent</str> + </arr> + </requestHandler> + + <!-- Solr Cell: http://wiki.apache.org/solr/ExtractingRequestHandler --> + <requestHandler name="/update/extract" class="org.apache.solr.handler.extraction.ExtractingRequestHandler" startup="lazy"> + <lst name="defaults"> + <!-- All the main content goes into "text"... if you need to return + the extracted text or do highlighting, use a stored field. --> + <str name="fmap.content">text</str> + <str name="lowernames">true</str> + <str name="uprefix">ignored_</str> + + <!-- capture link hrefs but ignore div attributes --> + <str name="captureAttr">true</str> + <str name="fmap.a">links</str> + <str name="fmap.div">ignored_</str> + </lst> + </requestHandler> + + + <!-- A component to return terms and document frequency of those terms. + This component does not yet support distributed search. --> + <searchComponent name="termsComponent" class="org.apache.solr.handler.component.TermsComponent"/> + + <requestHandler name="/terms" class="org.apache.solr.handler.component.SearchHandler"> + <lst name="defaults"> + <bool name="terms">true</bool> + </lst> + <arr name="components"> + <str>termsComponent</str> + </arr> + </requestHandler> + + + <!-- a search component that enables you to configure the top results for + a given query regardless of the normal lucene scoring.--> + <!-- <searchComponent name="elevator" class="solr.QueryElevationComponent" > + <str name="queryFieldType">string</str> + <str name="config-file">elevate.xml</str> + </searchComponent> + --> + + <!-- a request handler utilizing the elevator component + <requestHandler name="/elevate" class="solr.SearchHandler" startup="lazy"> + <lst name="defaults"> + <str name="echoParams">explicit</str> + </lst> + <arr name="last-components"> + <str>elevator</str> + </arr> + </requestHandler> +--> + + <!-- Update request handler. + + Note: Since solr1.1 requestHandlers requires a valid content type header if posted in + the body. For example, curl now requires: -H 'Content-type:text/xml; charset=utf-8' + The response format differs from solr1.1 formatting and returns a standard error code. + To enable solr1.1 behavior, remove the /update handler or change its path + --> + <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" /> + + + <requestHandler name="/update/javabin" class="solr.BinaryUpdateRequestHandler" /> + + <!-- + Analysis request handler. Since Solr 1.3. Use to return how a document is analyzed. Useful + for debugging and as a token server for other types of applications. + + This is deprecated in favor of the improved DocumentAnalysisRequestHandler and FieldAnalysisRequestHandler + + <requestHandler name="/analysis" class="solr.AnalysisRequestHandler" /> + --> + + <!-- + An analysis handler that provides a breakdown of the analysis process of provided docuemnts. This handler expects a + (single) content stream with the following format: + + <docs> + <doc> + <field name="id">1</field> + <field name="name">The Name</field> + <field name="text">The Text Value</field> + <doc> + <doc>...</doc> + <doc>...</doc> + ... + </docs> + + Note: Each document must contain a field which serves as the unique key. This key is used in the returned + response to assoicate an analysis breakdown to the analyzed document. + + Like the FieldAnalysisRequestHandler, this handler also supports query analysis by + sending either an "analysis.query" or "q" request paraemter that holds the query text to be analyized. It also + supports the "analysis.showmatch" parameter which when set to true, all field tokens that match the query + tokens will be marked as a "match". + --> + <requestHandler name="/analysis/document" class="solr.DocumentAnalysisRequestHandler" /> + + <!-- + RequestHandler that provides much the same functionality as analysis.jsp. Provides the ability + to specify multiple field types and field names in the same request and outputs index-time and + query-time analysis for each of them. + + Request parameters are: + analysis.fieldname - The field name whose analyzers are to be used + analysis.fieldtype - The field type whose analyzers are to be used + analysis.fieldvalue - The text for index-time analysis + q (or analysis.q) - The text for query time analysis + analysis.showmatch (true|false) - When set to true and when query analysis is performed, the produced + tokens of the field value analysis will be marked as "matched" for every + token that is produces by the query analysis + --> + <requestHandler name="/analysis/field" class="solr.FieldAnalysisRequestHandler" /> + + + <!-- CSV update handler, loaded on demand --> + <requestHandler name="/update/csv" class="solr.CSVRequestHandler" startup="lazy" /> + + + <!-- + Admin Handlers - This will register all the standard admin RequestHandlers. Adding + this single handler is equivalent to registering: + + <requestHandler name="/admin/luke" class="org.apache.solr.handler.admin.LukeRequestHandler" /> + <requestHandler name="/admin/system" class="org.apache.solr.handler.admin.SystemInfoHandler" /> + <requestHandler name="/admin/plugins" class="org.apache.solr.handler.admin.PluginInfoHandler" /> + <requestHandler name="/admin/threads" class="org.apache.solr.handler.admin.ThreadDumpHandler" /> + <requestHandler name="/admin/properties" class="org.apache.solr.handler.admin.PropertiesRequestHandler" /> + <requestHandler name="/admin/file" class="org.apache.solr.handler.admin.ShowFileRequestHandler" > + + If you wish to hide files under solr.home/conf, explicitly register the ShowFileRequestHandler using: + <requestHandler name="/admin/file" class="org.apache.solr.handler.admin.ShowFileRequestHandler" > + <lst name="invariants"> + <str name="hidden">synonyms.txt</str> + <str name="hidden">anotherfile.txt</str> + </lst> + </requestHandler> + --> + <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" /> + + <!-- ping/healthcheck --> + <requestHandler name="/admin/ping" class="PingRequestHandler"> + <lst name="defaults"> + <str name="qt">standard</str> + <str name="q">solrpingquery</str> + <str name="echoParams">all</str> + </lst> + </requestHandler> + + <!-- Echo the request contents back to the client --> + <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" > + <lst name="defaults"> + <str name="echoParams">explicit</str> <!-- for all params (including the default etc) use: 'all' --> + <str name="echoHandler">true</str> + </lst> + </requestHandler> + + <highlighting> + <!-- Configure the standard fragmenter --> + <!-- This could most likely be commented out in the "default" case --> + <fragmenter name="gap" class="org.apache.solr.highlight.GapFragmenter" default="true"> + <lst name="defaults"> + <int name="hl.fragsize">100</int> + </lst> + </fragmenter> + + <!-- A regular-expression-based fragmenter (f.i., for sentence extraction) --> + <fragmenter name="regex" class="org.apache.solr.highlight.RegexFragmenter"> + <lst name="defaults"> + <!-- slightly smaller fragsizes work better because of slop --> + <int name="hl.fragsize">70</int> + <!-- allow 50% slop on fragment sizes --> + <float name="hl.regex.slop">0.5</float> + <!-- a basic sentence pattern --> + <str name="hl.regex.pattern">[-\w ,/\n\"']{20,200}</str> + </lst> + </fragmenter> + + <!-- Configure the standard formatter --> + <formatter name="html" class="org.apache.solr.highlight.HtmlFormatter" default="true"> + <lst name="defaults"> + <str name="hl.simple.pre"><![CDATA[<em>]]></str> + <str name="hl.simple.post"><![CDATA[</em>]]></str> + </lst> + </formatter> + </highlighting> + + <!-- An example dedup update processor that creates the "id" field on the fly + based on the hash code of some other fields. This example has overwriteDupes + set to false since we are using the id field as the signatureField and Solr + will maintain uniqueness based on that anyway. + + You have to link the chain to an update handler above to use it ie: + <requestHandler name="/update "class="solr.XmlUpdateRequestHandler"> + <lst name="defaults"> + <str name="update.processor">dedupe</str> + </lst> + </requestHandler> + --> + <!-- + <updateRequestProcessorChain name="dedupe"> + <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory"> + <bool name="enabled">true</bool> + <str name="signatureField">id</str> + <bool name="overwriteDupes">false</bool> + <str name="fields">name,features,cat</str> + <str name="signatureClass">org.apache.solr.update.processor.Lookup3Signature</str> + </processor> + <processor class="solr.LogUpdateProcessorFactory" /> + <processor class="solr.RunUpdateProcessorFactory" /> + </updateRequestProcessorChain> + --> + + + <!-- queryResponseWriter plugins... query responses will be written using the + writer specified by the 'wt' request parameter matching the name of a registered + writer. + The "default" writer is the default and will be used if 'wt' is not specified + in the request. XMLResponseWriter will be used if nothing is specified here. + The json, python, and ruby writers are also available by default. + + <queryResponseWriter name="xml" class="org.apache.solr.request.XMLResponseWriter" default="true"/> + <queryResponseWriter name="json" class="org.apache.solr.request.JSONResponseWriter"/> + <queryResponseWriter name="python" class="org.apache.solr.request.PythonResponseWriter"/> + <queryResponseWriter name="ruby" class="org.apache.solr.request.RubyResponseWriter"/> + <queryResponseWriter name="php" class="org.apache.solr.request.PHPResponseWriter"/> + <queryResponseWriter name="phps" class="org.apache.solr.request.PHPSerializedResponseWriter"/> + + <queryResponseWriter name="custom" class="com.example.MyResponseWriter"/> + --> + + <!-- XSLT response writer transforms the XML output by any xslt file found + in Solr's conf/xslt directory. Changes to xslt files are checked for + every xsltCacheLifetimeSeconds. + --> + <queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter"> + <int name="xsltCacheLifetimeSeconds">5</int> + </queryResponseWriter> + + + <!-- example of registering a query parser + <queryParser name="lucene" class="org.apache.solr.search.LuceneQParserPlugin"/> + --> + + <!-- example of registering a custom function parser + <valueSourceParser name="myfunc" class="com.mycompany.MyValueSourceParser" /> + --> + + <!-- config for the admin interface --> + <admin> + <defaultQuery>solr</defaultQuery> + + <!-- configure a healthcheck file for servers behind a loadbalancer + <healthcheck type="file">server-enabled</healthcheck> + --> + </admin> + +</config>
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js index 9d7f4e4..4000571 100644 --- a/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js @@ -22,5 +22,18 @@ module.exports = { p.copyTemplate(p.ctx, 'InfrastructureLayer/IndexingModule/bootstrap.tmpl', 'bootstrap/src/main/java/' + p.javaPackageDir + '/bootstrap/infrastructure/' + p.indexing + 'IndexingModule.java'); + if( p.indexing === 'SQL' ) { + p.copyTemplate(p.ctx, + 'InfrastructureLayer/IndexingModule/indexing/ds-index-postgresql.properties', + 'app/src/main/resources/ds-index-postgresql.properties'); + } + if( p.indexing === 'Solr' ) { + p.copyTemplate(p.ctx, + 'InfrastructureLayer/IndexingModule/indexing/solrconfig.xml', + 'app/src/main/resources/solrconfig.xml'); + p.copyTemplate(p.ctx, + 'InfrastructureLayer/IndexingModule/indexing/solr-schema.xml', + 'app/src/main/resources/schema.xml'); + } } }; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl index fda83db..b2ebb64 100644 --- a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl @@ -27,13 +27,13 @@ import org.apache.polygene.bootstrap.LayerAssembly; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.bootstrap.layered.ModuleAssembler; import org.apache.polygene.entitystore.<%- polygene.entitystoremodule %>.assembly.<%- polygene.entitystore %>EntityStoreAssembler; -<% if( polygene.entitystore.indexOf('SQL') >= 0 ) { +<% +if( polygene.entitystore.indexOf('SQL') >= 0 ) { %>import org.apache.polygene.library.sql.assembly.DataSourceAssembler; -<% if( polygene.dbpool !== null && polygene.dbpool !== 'None' ) { -%>import org.apache.polygene.library.sql.<%= polygene.dbpool.toLowerCase() %>.<%= polygene.dbpool %>DataSourceAssembler; +import org.apache.polygene.library.sql.<%= polygene.dbpool.toLowerCase() %>.<%= polygene.dbpool %>DataSourceServiceAssembler; <% - } -} %> +} +%> public class <%- polygene.entitystore %>StorageModule implements ModuleAssembler @@ -52,20 +52,17 @@ public class <%- polygene.entitystore %>StorageModule { <% if( polygene.entitystore.indexOf( 'SQL' ) >= 0 ) { - if( polygene.dbpool !== null && polygene.dbpool !== 'None' ) { %> // DataSourceService new <%= polygene.dbpool %>DataSourceServiceAssembler() .identifiedBy( "<%= polygene.entitystore.toLowerCase() %>-datasource-service" ) .visibleIn( Visibility.module ) - .withConfig( config, Visibility.layer ) + .withConfig( configModule, Visibility.application ) .assemble( module ); -<% - } -%> + // DataSource new DataSourceAssembler() .withDataSourceServiceIdentity( "<%= polygene.entitystore.toLowerCase() %>-datasource-service" ) - .identifiedBy( "ds-<%= polygene.entitystore.toLowerCase() %>" ) + .identifiedBy( "ds-es-<%= polygene.entitystore.toLowerCase() %>" ) .visibleIn( Visibility.module ) .withCircuitBreaker() .assemble( module ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/module.js ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/module.js b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/module.js index 0d5491c..a9790bb 100644 --- a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/module.js +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/module.js @@ -25,29 +25,27 @@ module.exports = { 'bootstrap/src/main/java/' + p.javaPackageDir + '/bootstrap/infrastructure/' + p.entitystore + 'StorageModule.java'); var esFileName = 'es-' + p.entitystore.toLowerCase() + '.properties'; - var configurationPath = 'InfrastructureLayer/StorageModule/storage/' + esFileName; + var configurationPath = 'InfrastructureLayer/StorageModule/storage/'; + var configurationFile = configurationPath + esFileName; - if( p.entitystore.indexOf( 'SQL') < 0 ) { - fs.stat(__dirname + "/../../" + configurationPath, function (err, stat) { + if (p.entitystore.indexOf('SQL') < 0) { + fs.stat(__dirname + "/../../" + configurationFile, function (err, stat) { if (err === null) { p.copyTemplate(p.ctx, - configurationPath, + configurationFile, 'app/src/main/resources/' + esFileName); } }); } else { - var dsFileName = 'ds-' + p.entitystore.toLowerCase() + '.properties'; + p.copyTemplate(p.ctx, + 'InfrastructureLayer/StorageModule/storage/es-sql.properties', + 'app/src/main/resources/' + esFileName); + + var dsFileName = 'ds-es-' + p.entitystore.toLowerCase() + '.properties'; var datasourceFile = 'InfrastructureLayer/StorageModule/storage/' + dsFileName; - fs.stat(__dirname + "/../../" + configurationPath, function (err, stat) { - if (err === null) { - p.copyTemplate(p.ctx, - 'InfrastructureLayer/StorageModule/storage/es-sql.properties', - 'app/src/main/resources/' + esFileName); - p.copyTemplate(p.ctx, - datasourceFile, - 'app/src/main/resources/' + dsFileName); - } - }); + p.copyTemplate(p.ctx, + datasourceFile, + 'app/src/main/resources/' + dsFileName); } } }; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-derbysql.properties ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-derbysql.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-derbysql.properties deleted file mode 100644 index 39d9ca0..0000000 --- a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-derbysql.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# 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. -# -# -# -enabled=true -url=jdbc:derby:memory:<%= polygene.name %>;create=true -driver=org.apache.derby.jdbc.EmbeddedDriver -username= -password= http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-derbysql.properties ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-derbysql.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-derbysql.properties new file mode 100644 index 0000000..39d9ca0 --- /dev/null +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-derbysql.properties @@ -0,0 +1,24 @@ +# +# 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. +# +# +# +enabled=true +url=jdbc:derby:memory:<%= polygene.name %>;create=true +driver=org.apache.derby.jdbc.EmbeddedDriver +username= +password= http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-h2sql.properties ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-h2sql.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-h2sql.properties new file mode 100644 index 0000000..69f4a33 --- /dev/null +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-h2sql.properties @@ -0,0 +1,24 @@ +# +# 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. +# +# +# +enabled=true +url=jdbc:h2:file:h2-entities/ +driver=org.h2.Driver +username= +password= http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-mysql.properties ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-mysql.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-mysql.properties new file mode 100644 index 0000000..c1fd527 --- /dev/null +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-mysql.properties @@ -0,0 +1,24 @@ +# +# 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. +# +# +# +enabled=true +url=jdbc:mysql://127.0.0.1:3306/<%= polygene.name %>?profileSQL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true +driver=com.mysql.cj.jdbc.Driver +username=polygene +password=ThisIsGreat! http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-postgresql.properties ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-postgresql.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-postgresql.properties new file mode 100644 index 0000000..333d6aa --- /dev/null +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-postgresql.properties @@ -0,0 +1,24 @@ +# +# 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. +# +# +# +enabled=true +url=jdbc:postgres://127.0.0.1:5432/<%= polygene.name %> +driver=org.postgresql.Driver +username=polygene +password=ThisIsGreat! http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-sqlite.properties ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-sqlite.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-sqlite.properties new file mode 100644 index 0000000..5c49ece --- /dev/null +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-sqlite.properties @@ -0,0 +1,24 @@ +# +# 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. +# +# +# +enabled=true +url=jdbc:sqlite:sqlite-entities/ +driver=org.sqlite.JDBC +username=polygene +password=ThisIsGreat http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-h2sql.properties ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-h2sql.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-h2sql.properties deleted file mode 100644 index 69f4a33..0000000 --- a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-h2sql.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# 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. -# -# -# -enabled=true -url=jdbc:h2:file:h2-entities/ -driver=org.h2.Driver -username= -password= http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-mysql.properties ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-mysql.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-mysql.properties deleted file mode 100644 index c1fd527..0000000 --- a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-mysql.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# 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. -# -# -# -enabled=true -url=jdbc:mysql://127.0.0.1:3306/<%= polygene.name %>?profileSQL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true -driver=com.mysql.cj.jdbc.Driver -username=polygene -password=ThisIsGreat! http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-postgresql.properties ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-postgresql.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-postgresql.properties deleted file mode 100644 index 333d6aa..0000000 --- a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-postgresql.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# 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. -# -# -# -enabled=true -url=jdbc:postgres://127.0.0.1:5432/<%= polygene.name %> -driver=org.postgresql.Driver -username=polygene -password=ThisIsGreat! http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-sqlite.properties ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-sqlite.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-sqlite.properties deleted file mode 100644 index 5c49ece..0000000 --- a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-sqlite.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# 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. -# -# -# -enabled=true -url=jdbc:sqlite:sqlite-entities/ -driver=org.sqlite.JDBC -username=polygene -password=ThisIsGreat http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl b/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl index d5ae76b..74bec0b 100644 --- a/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl @@ -44,10 +44,10 @@ public class InfrastructureLayer extends LayeredLayerAssembler createModule( layer, <%= polygene.serialization %>SerializationModule.class ); createModule( layer, <%= polygene.metrics %>MetricsModule.class ); <% if( polygene.caching !== "None" ) { -%> createModule( layer, <%= polygene.caching %>CachingModule.class ); +%> createModule( layer, <%= polygene.caching %>CachingModule.class, configModule ); <% } -%> new <%= polygene.entitystore %>StorageModule( configModule ).assemble( layer, layer.module( <%= polygene.entitystore %>StorageModule.NAME ) ); - new <%= polygene.indexing %>IndexingModule( configModule ).assemble( layer, layer.module( <%= polygene.indexing %>IndexingModule.NAME ) ); +%> createModule( layer, <%= polygene.entitystore %>StorageModule.class, configModule ); + createModule( layer, <%= polygene.indexing %>IndexingModule.class, configModule ); return layer; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl b/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl index 54481cc..0eac743 100644 --- a/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl +++ b/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl @@ -47,13 +47,19 @@ if( polygene.entitystore !== 'Memory' && polygene.entitystore !== 'Preferences' <% } } -%>import org.apache.polygene.test.docker.DockerRule; +%> +import pl.domzal.junit.docker.rule.DockerRule; +import pl.domzal.junit.docker.rule.WaitFor; +import pl.domzal.junit.docker.rule.wait.StartCondition; +import pl.domzal.junit.docker.rule.wait.StartConditionCheck; + import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Test; public class BootstrapTest { - @Test + @Test @Ignore( "TODO: Testcase doesn't work for all combinations yet. Docker issues?" ) public void applicationBootstrapSucceeds() throws Exception { @@ -72,7 +78,9 @@ public class BootstrapTest protected void onModelCreated( ApplicationDescriptor model ) { ApplicationDetailDescriptor modelDescription = ApplicationDetailDescriptorBuilder.createApplicationDetailDescriptor( model ); + System.out.println( "Application Model" ); JsonWriter writer = Json.createWriter( System.out ); + System.out.println(); writer.writeObject( modelDescription.toJson() ); super.onModelCreated( model ); } @@ -94,15 +102,20 @@ if( polygene.entitystore === 'Cassandra' ) { { ModuleAssembly config = assembly.layer( ConfigurationLayer.NAME ).module( ConfigModule.NAME ); CassandraEntityStoreConfiguration defaults = config.forMixin( CassandraEntityStoreConfiguration.class ).declareDefaults(); - String host = DOCKER.getDockerHost(); - int port = DOCKER.getExposedContainerPort( "9042/tcp" ); + String host = ES_DOCKER.getDockerHost(); + int port = Integer.valueOf( ES_DOCKER.getExposedContainerPort( "9042/tcp" ) ); System.out.println("Cassandra: " + host + ":" + port); defaults.hostnames().set( host + ':' + port ); defaults.createIfMissing().set( true ); } @ClassRule - public static final DockerRule DOCKER = new DockerRule( "cassandra", "Starting listening for CQL clients" ); + public static final DockerRule ES_DOCKER = DockerRule.builder() + .imageName( "cassandra:latest" ) + .publishAllPorts( true ) + .waitForTimeout( 120 ) + .waitFor( WaitFor.logMessageSequence( "Starting listening for CQL clients" ) ) + .build(); <% } if( polygene.entitystore === 'DerbySQL' ) { %> @@ -139,6 +152,14 @@ if( polygene.entitystore === 'JClouds' ) { private void entityStoreSetup(ApplicationAssembly assembly ) { } + + @ClassRule + public static final DockerRule ES_DOCKER = DockerRule.builder() + .imageName( "scality/s3server:latest" ) + .publishAllPorts( true ) + .waitForTimeout( 120 ) + .waitFor( WaitFor.logMessageSequence( "server started" ) ) + .build(); <% } if( polygene.entitystore === 'Jdbm' ) { %> @@ -171,18 +192,17 @@ if( polygene.entitystore === 'MySQL' ) { } @ClassRule - public static final DockerRule DOCKER = new DockerRule( - "mysql", - new HashMap<String, String>() - {{ - put( "MYSQL_ROOT_PASSWORD", "" ); - put( "MYSQL_ALLOW_EMPTY_PASSWORD", "yes" ); - put( "MYSQL_DATABASE", "jdbc_test_db" ); - put( "MYSQL_ROOT_HOST", "172.17.0.1" ); - }}, - 30000L -// , "mysqld: ready for connections" TODO: add this after next release of tdomzal/junit-docker-rule - ); + public static final DockerRule ES_DOCKER = DockerRule.builder() + .imageName( "mariadb:latest" ) + .publishAllPorts( true ) + .waitForTimeout( 120 ) + .env("MYSQL_ROOT_PASSWORD", "") + .env("MYSQL_ALLOW_EMPTY_PASSWORD", "yes") + .env("MYSQL_DATABASE", "jdbc_test_db") + .env("MYSQL_ROOT_HOST", "172.17.0.1") +// .waitFor( WaitFor.logMessageSequence( "mysqld: ready for connections" ) ) TODO: add this after next release of tdomzal/junit-docker-rule + .waitFor( new DelayChecker( 30000L ) ) + .build(); <% } if( polygene.entitystore === 'PostgreSQL' ) { %> @@ -191,8 +211,13 @@ if( polygene.entitystore === 'PostgreSQL' ) { } @ClassRule - public static final DockerRule DOCKER = - new DockerRule( "postgres", 3000L, "PostgreSQL init process complete; ready for start up." ); + public static final DockerRule ES_DOCKER = DockerRule.builder() + .imageName( "<%= polygene.packagename %>-postgresql" ) + .publishAllPorts( true ) + .waitForTimeout( 120 ) + .waitFor( WaitFor.logMessageSequence( "PostgreSQL init process complete; ready for start up." ) ) + .waitFor( new DelayChecker( 3000L ) ) + .build(); <% } if( polygene.entitystore === 'Preferences' ) { %> @@ -207,7 +232,11 @@ if( polygene.entitystore === 'Redis' ) { } @ClassRule - public static final DockerRule DOCKER = new DockerRule( "redis", 6379 ); + public static final DockerRule ES_DOCKER = DockerRule.builder() + .imageName( "redis:latest" ) + .publishAllPorts( true ) + .waitForTimeout( 120 ) + .waitFor( pl.domzal.junit.docker.rule.WaitFor.tcpPort( 6379 ) ).build(); <% } if( polygene.entitystore === 'Riak' ) { %> @@ -216,13 +245,83 @@ if( polygene.entitystore === 'Riak' ) { } @ClassRule - public static final DockerRule DOCKER = new DockerRule( "riak","riak_auth_mods started on node"); + public static final DockerRule ES_DOCKER = DockerRule.builder() + .imageName( "basho/riak-kv:latest" ) + .publishAllPorts( true ) + .waitForTimeout( 120 ) + .waitFor( WaitFor.logMessageSequence( "riak_auth_mods started on node" ) ).build(); <% } if( polygene.entitystore === 'SQLite' ) { %> private void entityStoreSetup(ApplicationAssembly assembly ) { } +<% } +if( polygene.caching === 'Memcache' ) { +%> + @ClassRule + public static final DockerRule CACHE_DOCKER = DockerRule.builder() + .imageName( "memcached:latest" ) + .expose( "11211", "11211" ) + .waitForTimeout( 120 ) + .build(); + +<% } +if( polygene.caching === 'EhCache' ) { +%> + @ClassRule + public static final DockerRule CACHE_DOCKER = DockerRule.builder() + .imageName( "terracotta/terracotta-server-oss:latest" ) + .publishAllPorts( true ) + .waitForTimeout( 120 ) + .build(); +<% } +if( polygene.indexing === 'ElasticSearch' ) { +%> + @ClassRule + public static final DockerRule INDEXING_DOCKER = DockerRule.builder() + .imageName( "docker.elastic.co/elasticsearch/elasticsearch:latest" ) + .publishAllPorts( true ) + .waitForTimeout( 120 ) + .build(); <% } %> + + private static class DelayChecker + implements StartCondition + { + private final long millis; + private final long doneAt; + + DelayChecker( long millis ) + { + this.millis = millis; + this.doneAt = System.currentTimeMillis() + millis; + } + + @Override + public StartConditionCheck build( DockerRule currentRule ) + { + return new StartConditionCheck() + { + + @Override + public boolean check() + { + return System.currentTimeMillis() > doneAt; + } + + @Override + public String describe() + { + return String.format( "delay check %d ms", millis ); + } + + @Override + public void after() + { + } + }; + } + } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl index 4926bc7..0d8431a 100644 --- a/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl +++ b/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl @@ -34,11 +34,47 @@ if( hasFeature( 'security' ) ) { } %> implementation "org.apache.polygene.core:org.apache.polygene.core.spi:$polygeneVersion" implementation "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$polygeneVersion" + + implementation "org.apache.polygene.extensions:org.apache.polygene.extension.entitystore-<%= polygene.entitystoremodule.toLowerCase() %>:$polygeneVersion" + implementation "org.apache.polygene.extensions:org.apache.polygene.extension.indexing-<%= polygene.indexing.toLowerCase() %>:$polygeneVersion" + implementation "org.apache.polygene.extensions:org.apache.polygene.extension.serialization-<%= polygene.serialization.toLowerCase() %>:$polygeneVersion" +<% +if( polygene.caching !== "None" ) { +%> implementation "org.apache.polygene.extensions:org.apache.polygene.extension.cache-<%= polygene.caching.toLowerCase() %>:$polygeneVersion" <% +} +if( polygene.metrics !== "None" ) { +%> implementation "org.apache.polygene.extensions:org.apache.polygene.extension.metrics-<%= polygene.metrics.toLowerCase() %>:$polygeneVersion" +<% +} if( hasFeature( 'envisage' ) ) { %> implementation "org.apache.polygene.tools:org.apache.polygene.tool.envisage:$polygeneVersion" <% } +if( polygene.entitystore == 'LevelDB' ) { +%> implementation "org.fusesource.leveldbjni:leveldbjni-all:1.8" +<% +} +if( polygene.entitystore == 'DerbySQL' ) { +%> implementation "org.apache.derby:derby:10.13.1.1" +<% +} +if( polygene.entitystore == 'H2SQL' ) { +%> implementation "com.h2database:h2:1.4.194" +<% +} +if( polygene.entitystore == 'MySQL' ) { +%> implementation "mysql:mysql-connector-java:6.0.6" +<% +} +if( polygene.entitystore == 'PostgreSQL' ) { +%> implementation "org.postgresql:postgresql:42.0.0" +<% +} +if( polygene.entitystore == 'SQLite' ) { +%> implementation "org.xerial:sqlite-jdbc:3.16.1" +<% +} %> runtimeOnly "org.apache.polygene.core:org.apache.polygene.core.runtime:$polygeneVersion" @@ -51,24 +87,5 @@ if( hasFeature( 'envisage' ) ) { testImplementation "org.apache.polygene.tools:org.apache.polygene.tool.model-detail:$polygeneVersion" testImplementation "org.apache.polygene.core:org.apache.polygene.core.testsupport:$polygeneVersion" -<% -if( polygene.entitystore.indexOf('SQL') >= 0 ) { - if( polygene.dbpool !== 'None' ) { -%> testImplementation "org.apache.polygene.libraries:org.apache.polygene.library.sql-<%= polygene.dbpool.toLowerCase() %>:$polygeneVersion" -<% - } + testImplementation "com.github.tdomzal:junit-docker-rule:0.3" } -%> - testImplementation "org.apache.polygene.extensions:org.apache.polygene.extension.entitystore-<%= polygene.entitystoremodule.toLowerCase() %>:$polygeneVersion" - testImplementation "org.apache.polygene.extensions:org.apache.polygene.extension.indexing-<%= polygene.indexing.toLowerCase() %>:$polygeneVersion" - testImplementation "org.apache.polygene.extensions:org.apache.polygene.extension.serialization-<%= polygene.serialization.toLowerCase() %>:$polygeneVersion" -<% -if( polygene.caching !== "None" ) { -%> testImplementation "org.apache.polygene.extensions:org.apache.polygene.extension.cache-<%= polygene.caching.toLowerCase() %>:$polygeneVersion" -<% -} - if( polygene.metrics !== "None" ) { -%> testImplementation "org.apache.polygene.extensions:org.apache.polygene.extension.metrics-<%= polygene.metrics.toLowerCase() %>:$polygeneVersion" -<% - } -%>} http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a5feec04/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl index 7f1f06d..a8d499c 100644 --- a/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl +++ b/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl @@ -38,11 +38,9 @@ if( polygene.applicationtype === 'Rest API' ) { <% } -if( polygene.entitystore.indexOf('SQL') >= 0 ) { - if( polygene.dbpool !== 'None' ) { +if( polygene.entitystore.indexOf('SQL') >= 0 || polygene.indexing === 'SQL' ) { %> implementation "org.apache.polygene.libraries:org.apache.polygene.library.sql-<%= polygene.dbpool.toLowerCase() %>:$polygeneVersion" <% - } } %> implementation "org.apache.polygene.extensions:org.apache.polygene.extension.entitystore-<%= polygene.entitystoremodule.toLowerCase() %>:$polygeneVersion"
