Modified: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestPlugin.html URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestPlugin.html?rev=1243125&r1=1243124&r2=1243125&view=diff ============================================================================== --- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestPlugin.html (original) +++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestPlugin.html Sat Feb 11 19:16:11 2012 @@ -34,202 +34,254 @@ <a name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> java.io.FileOutputStream; <a name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> java.io.IOException; <a name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> java.io.OutputStream; -<a name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> java.util.LinkedHashMap; -<a name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> java.util.Map; -<a name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> java.util.Map.Entry; -<a name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> java.util.Properties; -<a name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> java.util.jar.Manifest; -<a name="32" href="#32">32</a> -<a name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugin.MojoExecutionException; -<a name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugin.MojoFailureException; -<a name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.MavenProject; -<a name="36" href="#36">36</a> -<a name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Analyzer; -<a name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Builder; -<a name="39" href="#39">39</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.lib.osgi.Resource; -<a name="41" href="#41">41</a> +<a name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> java.util.Iterator; +<a name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> java.util.LinkedHashMap; +<a name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> java.util.Map; +<a name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> java.util.Map.Entry; +<a name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> java.util.Properties; +<a name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> java.util.jar.Manifest; +<a name="33" href="#33">33</a> +<a name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugin.MojoExecutionException; +<a name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugin.MojoFailureException; +<a name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.MavenProject; +<a name="37" href="#37">37</a> +<a name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Analyzer; +<a name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Builder; +<a name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Jar; +<a name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Resource; <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"> * Generate an OSGi manifest for this project</em> -<a name="45" href="#45">45</a> <em class="jxr_javadoccomment"> * </em> -<a name="46" href="#46">46</a> <em class="jxr_javadoccomment"> * @goal manifest</em> -<a name="47" href="#47">47</a> <em class="jxr_javadoccomment"> * @phase process-classes</em> -<a name="48" href="#48">48</a> <em class="jxr_javadoccomment"> * @requiresDependencyResolution test</em> -<a name="49" href="#49">49</a> <em class="jxr_javadoccomment"> * @threadSafe</em> -<a name="50" href="#50">50</a> <em class="jxr_javadoccomment"> */</em> -<a name="51" href="#51">51</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/felix/bundleplugin/ManifestPlugin.html">ManifestPlugin</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/felix/bundleplugin/BundlePlugin.html">BundlePlugin</a> -<a name="52" href="#52">52</a> { -<a name="53" href="#53">53</a> <em class="jxr_javadoccomment">/**</em> -<a name="54" href="#54">54</a> <em class="jxr_javadoccomment"> * When true, generate the manifest by rebuilding the full bundle in memory </em> -<a name="55" href="#55">55</a> <em class="jxr_javadoccomment"> *</em> -<a name="56" href="#56">56</a> <em class="jxr_javadoccomment"> * @parameter expression="${rebuildBundle}"</em> -<a name="57" href="#57">57</a> <em class="jxr_javadoccomment"> */</em> -<a name="58" href="#58">58</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> rebuildBundle; -<a name="59" href="#59">59</a> +<a name="43" href="#43">43</a> +<a name="44" href="#44">44</a> <em class="jxr_javadoccomment">/**</em> +<a name="45" href="#45">45</a> <em class="jxr_javadoccomment"> * Generate an OSGi manifest for this project</em> +<a name="46" href="#46">46</a> <em class="jxr_javadoccomment"> * </em> +<a name="47" href="#47">47</a> <em class="jxr_javadoccomment"> * @goal manifest</em> +<a name="48" href="#48">48</a> <em class="jxr_javadoccomment"> * @phase process-classes</em> +<a name="49" href="#49">49</a> <em class="jxr_javadoccomment"> * @requiresDependencyResolution test</em> +<a name="50" href="#50">50</a> <em class="jxr_javadoccomment"> * @threadSafe</em> +<a name="51" href="#51">51</a> <em class="jxr_javadoccomment"> */</em> +<a name="52" href="#52">52</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/felix/bundleplugin/ManifestPlugin.html">ManifestPlugin</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/felix/bundleplugin/BundlePlugin.html">BundlePlugin</a> +<a name="53" href="#53">53</a> { +<a name="54" href="#54">54</a> <em class="jxr_javadoccomment">/**</em> +<a name="55" href="#55">55</a> <em class="jxr_javadoccomment"> * When true, generate the manifest by rebuilding the full bundle in memory </em> +<a name="56" href="#56">56</a> <em class="jxr_javadoccomment"> *</em> +<a name="57" href="#57">57</a> <em class="jxr_javadoccomment"> * @parameter expression="${rebuildBundle}"</em> +<a name="58" href="#58">58</a> <em class="jxr_javadoccomment"> */</em> +<a name="59" href="#59">59</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> rebuildBundle; <a name="60" href="#60">60</a> -<a name="61" href="#61">61</a> @Override -<a name="62" href="#62">62</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> execute( MavenProject project, Map instructions, Properties properties, Jar[] classpath ) -<a name="63" href="#63">63</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException -<a name="64" href="#64">64</a> { -<a name="65" href="#65">65</a> Manifest manifest; -<a name="66" href="#66">66</a> <strong class="jxr_keyword">try</strong> -<a name="67" href="#67">67</a> { -<a name="68" href="#68">68</a> manifest = getManifest( project, instructions, properties, classpath ); -<a name="69" href="#69">69</a> } -<a name="70" href="#70">70</a> <strong class="jxr_keyword">catch</strong> ( FileNotFoundException e ) -<a name="71" href="#71">71</a> { -<a name="72" href="#72">72</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Cannot find "</span> + e.getMessage() -<a name="73" href="#73">73</a> + <span class="jxr_string">" (manifest goal must be run after compile phase)"</span>, e ); -<a name="74" href="#74">74</a> } -<a name="75" href="#75">75</a> <strong class="jxr_keyword">catch</strong> ( IOException e ) -<a name="76" href="#76">76</a> { -<a name="77" href="#77">77</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error trying to generate Manifest"</span>, e ); -<a name="78" href="#78">78</a> } -<a name="79" href="#79">79</a> <strong class="jxr_keyword">catch</strong> ( MojoFailureException e ) -<a name="80" href="#80">80</a> { -<a name="81" href="#81">81</a> getLog().error( e.getLocalizedMessage() ); -<a name="82" href="#82">82</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error(s) found in manifest configuration"</span>, e ); -<a name="83" href="#83">83</a> } -<a name="84" href="#84">84</a> <strong class="jxr_keyword">catch</strong> ( Exception e ) -<a name="85" href="#85">85</a> { -<a name="86" href="#86">86</a> getLog().error( <span class="jxr_string">"An internal error occurred"</span>, e ); -<a name="87" href="#87">87</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Internal error in maven-bundle-plugin"</span>, e ); -<a name="88" href="#88">88</a> } -<a name="89" href="#89">89</a> -<a name="90" href="#90">90</a> File outputFile = <strong class="jxr_keyword">new</strong> File( manifestLocation, <span class="jxr_string">"MANIFEST.MF"</span> ); -<a name="91" href="#91">91</a> -<a name="92" href="#92">92</a> <strong class="jxr_keyword">try</strong> -<a name="93" href="#93">93</a> { -<a name="94" href="#94">94</a> writeManifest( manifest, outputFile ); -<a name="95" href="#95">95</a> } -<a name="96" href="#96">96</a> <strong class="jxr_keyword">catch</strong> ( IOException e ) -<a name="97" href="#97">97</a> { -<a name="98" href="#98">98</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error trying to write Manifest to file "</span> + outputFile, e ); -<a name="99" href="#99">99</a> } -<a name="100" href="#100">100</a> } -<a name="101" href="#101">101</a> +<a name="61" href="#61">61</a> +<a name="62" href="#62">62</a> @Override +<a name="63" href="#63">63</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> execute( MavenProject project, Map instructions, Properties properties, Jar[] classpath ) +<a name="64" href="#64">64</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException +<a name="65" href="#65">65</a> { +<a name="66" href="#66">66</a> Manifest manifest; +<a name="67" href="#67">67</a> <strong class="jxr_keyword">try</strong> +<a name="68" href="#68">68</a> { +<a name="69" href="#69">69</a> manifest = getManifest( project, instructions, properties, classpath ); +<a name="70" href="#70">70</a> } +<a name="71" href="#71">71</a> <strong class="jxr_keyword">catch</strong> ( FileNotFoundException e ) +<a name="72" href="#72">72</a> { +<a name="73" href="#73">73</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Cannot find "</span> + e.getMessage() +<a name="74" href="#74">74</a> + <span class="jxr_string">" (manifest goal must be run after compile phase)"</span>, e ); +<a name="75" href="#75">75</a> } +<a name="76" href="#76">76</a> <strong class="jxr_keyword">catch</strong> ( IOException e ) +<a name="77" href="#77">77</a> { +<a name="78" href="#78">78</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error trying to generate Manifest"</span>, e ); +<a name="79" href="#79">79</a> } +<a name="80" href="#80">80</a> <strong class="jxr_keyword">catch</strong> ( MojoFailureException e ) +<a name="81" href="#81">81</a> { +<a name="82" href="#82">82</a> getLog().error( e.getLocalizedMessage() ); +<a name="83" href="#83">83</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error(s) found in manifest configuration"</span>, e ); +<a name="84" href="#84">84</a> } +<a name="85" href="#85">85</a> <strong class="jxr_keyword">catch</strong> ( Exception e ) +<a name="86" href="#86">86</a> { +<a name="87" href="#87">87</a> getLog().error( <span class="jxr_string">"An internal error occurred"</span>, e ); +<a name="88" href="#88">88</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Internal error in maven-bundle-plugin"</span>, e ); +<a name="89" href="#89">89</a> } +<a name="90" href="#90">90</a> +<a name="91" href="#91">91</a> File outputFile = <strong class="jxr_keyword">new</strong> File( manifestLocation, <span class="jxr_string">"MANIFEST.MF"</span> ); +<a name="92" href="#92">92</a> +<a name="93" href="#93">93</a> <strong class="jxr_keyword">try</strong> +<a name="94" href="#94">94</a> { +<a name="95" href="#95">95</a> writeManifest( manifest, outputFile ); +<a name="96" href="#96">96</a> } +<a name="97" href="#97">97</a> <strong class="jxr_keyword">catch</strong> ( IOException e ) +<a name="98" href="#98">98</a> { +<a name="99" href="#99">99</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error trying to write Manifest to file "</span> + outputFile, e ); +<a name="100" href="#100">100</a> } +<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> Manifest getManifest( MavenProject project, Jar[] classpath ) <strong class="jxr_keyword">throws</strong> IOException, MojoFailureException, -<a name="104" href="#104">104</a> MojoExecutionException, Exception -<a name="105" href="#105">105</a> { -<a name="106" href="#106">106</a> <strong class="jxr_keyword">return</strong> getManifest( project, <strong class="jxr_keyword">new</strong> LinkedHashMap(), <strong class="jxr_keyword">new</strong> Properties(), classpath ); -<a name="107" href="#107">107</a> } -<a name="108" href="#108">108</a> +<a name="103" href="#103">103</a> +<a name="104" href="#104">104</a> <strong class="jxr_keyword">public</strong> Manifest getManifest( MavenProject project, Jar[] classpath ) <strong class="jxr_keyword">throws</strong> IOException, MojoFailureException, +<a name="105" href="#105">105</a> MojoExecutionException, Exception +<a name="106" href="#106">106</a> { +<a name="107" href="#107">107</a> <strong class="jxr_keyword">return</strong> getManifest( project, <strong class="jxr_keyword">new</strong> LinkedHashMap(), <strong class="jxr_keyword">new</strong> Properties(), classpath ); +<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> Manifest getManifest( MavenProject project, Map instructions, Properties properties, Jar[] classpath ) -<a name="111" href="#111">111</a> <strong class="jxr_keyword">throws</strong> IOException, MojoFailureException, MojoExecutionException, Exception -<a name="112" href="#112">112</a> { -<a name="113" href="#113">113</a> Analyzer analyzer = getAnalyzer( project, instructions, properties, classpath ); -<a name="114" href="#114">114</a> <strong class="jxr_keyword">boolean</strong> hasErrors = reportErrors( <span class="jxr_string">"Manifest "</span> + project.getArtifact(), analyzer ); -<a name="115" href="#115">115</a> <strong class="jxr_keyword">if</strong> ( hasErrors ) -<a name="116" href="#116">116</a> { -<a name="117" href="#117">117</a> String failok = analyzer.getProperty( <span class="jxr_string">"-failok"</span> ); -<a name="118" href="#118">118</a> <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">null</strong> == failok || <span class="jxr_string">"false"</span>.equalsIgnoreCase( failok ) ) -<a name="119" href="#119">119</a> { -<a name="120" href="#120">120</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoFailureException( <span class="jxr_string">"Error(s) found in manifest configuration"</span> ); -<a name="121" href="#121">121</a> } -<a name="122" href="#122">122</a> } -<a name="123" href="#123">123</a> -<a name="124" href="#124">124</a> Jar jar = analyzer.getJar(); -<a name="125" href="#125">125</a> -<a name="126" href="#126">126</a> <strong class="jxr_keyword">if</strong> ( unpackBundle ) -<a name="127" href="#127">127</a> { -<a name="128" href="#128">128</a> File outputFile = getOutputDirectory(); -<a name="129" href="#129">129</a> <strong class="jxr_keyword">for</strong> ( Entry<String, Resource> entry : jar.getResources().entrySet() ) -<a name="130" href="#130">130</a> { -<a name="131" href="#131">131</a> File entryFile = <strong class="jxr_keyword">new</strong> File( outputFile, entry.getKey() ); -<a name="132" href="#132">132</a> <strong class="jxr_keyword">if</strong> ( !entryFile.exists() || entry.getValue().lastModified() == 0 ) -<a name="133" href="#133">133</a> { -<a name="134" href="#134">134</a> entryFile.getParentFile().mkdirs(); -<a name="135" href="#135">135</a> OutputStream os = <strong class="jxr_keyword">new</strong> FileOutputStream( entryFile ); -<a name="136" href="#136">136</a> entry.getValue().write( os ); -<a name="137" href="#137">137</a> os.close(); -<a name="138" href="#138">138</a> } -<a name="139" href="#139">139</a> } -<a name="140" href="#140">140</a> } -<a name="141" href="#141">141</a> -<a name="142" href="#142">142</a> Manifest manifest = jar.getManifest(); -<a name="143" href="#143">143</a> -<a name="144" href="#144">144</a> <em class="jxr_comment">// cleanup...</em> -<a name="145" href="#145">145</a> analyzer.close(); -<a name="146" href="#146">146</a> -<a name="147" href="#147">147</a> <strong class="jxr_keyword">return</strong> manifest; -<a name="148" href="#148">148</a> } -<a name="149" href="#149">149</a> +<a name="110" href="#110">110</a> +<a name="111" href="#111">111</a> <strong class="jxr_keyword">public</strong> Manifest getManifest( MavenProject project, Map instructions, Properties properties, Jar[] classpath ) +<a name="112" href="#112">112</a> <strong class="jxr_keyword">throws</strong> IOException, MojoFailureException, MojoExecutionException, Exception +<a name="113" href="#113">113</a> { +<a name="114" href="#114">114</a> Analyzer analyzer = getAnalyzer( project, instructions, properties, classpath ); +<a name="115" href="#115">115</a> <strong class="jxr_keyword">boolean</strong> hasErrors = reportErrors( <span class="jxr_string">"Manifest "</span> + project.getArtifact(), analyzer ); +<a name="116" href="#116">116</a> <strong class="jxr_keyword">if</strong> ( hasErrors ) +<a name="117" href="#117">117</a> { +<a name="118" href="#118">118</a> String failok = analyzer.getProperty( <span class="jxr_string">"-failok"</span> ); +<a name="119" href="#119">119</a> <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">null</strong> == failok || <span class="jxr_string">"false"</span>.equalsIgnoreCase( failok ) ) +<a name="120" href="#120">120</a> { +<a name="121" href="#121">121</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoFailureException( <span class="jxr_string">"Error(s) found in manifest configuration"</span> ); +<a name="122" href="#122">122</a> } +<a name="123" href="#123">123</a> } +<a name="124" href="#124">124</a> +<a name="125" href="#125">125</a> Jar jar = analyzer.getJar(); +<a name="126" href="#126">126</a> +<a name="127" href="#127">127</a> <strong class="jxr_keyword">if</strong> ( unpackBundle ) +<a name="128" href="#128">128</a> { +<a name="129" href="#129">129</a> File outputFile = getOutputDirectory(); +<a name="130" href="#130">130</a> <strong class="jxr_keyword">for</strong> ( Entry<String, Resource> entry : jar.getResources().entrySet() ) +<a name="131" href="#131">131</a> { +<a name="132" href="#132">132</a> File entryFile = <strong class="jxr_keyword">new</strong> File( outputFile, entry.getKey() ); +<a name="133" href="#133">133</a> <strong class="jxr_keyword">if</strong> ( !entryFile.exists() || entry.getValue().lastModified() == 0 ) +<a name="134" href="#134">134</a> { +<a name="135" href="#135">135</a> entryFile.getParentFile().mkdirs(); +<a name="136" href="#136">136</a> OutputStream os = <strong class="jxr_keyword">new</strong> FileOutputStream( entryFile ); +<a name="137" href="#137">137</a> entry.getValue().write( os ); +<a name="138" href="#138">138</a> os.close(); +<a name="139" href="#139">139</a> } +<a name="140" href="#140">140</a> } +<a name="141" href="#141">141</a> } +<a name="142" href="#142">142</a> +<a name="143" href="#143">143</a> Manifest manifest = jar.getManifest(); +<a name="144" href="#144">144</a> +<a name="145" href="#145">145</a> <em class="jxr_comment">// cleanup...</em> +<a name="146" href="#146">146</a> analyzer.close(); +<a name="147" href="#147">147</a> +<a name="148" href="#148">148</a> <strong class="jxr_keyword">return</strong> manifest; +<a name="149" href="#149">149</a> } <a name="150" href="#150">150</a> -<a name="151" href="#151">151</a> <strong class="jxr_keyword">protected</strong> Analyzer getAnalyzer( MavenProject project, Jar[] classpath ) <strong class="jxr_keyword">throws</strong> IOException, MojoExecutionException, -<a name="152" href="#152">152</a> Exception -<a name="153" href="#153">153</a> { -<a name="154" href="#154">154</a> <strong class="jxr_keyword">return</strong> getAnalyzer( project, <strong class="jxr_keyword">new</strong> LinkedHashMap(), <strong class="jxr_keyword">new</strong> Properties(), classpath ); -<a name="155" href="#155">155</a> } -<a name="156" href="#156">156</a> +<a name="151" href="#151">151</a> +<a name="152" href="#152">152</a> <strong class="jxr_keyword">protected</strong> Analyzer getAnalyzer( MavenProject project, Jar[] classpath ) <strong class="jxr_keyword">throws</strong> IOException, MojoExecutionException, +<a name="153" href="#153">153</a> Exception +<a name="154" href="#154">154</a> { +<a name="155" href="#155">155</a> <strong class="jxr_keyword">return</strong> getAnalyzer( project, <strong class="jxr_keyword">new</strong> LinkedHashMap(), <strong class="jxr_keyword">new</strong> Properties(), classpath ); +<a name="156" href="#156">156</a> } <a name="157" href="#157">157</a> -<a name="158" href="#158">158</a> <strong class="jxr_keyword">protected</strong> Analyzer getAnalyzer( MavenProject project, Map instructions, Properties properties, Jar[] classpath ) -<a name="159" href="#159">159</a> <strong class="jxr_keyword">throws</strong> IOException, MojoExecutionException, Exception -<a name="160" href="#160">160</a> { -<a name="161" href="#161">161</a> <strong class="jxr_keyword">if</strong> ( rebuildBundle && supportedProjectTypes.contains( project.getArtifact().getType() ) ) -<a name="162" href="#162">162</a> { -<a name="163" href="#163">163</a> <strong class="jxr_keyword">return</strong> buildOSGiBundle( project, instructions, properties, classpath ); -<a name="164" href="#164">164</a> } -<a name="165" href="#165">165</a> -<a name="166" href="#166">166</a> File file = project.getArtifact().getFile(); -<a name="167" href="#167">167</a> <strong class="jxr_keyword">if</strong> ( file == <strong class="jxr_keyword">null</strong> ) -<a name="168" href="#168">168</a> { -<a name="169" href="#169">169</a> file = getOutputDirectory(); -<a name="170" href="#170">170</a> } -<a name="171" href="#171">171</a> -<a name="172" href="#172">172</a> <strong class="jxr_keyword">if</strong> ( !file.exists() ) -<a name="173" href="#173">173</a> { -<a name="174" href="#174">174</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> FileNotFoundException( file.getPath() ); -<a name="175" href="#175">175</a> } -<a name="176" href="#176">176</a> -<a name="177" href="#177">177</a> Builder analyzer = getOSGiBuilder( project, instructions, properties, classpath ); -<a name="178" href="#178">178</a> -<a name="179" href="#179">179</a> analyzer.setJar( file ); -<a name="180" href="#180">180</a> -<a name="181" href="#181">181</a> <strong class="jxr_keyword">if</strong> ( analyzer.getProperty( Analyzer.EXPORT_PACKAGE ) == <strong class="jxr_keyword">null</strong> -<a name="182" href="#182">182</a> && analyzer.getProperty( Analyzer.EXPORT_CONTENTS ) == <strong class="jxr_keyword">null</strong> -<a name="183" href="#183">183</a> && analyzer.getProperty( Analyzer.PRIVATE_PACKAGE ) == <strong class="jxr_keyword">null</strong> ) -<a name="184" href="#184">184</a> { -<a name="185" href="#185">185</a> String export = analyzer.calculateExportsFromContents( analyzer.getJar() ); -<a name="186" href="#186">186</a> analyzer.setProperty( Analyzer.EXPORT_PACKAGE, export ); -<a name="187" href="#187">187</a> } -<a name="188" href="#188">188</a> -<a name="189" href="#189">189</a> addMavenInstructions( project, analyzer ); -<a name="190" href="#190">190</a> -<a name="191" href="#191">191</a> analyzer.mergeManifest( analyzer.getJar().getManifest() ); -<a name="192" href="#192">192</a> analyzer.calcManifest(); -<a name="193" href="#193">193</a> -<a name="194" href="#194">194</a> mergeMavenManifest( project, analyzer ); +<a name="158" href="#158">158</a> +<a name="159" href="#159">159</a> <strong class="jxr_keyword">protected</strong> Analyzer getAnalyzer( MavenProject project, Map instructions, Properties properties, Jar[] classpath ) +<a name="160" href="#160">160</a> <strong class="jxr_keyword">throws</strong> IOException, MojoExecutionException, Exception +<a name="161" href="#161">161</a> { +<a name="162" href="#162">162</a> <strong class="jxr_keyword">if</strong> ( rebuildBundle && supportedProjectTypes.contains( project.getArtifact().getType() ) ) +<a name="163" href="#163">163</a> { +<a name="164" href="#164">164</a> <strong class="jxr_keyword">return</strong> buildOSGiBundle( project, instructions, properties, classpath ); +<a name="165" href="#165">165</a> } +<a name="166" href="#166">166</a> +<a name="167" href="#167">167</a> File file = project.getArtifact().getFile(); +<a name="168" href="#168">168</a> <strong class="jxr_keyword">if</strong> ( file == <strong class="jxr_keyword">null</strong> ) +<a name="169" href="#169">169</a> { +<a name="170" href="#170">170</a> file = getOutputDirectory(); +<a name="171" href="#171">171</a> } +<a name="172" href="#172">172</a> +<a name="173" href="#173">173</a> <strong class="jxr_keyword">if</strong> ( !file.exists() ) +<a name="174" href="#174">174</a> { +<a name="175" href="#175">175</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> FileNotFoundException( file.getPath() ); +<a name="176" href="#176">176</a> } +<a name="177" href="#177">177</a> +<a name="178" href="#178">178</a> Builder analyzer = getOSGiBuilder( project, instructions, properties, classpath ); +<a name="179" href="#179">179</a> +<a name="180" href="#180">180</a> analyzer.setJar( file ); +<a name="181" href="#181">181</a> +<a name="182" href="#182">182</a> <em class="jxr_comment">// calculateExportsFromContents when we have no explicit instructions defining</em> +<a name="183" href="#183">183</a> <em class="jxr_comment">// the contents of the bundle *and* we are not analyzing the output directory,</em> +<a name="184" href="#184">184</a> <em class="jxr_comment">// otherwise fall-back to addMavenInstructions approach</em> +<a name="185" href="#185">185</a> +<a name="186" href="#186">186</a> <strong class="jxr_keyword">boolean</strong> isOutputDirectory = file.equals( getOutputDirectory() ); +<a name="187" href="#187">187</a> +<a name="188" href="#188">188</a> <strong class="jxr_keyword">if</strong> ( analyzer.getProperty( Analyzer.EXPORT_PACKAGE ) == <strong class="jxr_keyword">null</strong> +<a name="189" href="#189">189</a> && analyzer.getProperty( Analyzer.EXPORT_CONTENTS ) == <strong class="jxr_keyword">null</strong> +<a name="190" href="#190">190</a> && analyzer.getProperty( Analyzer.PRIVATE_PACKAGE ) == <strong class="jxr_keyword">null</strong> && !isOutputDirectory ) +<a name="191" href="#191">191</a> { +<a name="192" href="#192">192</a> String export = calculateExportsFromContents( analyzer.getJar() ); +<a name="193" href="#193">193</a> analyzer.setProperty( Analyzer.EXPORT_PACKAGE, export ); +<a name="194" href="#194">194</a> } <a name="195" href="#195">195</a> -<a name="196" href="#196">196</a> <strong class="jxr_keyword">return</strong> analyzer; -<a name="197" href="#197">197</a> } -<a name="198" href="#198">198</a> -<a name="199" href="#199">199</a> -<a name="200" href="#200">200</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> writeManifest( Manifest manifest, File outputFile ) <strong class="jxr_keyword">throws</strong> IOException -<a name="201" href="#201">201</a> { -<a name="202" href="#202">202</a> outputFile.getParentFile().mkdirs(); -<a name="203" href="#203">203</a> -<a name="204" href="#204">204</a> FileOutputStream os; -<a name="205" href="#205">205</a> os = <strong class="jxr_keyword">new</strong> FileOutputStream( outputFile ); -<a name="206" href="#206">206</a> <strong class="jxr_keyword">try</strong> -<a name="207" href="#207">207</a> { -<a name="208" href="#208">208</a> Jar.writeManifest( manifest, os ); -<a name="209" href="#209">209</a> } -<a name="210" href="#210">210</a> <strong class="jxr_keyword">finally</strong> -<a name="211" href="#211">211</a> { -<a name="212" href="#212">212</a> <strong class="jxr_keyword">try</strong> -<a name="213" href="#213">213</a> { -<a name="214" href="#214">214</a> os.close(); -<a name="215" href="#215">215</a> } -<a name="216" href="#216">216</a> <strong class="jxr_keyword">catch</strong> ( IOException e ) -<a name="217" href="#217">217</a> { -<a name="218" href="#218">218</a> <em class="jxr_comment">// nothing we can do here</em> -<a name="219" href="#219">219</a> } -<a name="220" href="#220">220</a> } -<a name="221" href="#221">221</a> } -<a name="222" href="#222">222</a> } +<a name="196" href="#196">196</a> addMavenInstructions( project, analyzer ); +<a name="197" href="#197">197</a> +<a name="198" href="#198">198</a> <em class="jxr_comment">// if we spot Embed-Dependency and the bundle is "target/classes", assume we need to rebuild</em> +<a name="199" href="#199">199</a> <strong class="jxr_keyword">if</strong> ( analyzer.getProperty( DependencyEmbedder.EMBED_DEPENDENCY ) != <strong class="jxr_keyword">null</strong> && isOutputDirectory ) +<a name="200" href="#200">200</a> { +<a name="201" href="#201">201</a> analyzer.build(); +<a name="202" href="#202">202</a> } +<a name="203" href="#203">203</a> <strong class="jxr_keyword">else</strong> +<a name="204" href="#204">204</a> { +<a name="205" href="#205">205</a> analyzer.mergeManifest( analyzer.getJar().getManifest() ); +<a name="206" href="#206">206</a> analyzer.calcManifest(); +<a name="207" href="#207">207</a> } +<a name="208" href="#208">208</a> +<a name="209" href="#209">209</a> mergeMavenManifest( project, analyzer ); +<a name="210" href="#210">210</a> +<a name="211" href="#211">211</a> <strong class="jxr_keyword">return</strong> analyzer; +<a name="212" href="#212">212</a> } +<a name="213" href="#213">213</a> +<a name="214" href="#214">214</a> +<a name="215" href="#215">215</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> writeManifest( Manifest manifest, File outputFile ) <strong class="jxr_keyword">throws</strong> IOException +<a name="216" href="#216">216</a> { +<a name="217" href="#217">217</a> outputFile.getParentFile().mkdirs(); +<a name="218" href="#218">218</a> +<a name="219" href="#219">219</a> FileOutputStream os; +<a name="220" href="#220">220</a> os = <strong class="jxr_keyword">new</strong> FileOutputStream( outputFile ); +<a name="221" href="#221">221</a> <strong class="jxr_keyword">try</strong> +<a name="222" href="#222">222</a> { +<a name="223" href="#223">223</a> Jar.writeManifest( manifest, os ); +<a name="224" href="#224">224</a> } +<a name="225" href="#225">225</a> <strong class="jxr_keyword">finally</strong> +<a name="226" href="#226">226</a> { +<a name="227" href="#227">227</a> <strong class="jxr_keyword">try</strong> +<a name="228" href="#228">228</a> { +<a name="229" href="#229">229</a> os.close(); +<a name="230" href="#230">230</a> } +<a name="231" href="#231">231</a> <strong class="jxr_keyword">catch</strong> ( IOException e ) +<a name="232" href="#232">232</a> { +<a name="233" href="#233">233</a> <em class="jxr_comment">// nothing we can do here</em> +<a name="234" href="#234">234</a> } +<a name="235" href="#235">235</a> } +<a name="236" href="#236">236</a> } +<a name="237" href="#237">237</a> +<a name="238" href="#238">238</a> +<a name="239" href="#239">239</a> <em class="jxr_comment">/*</em> +<a name="240" href="#240">240</a> <em class="jxr_comment"> * Patched version of bnd's Analyzer.calculateExportsFromContents</em> +<a name="241" href="#241">241</a> <em class="jxr_comment"> */</em> +<a name="242" href="#242">242</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String calculateExportsFromContents( Jar bundle ) +<a name="243" href="#243">243</a> { +<a name="244" href="#244">244</a> String ddel = <span class="jxr_string">""</span>; +<a name="245" href="#245">245</a> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer(); +<a name="246" href="#246">246</a> Map<String, Map<String, Resource>> map = bundle.getDirectories(); +<a name="247" href="#247">247</a> <strong class="jxr_keyword">for</strong> ( Iterator<Entry<String, Map<String, Resource>>> i = map.entrySet().iterator(); i.hasNext(); ) +<a name="248" href="#248">248</a> { +<a name="249" href="#249">249</a> <em class="jxr_comment">//----------------------------------------------------</em> +<a name="250" href="#250">250</a> <em class="jxr_comment">// should also ignore directories with no resources</em> +<a name="251" href="#251">251</a> <em class="jxr_comment">//----------------------------------------------------</em> +<a name="252" href="#252">252</a> Entry<String, Map<String, Resource>> entry = i.next(); +<a name="253" href="#253">253</a> <strong class="jxr_keyword">if</strong> ( entry.getValue() == <strong class="jxr_keyword">null</strong> || entry.getValue().isEmpty() ) +<a name="254" href="#254">254</a> <strong class="jxr_keyword">continue</strong>; +<a name="255" href="#255">255</a> <em class="jxr_comment">//----------------------------------------------------</em> +<a name="256" href="#256">256</a> String directory = entry.getKey(); +<a name="257" href="#257">257</a> <strong class="jxr_keyword">if</strong> ( directory.equals( <span class="jxr_string">"META-INF"</span> ) || directory.startsWith( <span class="jxr_string">"META-INF/"</span> ) ) +<a name="258" href="#258">258</a> <strong class="jxr_keyword">continue</strong>; +<a name="259" href="#259">259</a> <strong class="jxr_keyword">if</strong> ( directory.equals( <span class="jxr_string">"OSGI-OPT"</span> ) || directory.startsWith( <span class="jxr_string">"OSGI-OPT/"</span> ) ) +<a name="260" href="#260">260</a> <strong class="jxr_keyword">continue</strong>; +<a name="261" href="#261">261</a> <strong class="jxr_keyword">if</strong> ( directory.equals( <span class="jxr_string">"/"</span> ) ) +<a name="262" href="#262">262</a> <strong class="jxr_keyword">continue</strong>; +<a name="263" href="#263">263</a> +<a name="264" href="#264">264</a> <strong class="jxr_keyword">if</strong> ( directory.endsWith( <span class="jxr_string">"/"</span> ) ) +<a name="265" href="#265">265</a> directory = directory.substring( 0, directory.length() - 1 ); +<a name="266" href="#266">266</a> +<a name="267" href="#267">267</a> directory = directory.replace( '/', '.' ); +<a name="268" href="#268">268</a> sb.append( ddel ); +<a name="269" href="#269">269</a> sb.append( directory ); +<a name="270" href="#270">270</a> ddel = <span class="jxr_string">","</span>; +<a name="271" href="#271">271</a> } +<a name="272" href="#272">272</a> <strong class="jxr_keyword">return</strong> sb.toString(); +<a name="273" href="#273">273</a> } +<a name="274" href="#274">274</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/package-frame.html URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/package-frame.html?rev=1243125&r1=1243124&r2=1243125&view=diff ============================================================================== --- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/package-frame.html (original) +++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/package-frame.html Sat Feb 11 19:16:11 2012 @@ -55,9 +55,6 @@ <a href="ManifestPlugin.html" target="classFrame">ManifestPlugin</a> </li> <li> - <a href="PackageVersionAnalyzer.html" target="classFrame">PackageVersionAnalyzer</a> - </li> - <li> <a href="VersionCleanerPlugin.html" target="classFrame">VersionCleanerPlugin</a> </li> <li> Modified: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/package-summary.html URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/package-summary.html?rev=1243125&r1=1243124&r2=1243125&view=diff ============================================================================== --- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/package-summary.html (original) +++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/package-summary.html Sat Feb 11 19:16:11 2012 @@ -102,11 +102,6 @@ </tr> <tr> <td> - <a href="PackageVersionAnalyzer.html" target="classFrame">PackageVersionAnalyzer</a> - </td> - </tr> - <tr> - <td> <a href="VersionCleanerPlugin.html" target="classFrame">VersionCleanerPlugin</a> </td> </tr> @@ -137,6 +132,6 @@ </ul> </div> <hr /> - Copyright © 2006-2011 The Apache Software Foundation. All Rights Reserved. + Copyright © 2006-2012 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/obrplugin/package-summary.html URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/package-summary.html?rev=1243125&r1=1243124&r2=1243125&view=diff ============================================================================== --- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/package-summary.html (original) +++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/package-summary.html Sat Feb 11 19:16:11 2012 @@ -127,6 +127,6 @@ </ul> </div> <hr /> - Copyright © 2006-2011 The Apache Software Foundation. All Rights Reserved. + Copyright © 2006-2012 The Apache Software Foundation. All Rights Reserved. </body> </html> \ No newline at end of file Modified: felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.html URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.html?rev=1243125&r1=1243124&r2=1243125&view=diff ============================================================================== --- felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.html (original) +++ felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.html Sat Feb 11 19:16:11 2012 @@ -585,7 +585,13 @@ <a name="575" href="#575">575</a> { <a name="576" href="#576">576</a> <strong class="jxr_keyword">return</strong> artifact.getDependencyConflictId() + <span class="jxr_string">":"</span> + artifact.getVersionRange(); <a name="577" href="#577">577</a> } -<a name="578" href="#578">578</a> } +<a name="578" href="#578">578</a> +<a name="579" href="#579">579</a> +<a name="580" href="#580">580</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> manageArtifactSystemPath( Artifact artifact, Artifact replacement ) +<a name="581" href="#581">581</a> { +<a name="582" href="#582">582</a> <em class="jxr_comment">// NO-OP</em> +<a name="583" href="#583">583</a> } +<a name="584" href="#584">584</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/maven/shared/dependency/tree/package-summary.html URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/dependency/tree/package-summary.html?rev=1243125&r1=1243124&r2=1243125&view=diff ============================================================================== --- felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/dependency/tree/package-summary.html (original) +++ felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/dependency/tree/package-summary.html Sat Feb 11 19:16:11 2012 @@ -62,6 +62,6 @@ </ul> </div> <hr /> - Copyright © 2006-2011 The Apache Software Foundation. All Rights Reserved. + Copyright © 2006-2012 The Apache Software Foundation. All Rights Reserved. </body> </html> \ No newline at end of file Modified: felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/package-summary.html URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/package-summary.html?rev=1243125&r1=1243124&r2=1243125&view=diff ============================================================================== --- felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/package-summary.html (original) +++ felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/package-summary.html Sat Feb 11 19:16:11 2012 @@ -72,6 +72,6 @@ </ul> </div> <hr /> - Copyright © 2006-2011 The Apache Software Foundation. All Rights Reserved. + Copyright © 2006-2012 The Apache Software Foundation. All Rights Reserved. </body> </html> \ No newline at end of file Modified: felix/trunk/bundleplugin/doc/site/xref/overview-summary.html URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/overview-summary.html?rev=1243125&r1=1243124&r2=1243125&view=diff ============================================================================== --- felix/trunk/bundleplugin/doc/site/xref/overview-summary.html (original) +++ felix/trunk/bundleplugin/doc/site/xref/overview-summary.html Sat Feb 11 19:16:11 2012 @@ -74,6 +74,6 @@ </div> <hr /> - Copyright © 2006-2011 The Apache Software Foundation. All Rights Reserved. + Copyright © 2006-2012 The Apache Software Foundation. All Rights Reserved. </body> </html> \ No newline at end of file
