You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ga...@apache.org on 2010/02/18 00:37:06 UTC
svn commit: r911226 -
/incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java
Author: gawor
Date: Wed Feb 17 23:37:06 2010
New Revision: 911226
URL: http://svn.apache.org/viewvc?rev=911226&view=rev
Log:
Use complete manifest information to compute hashCode for the symbolic name
Modified:
incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java
Modified: incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java?rev=911226&r1=911225&r2=911226&view=diff
==============================================================================
--- incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java (original)
+++ incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java Wed Feb 17 23:37:06 2010
@@ -300,15 +300,6 @@
}
properties.put(Constants.BUNDLE_MANIFESTVERSION, manifestVersion);
- //
- // Bundle-SymbolicName
- //
-
- if (manifest.getMainAttributes().getValue(Constants.BUNDLE_SYMBOLICNAME) == null
- && !properties.containsKey(Constants.BUNDLE_SYMBOLICNAME)) {
- properties.put(Constants.BUNDLE_SYMBOLICNAME, warName + "_" + manifest.hashCode());
- }
-
//
// Bundle-ClassPath
//
@@ -407,7 +398,15 @@
for (Map.Entry<String, String> entry : properties.entrySet()) {
String key = entry.getKey();
String value = entry.getValue();
- manifest.getMainAttributes().put(new Attributes.Name(key), value);
+ manifest.getMainAttributes().putValue(key, value);
+ }
+
+ //
+ // Bundle-SymbolicName
+ //
+
+ if (manifest.getMainAttributes().getValue(Constants.BUNDLE_SYMBOLICNAME) == null) {
+ manifest.getMainAttributes().putValue(Constants.BUNDLE_SYMBOLICNAME, warName + "_" + manifest.hashCode());
}
return manifest;