aries-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alasdair Nottingham <...@apache.org>
Subject Re: svn commit: r887358 - in /incubator/aries/trunk/application/application-utils/src: main/java/org/apache/aries/application/utils/manifest/ManifestProcessor.java test/resources/META-INF/APPLICATION.MF
Date Mon, 07 Dec 2009 11:34:50 GMT
Hi,

I've been in the process of making parsing improvements under ARIES-52
for a few weeks now. I just committed a few more changes, I think my
changes fix the problems you were fixing here, but I may have made a
mistake as I couldn't find a JIRA explaining the fixes you made. Mine
fixed some problems I introduced when I first made some changes under
ARIES-52.

If you could take a look and make sure you are happy I haven't
regressed your changes I would appreciate it.

Thanks
Alasdair

2009/12/4  <gawor@apache.org>:
> Author: gawor
> Date: Fri Dec  4 21:11:30 2009
> New Revision: 887358
>
> URL: http://svn.apache.org/viewvc?rev=887358&view=rev
> Log:
> another manifest parsing fix
>
> Modified:
>    incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestProcessor.java
>    incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION.MF
>
> Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestProcessor.java
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestProcessor.java?rev=887358&r1=887357&r2=887358&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestProcessor.java
(original)
> +++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestProcessor.java
Fri Dec  4 21:11:30 2009
> @@ -88,20 +88,20 @@
>     String namedAttribute = null;
>
>     while ((line = reader.readLine()) != null) {
> -      line = line.trim();
> +      String trimmedLine = line.trim();
>       // if we get a blank line skip to the next one
> -      if (line.length() == 0) continue;
> +      if (trimmedLine.length() == 0) continue;
>       if (line.charAt(0) == ' ' && attribute != null) {
>         // we have a continuation line, so add to the builder, ignoring the
>         // first character
> -        attribute.append(line.substring(1));
> +        attribute.append(trimmedLine);
>       } else if (attribute == null) {
> -        attribute = new StringBuilder(line);
> +        attribute = new StringBuilder(trimmedLine);
>       } else if (attribute != null) {
>         // We have fully parsed an attribute
>         namedAttribute = setAttribute(man, namedAttribute, attribute);
>
> -        attribute = new StringBuilder(line);
> +        attribute = new StringBuilder(trimmedLine);
>       }
>     }
>
>
> Modified: incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION.MF
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION.MF?rev=887358&r1=887357&r2=887358&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION.MF
(original)
> +++ incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION.MF
Fri Dec  4 21:11:30 2009
> @@ -3,7 +3,8 @@
>  Application-Name: Travel Reservation
>  Application-SymbolicName: com.travel.reservation
>  Application-Version: 1.2
> -Application-Content: com.travel.reservation.web;version="[1.1.0,1.2.0)",com.travel.reservation.business
> +Application-Content: com.travel.reservation.web;version="[1.1.0,1.2.0)",
> + com.travel.reservation.business
>  Export-Package: com.travel.reservation.api;version=1.2
>  Import-Package: com.travel.flight.api;version="[2.1.1,3.0.0)",com.travel.rail.api;version="[1.0.0,2.0.0)"
>  Application-Services: services.xml
>
>
>



-- 
Alasdair Nottingham
not@apache.org

Mime
View raw message