Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E1139200CEC for ; Mon, 10 Jul 2017 08:53:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DFAA016726A; Mon, 10 Jul 2017 06:53:10 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C745016717A for ; Mon, 10 Jul 2017 08:53:09 +0200 (CEST) Received: (qmail 82799 invoked by uid 500); 10 Jul 2017 06:53:08 -0000 Mailing-List: contact commits-help@polygene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@polygene.apache.org Delivered-To: mailing list commits@polygene.apache.org Received: (qmail 81985 invoked by uid 99); 10 Jul 2017 06:53:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2017 06:53:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6085BF553E; Mon, 10 Jul 2017 06:53:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: niclas@apache.org To: commits@polygene.apache.org Date: Mon, 10 Jul 2017 06:53:36 -0000 Message-Id: <4ebea13a1609445ea63e16376c1e226a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [34/50] polygene-java git commit: Stanislav correctly identified a new regexp to be used. archived-at: Mon, 10 Jul 2017 06:53:11 -0000 Stanislav correctly identified a new regexp to be used. Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/c9d8c249 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/c9d8c249 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/c9d8c249 Branch: refs/heads/es-jooq Commit: c9d8c249642d6edb2ea29409a462a25ff0efc9cb Parents: 8393d86 Author: niclas Authored: Sun Jul 9 09:48:37 2017 +0800 Committer: niclas Committed: Sun Jul 9 09:48:37 2017 +0800 ---------------------------------------------------------------------- .../index/sql/support/skeletons/AbstractSQLStartup.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c9d8c249/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java index e2d2cc6..6a8aa12 100644 --- a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java +++ b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java @@ -1654,9 +1654,14 @@ public abstract class AbstractSQLStartup + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END ) + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_START ) + "(.*)" + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END ) - + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_START ) + "(" + "[^" + + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_START ) + + "([^" + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END + DESCRIPTOR_TYPE_SEPARATOR ) - + "]+)" + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END ) + "$" ); + + "]+)" + + "(,[^" + + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END + DESCRIPTOR_TYPE_SEPARATOR ) + + "]+)*" + + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END ) + "$" ); protected static String compositeDescriptorToString( LayerDescriptor layer, ModuleDescriptor module, CompositeDescriptor descriptor )