Index: src/test/java/org/apache/maven/plugin/eclipse/EclipseToMavenTest.java
===================================================================
--- src/test/java/org/apache/maven/plugin/eclipse/EclipseToMavenTest.java (revision 1325242)
+++ src/test/java/org/apache/maven/plugin/eclipse/EclipseToMavenTest.java (working copy)
@@ -113,6 +113,12 @@
assertEquals( "org.eclipse", mojo.createGroupId( "org.eclipse.jdt" ) );
assertEquals( "org.eclipse.jdt", mojo.createGroupId( "org.eclipse.jdt.apt" ) );
assertEquals( "org.eclipse.jdt.apt", mojo.createGroupId( "org.eclipse.jdt.apt.core" ) );
+
+ assertEquals( "test", mojo.createGroupId( "test.source" ) );
+ assertEquals( "org", mojo.createGroupId( "org.eclipse.source" ) );
+ assertEquals( "org.eclipse", mojo.createGroupId( "org.eclipse.jdt.source" ) );
+ assertEquals( "org.eclipse.jdt", mojo.createGroupId( "org.eclipse.jdt.apt.source" ) );
+ assertEquals( "org.eclipse.jdt.apt", mojo.createGroupId( "org.eclipse.jdt.apt.core.source" ) );
}
/**
@@ -125,8 +131,29 @@
assertEquals( "jdt", mojo.createArtifactId( "org.eclipse.jdt" ) );
assertEquals( "apt", mojo.createArtifactId( "org.eclipse.jdt.apt" ) );
assertEquals( "core", mojo.createArtifactId( "org.eclipse.jdt.apt.core" ) );
+
+ assertEquals( "test", mojo.createArtifactId( "test.source" ) );
+ assertEquals( "eclipse", mojo.createArtifactId( "org.eclipse.source" ) );
+ assertEquals( "jdt", mojo.createArtifactId( "org.eclipse.jdt.source" ) );
+ assertEquals( "apt", mojo.createArtifactId( "org.eclipse.jdt.apt.source" ) );
+ assertEquals( "core", mojo.createArtifactId( "org.eclipse.jdt.apt.core.source" ) );
}
+ public void testCreateClassifier()
+ {
+ assertEquals( "", mojo.createClassifier( "test" ) );
+ assertEquals( "", mojo.createClassifier( "org.eclipse" ) );
+ assertEquals( "", mojo.createClassifier( "org.eclipse.jdt" ) );
+ assertEquals( "", mojo.createClassifier( "org.eclipse.jdt.apt" ) );
+ assertEquals( "", mojo.createClassifier( "org.eclipse.jdt.apt.core" ) );
+
+ assertEquals( "sources", mojo.createClassifier( "test.source" ) );
+ assertEquals( "sources", mojo.createClassifier( "org.eclipse.source" ) );
+ assertEquals( "sources", mojo.createClassifier( "org.eclipse.jdt.source" ) );
+ assertEquals( "sources", mojo.createClassifier( "org.eclipse.jdt.apt.source" ) );
+ assertEquals( "sources", mojo.createClassifier( "org.eclipse.jdt.apt.core.source" ) );
+ }
+
public void testOsgiVersionToMavenVersion()
{
assertEquals( "1.2.3", mojo.osgiVersionToMavenVersion( "1.2.3", null, false ) );
Index: src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
===================================================================
--- src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java (revision 1325242)
+++ src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java (working copy)
@@ -83,6 +83,13 @@
{
/**
+ * Workaround to save classifier on found models
+ */
+ private static final String CLASSIFIER_KEY = "maven-eclipse-plugin.classifier"; //$NON-NLS-1$
+
+ private static final String SOURCE_BUNDLE_SUFFIX = ".source"; //$NON-NLS-1$
+
+ /**
* A pattern the deployTo param should match.
*/
private static final Pattern DEPLOYTO_PATTERN = Pattern.compile( "(.+)::(.+)::(.+)" ); //$NON-NLS-1$
@@ -235,7 +242,16 @@
String key = (String) it.next();
EclipseOsgiPlugin plugin = (EclipseOsgiPlugin) plugins.get( key );
Model model = (Model) models.get( key );
- writeArtifact( plugin, model, remoteRepo );
+
+ String classifier = (String) model.getProperties().remove( CLASSIFIER_KEY );
+ if ( "sources".equals( classifier ) ) //$NON-NLS-1$
+ {
+ writeSourceArtifact( plugin, model, remoteRepo );
+ }
+ else
+ {
+ writeArtifact( plugin, model, remoteRepo );
+ }
}
}
@@ -260,6 +276,11 @@
processPlugin( plugin, model, plugins, models );
}
+ protected String getClassifier( Model model )
+ {
+ return model.getProperties().getProperty( CLASSIFIER_KEY );
+ }
+
protected void processPlugin( EclipseOsgiPlugin plugin, Model model, Map plugins, Map models )
throws MojoExecutionException, MojoFailureException
{
@@ -269,12 +290,12 @@
protected String getKey( Model model )
{
- return model.getGroupId() + "." + model.getArtifactId(); //$NON-NLS-1$
+ return model.getGroupId() + "." + model.getArtifactId() + "." + getClassifier( model ); //$NON-NLS-1$ $NON-NLS-2$
}
private String getKey( Dependency dependency )
{
- return dependency.getGroupId() + "." + dependency.getArtifactId(); //$NON-NLS-1$
+ return dependency.getGroupId() + "." + dependency.getArtifactId() + "." + dependency.getClassifier(); //$NON-NLS-1$ $NON-NLS-2$
}
/**
@@ -350,7 +371,7 @@
throws MojoExecutionException
{
- String name, bundleName, version, groupId, artifactId, requireBundle;
+ String name, bundleName, version, groupId, artifactId, classifier, requireBundle;
try
{
@@ -390,6 +411,7 @@
groupId = createGroupId( bundleName );
artifactId = createArtifactId( bundleName );
+ classifier = createClassifier( bundleName );
Model model = new Model();
model.setModelVersion( "4.0.0" ); //$NON-NLS-1$
@@ -399,6 +421,7 @@
model.setVersion( version );
model.setProperties( plugin.getPomProperties() );
+ model.addProperty( CLASSIFIER_KEY, classifier ); //workaround for no setClassifier() on model
if ( groupId.startsWith( "org.eclipse" ) ) //$NON-NLS-1$
{
@@ -509,6 +532,53 @@
}
+ /**
+ * Writes the source artifact to the repo
+ *
+ * @param model
+ * @param remoteRepo remote repository (if set)
+ * @throws MojoExecutionException
+ */
+ private void writeSourceArtifact( EclipseOsgiPlugin plugin, Model model, ArtifactRepository remoteRepo )
+ throws MojoExecutionException
+ {
+ Artifact artifact = artifactFactory.createArtifactWithClassifier( model.getGroupId(), model.getArtifactId(),
+ model.getVersion(),
+ Constants.PROJECT_PACKAGING_JAR, "sources" ); //$NON-NLS-1$
+
+ try
+ {
+ File jarFile = plugin.getJarFile();
+
+ if ( remoteRepo != null )
+ {
+ deployer.deploy( jarFile, artifact, remoteRepo, localRepository );
+ }
+ else
+ {
+ installer.install( jarFile, artifact, localRepository );
+ }
+ }
+ catch ( ArtifactDeploymentException e )
+ {
+ throw new MojoExecutionException(
+ Messages.getString( "EclipseToMavenMojo.errordeployartifacttorepository" ), e ); //$NON-NLS-1$
+ }
+ catch ( ArtifactInstallationException e )
+ {
+ throw new MojoExecutionException(
+ Messages
+ .getString( "EclipseToMavenMojo.errorinstallartifacttorepository" ), e ); //$NON-NLS-1$
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException(
+ Messages
+ .getString( "EclipseToMavenMojo.errorgettingjarfileforplugin", plugin ), e ); //$NON-NLS-1$
+ }
+
+ }
+
protected String osgiVersionToMavenVersion( String version )
{
return osgiVersionToMavenVersion( version, null, stripQualifier );
@@ -599,6 +669,33 @@
}
/**
+ * Check if the provided bundle name is a source bundle, i.e. if it ends with {@link #SOURCE_BUNDLE_SUFFIX }
+ *
+ * @param bundleName the bundle name to check
+ * @return true if it is a source bundle, false otherwise
+ */
+ protected boolean isSourceBundle( String bundleName )
+ {
+ return bundleName.endsWith( SOURCE_BUNDLE_SUFFIX );
+ }
+
+ /**
+ * Remove the source bundle suffix from a bundle name, if and only if it is a source bundle (as defined by {@link #isSourceBundle(String)}
+ *
+ * @param bundleName the bundle name to trim
+ * @return the trimmed bundle name, or the original bundle name if not a source bundle
+ */
+ protected String removeSourceSuffix( String bundleName )
+ {
+ if ( isSourceBundle( bundleName ) )
+ {
+ int trimmedLength = bundleName.length() - SOURCE_BUNDLE_SUFFIX.length();
+ return bundleName.substring( 0, trimmedLength );
+ }
+ return bundleName;
+ }
+
+ /**
* Get the group id as the tokens until last dot e.g. org.eclipse.jdt -> org.eclipse
*
* @param bundleName bundle name
@@ -606,6 +703,7 @@
*/
protected String createGroupId( String bundleName )
{
+ bundleName = removeSourceSuffix( bundleName );
int i = bundleName.lastIndexOf( '.' ); //$NON-NLS-1$
if ( i > 0 )
{
@@ -623,6 +721,7 @@
*/
protected String createArtifactId( String bundleName )
{
+ bundleName = removeSourceSuffix( bundleName );
int i = bundleName.lastIndexOf( '.' ); //$NON-NLS-1$
if ( i > 0 )
{
@@ -632,6 +731,11 @@
return bundleName;
}
+ protected String createClassifier( String bundleName )
+ {
+ return isSourceBundle( bundleName ) ? "sources" : ""; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
/**
* Parses the "Require-Bundle" and convert it to a list of dependencies.
*
@@ -672,6 +776,7 @@
Dependency dep = new Dependency();
dep.setGroupId( createGroupId( bundleName ) );
dep.setArtifactId( createArtifactId( bundleName ) );
+ dep.setClassifier( createClassifier( bundleName ) );
dep.setVersion( version );
dep.setOptional( optional );