felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mccu...@apache.org
Subject svn commit: r1604145 [5/5] - in /felix/trunk/bundleplugin: doc/site/ doc/site/xref/org/apache/felix/bundleplugin/ src/main/java/org/apache/felix/bundleplugin/
Date Fri, 20 Jun 2014 11:41:01 GMT
Modified: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/VersionCleanerPlugin.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/VersionCleanerPlugin.html?rev=1604145&r1=1604144&r2=1604145&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/VersionCleanerPlugin.html
(original)
+++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/VersionCleanerPlugin.html
Fri Jun 20 11:41:00 2014
@@ -41,55 +41,57 @@
 <a name="31" href="#31">31</a>  
 <a name="32" href="#32">32</a>  
 <a name="33" href="#33">33</a>  <em class="jxr_javadoccomment">/**</em>
-<a name="34" href="#34">34</a>  <em class="jxr_javadoccomment"> * @goal
cleanVersions</em>
-<a name="35" href="#35">35</a>  <em class="jxr_javadoccomment"> * @description
clean OSGi versions</em>
-<a name="36" href="#36">36</a>  <em class="jxr_javadoccomment"> * @threadSafe</em>
-<a name="37" href="#37">37</a>  <em class="jxr_javadoccomment"> */</em>
-<a name="38" href="#38">38</a>  <strong class="jxr_keyword">public</strong>
<strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/felix/bundleplugin/VersionCleanerPlugin.html">VersionCleanerPlugin</a>
<strong class="jxr_keyword">extends</strong> AbstractMojo
-<a name="39" href="#39">39</a>  {
-<a name="40" href="#40">40</a>  
-<a name="41" href="#41">41</a>      <em class="jxr_javadoccomment">/**</em>
-<a name="42" href="#42">42</a>  <em class="jxr_javadoccomment">     * The
BND instructions for the bundle.</em>
-<a name="43" href="#43">43</a>  <em class="jxr_javadoccomment">     *</em>
-<a name="44" href="#44">44</a>  <em class="jxr_javadoccomment">     * @parameter</em>
-<a name="45" href="#45">45</a>  <em class="jxr_javadoccomment">     */</em>
-<a name="46" href="#46">46</a>      <strong class="jxr_keyword">private</strong>
Map versions = <strong class="jxr_keyword">new</strong> LinkedHashMap();
-<a name="47" href="#47">47</a>  
-<a name="48" href="#48">48</a>      <em class="jxr_javadoccomment">/**</em>
-<a name="49" href="#49">49</a>  <em class="jxr_javadoccomment">     * The
Maven project.</em>
-<a name="50" href="#50">50</a>  <em class="jxr_javadoccomment">     *</em>
-<a name="51" href="#51">51</a>  <em class="jxr_javadoccomment">     * @parameter
expression="${project}"</em>
-<a name="52" href="#52">52</a>  <em class="jxr_javadoccomment">     * @required</em>
-<a name="53" href="#53">53</a>  <em class="jxr_javadoccomment">     * @readonly</em>
-<a name="54" href="#54">54</a>  <em class="jxr_javadoccomment">     */</em>
-<a name="55" href="#55">55</a>      <strong class="jxr_keyword">private</strong>
MavenProject project;
-<a name="56" href="#56">56</a>  
-<a name="57" href="#57">57</a>      <strong class="jxr_keyword">private</strong>
Maven2OsgiConverter maven2OsgiConverter = <strong class="jxr_keyword">new</strong>
DefaultMaven2OsgiConverter();
+<a name="34" href="#34">34</a>  <em class="jxr_javadoccomment"> * Convert
a group of versions to OSGi format.</em>
+<a name="35" href="#35">35</a>  <em class="jxr_javadoccomment"> *</em>
+<a name="36" href="#36">36</a>  <em class="jxr_javadoccomment"> * @goal
cleanVersions</em>
+<a name="37" href="#37">37</a>  <em class="jxr_javadoccomment"> * @description
clean OSGi versions</em>
+<a name="38" href="#38">38</a>  <em class="jxr_javadoccomment"> * @threadSafe</em>
+<a name="39" href="#39">39</a>  <em class="jxr_javadoccomment"> */</em>
+<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/VersionCleanerPlugin.html">VersionCleanerPlugin</a>
<strong class="jxr_keyword">extends</strong> AbstractMojo
+<a name="41" href="#41">41</a>  {
+<a name="42" href="#42">42</a>  
+<a name="43" href="#43">43</a>      <em class="jxr_javadoccomment">/**</em>
+<a name="44" href="#44">44</a>  <em class="jxr_javadoccomment">     * The
BND instructions for the bundle.</em>
+<a name="45" href="#45">45</a>  <em class="jxr_javadoccomment">     *</em>
+<a name="46" href="#46">46</a>  <em class="jxr_javadoccomment">     * @parameter</em>
+<a name="47" href="#47">47</a>  <em class="jxr_javadoccomment">     */</em>
+<a name="48" href="#48">48</a>      <strong class="jxr_keyword">private</strong>
Map versions = <strong class="jxr_keyword">new</strong> LinkedHashMap();
+<a name="49" href="#49">49</a>  
+<a name="50" href="#50">50</a>      <em class="jxr_javadoccomment">/**</em>
+<a name="51" href="#51">51</a>  <em class="jxr_javadoccomment">     * The
Maven project.</em>
+<a name="52" href="#52">52</a>  <em class="jxr_javadoccomment">     *</em>
+<a name="53" href="#53">53</a>  <em class="jxr_javadoccomment">     * @parameter
expression="${project}"</em>
+<a name="54" href="#54">54</a>  <em class="jxr_javadoccomment">     * @required</em>
+<a name="55" href="#55">55</a>  <em class="jxr_javadoccomment">     * @readonly</em>
+<a name="56" href="#56">56</a>  <em class="jxr_javadoccomment">     */</em>
+<a name="57" href="#57">57</a>      <strong class="jxr_keyword">private</strong>
MavenProject project;
 <a name="58" href="#58">58</a>  
-<a name="59" href="#59">59</a>  
-<a name="60" href="#60">60</a>      <strong class="jxr_keyword">public</strong>
Maven2OsgiConverter getMaven2OsgiConverter()
-<a name="61" href="#61">61</a>      {
-<a name="62" href="#62">62</a>          <strong class="jxr_keyword">return</strong>
maven2OsgiConverter;
-<a name="63" href="#63">63</a>      }
-<a name="64" href="#64">64</a>  
-<a name="65" href="#65">65</a>  
-<a name="66" href="#66">66</a>      <strong class="jxr_keyword">public</strong>
<strong class="jxr_keyword">void</strong> setMaven2OsgiConverter( Maven2OsgiConverter
maven2OsgiConverter )
-<a name="67" href="#67">67</a>      {
-<a name="68" href="#68">68</a>          <strong class="jxr_keyword">this</strong>.maven2OsgiConverter
= maven2OsgiConverter;
-<a name="69" href="#69">69</a>      }
-<a name="70" href="#70">70</a>  
-<a name="71" href="#71">71</a>  
-<a name="72" href="#72">72</a>      <strong class="jxr_keyword">public</strong>
<strong class="jxr_keyword">void</strong> execute() <strong class="jxr_keyword">throws</strong>
MojoExecutionException, MojoFailureException
-<a name="73" href="#73">73</a>      {
-<a name="74" href="#74">74</a>          <strong class="jxr_keyword">for</strong>
( Object key : versions.keySet() )
-<a name="75" href="#75">75</a>          {
-<a name="76" href="#76">76</a>              String name = ( String ) key;
-<a name="77" href="#77">77</a>              String version = ( String ) versions.get(
key );
-<a name="78" href="#78">78</a>              String osgi = maven2OsgiConverter.getVersion(
version );
-<a name="79" href="#79">79</a>              project.getProperties().put( name,
osgi );
-<a name="80" href="#80">80</a>          }
-<a name="81" href="#81">81</a>      }
-<a name="82" href="#82">82</a>  }
+<a name="59" href="#59">59</a>      <strong class="jxr_keyword">private</strong>
Maven2OsgiConverter maven2OsgiConverter = <strong class="jxr_keyword">new</strong>
DefaultMaven2OsgiConverter();
+<a name="60" href="#60">60</a>  
+<a name="61" href="#61">61</a>  
+<a name="62" href="#62">62</a>      <strong class="jxr_keyword">public</strong>
Maven2OsgiConverter getMaven2OsgiConverter()
+<a name="63" href="#63">63</a>      {
+<a name="64" href="#64">64</a>          <strong class="jxr_keyword">return</strong>
maven2OsgiConverter;
+<a name="65" href="#65">65</a>      }
+<a name="66" href="#66">66</a>  
+<a name="67" href="#67">67</a>  
+<a name="68" href="#68">68</a>      <strong class="jxr_keyword">public</strong>
<strong class="jxr_keyword">void</strong> setMaven2OsgiConverter( Maven2OsgiConverter
maven2OsgiConverter )
+<a name="69" href="#69">69</a>      {
+<a name="70" href="#70">70</a>          <strong class="jxr_keyword">this</strong>.maven2OsgiConverter
= maven2OsgiConverter;
+<a name="71" href="#71">71</a>      }
+<a name="72" href="#72">72</a>  
+<a name="73" href="#73">73</a>  
+<a name="74" href="#74">74</a>      <strong class="jxr_keyword">public</strong>
<strong class="jxr_keyword">void</strong> execute() <strong class="jxr_keyword">throws</strong>
MojoExecutionException, MojoFailureException
+<a name="75" href="#75">75</a>      {
+<a name="76" href="#76">76</a>          <strong class="jxr_keyword">for</strong>
( Object key : versions.keySet() )
+<a name="77" href="#77">77</a>          {
+<a name="78" href="#78">78</a>              String name = ( String ) key;
+<a name="79" href="#79">79</a>              String version = ( String ) versions.get(
key );
+<a name="80" href="#80">80</a>              String osgi = maven2OsgiConverter.getVersion(
version );
+<a name="81" href="#81">81</a>              project.getProperties().put( name,
osgi );
+<a name="82" href="#82">82</a>          }
+<a name="83" href="#83">83</a>      }
+<a name="84" href="#84">84</a>  }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/WrapPlugin.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/WrapPlugin.html?rev=1604145&r1=1604144&r2=1604145&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/WrapPlugin.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/WrapPlugin.html Fri
Jun 20 11:41:00 2014
@@ -33,25 +33,27 @@
 <a name="23" href="#23">23</a>  
 <a name="24" href="#24">24</a>  
 <a name="25" href="#25">25</a>  <em class="jxr_javadoccomment">/**</em>
-<a name="26" href="#26">26</a>  <em class="jxr_javadoccomment"> * @goal
wrap</em>
-<a name="27" href="#27">27</a>  <em class="jxr_javadoccomment"> * @phase
package</em>
-<a name="28" href="#28">28</a>  <em class="jxr_javadoccomment"> * @requiresDependencyResolution
test</em>
-<a name="29" href="#29">29</a>  <em class="jxr_javadoccomment"> * @description
build an OSGi bundle jar for direct dependencies</em>
-<a name="30" href="#30">30</a>  <em class="jxr_javadoccomment"> * @deprecated
The wrap goal is no longer supported and may be removed in a future release</em>
-<a name="31" href="#31">31</a>  <em class="jxr_javadoccomment"> */</em>
-<a name="32" href="#32">32</a>  @Deprecated
-<a name="33" href="#33">33</a>  <strong class="jxr_keyword">public</strong>
<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong>
<a href="../../../../org/apache/felix/bundleplugin/WrapPlugin.html">WrapPlugin</a>
<strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/felix/bundleplugin/BundleAllPlugin.html">BundleAllPlugin</a>
-<a name="34" href="#34">34</a>  {
-<a name="35" href="#35">35</a>      <strong class="jxr_keyword">public</strong>
<strong class="jxr_keyword">void</strong> execute() <strong class="jxr_keyword">throws</strong>
MojoExecutionException
-<a name="36" href="#36">36</a>      {
-<a name="37" href="#37">37</a>          getLog().warn( <span class="jxr_string">"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"</span>
);
-<a name="38" href="#38">38</a>          getLog().warn( <span class="jxr_string">"!
The wrap goal is no longer supported and may be removed in a future release !"</span>
);
+<a name="26" href="#26">26</a>  <em class="jxr_javadoccomment"> * Create
OSGi bundles from the direct dependencies of the Maven project.</em>
+<a name="27" href="#27">27</a>  <em class="jxr_javadoccomment"> *</em>
+<a name="28" href="#28">28</a>  <em class="jxr_javadoccomment"> * @goal
wrap</em>
+<a name="29" href="#29">29</a>  <em class="jxr_javadoccomment"> * @phase
package</em>
+<a name="30" href="#30">30</a>  <em class="jxr_javadoccomment"> * @requiresDependencyResolution
test</em>
+<a name="31" href="#31">31</a>  <em class="jxr_javadoccomment"> * @description
build an OSGi bundle jar for direct dependencies</em>
+<a name="32" href="#32">32</a>  <em class="jxr_javadoccomment"> * @deprecated
The wrap goal is no longer supported and may be removed in a future release</em>
+<a name="33" href="#33">33</a>  <em class="jxr_javadoccomment"> */</em>
+<a name="34" href="#34">34</a>  @Deprecated
+<a name="35" href="#35">35</a>  <strong class="jxr_keyword">public</strong>
<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong>
<a href="../../../../org/apache/felix/bundleplugin/WrapPlugin.html">WrapPlugin</a>
<strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/felix/bundleplugin/BundleAllPlugin.html">BundleAllPlugin</a>
+<a name="36" href="#36">36</a>  {
+<a name="37" href="#37">37</a>      <strong class="jxr_keyword">public</strong>
<strong class="jxr_keyword">void</strong> execute() <strong class="jxr_keyword">throws</strong>
MojoExecutionException
+<a name="38" href="#38">38</a>      {
 <a name="39" href="#39">39</a>          getLog().warn( <span class="jxr_string">"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"</span>
);
-<a name="40" href="#40">40</a>  
-<a name="41" href="#41">41</a>          <a href="../../../../org/apache/felix/bundleplugin/BundleInfo.html">BundleInfo</a>
bundleInfo = bundleAll( getProject(), 1 );
-<a name="42" href="#42">42</a>          logDuplicatedPackages( bundleInfo );
-<a name="43" href="#43">43</a>      }
-<a name="44" href="#44">44</a>  }
+<a name="40" href="#40">40</a>          getLog().warn( <span class="jxr_string">"!
The wrap goal is no longer supported and may be removed in a future release !"</span>
);
+<a name="41" href="#41">41</a>          getLog().warn( <span class="jxr_string">"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"</span>
);
+<a name="42" href="#42">42</a>  
+<a name="43" href="#43">43</a>          <a href="../../../../org/apache/felix/bundleplugin/BundleInfo.html">BundleInfo</a>
bundleInfo = bundleAll( getProject(), 1 );
+<a name="44" href="#44">44</a>          logDuplicatedPackages( bundleInfo );
+<a name="45" href="#45">45</a>      }
+<a name="46" href="#46">46</a>  }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=1604145&r1=1604144&r2=1604145&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
(original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Fri Jun 20 11:41:00 2014
@@ -226,6 +226,8 @@ public class BundlePlugin extends Abstra
     private MavenSession m_mavenSession;
 
     /**
+     * Output a nicely formatted manifest that still respects the 72 character line limit.
+     *
      * @parameter
      */
     private boolean niceManifest = false;

Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java?rev=1604145&r1=1604144&r2=1604145&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java
(original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java
Fri Jun 20 11:41:00 2014
@@ -31,6 +31,8 @@ import org.apache.maven.shared.osgi.Mave
 
 
 /**
+ * Convert a group of versions to OSGi format.
+ *
  * @goal cleanVersions
  * @description clean OSGi versions
  * @threadSafe

Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java?rev=1604145&r1=1604144&r2=1604145&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java Fri
Jun 20 11:41:00 2014
@@ -23,6 +23,8 @@ import org.apache.maven.plugin.MojoExecu
 
 
 /**
+ * Create OSGi bundles from the direct dependencies of the Maven project.
+ *
  * @goal wrap
  * @phase package
  * @requiresDependencyResolution test



Mime
View raw message