You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/08/22 18:37:46 UTC
svn commit: r568694 - in /maven/shared/trunk/maven-osgi/src:
main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
test/resources/xercesImpl-2.6.2.jar
Author: carlos
Date: Wed Aug 22 09:37:45 2007
New Revision: 568694
URL: http://svn.apache.org/viewvc?rev=568694&view=rev
Log:
Add a test case for xercesImpl
Added:
maven/shared/trunk/maven-osgi/src/test/resources/xercesImpl-2.6.2.jar (with props)
Modified:
maven/shared/trunk/maven-osgi/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
maven/shared/trunk/maven-osgi/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
Modified: maven/shared/trunk/maven-osgi/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-osgi/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java?rev=568694&r1=568693&r2=568694&view=diff
==============================================================================
--- maven/shared/trunk/maven-osgi/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java (original)
+++ maven/shared/trunk/maven-osgi/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java Wed Aug 22 09:37:45 2007
@@ -122,7 +122,7 @@
}
if ( artifact.getArtifactId().startsWith( lastSection ) )
{
- String artifactId = artifact.getArtifactId().substring( lastSection.length() + 1 );
+ String artifactId = artifact.getArtifactId().substring( lastSection.length() );
if ( Character.isLetterOrDigit( artifactId.charAt( 0 ) ) )
{
return getBundleSymbolicName( artifact.getGroupId(), artifactId );
@@ -189,6 +189,12 @@
}
if ( ( groupIdSections == null ) || ( groupIdSections.length == 0 ) )
+ {
+ return null;
+ }
+
+ /* only one section as id doesn't seem enough, so ignore it */
+ if ( groupIdSections.length == 1 )
{
return null;
}
Modified: maven/shared/trunk/maven-osgi/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-osgi/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java?rev=568694&r1=568693&r2=568694&view=diff
==============================================================================
--- maven/shared/trunk/maven-osgi/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java (original)
+++ maven/shared/trunk/maven-osgi/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java Wed Aug 22 09:37:45 2007
@@ -51,6 +51,7 @@
artifact.setFile( getTestFile( "junit-3.8.2.jar" ) );
artifact.setGroupId( "junit" );
+ artifact.setArtifactId( "junit" );
s = maven2Osgi.getBundleSymbolicName( artifact );
assertEquals( "junit", s );
@@ -65,6 +66,12 @@
artifact.setArtifactId( "test" );
s = maven2Osgi.getBundleSymbolicName( artifact );
assertEquals( "test", s );
+
+ artifact.setFile( getTestFile( "xercesImpl-2.6.2.jar" ) );
+ artifact.setGroupId( "xerces" );
+ artifact.setArtifactId( "xercesImpl" );
+ s = maven2Osgi.getBundleSymbolicName( artifact );
+ assertEquals( "xerces.Impl", s );
}
public void testGetBundleFileName()
Added: maven/shared/trunk/maven-osgi/src/test/resources/xercesImpl-2.6.2.jar
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-osgi/src/test/resources/xercesImpl-2.6.2.jar?rev=568694&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/shared/trunk/maven-osgi/src/test/resources/xercesImpl-2.6.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream