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 2011/06/29 01:20:38 UTC
svn commit: r1140901 [2/2] - in /felix/trunk/bundleplugin/src:
main/java/org/apache/felix/bundleplugin/
main/java/org/apache/felix/obrplugin/
main/java/org/apache/maven/shared/dependency/tree/
main/java/org/apache/maven/shared/osgi/ test/java/org/apach...
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java?rev=1140901&r1=1140900&r2=1140901&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java Tue Jun 28 23:20:37 2011
@@ -18,8 +18,10 @@
*/
package org.apache.maven.shared.osgi;
+
import org.apache.maven.artifact.Artifact;
+
/**
* Converter from Maven groupId,artifactId and versions to OSGi Bundle-SymbolicName and version
*
@@ -37,8 +39,10 @@ public interface Maven2OsgiConverter
*/
String getBundleSymbolicName( Artifact artifact );
+
String getBundleFileName( Artifact artifact );
+
/**
* Convert a Maven version into an OSGi compliant version
*
@@ -47,6 +51,7 @@ public interface Maven2OsgiConverter
*/
String getVersion( Artifact artifact );
+
/**
* Convert a Maven version into an OSGi compliant version
*
Modified: felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BlueprintComponentTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BlueprintComponentTest.java?rev=1140901&r1=1140900&r2=1140901&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BlueprintComponentTest.java (original)
+++ felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BlueprintComponentTest.java Tue Jun 28 23:20:37 2011
@@ -18,6 +18,7 @@
*/
package org.apache.felix.bundleplugin;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
@@ -27,70 +28,81 @@ import java.util.Map;
import java.util.Properties;
import java.util.jar.Manifest;
-import aQute.lib.osgi.Builder;
import junit.framework.TestCase;
-import org.apache.felix.bundleplugin.ManifestPlugin;
+
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.osgi.framework.Constants;
-public class BlueprintComponentTest extends TestCase {
+import aQute.lib.osgi.Builder;
+
+
+public class BlueprintComponentTest extends TestCase
+{
public void testBlueprint() throws Exception
{
- MavenProjectStub project = new MavenProjectStub() {
+ MavenProjectStub project = new MavenProjectStub()
+ {
private final List resources = new ArrayList();
+
+
@Override
- public void addResource(Resource resource) {
- resources.add(resource);
+ public void addResource( Resource resource )
+ {
+ resources.add( resource );
}
+
@Override
- public List getResources() {
+ public List getResources()
+ {
return resources;
}
+
@Override
public File getBasedir()
{
- return new File("target/tmp/basedir");
+ return new File( "target/tmp/basedir" );
}
};
project.setGroupId( "group" );
project.setArtifactId( "artifact" );
project.setVersion( "1.1.0.0" );
Resource r = new Resource();
- r.setDirectory(new File("src/test/resources").getAbsoluteFile().getCanonicalPath());
- r.setIncludes(Arrays.asList("**/*.*"));
- project.addResource(r);
- project.addCompileSourceRoot(new File("src/test/resources").getAbsoluteFile().getCanonicalPath());
+ r.setDirectory( new File( "src/test/resources" ).getAbsoluteFile().getCanonicalPath() );
+ r.setIncludes( Arrays.asList( "**/*.*" ) );
+ project.addResource( r );
+ project.addCompileSourceRoot( new File( "src/test/resources" ).getAbsoluteFile().getCanonicalPath() );
ManifestPlugin plugin = new ManifestPlugin();
- plugin.setBuildDirectory("target/tmp/basedir/target");
- plugin.setOutputDirectory(new File("target/tmp/basedir/target/classes"));
+ plugin.setBuildDirectory( "target/tmp/basedir/target" );
+ plugin.setOutputDirectory( new File( "target/tmp/basedir/target/classes" ) );
Map instructions = new HashMap();
- instructions.put("Test", "Foo");
+ instructions.put( "Test", "Foo" );
- instructions.put("nsh_interface", "foo.bar.Namespace");
- instructions.put("nsh_namespace", "ns");
+ instructions.put( "nsh_interface", "foo.bar.Namespace" );
+ instructions.put( "nsh_namespace", "ns" );
- instructions.put("Export-Service", "p7.Foo;mk=mv");
- instructions.put("Import-Service", "org.osgi.service.cm.ConfigurationAdmin;availability:=optional");
+ instructions.put( "Export-Service", "p7.Foo;mk=mv" );
+ instructions.put( "Import-Service", "org.osgi.service.cm.ConfigurationAdmin;availability:=optional" );
Properties props = new Properties();
- Builder builder = plugin.buildOSGiBundle(project, instructions, props, plugin.getClasspath(project));
+ Builder builder = plugin.buildOSGiBundle( project, instructions, props, plugin.getClasspath( project ) );
Manifest manifest = builder.getJar().getManifest();
- String expSvc = manifest.getMainAttributes().getValue(Constants.EXPORT_SERVICE);
- String impSvc = manifest.getMainAttributes().getValue(Constants.IMPORT_SERVICE);
- assertNotNull(expSvc);
- assertNotNull(impSvc);
-
- String impPkg = manifest.getMainAttributes().getValue(Constants.IMPORT_PACKAGE);
- List<String> pkgs = Arrays.asList(impPkg.split(","));
- for (int i = 1; i <= 13; i++) {
- assertTrue(pkgs.contains("p" + i));
+ String expSvc = manifest.getMainAttributes().getValue( Constants.EXPORT_SERVICE );
+ String impSvc = manifest.getMainAttributes().getValue( Constants.IMPORT_SERVICE );
+ assertNotNull( expSvc );
+ assertNotNull( impSvc );
+
+ String impPkg = manifest.getMainAttributes().getValue( Constants.IMPORT_PACKAGE );
+ List<String> pkgs = Arrays.asList( impPkg.split( "," ) );
+ for ( int i = 1; i <= 13; i++ )
+ {
+ assertTrue( pkgs.contains( "p" + i ) );
}
}
Modified: felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java?rev=1140901&r1=1140900&r2=1140901&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java (original)
+++ felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java Tue Jun 28 23:20:37 2011
@@ -114,8 +114,8 @@ public class BundleAllPluginTest extends
exports.containsKey( packages[i] ) );
}
- assertFalse( "Bundle info contains a package that it is not exported in the manifest", exports
- .containsKey( "org.apache.maven.model.io.xpp3" ) );
+ assertFalse( "Bundle info contains a package that it is not exported in the manifest",
+ exports.containsKey( "org.apache.maven.model.io.xpp3" ) );
}
// public void testRewriting()
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=1140901&r1=1140900&r2=1140901&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 Jun 28 23:20:37 2011
@@ -22,13 +22,13 @@ package org.apache.felix.bundleplugin;
import java.io.File;
import java.util.Map;
-import java.util.TreeMap;
import java.util.Properties;
+import java.util.TreeMap;
+import org.apache.maven.model.Organization;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
-import org.apache.maven.model.Organization;
import aQute.lib.osgi.Analyzer;
import aQute.lib.osgi.Builder;
@@ -112,7 +112,7 @@ public class BundlePluginTest extends Ab
project.setArtifactId( "artifact" );
project.setVersion( "1.1.0.0" );
-// PackageVersionAnalyzer analyzer = new PackageVersionAnalyzer();
+ // PackageVersionAnalyzer analyzer = new PackageVersionAnalyzer();
Builder analyzer = new Builder();
Jar jar = new Jar( "name", osgiBundleFile );
analyzer.setJar( jar );
@@ -165,6 +165,7 @@ public class BundlePluginTest extends Ab
assertEquals( "", transformedInstructions.get( "-z" ) );
}
+
public void testDefaultPropertiesIncludeOrganization()
{
final Organization organization = new Organization();
@@ -174,7 +175,8 @@ public class BundlePluginTest extends Ab
// MavenProjectStub.setOrganization(Organization) doesn't do anything, so we have to make it work this way
MavenProject project = new MavenProjectStub()
{
- @Override public Organization getOrganization()
+ @Override
+ public Organization getOrganization()
{
return organization;
}
@@ -190,12 +192,14 @@ public class BundlePluginTest extends Ab
assertEquals( organization.getUrl(), properties.getProperty( "pom.organization.url" ) );
}
+
public void testVersion() throws Exception
{
String cleanupVersion = Builder.cleanupVersion( "0.0.0.4aug2000r7-dev" );
assertEquals( "0.0.0.4aug2000r7-dev", cleanupVersion );
}
-
+
+
public void testPackageInfoDetection() throws Exception
{
MavenProject project = new MavenProjectStub();
@@ -203,7 +207,7 @@ public class BundlePluginTest extends Ab
String resourcePaths = plugin.getMavenResourcePaths( project );
- assertEquals( "org/apache/felix/bundleplugin/packageinfo=" +
- "src/test/java/org/apache/felix/bundleplugin/packageinfo", resourcePaths );
+ assertEquals( "org/apache/felix/bundleplugin/packageinfo="
+ + "src/test/java/org/apache/felix/bundleplugin/packageinfo", resourcePaths );
}
}