svn commit: r1162236 - in /maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index: ArtifactInfo.java OSGI.java creator/OsgiArtifactIndexCreator.java

[olamy]

Author: olamy
Date: Fri Aug 26 20:25:30 2011
New Revision: 1162236

URL: http://svn.apache.org/viewvc?rev=1162236&view=rev
Log:
[MINDEXER-36] osgi metdatas.
index Require-Bundle too.

Modified:
    
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
    
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/OSGI.java
    
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java

Modified: 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
URL: 
http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java?rev=1162236&r1=1162235&r2=1162236&view=diff
==============================================================================
--- 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
 (original)
+++ 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
 Fri Aug 26 20:25:30 2011
@@ -276,6 +276,11 @@ public class ArtifactInfo
      */
     public String bundleImportPackage;
 
+    /**
+     * contains osgi metadata Require-Bundle if available
+     * @since 4.1.2
+     */
+    public String bundleRequireBundle;
 
 
 

Modified: 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/OSGI.java
URL: 
http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/OSGI.java?rev=1162236&r1=1162235&r2=1162236&view=diff
==============================================================================
--- 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/OSGI.java 
(original)
+++ 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/OSGI.java 
Fri Aug 26 20:25:30 2011
@@ -50,5 +50,7 @@ public interface OSGI
 
     Field IMPORT_PACKAGE = new Field( null, OSGI_NAMESPACE, "importPackage", 
"Import-Package" );
 
+    Field REQUIRE_BUNDLE  = new Field( null, OSGI_NAMESPACE, "requireBundle", 
"Require-Bundle" );
+
 
 }

Modified: 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java
URL: 
http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java?rev=1162236&r1=1162235&r2=1162236&view=diff
==============================================================================
--- 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java
 (original)
+++ 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java
 Fri Aug 26 20:25:30 2011
@@ -122,11 +122,20 @@ public class OsgiArtifactIndexCreator
                           Field.Store.YES, Field.Index.ANALYZED );
 
 
+    private static final String BRB = "Require-Bundle";
+
+    public static final IndexerField FLD_BUNDLE_REQUIRE_BUNDLE =
+        new IndexerField( OSGI.REQUIRE_BUNDLE, IndexerFieldVersion.V4, BRB, 
"Require-Bundle (indexed, stored)",
+                          Field.Store.YES, Field.Index.ANALYZED );
+
+
+
+
     public Collection<IndexerField> getIndexerFields()
     {
         return Arrays.asList( FLD_BUNDLE_SYMBOLIC_NAME, FLD_BUNDLE_VERSION, 
FLD_BUNDLE_EXPORT_PACKAGE,
                               FLD_BUNDLE_EXPORT_SERVIVE, 
FLD_BUNDLE_DESCRIPTION, FLD_BUNDLE_NAME, FLD_BUNDLE_LICENSE,
-                              FLD_BUNDLE_DOCURL, FLD_BUNDLE_IMPORT_PACKAGE );
+                              FLD_BUNDLE_DOCURL, FLD_BUNDLE_IMPORT_PACKAGE, 
FLD_BUNDLE_REQUIRE_BUNDLE );
     }
 
     public OsgiArtifactIndexCreator()
@@ -196,6 +205,11 @@ public class OsgiArtifactIndexCreator
         {
             document.add( FLD_BUNDLE_IMPORT_PACKAGE.toField( 
artifactInfo.bundleImportPackage ) );
         }
+
+        if ( artifactInfo.bundleRequireBundle != null )
+        {
+            document.add( FLD_BUNDLE_REQUIRE_BUNDLE.toField( 
artifactInfo.bundleRequireBundle ) );
+        }
     }
 
     public boolean updateArtifactInfo( Document document, ArtifactInfo 
artifactInfo )
@@ -292,6 +306,16 @@ public class OsgiArtifactIndexCreator
 
         }
 
+        String bundleRequireBundle = document.get( 
FLD_BUNDLE_REQUIRE_BUNDLE.getKey() );
+
+        if ( bundleRequireBundle != null )
+        {
+            artifactInfo.bundleRequireBundle = bundleRequireBundle;
+
+            updated = true;
+
+        }
+
 
         return updated;
     }
@@ -418,6 +442,17 @@ public class OsgiArtifactIndexCreator
                             ai.bundleImportPackage = null;
                         }
 
+                        attValue = mainAttributes.getValue( BRB );
+                        if ( StringUtils.isNotBlank( attValue ) )
+                        {
+                            ai.bundleRequireBundle = attValue;
+                            updated = true;
+                        }
+                        else
+                        {
+                            ai.bundleRequireBundle = null;
+                        }
+
                     }
                 }
             }