You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2008/01/29 12:58:07 UTC
svn commit: r616274 -
/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
Author: mcculls
Date: Tue Jan 29 03:58:01 2008
New Revision: 616274
URL: http://svn.apache.org/viewvc?rev=616274&view=rev
Log:
FELIX-472: refactor property update code
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java?rev=616274&r1=616273&r2=616274&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java Tue Jan 29 03:58:01 2008
@@ -291,27 +291,6 @@
File sourceFile = dependency.getFile();
if ( null != sourceFile && sourceFile.exists() )
{
- String bundleClassPath = properties.getProperty( Analyzer.BUNDLE_CLASSPATH );
- String includeResource = properties.getProperty( Analyzer.INCLUDE_RESOURCE );
-
- if ( null == bundleClassPath )
- {
- bundleClassPath = ".,";
- }
- else if ( bundleClassPath.length() > 0 )
- {
- bundleClassPath += ",";
- }
-
- if ( null == includeResource )
- {
- includeResource = "";
- }
- else if ( includeResource.length() > 0 )
- {
- includeResource += ",";
- }
-
String embedDirectory = m_embedDirectory;
if ( "".equals( embedDirectory ) || ".".equals( embedDirectory ) )
{
@@ -349,8 +328,32 @@
targetFilePath = targetFilePath.replace( File.separatorChar, '/' );
}
+ String bundleClassPath = properties.getProperty( Analyzer.BUNDLE_CLASSPATH );
+ String includeResource = properties.getProperty( Analyzer.INCLUDE_RESOURCE );
+
+ if ( null == includeResource )
+ {
+ includeResource = "";
+ }
+ else if ( includeResource.length() > 0 )
+ {
+ includeResource += ",";
+ }
+
+ includeResource += targetFilePath;
+ includeResource += "=";
+ includeResource += sourceFile;
+
+ if ( null == bundleClassPath )
+ {
+ bundleClassPath = ".,";
+ }
+ else if ( bundleClassPath.length() > 0 )
+ {
+ bundleClassPath += ",";
+ }
+
bundleClassPath += targetFilePath;
- includeResource += targetFilePath + "=" + sourceFile;
properties.setProperty( Analyzer.BUNDLE_CLASSPATH, bundleClassPath );
properties.setProperty( Analyzer.INCLUDE_RESOURCE, includeResource );
@@ -374,7 +377,8 @@
includeResource += ",";
}
- includeResource += "@" + sourceFile;
+ includeResource += "@";
+ includeResource += sourceFile;
properties.setProperty( Analyzer.INCLUDE_RESOURCE, includeResource );
}