Author: mcculls
Date: Tue Oct 16 07:13:49 2007
New Revision: 585149
URL: http://svn.apache.org/viewvc?rev=585149&view=rev
Log:
FELIX-390: upgrade to BND 0.0.203, and remove redundant getPackages method
Modified:
felix/trunk/bundleplugin/pom.xml
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
Modified: felix/trunk/bundleplugin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/pom.xml?rev=585149&r1=585148&r2=585149&view=diff
==============================================================================
--- felix/trunk/bundleplugin/pom.xml (original)
+++ felix/trunk/bundleplugin/pom.xml Tue Oct 16 07:13:49 2007
@@ -51,7 +51,7 @@
<dependency>
<groupId>biz.aQute</groupId>
<artifactId>bndlib</artifactId>
- <version>0.0.198</version>
+ <version>0.0.203</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
URL:
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=585149&r1=585148&r2=585149&view=diff
==============================================================================
---
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
(original)
+++
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Tue Oct 16 07:13:49 2007
@@ -500,7 +500,7 @@
return project.getBuild().getFinalName() + ".jar";
}
- public String getBuildDirectory()
+ protected String getBuildDirectory()
{
return this.buildDirectory;
}
@@ -508,26 +508,6 @@
void setBuildDirectory(String buildirectory)
{
this.buildDirectory = buildirectory;
- }
-
- /**
- * Get a list of packages inside a Jar
- *
- * @param jar
- * @return list of package names
- */
- public List getPackages(Jar jar)
- {
- List packages = new ArrayList();
- for (Iterator p = jar.getDirectories().entrySet().iterator();
p.hasNext();)
- {
- Map.Entry directory = (Map.Entry) p.next();
- String path = (String) directory.getKey();
-
- String pack = path.replace('/', '.');
- packages.add(pack);
- }
- return packages;
}
protected Properties getDefaultProperties(MavenProject project)
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=585149&r1=585148&r2=585149&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 Oct 16 07:13:49 2007
@@ -30,7 +30,7 @@
import aQute.lib.osgi.Analyzer;
import aQute.lib.osgi.Instruction;
-import aQute.lib.osgi.header.OSGiHeader;
+import aQute.lib.header.OSGiHeader;
/**
* Add BND directives to embed selected dependencies inside a bundle
Modified:
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java?rev=585149&r1=585148&r2=585149&view=diff
==============================================================================
---
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
(original)
+++
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
Tue Oct 16 07:13:49 2007
@@ -19,18 +19,13 @@
* under the License.
*/
-import org.apache.felix.bundleplugin.PackageVersionAnalyzer;
import java.io.File;
-import java.io.IOException;
-import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.jar.JarArchiver;
import aQute.lib.osgi.Analyzer;
import aQute.lib.osgi.Jar;
@@ -120,38 +115,6 @@
analyzer.calcManifest();
assertEquals( 3, analyzer.getExports().size() );
- }
-
- public void testGetPackages()
- throws Exception
- {
- File jarFile = getTestFile( "target/test-jar.jar" );
-
- createTestJar( jarFile );
-
- Jar jar = new Jar( "testJar", jarFile );
- List packages = plugin.getPackages( jar );
-
- assertEquals( 4, packages.size() );
- int i = 0;
- assertEquals( "META-INF", packages.get( i++ ) );
- assertEquals(
"META-INF.maven.org.apache.maven.plugins.maven-bundle-plugin", packages.get(
i++ ) );
- assertEquals( "org.apache.maven.test", packages.get( i++ ) );
- assertEquals( "org.apache.maven.test.resources", packages.get( i++ ) );
- }
-
- private void createTestJar( File jarFile )
- throws ArchiverException, IOException
- {
- JarArchiver archiver = new JarArchiver();
- archiver
- .addFile( getTestFile( "target/classes/" +
BundlePlugin.class.getName().replace( '.', '/' ) + ".class" ),
- "org/apache/maven/test/BundlePlugin.class" );
- archiver.addFile( getTestFile( "pom.xml" ),
-
"META-INF/maven/org.apache.maven.plugins/maven-bundle-plugin/pom.xml" );
- archiver.addFile( getTestFile( "pom.xml" ),
"org/apache/maven/test/resources/someresource" );
- archiver.setDestFile( jarFile );
- archiver.createArchive();
}
public void testTransformDirectives()
