felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mccu...@apache.org
Subject svn commit: r1490866 [5/8] - in /felix/trunk/bundleplugin/doc/site: ./ xref-test/ xref-test/org/apache/felix/bundleplugin/ xref-test/org/apache/maven/ xref-test/org/apache/maven/shared/ xref-test/org/apache/maven/shared/osgi/ xref/ xref/org/apache/feli...
Date Fri, 07 Jun 2013 23:25:20 GMT
Modified: felix/trunk/bundleplugin/doc/site/plugin-info.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/plugin-info.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/plugin-info.html (original)
+++ felix/trunk/bundleplugin/doc/site/plugin-info.html Fri Jun  7 23:25:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Feb 11, 2012 -->
+<!-- Generated by Apache Maven Doxia at Jun 8, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20120211" />
+    <meta name="Date-Revision-yyyymmdd" content="20130608" />
     <meta http-equiv="Content-Language" content="en" />
         
   </head>
@@ -27,7 +27,7 @@
             
         
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2012-02-11</span>
+        <span id="publishDate">Last Published: 2013-06-08</span>
                   &nbsp;| <span id="projectVersion">Version: 2.4.0-SNAPSHOT</span>
                       </div>
             <div class="xright">        
@@ -94,14 +94,14 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <a name="Plugin_Documentation"></a><div class="section"><h2>Plugin Documentation<a name="Plugin_Documentation"></a></h2><p>Goals available for this plugin:</p><table border="0" class="bodyTable"><tr class="a"><th>Goal</th><th>Description</th></tr><tr class="b"><td><a href="ant-mojo.html">bundle:ant</a></td><td>Generate Ant script to create the bundle (you should run ant:ant
+        <div class="section"><h2>Plugin Documentation<a name="Plugin_Documentation"></a></h2><a name="Plugin_Documentation"></a><p>Goals available for this plugin:</p><table border="0" class="bodyTable"><tr class="a"><th>Goal</th><th>Description</th></tr><tr class="b"><td><a href="ant-mojo.html">bundle:ant</a></td><td>Generate Ant script to create the bundle (you should run ant:ant
 first).</td></tr><tr class="a"><td><a href="bundle-mojo.html">bundle:bundle</a></td><td>Create an OSGi bundle from Maven project</td></tr><tr class="b"><td><a href="bundleall-mojo.html">bundle:bundleall</a></td><td><strong>Deprecated.</strong> The bundleall goal is no longer supported and may be removed in a
 future release</td></tr><tr class="a"><td><a href="clean-mojo.html">bundle:clean</a></td><td>Clean an OBR repository by finding and removing missing resources.</td></tr><tr class="b"><td><a href="cleanVersions-mojo.html">bundle:cleanVersions</a></td><td>No description.</td></tr><tr class="a"><td><a href="deploy-mojo.html">bundle:deploy</a></td><td>Deploys bundle details to a remote OBR repository (life-cycle goal)</td></tr><tr class="b"><td><a href="deploy-file-mojo.html">bundle:deploy-file</a></td><td>Deploys bundle details to a remote OBR repository (command-line
 goal)</td></tr><tr class="a"><td><a href="index-mojo.html">bundle:index</a></td><td>Index the content of a maven repository using OBR</td></tr><tr class="b"><td><a href="install-mojo.html">bundle:install</a></td><td>Installs bundle details in the local OBR repository (life-cycle
 goal)</td></tr><tr class="a"><td><a href="install-file-mojo.html">bundle:install-file</a></td><td>Installs bundle details in the local OBR repository (command-line
 goal)</td></tr><tr class="b"><td><a href="instructions-mojo.html">bundle:instructions</a></td><td>Generate BND instructions for this project</td></tr><tr class="a"><td><a href="manifest-mojo.html">bundle:manifest</a></td><td>Generate an OSGi manifest for this project</td></tr><tr class="b"><td><a href="remote-clean-mojo.html">bundle:remote-clean</a></td><td>Clean a remote repository file. It just looks for every resources
 and check that pointed file exists.</td></tr><tr class="a"><td><a href="wrap-mojo.html">bundle:wrap</a></td><td><strong>Deprecated.</strong> The wrap goal is no longer supported and may be removed in a future
-release</td></tr></table><a name="System_Requirements"></a><div class="section"><h3>System Requirements<a name="System_Requirements"></a></h3><p>The following specifies the minimum requirements to run this Maven plugin:</p><table border="0" class="bodyTable"><tr class="b"><td>Maven</td><td>2.0</td></tr><tr class="a"><td>JDK</td><td>1.5</td></tr><tr class="b"><td>Memory</td><td>No minimum requirement.</td></tr><tr class="a"><td>Disk Space</td><td>No minimum requirement.</td></tr></table></div><a name="Usage"></a><div class="section"><h3>Usage<a name="Usage"></a></h3><p>You should specify the version in your project's plugin configuration:</p><div class="source"><pre>&lt;project&gt;
+release</td></tr></table><div class="section"><h3>System Requirements<a name="System_Requirements"></a></h3><a name="System_Requirements"></a><p>The following specifies the minimum requirements to run this Maven plugin:</p><table border="0" class="bodyTable"><tr class="a"><td>Maven</td><td>2.0</td></tr><tr class="b"><td>JDK</td><td>1.5</td></tr><tr class="a"><td>Memory</td><td>No minimum requirement.</td></tr><tr class="b"><td>Disk Space</td><td>No minimum requirement.</td></tr></table></div><div class="section"><h3>Usage<a name="Usage"></a></h3><a name="Usage"></a><p>You should specify the version in your project's plugin configuration:</p><div class="source"><pre>&lt;project&gt;
   ...
   &lt;build&gt;
     &lt;!-- To define the plugin version in your parent POM --&gt;
@@ -134,7 +134,7 @@ release</td></tr></table><a name="System
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2012
+      <div class="xright">Copyright &#169;                    2006-2013
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All Rights Reserved.      
         

Modified: felix/trunk/bundleplugin/doc/site/project-info.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/project-info.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/project-info.html (original)
+++ felix/trunk/bundleplugin/doc/site/project-info.html Fri Jun  7 23:25:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Feb 11, 2012 -->
+<!-- Generated by Apache Maven Doxia at Jun 8, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20120211" />
+    <meta name="Date-Revision-yyyymmdd" content="20130608" />
     <meta http-equiv="Content-Language" content="en" />
         
   </head>
@@ -27,7 +27,7 @@
             
         
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2012-02-11</span>
+        <span id="publishDate">Last Published: 2013-06-08</span>
                   &nbsp;| <span id="projectVersion">Version: 2.4.0-SNAPSHOT</span>
                       </div>
             <div class="xright">        
@@ -110,7 +110,7 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2012
+      <div class="xright">Copyright &#169;                    2006-2013
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All Rights Reserved.      
         

Modified: felix/trunk/bundleplugin/doc/site/project-reports.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/project-reports.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/project-reports.html (original)
+++ felix/trunk/bundleplugin/doc/site/project-reports.html Fri Jun  7 23:25:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Feb 11, 2012 -->
+<!-- Generated by Apache Maven Doxia at Jun 8, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20120211" />
+    <meta name="Date-Revision-yyyymmdd" content="20130608" />
     <meta http-equiv="Content-Language" content="en" />
         
   </head>
@@ -27,7 +27,7 @@
             
         
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2012-02-11</span>
+        <span id="publishDate">Last Published: 2013-06-08</span>
                   &nbsp;| <span id="projectVersion">Version: 2.4.0-SNAPSHOT</span>
                       </div>
             <div class="xright">        
@@ -101,7 +101,7 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2012
+      <div class="xright">Copyright &#169;                    2006-2013
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All Rights Reserved.      
         

Modified: felix/trunk/bundleplugin/doc/site/remote-clean-mojo.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/remote-clean-mojo.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/remote-clean-mojo.html (original)
+++ felix/trunk/bundleplugin/doc/site/remote-clean-mojo.html Fri Jun  7 23:25:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Feb 11, 2012 -->
+<!-- Generated by Apache Maven Doxia at Jun 8, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -11,7 +11,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20120211" />
+    <meta name="Date-Revision-yyyymmdd" content="20130608" />
     <meta http-equiv="Content-Language" content="en" />
         
   </head>
@@ -28,7 +28,7 @@
             
         
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2012-02-11</span>
+        <span id="publishDate">Last Published: 2013-06-08</span>
                   &nbsp;| <span id="projectVersion">Version: 2.4.0-SNAPSHOT</span>
                       </div>
             <div class="xright">        
@@ -88,7 +88,7 @@
 and check that pointed file exists.</div>
       <p><b>Attributes</b>:</p>
       <ul>
-        <li>Binds by default to the lifecycle phase: <tt>clean</tt>.</li>
+        <li>Binds by default to the <a class="externalLink" href="http://maven.apache.org/ref/current/maven-core/lifecycles.html">lifecycle phase</a>: <tt>clean</tt>.</li>
       </ul>
       <div class="section"><h3>Optional Parameters<a name="Optional_Parameters"></a></h3>
         <table class="bodyTable" border="0">
@@ -102,37 +102,37 @@ and check that pointed file exists.</div
             <td><b><a href="#altDeploymentRepository">altDeploymentRepository</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>-</tt></td>
-            <td>Alternative deployment repository. Format: id::layout::url<br /></td>
+            <td>Alternative deployment repository. Format: id::layout::url<br /><b>User property is</b>: <tt>altDeploymentRepository</tt>.</td>
           </tr>
           <tr class="a">
             <td><b><a href="#ignoreLock">ignoreLock</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>-</tt></td>
-            <td>When true, ignore remote locking.<br /></td>
+            <td>When true, ignore remote locking.<br /><b>User property is</b>: <tt>ignoreLock</tt>.</td>
           </tr>
           <tr class="b">
             <td><b><a href="#obrDeploymentRepository">obrDeploymentRepository</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>-</tt></td>
-            <td>OBR specific deployment repository. Format: id::layout::url<br /></td>
+            <td>OBR specific deployment repository. Format: id::layout::url<br /><b>User property is</b>: <tt>obrDeploymentRepository</tt>.</td>
           </tr>
           <tr class="a">
             <td><b><a href="#obrRepository">obrRepository</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>-</tt></td>
-            <td>Local OBR Repository.<br /></td>
+            <td>Local OBR Repository.<br /><b>User property is</b>: <tt>obrRepository</tt>.</td>
           </tr>
           <tr class="b">
             <td><b><a href="#prefixUrl">prefixUrl</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>-</tt></td>
-            <td>Optional public URL prefix for the remote repository.<br /></td>
+            <td>Optional public URL prefix for the remote repository.<br /><b>User property is</b>: <tt>prefixUrl</tt>.</td>
           </tr>
           <tr class="a">
             <td><b><a href="#remoteOBR">remoteOBR</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>-</tt></td>
-            <td>Remote OBR Repository.<br /><b>Default value is</b>: <tt>NONE</tt>.</td>
+            <td>Remote OBR Repository.<br /><b>Default value is</b>: <tt>NONE</tt>.<br /><b>User property is</b>: <tt>remoteOBR</tt>.</td>
           </tr>
           <tr class="b">
             <td><b><a href="#supportedProjectTypes">supportedProjectTypes</a></b></td>
@@ -148,37 +148,37 @@ and check that pointed file exists.</div
         <ul>
           <li><b>Type</b>: <tt>java.lang.String</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${altDeploymentRepository}</tt></li>
+          <li><b>User Property</b>: <tt>altDeploymentRepository</tt></li>
         </ul><hr /><p><b><a name="ignoreLock">ignoreLock</a>:</b></p>
         <div>When true, ignore remote locking.</div>
         <ul>
           <li><b>Type</b>: <tt>boolean</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${ignoreLock}</tt></li>
+          <li><b>User Property</b>: <tt>ignoreLock</tt></li>
         </ul><hr /><p><b><a name="obrDeploymentRepository">obrDeploymentRepository</a>:</b></p>
         <div>OBR specific deployment repository. Format: id::layout::url</div>
         <ul>
           <li><b>Type</b>: <tt>java.lang.String</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${obrDeploymentRepository}</tt></li>
+          <li><b>User Property</b>: <tt>obrDeploymentRepository</tt></li>
         </ul><hr /><p><b><a name="obrRepository">obrRepository</a>:</b></p>
         <div>Local OBR Repository.</div>
         <ul>
           <li><b>Type</b>: <tt>java.lang.String</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${obrRepository}</tt></li>
+          <li><b>User Property</b>: <tt>obrRepository</tt></li>
         </ul><hr /><p><b><a name="prefixUrl">prefixUrl</a>:</b></p>
         <div>Optional public URL prefix for the remote repository.</div>
         <ul>
           <li><b>Type</b>: <tt>java.lang.String</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${prefixUrl}</tt></li>
+          <li><b>User Property</b>: <tt>prefixUrl</tt></li>
         </ul><hr /><p><b><a name="remoteOBR">remoteOBR</a>:</b></p>
         <div>Remote OBR Repository.</div>
         <ul>
           <li><b>Type</b>: <tt>java.lang.String</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${remoteOBR}</tt></li>
+          <li><b>User Property</b>: <tt>remoteOBR</tt></li>
           <li><b>Default</b>: <tt>NONE</tt></li>
         </ul><hr /><p><b><a name="supportedProjectTypes">supportedProjectTypes</a>:</b></p>
         <div>Project types which this plugin supports.</div>
@@ -196,7 +196,7 @@ and check that pointed file exists.</div
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2012
+      <div class="xright">Copyright &#169;                    2006-2013
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All Rights Reserved.      
         

Modified: felix/trunk/bundleplugin/doc/site/source-repository.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/source-repository.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/source-repository.html (original)
+++ felix/trunk/bundleplugin/doc/site/source-repository.html Fri Jun  7 23:25:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Feb 11, 2012 -->
+<!-- Generated by Apache Maven Doxia at Jun 8, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20120211" />
+    <meta name="Date-Revision-yyyymmdd" content="20130608" />
     <meta http-equiv="Content-Language" content="en" />
         
   </head>
@@ -27,7 +27,7 @@
             
         
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2012-02-11</span>
+        <span id="publishDate">Last Published: 2013-06-08</span>
                   &nbsp;| <span id="projectVersion">Version: 2.4.0-SNAPSHOT</span>
                       </div>
             <div class="xright">        
@@ -110,7 +110,7 @@ http-proxy-port = 3128
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2012
+      <div class="xright">Copyright &#169;                    2006-2013
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All Rights Reserved.      
         

Modified: felix/trunk/bundleplugin/doc/site/surefire-report.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/surefire-report.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/surefire-report.html (original)
+++ felix/trunk/bundleplugin/doc/site/surefire-report.html Fri Jun  7 23:25:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Feb 11, 2012 -->
+<!-- Generated by Apache Maven Doxia at Jun 8, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20120211" />
+    <meta name="Date-Revision-yyyymmdd" content="20130608" />
     <meta http-equiv="Content-Language" content="en" />
         
   </head>
@@ -27,7 +27,7 @@
             
         
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2012-02-11</span>
+        <span id="publishDate">Last Published: 2013-06-08</span>
                   &nbsp;| <span id="projectVersion">Version: 2.4.0-SNAPSHOT</span>
                       </div>
             <div class="xright">        
@@ -94,14 +94,14 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <div class="section"><h2>Surefire Report<a name="Surefire_Report"></a></h2></div><div class="section"><h2><a name="Summary"></a>Summary<a name="Summary"></a></h2><div class="section">[<a href="#Summary">Summary</a>] [<a href="#Package_List">Package List</a>] [<a href="#Test_Cases">Test Cases</a>]</div><br /><table border="0" class="bodyTable"><tr class="a"><th>Tests</th><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="b"><td>15</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>2.621</td></tr></table><br />Note: failures are anticipated and checked for with assertions while errors are unanticipated.<br /></div><div class="section"><h2><a name="Package_List"></a>Package List<a name="Package_List"></a></h2><div class="section">[<a href="#Summary">Summary</a>] [<a href="#Package_List">Package List</a>] [<a href="#Test_Cases">Test Cases</a>]</div><br /><table border="0" class="bodyTable"><tr class="a"><th>Package</th><th>
 Tests</th><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="b"><td><a href="#org.apache.felix.bundleplugin">org.apache.felix.bundleplugin</a></td><td>15</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>2.621</td></tr></table><br />Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.<div class="section"><h3><a name="org.apache.felix.bundleplugin"></a>org.apache.felix.bundleplugin<a name="org.apache.felix.bundleplugin"></a></h3><table border="0" class="bodyTable"><tr class="a"><th></th><th>Class</th><th>Tests</th><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="b"><td><a href="#org.apache.felix.bundlepluginBlueprintComponentTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apache.felix.bundlepluginBlueprintComponentTest">BlueprintComponentTest</a></td><td>1</td><td>0</td><td>0</td><td>0</td><td>100
 %</td><td>0.643</td></tr><tr class="a"><td><a href="#org.apache.felix.bundlepluginBundleAllPluginTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apache.felix.bundlepluginBundleAllPluginTest">BundleAllPluginTest</a></td><td>2</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>0.877</td></tr><tr class="b"><td><a href="#org.apache.felix.bundlepluginBundlePluginTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apache.felix.bundlepluginBundlePluginTest">BundlePluginTest</a></td><td>12</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>1.101</td></tr></table></div><br /></div><div class="section"><h2><a name="Test_Cases"></a>Test Cases<a name="Test_Cases"></a></h2><div class="section">[<a href="#Summary">Summary</a>] [<a href="#Package_List">Package List</a>] [<a href="#Test_Cases">Test Cases</a>]</div><div class="section"><h3><a name="org.apache.felix.bundlepluginBlueprintComponentTest"></a>BlueprintComponentTest<a n
 ame="BlueprintComponentTest"></a></h3><table border="0" class="bodyTable"><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testBlueprint</td><td>0.598</td></tr></table></div><div class="section"><h3><a name="org.apache.felix.bundlepluginBundleAllPluginTest"></a>BundleAllPluginTest<a name="BundleAllPluginTest"></a></h3><table border="0" class="bodyTable"><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testSnapshotMatch</td><td>0.381</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testNoReBundling</td><td>0.491</td></tr></table></div><div class="section"><h3><a name="org.apache.felix.bundlepluginBundlePluginTest"></a>BundlePluginTest<a name="BundlePluginTest"></a></h3><table border="0" class="bodyTable"><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testConvertVersionToOsgi</td><td>0.06</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /><
 /td><td>testReadExportedModules</td><td>0.15</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testTransformDirectives</td><td>0.054</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testDefaultPropertiesIncludeOrganization</td><td>0.061</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testVersion</td><td>0.045</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testPackageInfoDetection</td><td>0.066</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyPositiveClauses</td><td>0.123</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyNegativeClauses</td><td>0.099</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyDuplicateKeys</td><td>0.111</td></tr><tr class="a"><td><img src="images/icon_succ
 ess_sml.gif" alt="" /></td><td>testEmbedDependencyMissingPositiveKey</td><td>0.117</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyMissingNegativeKey</td><td>0.164</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testPropertySanitizing</td><td>0.028</td></tr></table></div><br /></div><br />
+        <div class="section"><h2>Surefire Report<a name="Surefire_Report"></a></h2></div><div class="section"><h2><a name="Summary"></a>Summary<a name="Summary"></a></h2><div class="section">[<a href="#Summary">Summary</a>] [<a href="#Package_List">Package List</a>] [<a href="#Test_Cases">Test Cases</a>]</div><br /><table border="0" class="bodyTable"><tr class="a"><th>Tests</th><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="b"><td>19</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>4.102</td></tr></table><br />Note: failures are anticipated and checked for with assertions while errors are unanticipated.<br /></div><div class="section"><h2><a name="Package_List"></a>Package List<a name="Package_List"></a></h2><div class="section">[<a href="#Summary">Summary</a>] [<a href="#Package_List">Package List</a>] [<a href="#Test_Cases">Test Cases</a>]</div><br /><table border="0" class="bodyTable"><tr class="a"><th>Package</th><th>
 Tests</th><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="b"><td><a href="#org.apache.maven.shared.osgi">org.apache.maven.shared.osgi</a></td><td>4</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>0.229</td></tr><tr class="a"><td><a href="#org.apache.felix.bundleplugin">org.apache.felix.bundleplugin</a></td><td>15</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>3.873</td></tr></table><br />Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.<div class="section"><h3><a name="org.apache.maven.shared.osgi"></a>org.apache.maven.shared.osgi<a name="org.apache.maven.shared.osgi"></a></h3><table border="0" class="bodyTable"><tr class="b"><th></th><th>Class</th><th>Tests</th><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="a"><td><a href="#org.apache.maven.shared.osgiMaven2OsgiConverterTest"><img src="images/icon_success_sml.gif"
  alt="" /></a></td><td><a href="#org.apache.maven.shared.osgiMaven2OsgiConverterTest">Maven2OsgiConverterTest</a></td><td>4</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>0.229</td></tr></table></div><div class="section"><h3><a name="org.apache.felix.bundleplugin"></a>org.apache.felix.bundleplugin<a name="org.apache.felix.bundleplugin"></a></h3><table border="0" class="bodyTable"><tr class="b"><th></th><th>Class</th><th>Tests</th><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="a"><td><a href="#org.apache.felix.bundlepluginBlueprintComponentTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apache.felix.bundlepluginBlueprintComponentTest">BlueprintComponentTest</a></td><td>1</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>0.84</td></tr><tr class="b"><td><a href="#org.apache.felix.bundlepluginBundleAllPluginTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apa
 che.felix.bundlepluginBundleAllPluginTest">BundleAllPluginTest</a></td><td>2</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>1.311</td></tr><tr class="a"><td><a href="#org.apache.felix.bundlepluginBundlePluginTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apache.felix.bundlepluginBundlePluginTest">BundlePluginTest</a></td><td>12</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>1.722</td></tr></table></div><br /></div><div class="section"><h2><a name="Test_Cases"></a>Test Cases<a name="Test_Cases"></a></h2><div class="section">[<a href="#Summary">Summary</a>] [<a href="#Package_List">Package List</a>] [<a href="#Test_Cases">Test Cases</a>]</div><div class="section"><h3><a name="org.apache.felix.bundlepluginBlueprintComponentTest"></a>BlueprintComponentTest<a name="BlueprintComponentTest"></a></h3><table border="0" class="bodyTable"><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testBlueprint</td><td>0.791</td>
 </tr></table></div><div class="section"><h3><a name="org.apache.felix.bundlepluginBundleAllPluginTest"></a>BundleAllPluginTest<a name="BundleAllPluginTest"></a></h3><table border="0" class="bodyTable"><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testSnapshotMatch</td><td>0.518</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testNoReBundling</td><td>0.787</td></tr></table></div><div class="section"><h3><a name="org.apache.felix.bundlepluginBundlePluginTest"></a>BundlePluginTest<a name="BundlePluginTest"></a></h3><table border="0" class="bodyTable"><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testConvertVersionToOsgi</td><td>0.195</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testReadExportedModules</td><td>0.284</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testTransformDirectives</td><td>0.099</td></tr><tr
  class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testDefaultPropertiesIncludeOrganization</td><td>0.097</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testVersion</td><td>0.078</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testPackageInfoDetection</td><td>0.085</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyPositiveClauses</td><td>0.166</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyNegativeClauses</td><td>0.131</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyDuplicateKeys</td><td>0.136</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyMissingPositiveKey</td><td>0.136</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDep
 endencyMissingNegativeKey</td><td>0.254</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testPropertySanitizing</td><td>0.048</td></tr></table></div><div class="section"><h3><a name="org.apache.maven.shared.osgiMaven2OsgiConverterTest"></a>Maven2OsgiConverterTest<a name="Maven2OsgiConverterTest"></a></h3><table border="0" class="bodyTable"><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testConvertVersionToOsgi</td><td>0.067</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testGetBundleSymbolicName</td><td>0.072</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testGetBundleFileName</td><td>0.038</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testGetVersion</td><td>0.049</td></tr></table></div><br /></div><br />
       </div>
     </div>
     <div class="clear">
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2012
+      <div class="xright">Copyright &#169;                    2006-2013
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All Rights Reserved.      
         

Modified: felix/trunk/bundleplugin/doc/site/team-list.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/team-list.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/team-list.html (original)
+++ felix/trunk/bundleplugin/doc/site/team-list.html Fri Jun  7 23:25:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Feb 11, 2012 -->
+<!-- Generated by Apache Maven Doxia at Jun 8, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20120211" />
+    <meta name="Date-Revision-yyyymmdd" content="20130608" />
     <meta http-equiv="Content-Language" content="en" />
         
   </head>
@@ -27,7 +27,7 @@
             
         
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2012-02-11</span>
+        <span id="publishDate">Last Published: 2013-06-08</span>
                   &nbsp;| <span id="projectVersion">Version: 2.4.0-SNAPSHOT</span>
                       </div>
             <div class="xright">        
@@ -122,7 +122,7 @@ window.onLoad = init();
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2012
+      <div class="xright">Copyright &#169;                    2006-2013
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All Rights Reserved.      
         

Modified: felix/trunk/bundleplugin/doc/site/wrap-mojo.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/wrap-mojo.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/wrap-mojo.html (original)
+++ felix/trunk/bundleplugin/doc/site/wrap-mojo.html Fri Jun  7 23:25:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Feb 11, 2012 -->
+<!-- Generated by Apache Maven Doxia at Jun 8, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -11,7 +11,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20120211" />
+    <meta name="Date-Revision-yyyymmdd" content="20130608" />
     <meta http-equiv="Content-Language" content="en" />
         
   </head>
@@ -28,7 +28,7 @@
             
         
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2012-02-11</span>
+        <span id="publishDate">Last Published: 2013-06-08</span>
                   &nbsp;| <span id="projectVersion">Version: 2.4.0-SNAPSHOT</span>
                       </div>
             <div class="xright">        
@@ -93,7 +93,7 @@ release</div>
         <li>Requires a Maven project to be executed.</li>
         <li>Requires dependency resolution of artifacts in scope: <tt>test</tt>.</li>
         <li>The goal is thread-safe and supports parallel builds.</li>
-        <li>Binds by default to the lifecycle phase: <tt>package</tt>.</li>
+        <li>Binds by default to the <a class="externalLink" href="http://maven.apache.org/ref/current/maven-core/lifecycles.html">lifecycle phase</a>: <tt>package</tt>.</li>
       </ul>
       <div class="section"><h3>Required Parameters<a name="Required_Parameters"></a></h3>
         <table class="bodyTable" border="0">
@@ -107,13 +107,13 @@ release</div>
             <td><b><a href="#buildDirectory">buildDirectory</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>-</tt></td>
-            <td>The directory for the generated JAR.<br /></td>
+            <td>The directory for the generated JAR.<br /><b>User property is</b>: <tt>project.build.directory</tt>.</td>
           </tr>
           <tr class="a">
             <td><b><a href="#outputDirectory">outputDirectory</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>-</tt></td>
-            <td>The directory for the generated bundles.<br /></td>
+            <td>The directory for the generated bundles.<br /><b>User property is</b>: <tt>project.build.outputDirectory</tt>.</td>
           </tr>
         </table>
       </div>
@@ -149,46 +149,59 @@ bundle.<br /></td>
             <td><b><a href="#dumpClasspath">dumpClasspath</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>-</tt></td>
-            <td>File where the BND class-path will be dumped<br /></td>
+            <td>File where the BND class-path will be dumped<br /><b>User property is</b>: <tt>dumpClasspath</tt>.</td>
           </tr>
           <tr class="b">
             <td><b><a href="#dumpInstructions">dumpInstructions</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>-</tt></td>
-            <td>File where the BND instructions will be dumped<br /></td>
+            <td>File where the BND instructions will be dumped<br /><b>User property is</b>: <tt>dumpInstructions</tt>.</td>
           </tr>
           <tr class="a">
             <td><b><a href="#excludeDependencies">excludeDependencies</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>-</tt></td>
             <td>Comma separated list of artifactIds to exclude from the dependency
-classpath passed to BND (use &quot;true&quot; to exclude everything)<br /></td>
+classpath passed to BND (use &quot;true&quot; to exclude everything)<br /><b>User property is</b>: <tt>excludeDependencies</tt>.</td>
           </tr>
           <tr class="b">
+            <td><b><a href="#finalName">finalName</a></b></td>
+            <td><tt>String</tt></td>
+            <td><tt>-</tt></td>
+            <td>Final name of the bundle (without classifier or extension)<br /><b>User property is</b>: <tt>project.build.finalName</tt>.</td>
+          </tr>
+          <tr class="a">
             <td><b><a href="#ignoreMissingArtifacts">ignoreMissingArtifacts</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>-</tt></td>
             <td>Ignore missing artifacts that are not required by current project
 but are required by the transitive dependencies.<br /></td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#instructions">instructions</a></b></td>
             <td><tt>Map</tt></td>
             <td><tt>-</tt></td>
             <td>The BND instructions for the bundle.<br /></td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#manifestLocation">manifestLocation</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>-</tt></td>
-            <td>Directory where the manifest will be written<br /><b>Default value is</b>: <tt>${project.build.outputDirectory}/META-INF</tt>.</td>
+            <td>Directory where the manifest will be written<br /><b>Default value is</b>: <tt>${project.build.outputDirectory}/META-INF</tt>.<br /><b>User property is</b>: <tt>manifestLocation</tt>.</td>
+          </tr>
+          <tr class="b">
+            <td><b><a href="#packaging">packaging</a></b></td>
+            <td><tt>String</tt></td>
+            <td><tt>-</tt></td>
+            <td>Packaging type of the bundle to be installed. For example, &quot;jar&quot;.
+Defaults to none which means use the same packaging as the project.<br /></td>
           </tr>
           <tr class="a">
             <td><b><a href="#rebuildBundle">rebuildBundle</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>-</tt></td>
             <td>When true, generate the manifest by rebuilding the full bundle in
-memory<br /></td>
+memory<br /><b>User property is</b>: <tt>rebuildBundle</tt>.</td>
           </tr>
           <tr class="b">
             <td><b><a href="#supportedProjectTypes">supportedProjectTypes</a></b></td>
@@ -200,13 +213,13 @@ memory<br /></td>
             <td><b><a href="#unpackBundle">unpackBundle</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>-</tt></td>
-            <td>When true, unpack the bundle contents to the outputDirectory<br /></td>
+            <td>When true, unpack the bundle contents to the outputDirectory<br /><b>User property is</b>: <tt>unpackBundle</tt>.</td>
           </tr>
           <tr class="b">
             <td><b><a href="#wrapImportPackage">wrapImportPackage</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>-</tt></td>
-            <td>Import-Package to be used when wrapping dependencies.<br /><b>Default value is</b>: <tt>*</tt>.</td>
+            <td>Import-Package to be used when wrapping dependencies.<br /><b>Default value is</b>: <tt>*</tt>.<br /><b>User property is</b>: <tt>wrapImportPackage</tt>.</td>
           </tr>
         </table>
       </div>
@@ -221,7 +234,7 @@ memory<br /></td>
         <ul>
           <li><b>Type</b>: <tt>java.lang.String</tt></li>
           <li><b>Required</b>: <tt>Yes</tt></li>
-          <li><b>Expression</b>: <tt>${project.build.directory}</tt></li>
+          <li><b>User Property</b>: <tt>project.build.directory</tt></li>
         </ul><hr /><p><b><a name="classifier">classifier</a>:</b></p>
         <div>Classifier type of the bundle to be installed. For example,
 &quot;jdk14&quot;. Defaults to none which means this is the project's main
@@ -239,20 +252,26 @@ bundle.</div>
         <ul>
           <li><b>Type</b>: <tt>java.io.File</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${dumpClasspath}</tt></li>
+          <li><b>User Property</b>: <tt>dumpClasspath</tt></li>
         </ul><hr /><p><b><a name="dumpInstructions">dumpInstructions</a>:</b></p>
         <div>File where the BND instructions will be dumped</div>
         <ul>
           <li><b>Type</b>: <tt>java.io.File</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${dumpInstructions}</tt></li>
+          <li><b>User Property</b>: <tt>dumpInstructions</tt></li>
         </ul><hr /><p><b><a name="excludeDependencies">excludeDependencies</a>:</b></p>
         <div>Comma separated list of artifactIds to exclude from the dependency
 classpath passed to BND (use &quot;true&quot; to exclude everything)</div>
         <ul>
           <li><b>Type</b>: <tt>java.lang.String</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${excludeDependencies}</tt></li>
+          <li><b>User Property</b>: <tt>excludeDependencies</tt></li>
+        </ul><hr /><p><b><a name="finalName">finalName</a>:</b></p>
+        <div>Final name of the bundle (without classifier or extension)</div>
+        <ul>
+          <li><b>Type</b>: <tt>java.lang.String</tt></li>
+          <li><b>Required</b>: <tt>No</tt></li>
+          <li><b>User Property</b>: <tt>project.build.finalName</tt></li>
         </ul><hr /><p><b><a name="ignoreMissingArtifacts">ignoreMissingArtifacts</a>:</b></p>
         <div>Ignore missing artifacts that are not required by current project
 but are required by the transitive dependencies.</div>
@@ -269,21 +288,27 @@ but are required by the transitive depen
         <ul>
           <li><b>Type</b>: <tt>java.io.File</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${manifestLocation}</tt></li>
+          <li><b>User Property</b>: <tt>manifestLocation</tt></li>
           <li><b>Default</b>: <tt>${project.build.outputDirectory}/META-INF</tt></li>
         </ul><hr /><p><b><a name="outputDirectory">outputDirectory</a>:</b></p>
         <div>The directory for the generated bundles.</div>
         <ul>
           <li><b>Type</b>: <tt>java.io.File</tt></li>
           <li><b>Required</b>: <tt>Yes</tt></li>
-          <li><b>Expression</b>: <tt>${project.build.outputDirectory}</tt></li>
+          <li><b>User Property</b>: <tt>project.build.outputDirectory</tt></li>
+        </ul><hr /><p><b><a name="packaging">packaging</a>:</b></p>
+        <div>Packaging type of the bundle to be installed. For example, &quot;jar&quot;.
+Defaults to none which means use the same packaging as the project.</div>
+        <ul>
+          <li><b>Type</b>: <tt>java.lang.String</tt></li>
+          <li><b>Required</b>: <tt>No</tt></li>
         </ul><hr /><p><b><a name="rebuildBundle">rebuildBundle</a>:</b></p>
         <div>When true, generate the manifest by rebuilding the full bundle in
 memory</div>
         <ul>
           <li><b>Type</b>: <tt>boolean</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${rebuildBundle}</tt></li>
+          <li><b>User Property</b>: <tt>rebuildBundle</tt></li>
         </ul><hr /><p><b><a name="supportedProjectTypes">supportedProjectTypes</a>:</b></p>
         <div>Project types which this plugin supports.</div>
         <ul>
@@ -294,13 +319,13 @@ memory</div>
         <ul>
           <li><b>Type</b>: <tt>boolean</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${unpackBundle}</tt></li>
+          <li><b>User Property</b>: <tt>unpackBundle</tt></li>
         </ul><hr /><p><b><a name="wrapImportPackage">wrapImportPackage</a>:</b></p>
         <div>Import-Package to be used when wrapping dependencies.</div>
         <ul>
           <li><b>Type</b>: <tt>java.lang.String</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${wrapImportPackage}</tt></li>
+          <li><b>User Property</b>: <tt>wrapImportPackage</tt></li>
           <li><b>Default</b>: <tt>*</tt></li>
         </ul>
       </div>
@@ -313,7 +338,7 @@ memory</div>
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2012
+      <div class="xright">Copyright &#169;                    2006-2013
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All Rights Reserved.      
         

Modified: felix/trunk/bundleplugin/doc/site/xref-test/allclasses-frame.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref-test/allclasses-frame.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref-test/allclasses-frame.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref-test/allclasses-frame.html Fri Jun  7 23:25:18 2013
@@ -26,6 +26,9 @@
 						<li>
 				<a href="org/apache/felix/bundleplugin/BundlePluginTest.html" target="classFrame">BundlePluginTest</a>
 			</li>
+						<li>
+				<a href="org/apache/maven/shared/osgi/Maven2OsgiConverterTest.html" target="classFrame">Maven2OsgiConverterTest</a>
+			</li>
 			      </ul>
 
     </body>

Modified: felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BlueprintComponentTest.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BlueprintComponentTest.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BlueprintComponentTest.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BlueprintComponentTest.html Fri Jun  7 23:25:18 2013
@@ -44,7 +44,7 @@
 <a name="34" href="#34">34</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.plugin.testing.stubs.MavenProjectStub;
 <a name="35" href="#35">35</a>  <strong class="jxr_keyword">import</strong> org.osgi.framework.Constants;
 <a name="36" href="#36">36</a>  
-<a name="37" href="#37">37</a>  <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Builder;
+<a name="37" href="#37">37</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Builder;
 <a name="38" href="#38">38</a>  
 <a name="39" href="#39">39</a>  
 <a name="40" href="#40">40</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/felix/bundleplugin/BlueprintComponentTest.html">BlueprintComponentTest</a> <strong class="jxr_keyword">extends</strong> TestCase

Modified: felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BundlePluginTest.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BundlePluginTest.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BundlePluginTest.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BundlePluginTest.html Fri Jun  7 23:25:18 2013
@@ -47,9 +47,9 @@
 <a name="37" href="#37">37</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
 <a name="38" href="#38">38</a>  <strong class="jxr_keyword">import</strong> org.osgi.framework.Constants;
 <a name="39" href="#39">39</a>  
-<a name="40" href="#40">40</a>  <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Analyzer;
-<a name="41" href="#41">41</a>  <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Builder;
-<a name="42" href="#42">42</a>  <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Jar;
+<a name="40" href="#40">40</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Analyzer;
+<a name="41" href="#41">41</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Builder;
+<a name="42" href="#42">42</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Jar;
 <a name="43" href="#43">43</a>  
 <a name="44" href="#44">44</a>  
 <a name="45" href="#45">45</a>  <em class="jxr_javadoccomment">/**</em>
@@ -134,7 +134,7 @@
 <a name="124" href="#124">124</a>             { jar } );
 <a name="125" href="#125">125</a> 
 <a name="126" href="#126">126</a>         analyzer.setProperty( Analyzer.EXPORT_PACKAGE, <span class="jxr_string">"*"</span> );
-<a name="127" href="#127">127</a>         analyzer.calcManifest();
+<a name="127" href="#127">127</a>         analyzer.getJar().setManifest( analyzer.calcManifest() );
 <a name="128" href="#128">128</a> 
 <a name="129" href="#129">129</a>         assertEquals( 3, analyzer.getExports().size() );
 <a name="130" href="#130">130</a> 

Modified: felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/package-summary.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/package-summary.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/package-summary.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/package-summary.html Fri Jun  7 23:25:18 2013
@@ -82,6 +82,6 @@
         	</ul>
       	</div>
 				<hr />
-		Copyright &copy; 2006-2012 The Apache Software Foundation. All Rights Reserved.
+		Copyright &copy; 2006-2013 The Apache Software Foundation. All Rights Reserved.
 	</body>
 </html>
\ No newline at end of file

Added: felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.html?rev=1490866&view=auto
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.html (added)
+++ felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.html Fri Jun  7 23:25:18 2013
@@ -0,0 +1,188 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+<title>Maven2OsgiConverterTest xref</title>
+<link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
+</head>
+<body>
+<pre>
+
+<a name="1" href="#1">1</a>   <strong class="jxr_keyword">package</strong> org.apache.maven.shared.osgi;
+<a name="2" href="#2">2</a>   
+<a name="3" href="#3">3</a>   <em class="jxr_comment">/*</em>
+<a name="4" href="#4">4</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a name="5" href="#5">5</a>   <em class="jxr_comment"> * or more contributor license agreements.  See the NOTICE file</em>
+<a name="6" href="#6">6</a>   <em class="jxr_comment"> * distributed with this work for additional information</em>
+<a name="7" href="#7">7</a>   <em class="jxr_comment"> * regarding copyright ownership.  The ASF licenses this file</em>
+<a name="8" href="#8">8</a>   <em class="jxr_comment"> * to you under the Apache License, Version 2.0 (the</em>
+<a name="9" href="#9">9</a>   <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
+<a name="10" href="#10">10</a>  <em class="jxr_comment"> * with the License.  You may obtain a copy of the License at</em>
+<a name="11" href="#11">11</a>  <em class="jxr_comment"> *</em>
+<a name="12" href="#12">12</a>  <em class="jxr_comment"> *   <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a name="13" href="#13">13</a>  <em class="jxr_comment"> *</em>
+<a name="14" href="#14">14</a>  <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing,</em>
+<a name="15" href="#15">15</a>  <em class="jxr_comment"> * software distributed under the License is distributed on an</em>
+<a name="16" href="#16">16</a>  <em class="jxr_comment"> * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY</em>
+<a name="17" href="#17">17</a>  <em class="jxr_comment"> * KIND, either express or implied.  See the License for the</em>
+<a name="18" href="#18">18</a>  <em class="jxr_comment"> * specific language governing permissions and limitations</em>
+<a name="19" href="#19">19</a>  <em class="jxr_comment"> * under the License.</em>
+<a name="20" href="#20">20</a>  <em class="jxr_comment"> */</em>
+<a name="21" href="#21">21</a>  
+<a name="22" href="#22">22</a>  <strong class="jxr_keyword">import</strong> java.io.File;
+<a name="23" href="#23">23</a>  
+<a name="24" href="#24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.plugin.testing.stubs.ArtifactStub;
+<a name="25" href="#25">25</a>  <strong class="jxr_keyword">import</strong> org.codehaus.plexus.PlexusTestCase;
+<a name="26" href="#26">26</a>  
+<a name="27" href="#27">27</a>  <em class="jxr_javadoccomment">/**</em>
+<a name="28" href="#28">28</a>  <em class="jxr_javadoccomment"> * Test for {@link DefaultMaven2OsgiConverter}</em>
+<a name="29" href="#29">29</a>  <em class="jxr_javadoccomment"> * </em>
+<a name="30" href="#30">30</a>  <em class="jxr_javadoccomment"> * @author &lt;a href="<a href="mailto:carlos@apache.org" target="alexandria_uri">mailto:carlos@apache.org</a>"&gt;Carlos Sanchez&lt;/a&gt;</em>
+<a name="31" href="#31">31</a>  <em class="jxr_javadoccomment"> * @version $Id$</em>
+<a name="32" href="#32">32</a>  <em class="jxr_javadoccomment"> */</em>
+<a name="33" href="#33">33</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> Maven2OsgiConverterTest
+<a name="34" href="#34">34</a>      <strong class="jxr_keyword">extends</strong> PlexusTestCase
+<a name="35" href="#35">35</a>  {
+<a name="36" href="#36">36</a>  
+<a name="37" href="#37">37</a>      <strong class="jxr_keyword">private</strong> Maven2OsgiConverter maven2Osgi = <strong class="jxr_keyword">new</strong> DefaultMaven2OsgiConverter();
+<a name="38" href="#38">38</a>  
+<a name="39" href="#39">39</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGetBundleSymbolicName()
+<a name="40" href="#40">40</a>      {
+<a name="41" href="#41">41</a>          ArtifactStub artifact = getTestArtifact();
+<a name="42" href="#42">42</a>          String s;
+<a name="43" href="#43">43</a>          s = maven2Osgi.getBundleSymbolicName( artifact );
+<a name="44" href="#44">44</a>          assertEquals( <span class="jxr_string">"org.apache.commons.logging"</span>, s );
+<a name="45" href="#45">45</a>  
+<a name="46" href="#46">46</a>          artifact.setGroupId( <span class="jxr_string">"org.apache.commons"</span> );
+<a name="47" href="#47">47</a>          s = maven2Osgi.getBundleSymbolicName( artifact );
+<a name="48" href="#48">48</a>          assertEquals( <span class="jxr_string">"org.apache.commons.logging"</span>, s );
+<a name="49" href="#49">49</a>  
+<a name="50" href="#50">50</a>          artifact.setGroupId( <span class="jxr_string">"org.apache.commons.commons-logging"</span> );
+<a name="51" href="#51">51</a>          s = maven2Osgi.getBundleSymbolicName( artifact );
+<a name="52" href="#52">52</a>          assertEquals( <span class="jxr_string">"org.apache.commons.commons-logging"</span>, s );
+<a name="53" href="#53">53</a>  
+<a name="54" href="#54">54</a>          artifact.setGroupId( <span class="jxr_string">"org.apache"</span> );
+<a name="55" href="#55">55</a>          artifact.setArtifactId( <span class="jxr_string">"org.apache.commons-logging"</span> );
+<a name="56" href="#56">56</a>          s = maven2Osgi.getBundleSymbolicName( artifact );
+<a name="57" href="#57">57</a>          assertEquals( <span class="jxr_string">"org.apache.commons-logging"</span>, s );
+<a name="58" href="#58">58</a>  
+<a name="59" href="#59">59</a>          artifact.setFile( getTestFile( <span class="jxr_string">"junit-3.8.2.jar"</span> ) );
+<a name="60" href="#60">60</a>          artifact.setGroupId( <span class="jxr_string">"junit"</span> );
+<a name="61" href="#61">61</a>          artifact.setArtifactId( <span class="jxr_string">"junit"</span> );
+<a name="62" href="#62">62</a>          s = maven2Osgi.getBundleSymbolicName( artifact );
+<a name="63" href="#63">63</a>          assertEquals( <span class="jxr_string">"junit"</span>, s );
+<a name="64" href="#64">64</a>  
+<a name="65" href="#65">65</a>          artifact.setFile( getTestFile( <span class="jxr_string">"xml-apis-1.0.b2.jar"</span> ) );
+<a name="66" href="#66">66</a>          artifact.setGroupId( <span class="jxr_string">"xml-apis"</span> );
+<a name="67" href="#67">67</a>          artifact.setArtifactId( <span class="jxr_string">"a"</span> );
+<a name="68" href="#68">68</a>          s = maven2Osgi.getBundleSymbolicName( artifact );
+<a name="69" href="#69">69</a>          assertEquals( <span class="jxr_string">"xml-apis.a"</span>, s );
+<a name="70" href="#70">70</a>  
+<a name="71" href="#71">71</a>          artifact.setFile( getTestFile( <span class="jxr_string">"test-1.jar"</span> ) );
+<a name="72" href="#72">72</a>          artifact.setGroupId( <span class="jxr_string">"test"</span> );
+<a name="73" href="#73">73</a>          artifact.setArtifactId( <span class="jxr_string">"test"</span> );
+<a name="74" href="#74">74</a>          s = maven2Osgi.getBundleSymbolicName( artifact );
+<a name="75" href="#75">75</a>          assertEquals( <span class="jxr_string">"test"</span>, s );
+<a name="76" href="#76">76</a>  
+<a name="77" href="#77">77</a>          artifact.setFile( getTestFile( <span class="jxr_string">"xercesImpl-2.6.2.jar"</span> ) );
+<a name="78" href="#78">78</a>          artifact.setGroupId( <span class="jxr_string">"xerces"</span> );
+<a name="79" href="#79">79</a>          artifact.setArtifactId( <span class="jxr_string">"xercesImpl"</span> );
+<a name="80" href="#80">80</a>          s = maven2Osgi.getBundleSymbolicName( artifact );
+<a name="81" href="#81">81</a>          assertEquals( <span class="jxr_string">"xerces.Impl"</span>, s );
+<a name="82" href="#82">82</a>  
+<a name="83" href="#83">83</a>          artifact.setFile( getTestFile( <span class="jxr_string">"aopalliance-1.0.jar"</span> ) );
+<a name="84" href="#84">84</a>          artifact.setGroupId( <span class="jxr_string">"org.aopalliance"</span> );
+<a name="85" href="#85">85</a>          artifact.setArtifactId( <span class="jxr_string">"aopalliance"</span> );
+<a name="86" href="#86">86</a>          s = maven2Osgi.getBundleSymbolicName( artifact );
+<a name="87" href="#87">87</a>          assertEquals( <span class="jxr_string">"org.aopalliance"</span>, s );
+<a name="88" href="#88">88</a>      }
+<a name="89" href="#89">89</a>  
+<a name="90" href="#90">90</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGetBundleFileName()
+<a name="91" href="#91">91</a>      {
+<a name="92" href="#92">92</a>          ArtifactStub artifact = getTestArtifact();
+<a name="93" href="#93">93</a>          String s;
+<a name="94" href="#94">94</a>          s = maven2Osgi.getBundleFileName( artifact );
+<a name="95" href="#95">95</a>          assertEquals( <span class="jxr_string">"org.apache.commons.logging_1.1.0.jar"</span>, s );
+<a name="96" href="#96">96</a>  
+<a name="97" href="#97">97</a>          artifact.setGroupId( <span class="jxr_string">"org.aopalliance"</span> );
+<a name="98" href="#98">98</a>          artifact.setArtifactId( <span class="jxr_string">"aopalliance"</span> );
+<a name="99" href="#99">99</a>          s = maven2Osgi.getBundleFileName( artifact );
+<a name="100" href="#100">100</a>         assertEquals( <span class="jxr_string">"org.aopalliance_1.1.0.jar"</span>, s );
+<a name="101" href="#101">101</a>     }
+<a name="102" href="#102">102</a> 
+<a name="103" href="#103">103</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGetVersion()
+<a name="104" href="#104">104</a>     {
+<a name="105" href="#105">105</a>         ArtifactStub artifact = getTestArtifact();
+<a name="106" href="#106">106</a>         String s = maven2Osgi.getVersion( artifact );
+<a name="107" href="#107">107</a>         assertEquals( <span class="jxr_string">"1.1.0"</span>, s );
+<a name="108" href="#108">108</a>     }
+<a name="109" href="#109">109</a> 
+<a name="110" href="#110">110</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testConvertVersionToOsgi()
+<a name="111" href="#111">111</a>     {
+<a name="112" href="#112">112</a>         String osgiVersion;
+<a name="113" href="#113">113</a> 
+<a name="114" href="#114">114</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"2.1.0-SNAPSHOT"</span> );
+<a name="115" href="#115">115</a>         assertEquals( <span class="jxr_string">"2.1.0.SNAPSHOT"</span>, osgiVersion );
+<a name="116" href="#116">116</a> 
+<a name="117" href="#117">117</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"2.1-SNAPSHOT"</span> );
+<a name="118" href="#118">118</a>         assertEquals( <span class="jxr_string">"2.1.0.SNAPSHOT"</span>, osgiVersion );
+<a name="119" href="#119">119</a> 
+<a name="120" href="#120">120</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"2-SNAPSHOT"</span> );
+<a name="121" href="#121">121</a>         assertEquals( <span class="jxr_string">"2.0.0.SNAPSHOT"</span>, osgiVersion );
+<a name="122" href="#122">122</a> 
+<a name="123" href="#123">123</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"2"</span> );
+<a name="124" href="#124">124</a>         assertEquals( <span class="jxr_string">"2.0.0"</span>, osgiVersion );
+<a name="125" href="#125">125</a> 
+<a name="126" href="#126">126</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"2.1"</span> );
+<a name="127" href="#127">127</a>         assertEquals( <span class="jxr_string">"2.1.0"</span>, osgiVersion );
+<a name="128" href="#128">128</a> 
+<a name="129" href="#129">129</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"2.1.3"</span> );
+<a name="130" href="#130">130</a>         assertEquals( <span class="jxr_string">"2.1.3"</span>, osgiVersion );
+<a name="131" href="#131">131</a> 
+<a name="132" href="#132">132</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"2.1.3.4"</span> );
+<a name="133" href="#133">133</a>         assertEquals( <span class="jxr_string">"2.1.3.4"</span>, osgiVersion );
+<a name="134" href="#134">134</a> 
+<a name="135" href="#135">135</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"4aug2000r7-dev"</span> );
+<a name="136" href="#136">136</a>         assertEquals( <span class="jxr_string">"0.0.0.4aug2000r7-dev"</span>, osgiVersion );
+<a name="137" href="#137">137</a> 
+<a name="138" href="#138">138</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"1.1-alpha-2"</span> );
+<a name="139" href="#139">139</a>         assertEquals( <span class="jxr_string">"1.1.0.alpha-2"</span>, osgiVersion );
+<a name="140" href="#140">140</a> 
+<a name="141" href="#141">141</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"1.0-alpha-16-20070122.203121-13"</span> );
+<a name="142" href="#142">142</a>         assertEquals( <span class="jxr_string">"1.0.0.alpha-16-20070122_203121-13"</span>, osgiVersion );
+<a name="143" href="#143">143</a> 
+<a name="144" href="#144">144</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"1.0-20070119.021432-1"</span> );
+<a name="145" href="#145">145</a>         assertEquals( <span class="jxr_string">"1.0.0.20070119_021432-1"</span>, osgiVersion );
+<a name="146" href="#146">146</a> 
+<a name="147" href="#147">147</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"1-20070119.021432-1"</span> );
+<a name="148" href="#148">148</a>         assertEquals( <span class="jxr_string">"1.0.0.20070119_021432-1"</span>, osgiVersion );
+<a name="149" href="#149">149</a> 
+<a name="150" href="#150">150</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"1.4.1-20070217.082013-7"</span> );
+<a name="151" href="#151">151</a>         assertEquals( <span class="jxr_string">"1.4.1.20070217_082013-7"</span>, osgiVersion );
+<a name="152" href="#152">152</a>         
+<a name="153" href="#153">153</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"0.0.0.4aug2000r7-dev"</span> );
+<a name="154" href="#154">154</a>         assertEquals( <span class="jxr_string">"0.0.0.4aug2000r7-dev"</span>, osgiVersion );
+<a name="155" href="#155">155</a>         
+<a name="156" href="#156">156</a>         osgiVersion = maven2Osgi.getVersion( <span class="jxr_string">"4aug2000r7-dev"</span> );
+<a name="157" href="#157">157</a>         assertEquals( <span class="jxr_string">"0.0.0.4aug2000r7-dev"</span>, osgiVersion );
+<a name="158" href="#158">158</a>     }
+<a name="159" href="#159">159</a> 
+<a name="160" href="#160">160</a>     <strong class="jxr_keyword">private</strong> ArtifactStub getTestArtifact()
+<a name="161" href="#161">161</a>     {
+<a name="162" href="#162">162</a>         ArtifactStub a = <strong class="jxr_keyword">new</strong> ArtifactStub();
+<a name="163" href="#163">163</a>         a.setGroupId( <span class="jxr_string">"commons-logging"</span> );
+<a name="164" href="#164">164</a>         a.setArtifactId( <span class="jxr_string">"commons-logging"</span> );
+<a name="165" href="#165">165</a>         a.setVersion( <span class="jxr_string">"1.1"</span> );
+<a name="166" href="#166">166</a>         a.setFile( getTestFile( <span class="jxr_string">"commons-logging-1.1.jar"</span> ) );
+<a name="167" href="#167">167</a>         <strong class="jxr_keyword">return</strong> a;
+<a name="168" href="#168">168</a>     }
+<a name="169" href="#169">169</a> 
+<a name="170" href="#170">170</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> File getTestFile( String fileName )
+<a name="171" href="#171">171</a>     {
+<a name="172" href="#172">172</a>         <strong class="jxr_keyword">return</strong> PlexusTestCase.getTestFile( <span class="jxr_string">"src/test/resources/"</span> + fileName );
+<a name="173" href="#173">173</a>     }
+<a name="174" href="#174">174</a> }
+</pre>
+<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
+</html>
+

Propchange: felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.html
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-frame.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-frame.html?rev=1490866&view=auto
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-frame.html (added)
+++ felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-frame.html Fri Jun  7 23:25:18 2013
@@ -0,0 +1,24 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
+<html xml:lang="en" lang="en">
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+		<title>Maven Bundle Plugin 2.4.0-SNAPSHOT Reference Package org.apache.maven.shared.osgi</title>
+		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
+	</head>
+	<body>
+
+		<h3>
+        	<a href="package-summary.html" target="classFrame">org.apache.maven.shared.osgi</a>
+      	</h3>
+
+      	<h3>Classes</h3>
+
+      	<ul>
+      		          	<li>
+            	<a href="Maven2OsgiConverterTest.html" target="classFrame">Maven2OsgiConverterTest</a>
+          	</li>
+          	      	</ul>
+
+	</body>
+</html>
\ No newline at end of file

Propchange: felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-frame.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-frame.html
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-summary.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-summary.html?rev=1490866&view=auto
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-summary.html (added)
+++ felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-summary.html Fri Jun  7 23:25:18 2013
@@ -0,0 +1,67 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
+<html xml:lang="en" lang="en">
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+		<title>Maven Bundle Plugin 2.4.0-SNAPSHOT Reference Package org.apache.maven.shared.osgi</title>
+		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
+	</head>
+	<body>
+		      	<div class="overview">
+        	<ul>
+          		<li>
+            		<a href="../../../../../overview-summary.html">Overview</a>
+          		</li>
+          		<li class="selected">Package</li>
+        	</ul>
+      	</div>
+      	<div class="framenoframe">
+        	<ul>
+          		<li>
+            		<a href="../../../../../index.html" target="_top">FRAMES</a>
+          		</li>
+          		<li>
+            		<a href="package-summary.html" target="_top">NO FRAMES</a>
+          		</li>
+        	</ul>
+      	</div>
+		
+		      	<h2>Package org.apache.maven.shared.osgi</h2>
+
+		<table class="summary">
+        	<thead>
+          		<tr>
+            		<th>Class Summary</th>
+          		</tr>
+        	</thead>
+        	<tbody>
+        		            	<tr>
+              		<td>
+                		<a href="Maven2OsgiConverterTest.html" target="classFrame">Maven2OsgiConverterTest</a>
+              		</td>
+            	</tr>
+				        	</tbody>
+      	</table>
+		
+		      	<div class="overview">
+        	<ul>
+          		<li>
+            		<a href="../../../../../overview-summary.html">Overview</a>
+          		</li>
+          		<li class="selected">Package</li>
+        	</ul>
+      	</div>
+      	<div class="framenoframe">
+        	<ul>
+          		<li>
+            		<a href="../../../../../index.html" target="_top">FRAMES</a>
+          		</li>
+          		<li>
+            		<a href="package-summary.html" target="_top">NO FRAMES</a>
+          		</li>
+        	</ul>
+      	</div>
+				<hr />
+		Copyright &copy; 2006-2013 The Apache Software Foundation. All Rights Reserved.
+	</body>
+</html>
\ No newline at end of file

Propchange: felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-summary.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-summary.html
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: felix/trunk/bundleplugin/doc/site/xref-test/overview-frame.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref-test/overview-frame.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref-test/overview-frame.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref-test/overview-frame.html Fri Jun  7 23:25:18 2013
@@ -18,6 +18,9 @@
 						<li>
 				<a href="org/apache/felix/bundleplugin/package-frame.html" target="packageFrame">org.apache.felix.bundleplugin</a>
 			</li>
+						<li>
+				<a href="org/apache/maven/shared/osgi/package-frame.html" target="packageFrame">org.apache.maven.shared.osgi</a>
+			</li>
 					</ul>
 
 	</body>

Modified: felix/trunk/bundleplugin/doc/site/xref-test/overview-summary.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref-test/overview-summary.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref-test/overview-summary.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref-test/overview-summary.html Fri Jun  7 23:25:18 2013
@@ -38,6 +38,11 @@
                 		<a href="org/apache/felix/bundleplugin/package-summary.html">org.apache.felix.bundleplugin</a>
               		</td>
             	</tr>
+	          	            	<tr>
+              		<td>
+                		<a href="org/apache/maven/shared/osgi/package-summary.html">org.apache.maven.shared.osgi</a>
+              		</td>
+            	</tr>
 	          	        	</tbody>
       	</table>
 		
@@ -59,6 +64,6 @@
       	</div>
 		
 		<hr />
-		Copyright &copy; 2006-2012 The Apache Software Foundation. All Rights Reserved.
+		Copyright &copy; 2006-2013 The Apache Software Foundation. All Rights Reserved.
 	</body>
 </html>
\ No newline at end of file

Modified: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/AbstractDependencyFilter.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/AbstractDependencyFilter.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/AbstractDependencyFilter.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/AbstractDependencyFilter.html Fri Jun  7 23:25:18 2013
@@ -38,8 +38,8 @@
 <a name="28" href="#28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.Artifact;
 <a name="29" href="#29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.plugin.MojoExecutionException;
 <a name="30" href="#30">30</a>  
-<a name="31" href="#31">31</a>  <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Instruction;
-<a name="32" href="#32">32</a>  <strong class="jxr_keyword">import</strong> aQute.libg.header.OSGiHeader;
+<a name="31" href="#31">31</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Instruction;
+<a name="32" href="#32">32</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.header.OSGiHeader;
 <a name="33" href="#33">33</a>  
 <a name="34" href="#34">34</a>  
 <a name="35" href="#35">35</a>  <em class="jxr_javadoccomment">/**</em>
@@ -76,7 +76,7 @@
 <a name="66" href="#66">66</a>  
 <a name="67" href="#67">67</a>          <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/felix/bundleplugin/AbstractDependencyFilter.html">DependencyFilter</a>( String expression, String defaultValue )
 <a name="68" href="#68">68</a>          {
-<a name="69" href="#69">69</a>              m_instruction = Instruction.getPattern( expression );
+<a name="69" href="#69">69</a>              m_instruction = <strong class="jxr_keyword">new</strong> Instruction( expression );
 <a name="70" href="#70">70</a>              m_defaultValue = defaultValue;
 <a name="71" href="#71">71</a>          }
 <a name="72" href="#72">72</a>  

Modified: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/AntPlugin.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/AntPlugin.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/AntPlugin.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/AntPlugin.html Fri Jun  7 23:25:18 2013
@@ -41,8 +41,8 @@
 <a name="31" href="#31">31</a>  <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.IOUtil;
 <a name="32" href="#32">32</a>  <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.StringUtils;
 <a name="33" href="#33">33</a>  
-<a name="34" href="#34">34</a>  <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Builder;
-<a name="35" href="#35">35</a>  <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Jar;
+<a name="34" href="#34">34</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Builder;
+<a name="35" href="#35">35</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Jar;
 <a name="36" href="#36">36</a>  
 <a name="37" href="#37">37</a>  
 <a name="38" href="#38">38</a>  <em class="jxr_javadoccomment">/**</em>



Mime
View raw message