svn commit: r1174168 - in /felix/trunk/framework: ./ src/main/java/org/apache/felix/framework/ src/main/resources/org/apache/felix/ src/main/resources/org/apache/felix/framework/

[ri...@apache.org]

Author: rickhall
Date: Thu Sep 22 14:44:04 2011
New Revision: 1174168

URL: http://svn.apache.org/viewvc?rev=1174168&view=rev
Log:
Revert changes to make framework version a compile-time substitution. (FELIX-3035)

Added:
    felix/trunk/framework/src/main/resources/org/apache/felix/
    felix/trunk/framework/src/main/resources/org/apache/felix/framework/
    felix/trunk/framework/src/main/resources/org/apache/felix/framework/Felix.properties
Modified:
    felix/trunk/framework/pom.xml
    felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

Modified: felix/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/framework/pom.xml?rev=1174168&r1=1174167&r2=1174168&view=diff
==============================================================================
--- felix/trunk/framework/pom.xml (original)
+++ felix/trunk/framework/pom.xml Thu Sep 22 14:44:04 2011
@@ -80,36 +80,16 @@
                   <exclude>src/main/appended-resources/**</exclude>
                   <exclude>src/**/packageinfo</exclude>
                   <exclude>src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory</exclude>
+                  <exclude>src/main/resources/org/apache/felix/framework/Felix.properties</exclude>
               </excludes>
             </configuration>
       </plugin>
     </plugins>
     <resources>
-      <!-- Add back in the default resources, since we are overriding resources. -->
       <resource>
         <directory>src/main/resources</directory>
         <filtering>true</filtering>
       </resource>
-      <!-- Copy Felix.java with property substitution enabled to get version. -->
-      <resource>
-        <directory>src/main/java</directory>
-        <includes>
-            <include>org/apache/felix/framework/Felix.java</include>
-        </includes>
-        <filtering>true</filtering>
-        <targetPath>../filtered-sources/java</targetPath>
-      </resource>
-      <!-- Copy other source files with no property substitution. -->
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-            <exclude>org/apache/felix/framework/Felix.java</exclude>
-        </excludes>
-        <filtering>false</filtering>
-        <targetPath>../filtered-sources/java</targetPath>
-      </resource>
     </resources>
-    <!-- Set the source directory to be the filtered source files. -->
-    <sourceDirectory>target/filtered-sources/java</sourceDirectory>
   </build>
 </project>

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=1174168&r1=1174167&r2=1174168&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Thu Sep 22 14:44:04 2011
@@ -73,9 +73,6 @@ import org.osgi.service.packageadmin.Exp
 
 public class Felix extends BundleImpl implements Framework
 {
-    // This value is substituted by maven when building the framework.
-    private static final String m_frameworkVersion = "${pom.version}";
-
     // The secure action used to do privileged calls
     static final SecureAction m_secureAction = new SecureAction();
 
@@ -4307,9 +4304,27 @@ public class Felix extends BundleImpl im
     **/
     private static String getFrameworkVersion()
     {
+        // The framework version property.
+        Properties props = new Properties();
+        InputStream in = Felix.class.getResourceAsStream("Felix.properties");
+        if (in != null)
+        {
+            try
+            {
+                props.load(in);
+            }
+            catch (IOException ex)
+            {
+                ex.printStackTrace();
+            }
+        }
+
         // Maven uses a '-' to separate the version qualifier,
         // while OSGi uses a '.', so we need to convert to a '.'
-        StringBuffer sb = new StringBuffer(m_frameworkVersion);
+        StringBuffer sb =
+            new StringBuffer(
+                props.getProperty(
+                    FelixConstants.FELIX_VERSION_PROPERTY, "0.0.0"));
         if (sb.toString().indexOf("-") >= 0)
         {
             sb.setCharAt(sb.toString().indexOf("-"), '.');

Added: felix/trunk/framework/src/main/resources/org/apache/felix/framework/Felix.properties
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/resources/org/apache/felix/framework/Felix.properties?rev=1174168&view=auto
==============================================================================
--- felix/trunk/framework/src/main/resources/org/apache/felix/framework/Felix.properties (added)
+++ felix/trunk/framework/src/main/resources/org/apache/felix/framework/Felix.properties Thu Sep 22 14:44:04 2011
@@ -0,0 +1 @@
+felix.version=${pom.version}