implementation search method

Issue imixs#554

imixs-workflow-core/src/main/java/org/imixs/workflow/util/JSONParser.java

@@ -45,6 +45,9 @@ public class JSONParser {
 	 * @return - the json value or the json object for the corresponding json key
 	 */
 	public static String getKey(String key, String json) {
+		if (json==null || json.isEmpty()) {
+			return null;
+		}
 		String result = null;
 		// now extract the key
 		JsonParser parser = Json.createParser(new StringReader(json));

imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/SetupService.java

@@ -38,7 +38,6 @@
 import javax.annotation.Resource;
 import javax.annotation.security.DeclareRoles;
 import javax.annotation.security.RunAs;
-import javax.ejb.EJB;
 import javax.ejb.Singleton;
 import javax.ejb.Startup;
 import javax.ejb.Timer;
@@ -154,12 +153,6 @@ public void startup() {
 			}
 		}
 
-		// migrate old workflow scheduler
-		migrateWorkflowScheduler();
-
-		// next start optional schedulers
-		logger.info("...initalizing schedulers...");
-		schedulerService.startAllSchedulers();
 
 		// Finally fire the SetupEvent. This allows CDI Observers to react on the setup 
 		if (setupEvents != null) {
@@ -170,6 +163,16 @@ public void startup() {
 			logger.warning("Missing CDI support for Event<SetupEvent> !");
 		}
 
+
+
+
+		// migrate old workflow scheduler
+		migrateWorkflowScheduler();
+
+		// Finally start optional schedulers
+		logger.info("...initalizing schedulers...");
+		schedulerService.startAllSchedulers();
+
 	}
 
 	/**

imixs-workflow-index-lucene/src/main/java/org/imixs/workflow/engine/lucene/LuceneIndexService.java

@@ -84,9 +84,7 @@ public class LuceneIndexService {
 
 	public static final String ANONYMOUS = "ANONYMOUS";
 	public static final String DEFAULT_ANALYSER = "org.apache.lucene.analysis.standard.ClassicAnalyzer";
-	public static final String DEFAULT_INDEX_DIRECTORY = "imixs-workflow-index";
-
-
+	public static final String DEFAULT_INDEX_DIRECTORY = "imixs-workflow-index";	
 
 	@PersistenceContext(unitName = "org.imixs.workflow.jpa")
 	private EntityManager manager;
@@ -228,7 +226,7 @@ public void rebuildIndex(Directory indexDir) throws IOException {
 	 *            of ItemCollections to be indexed
 	 * @throws IndexException
 	 */
-	public void updateDocumentsUncommitted(Collection<ItemCollection> documents) {
+	public void indexDocuments(Collection<ItemCollection> documents) {
 
 		IndexWriter awriter = null;
 		long ltime = System.currentTimeMillis();

imixs-workflow-index-lucene/src/main/java/org/imixs/workflow/engine/lucene/LuceneUpdateService.java

@@ -30,7 +30,6 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import javax.annotation.PostConstruct;
 import javax.ejb.Singleton;
 import javax.inject.Inject;
 
@@ -70,21 +69,9 @@ public class LuceneUpdateService implements UpdateService {
 
 	@Inject
 	private LuceneIndexService luceneIndexService;
-
 
 	private static Logger logger = Logger.getLogger(LuceneUpdateService.class.getName());
 
-	/**
-	 * PostContruct event - The method loads the lucene index properties from the
-	 * imixs.properties file from the classpath. If no properties are defined the
-	 * method terminates.
-	 * 
-	 */
-	@PostConstruct
-	void init() {
-		logger.finest("......lucene IndexDir=" + luceneIndexService.getLuceneIndexDir());
-	}
-
 	/**
 	 * This method adds a collection of documents to the Lucene index. The documents
 	 * are added immediately to the index. Calling this method within a running
@@ -100,7 +87,7 @@ void init() {
 	 */
 	@Override
 	public void updateIndex(List<ItemCollection> documents) {
-		luceneIndexService.updateDocumentsUncommitted(documents);
+		luceneIndexService.indexDocuments(documents);
 
 	}