You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rs...@apache.org on 2008/09/02 20:13:57 UTC
svn commit: r691337 -
/tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
Author: rsivaram
Date: Tue Sep 2 11:13:56 2008
New Revision: 691337
URL: http://svn.apache.org/viewvc?rev=691337&view=rev
Log:
Modify import version for OSGi framework packages
Modified:
tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
Modified: tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java?rev=691337&r1=691336&r2=691337&view=diff
==============================================================================
--- tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java (original)
+++ tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java Tue Sep 2 11:13:56 2008
@@ -347,7 +347,7 @@
String artifactId = artifact.getGroupId() + ":" + artifact.getArtifactId();
String bundleSymName = (String)attributes.getValue("Bundle-SymbolicName");
- if (!bundleSymName.startsWith("org.apache.tuscany")) {
+ if (!bundleSymName.startsWith("org.apache.tuscany.sca")) {
bundleSymName = "org.apache.tuscany.sca.3rdparty." + bundleSymName;
attributes.putValue("Bundle-SymbolicName", bundleSymName);
@@ -376,7 +376,10 @@
Map importAttr = (Map)importMap.get(pkg);
String version = (String)importAttr.get("version");
if (version != null && version.indexOf(',') == -1) {
- if (!version.matches(".*\\..*\\.")) {
+ if (((String)pkg).startsWith("org.osgi")) {
+ // Leave version as is - for OSGi packages, assume backward compatibility
+ }
+ else if (!version.matches(".*\\..*\\.")) {
Version curVersion = new Version(version);
Version nextVersion = new Version(curVersion.getMajor(), curVersion.getMinor()+1, 0);
version = '[' + version + ',' + nextVersion + ')';
@@ -499,4 +502,4 @@
}
}
}
-}
\ No newline at end of file
+}