You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jw...@apache.org on 2012/11/28 22:55:16 UTC
svn commit: r1414952 - in
/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive:
Grammar.java ImportPackageHeader.java
Author: jwross
Date: Wed Nov 28 21:55:15 2012
New Revision: 1414952
URL: http://svn.apache.org/viewvc?rev=1414952&view=rev
Log:
Whitespace between package name and semi-colon should be ignored in import package header.
Modified:
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/Grammar.java
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/ImportPackageHeader.java
Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/Grammar.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/Grammar.java?rev=1414952&r1=1414951&r2=1414952&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/Grammar.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/Grammar.java Wed Nov 28 21:55:15 2012
@@ -111,7 +111,7 @@ public interface Grammar {
public static final String UNIQUENAME = IDENTIFIER + "(?:\\." + IDENTIFIER + ")*";
public static final String SYMBOLICNAME = TOKEN + "(?:\\." + TOKEN + ")*";
public static final String PACKAGENAME = UNIQUENAME;
- public static final String PACKAGENAMES = PACKAGENAME + "(?:\\;\\s*" + PACKAGENAME + ")*";
+ public static final String PACKAGENAMES = PACKAGENAME + "\\s*(?:\\;\\s*" + PACKAGENAME + ")*";
public static final String IMPORT = PACKAGENAMES + "(?:;\\s*(?:" + PARAMETER + "))*";
public static final String IMPORTPACKAGE = IMPORT + "(?:\\,\\s*" + IMPORT + ")*";
Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/ImportPackageHeader.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/ImportPackageHeader.java?rev=1414952&r1=1414951&r2=1414952&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/ImportPackageHeader.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/ImportPackageHeader.java Wed Nov 28 21:55:15 2012
@@ -73,7 +73,7 @@ public class ImportPackageHeader impleme
public Clause(String clause) {
Matcher matcher = PATTERN1.matcher(clause);
if (matcher.find())
- myPath = matcher.group();
+ myPath = matcher.group().replaceAll("\\s", "");
else
throw new IllegalArgumentException("Invalid " + Constants.IMPORT_PACKAGE + " header clause: " + clause);
matcher.usePattern(PATTERN2);