You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2006/03/09 22:20:04 UTC
svn commit: r384619 - in /incubator/felix/trunk:
org.apache.felix.framework/src/main/java/org/apache/felix/framework/
org.apache.felix.main/src/main/manifest/
tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/
Author: rickhall
Date: Thu Mar 9 13:20:02 2006
New Revision: 384619
URL: http://svn.apache.org/viewcvs?rev=384619&view=rev
Log:
Modified main manifest to use new version numbers (this needs to be automated)
and modified Felix and maven plugin to convert Maven versions into OSGi
versions by replacing the '-' with a '.' to separate the qualifier.
Modified:
incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
incubator/felix/trunk/org.apache.felix.main/src/main/manifest/Manifest.mf
incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java
Modified: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java?rev=384619&r1=384618&r2=384619&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java Thu Mar 9 13:20:02 2006
@@ -3323,8 +3323,6 @@
FelixConstants.FRAMEWORK_PROCESSOR,
System.getProperty("os.arch"));
m_configMutable.put(FelixConstants.FRAMEWORK_PROCESSOR, s);
-
-
m_configMutable.put(
FelixConstants.FELIX_VERSION_PROPERTY, getFrameworkVersion());
}
@@ -3346,8 +3344,18 @@
{
ex.printStackTrace();
}
-
- return props.getProperty(FelixConstants.FELIX_VERSION_PROPERTY, "unknown");
+
+ // Maven uses a '-' to separate the version qualifier,
+ // while OSGi uses a '.', so we need to convert to a '.'
+ StringBuffer sb =
+ new StringBuffer(
+ props.getProperty(
+ FelixConstants.FELIX_VERSION_PROPERTY, "unknown"));
+ if (sb.indexOf("-") >= 0)
+ {
+ sb.setCharAt(sb.indexOf("-"), '.');
+ }
+ return sb.toString();
}
private void processAutoProperties()
Modified: incubator/felix/trunk/org.apache.felix.main/src/main/manifest/Manifest.mf
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.main/src/main/manifest/Manifest.mf?rev=384619&r1=384618&r2=384619&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.main/src/main/manifest/Manifest.mf (original)
+++ incubator/felix/trunk/org.apache.felix.main/src/main/manifest/Manifest.mf Thu Mar 9 13:20:02 2006
@@ -1,5 +1,5 @@
Main-Class: org.apache.felix.main.Main
-Class-Path: ../lib/org.osgi-0.8-SNAPSHOT.jar
- ../lib/org.apache.felix.moduleloader-0.8-SNAPSHOT.jar
- ../lib/org.apache.felix.framework-0.8-SNAPSHOT.jar
-
\ No newline at end of file
+Class-Path: ../lib/org.osgi-0.8.0-SNAPSHOT.jar
+ ../lib/org.apache.felix.moduleloader-0.8.0-SNAPSHOT.jar
+ ../lib/org.apache.felix.framework-0.8.0-SNAPSHOT.jar
+
Modified: incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java?rev=384619&r1=384618&r2=384619&view=diff
==============================================================================
--- incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java (original)
+++ incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java Thu Mar 9 13:20:02 2006
@@ -269,7 +269,14 @@
*/
private void addBundleVersion()
{
- archiveConfig.addManifestEntry( "Bundle-Version", project.getVersion() );
+ // Maven uses a '-' to separate the version qualifier,
+ // while OSGi uses a '.', so we need to convert to a '.'
+ StringBuffer sb = new StringBuffer(project.getVersion());
+ if (sb.indexOf("-") >= 0)
+ {
+ sb.setCharAt(sb.indexOf("-"), '.');
+ }
+ archiveConfig.addManifestEntry( "Bundle-Version", sb.toString() );
}
/**