You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2013/06/08 01:25:20 UTC
svn commit: r1490866 [8/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...
Modified: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/DependencyEmbedder.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/DependencyEmbedder.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/DependencyEmbedder.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/DependencyEmbedder.html Fri Jun 7 23:25:18 2013
@@ -39,7 +39,7 @@
<a name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugin.logging.Log;
<a name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.StringUtils;
<a name="31" href="#31">31</a>
-<a name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Analyzer;
+<a name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Analyzer;
<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>
Modified: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/InstructionsPlugin.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/InstructionsPlugin.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/InstructionsPlugin.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/InstructionsPlugin.html Fri Jun 7 23:25:18 2013
@@ -39,7 +39,7 @@
<a name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugin.MojoFailureException;
<a name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.MavenProject;
<a name="31" href="#31">31</a>
-<a name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Jar;
+<a name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Jar;
<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>
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=1490866&r1=1490865&r2=1490866&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 Fri Jun 7 23:25:18 2013
@@ -45,10 +45,10 @@
<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="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Analyzer;
+<a name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Builder;
+<a name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Jar;
+<a name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Resource;
<a name="42" href="#42">42</a>
<a name="43" href="#43">43</a>
<a name="44" href="#44">44</a> <em class="jxr_javadoccomment">/**</em>
@@ -182,106 +182,113 @@
<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> 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> }
+<a name="175" href="#175">175</a> <strong class="jxr_keyword">if</strong> ( file.equals( getOutputDirectory() ) )
+<a name="176" href="#176">176</a> {
+<a name="177" href="#177">177</a> file.mkdirs();
+<a name="178" href="#178">178</a> }
+<a name="179" href="#179">179</a> <strong class="jxr_keyword">else</strong>
+<a name="180" href="#180">180</a> {
+<a name="181" href="#181">181</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> FileNotFoundException( file.getPath() );
+<a name="182" href="#182">182</a> }
+<a name="183" href="#183">183</a> }
+<a name="184" href="#184">184</a>
+<a name="185" href="#185">185</a> Builder analyzer = getOSGiBuilder( project, instructions, properties, classpath );
+<a name="186" href="#186">186</a>
+<a name="187" href="#187">187</a> analyzer.setJar( file );
+<a name="188" href="#188">188</a>
+<a name="189" href="#189">189</a> <em class="jxr_comment">// calculateExportsFromContents when we have no explicit instructions defining</em>
+<a name="190" href="#190">190</a> <em class="jxr_comment">// the contents of the bundle *and* we are not analyzing the output directory,</em>
+<a name="191" href="#191">191</a> <em class="jxr_comment">// otherwise fall-back to addMavenInstructions approach</em>
+<a name="192" href="#192">192</a>
+<a name="193" href="#193">193</a> <strong class="jxr_keyword">boolean</strong> isOutputDirectory = file.equals( getOutputDirectory() );
+<a name="194" href="#194">194</a>
+<a name="195" href="#195">195</a> <strong class="jxr_keyword">if</strong> ( analyzer.getProperty( Analyzer.EXPORT_PACKAGE ) == <strong class="jxr_keyword">null</strong>
+<a name="196" href="#196">196</a> && analyzer.getProperty( Analyzer.EXPORT_CONTENTS ) == <strong class="jxr_keyword">null</strong>
+<a name="197" href="#197">197</a> && analyzer.getProperty( Analyzer.PRIVATE_PACKAGE ) == <strong class="jxr_keyword">null</strong> && !isOutputDirectory )
+<a name="198" href="#198">198</a> {
+<a name="199" href="#199">199</a> String export = calculateExportsFromContents( analyzer.getJar() );
+<a name="200" href="#200">200</a> analyzer.setProperty( Analyzer.EXPORT_PACKAGE, export );
+<a name="201" href="#201">201</a> }
+<a name="202" href="#202">202</a>
+<a name="203" href="#203">203</a> addMavenInstructions( project, analyzer );
+<a name="204" href="#204">204</a>
+<a name="205" href="#205">205</a> <em class="jxr_comment">// if we spot Embed-Dependency and the bundle is "target/classes", assume we need to rebuild</em>
+<a name="206" href="#206">206</a> <strong class="jxr_keyword">if</strong> ( analyzer.getProperty( DependencyEmbedder.EMBED_DEPENDENCY ) != <strong class="jxr_keyword">null</strong> && isOutputDirectory )
+<a name="207" href="#207">207</a> {
+<a name="208" href="#208">208</a> analyzer.build();
+<a name="209" href="#209">209</a> }
+<a name="210" href="#210">210</a> <strong class="jxr_keyword">else</strong>
+<a name="211" href="#211">211</a> {
+<a name="212" href="#212">212</a> analyzer.mergeManifest( analyzer.getJar().getManifest() );
+<a name="213" href="#213">213</a> analyzer.getJar().setManifest( analyzer.calcManifest() );
+<a name="214" href="#214">214</a> }
+<a name="215" href="#215">215</a>
+<a name="216" href="#216">216</a> mergeMavenManifest( project, analyzer );
+<a name="217" href="#217">217</a>
+<a name="218" href="#218">218</a> <strong class="jxr_keyword">return</strong> analyzer;
+<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> <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="223" href="#223">223</a> {
+<a name="224" href="#224">224</a> outputFile.getParentFile().mkdirs();
+<a name="225" href="#225">225</a>
+<a name="226" href="#226">226</a> FileOutputStream os;
+<a name="227" href="#227">227</a> os = <strong class="jxr_keyword">new</strong> FileOutputStream( outputFile );
+<a name="228" href="#228">228</a> <strong class="jxr_keyword">try</strong>
+<a name="229" href="#229">229</a> {
+<a name="230" href="#230">230</a> Jar.writeManifest( manifest, os );
+<a name="231" href="#231">231</a> }
+<a name="232" href="#232">232</a> <strong class="jxr_keyword">finally</strong>
+<a name="233" href="#233">233</a> {
+<a name="234" href="#234">234</a> <strong class="jxr_keyword">try</strong>
+<a name="235" href="#235">235</a> {
+<a name="236" href="#236">236</a> os.close();
+<a name="237" href="#237">237</a> }
+<a name="238" href="#238">238</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
+<a name="239" href="#239">239</a> {
+<a name="240" href="#240">240</a> <em class="jxr_comment">// nothing we can do here</em>
+<a name="241" href="#241">241</a> }
+<a name="242" href="#242">242</a> }
+<a name="243" href="#243">243</a> }
+<a name="244" href="#244">244</a>
+<a name="245" href="#245">245</a>
+<a name="246" href="#246">246</a> <em class="jxr_comment">/*</em>
+<a name="247" href="#247">247</a> <em class="jxr_comment"> * Patched version of bnd's Analyzer.calculateExportsFromContents</em>
+<a name="248" href="#248">248</a> <em class="jxr_comment"> */</em>
+<a name="249" href="#249">249</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String calculateExportsFromContents( Jar bundle )
+<a name="250" href="#250">250</a> {
+<a name="251" href="#251">251</a> String ddel = <span class="jxr_string">""</span>;
+<a name="252" href="#252">252</a> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer();
+<a name="253" href="#253">253</a> Map<String, Map<String, Resource>> map = bundle.getDirectories();
+<a name="254" href="#254">254</a> <strong class="jxr_keyword">for</strong> ( Iterator<Entry<String, Map<String, Resource>>> i = map.entrySet().iterator(); i.hasNext(); )
+<a name="255" href="#255">255</a> {
+<a name="256" href="#256">256</a> <em class="jxr_comment">//----------------------------------------------------</em>
+<a name="257" href="#257">257</a> <em class="jxr_comment">// should also ignore directories with no resources</em>
+<a name="258" href="#258">258</a> <em class="jxr_comment">//----------------------------------------------------</em>
+<a name="259" href="#259">259</a> Entry<String, Map<String, Resource>> entry = i.next();
+<a name="260" href="#260">260</a> <strong class="jxr_keyword">if</strong> ( entry.getValue() == <strong class="jxr_keyword">null</strong> || entry.getValue().isEmpty() )
+<a name="261" href="#261">261</a> <strong class="jxr_keyword">continue</strong>;
+<a name="262" href="#262">262</a> <em class="jxr_comment">//----------------------------------------------------</em>
+<a name="263" href="#263">263</a> String directory = entry.getKey();
+<a name="264" href="#264">264</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="265" href="#265">265</a> <strong class="jxr_keyword">continue</strong>;
+<a name="266" href="#266">266</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="267" href="#267">267</a> <strong class="jxr_keyword">continue</strong>;
+<a name="268" href="#268">268</a> <strong class="jxr_keyword">if</strong> ( directory.equals( <span class="jxr_string">"/"</span> ) )
+<a name="269" href="#269">269</a> <strong class="jxr_keyword">continue</strong>;
+<a name="270" href="#270">270</a>
+<a name="271" href="#271">271</a> <strong class="jxr_keyword">if</strong> ( directory.endsWith( <span class="jxr_string">"/"</span> ) )
+<a name="272" href="#272">272</a> directory = directory.substring( 0, directory.length() - 1 );
+<a name="273" href="#273">273</a>
+<a name="274" href="#274">274</a> directory = directory.replace( '/', '.' );
+<a name="275" href="#275">275</a> sb.append( ddel );
+<a name="276" href="#276">276</a> sb.append( directory );
+<a name="277" href="#277">277</a> ddel = <span class="jxr_string">","</span>;
+<a name="278" href="#278">278</a> }
+<a name="279" href="#279">279</a> <strong class="jxr_keyword">return</strong> sb.toString();
+<a name="280" href="#280">280</a> }
+<a name="281" href="#281">281</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-summary.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/package-summary.html?rev=1490866&r1=1490865&r2=1490866&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 Fri Jun 7 23:25:18 2013
@@ -132,6 +132,6 @@
</ul>
</div>
<hr />
- Copyright © 2006-2012 The Apache Software Foundation. All Rights Reserved.
+ Copyright © 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/obrplugin/ObrInstall.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrInstall.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrInstall.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrInstall.html Fri Jun 7 23:25:18 2013
@@ -148,52 +148,55 @@
<a name="138" href="#138">138</a> <a href="../../../../org/apache/felix/obrplugin/Config.html">Config</a> userConfig = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/felix/obrplugin/Config.html">Config</a>();
<a name="139" href="#139">139</a>
<a name="140" href="#140">140</a> update = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/felix/obrplugin/ObrUpdate.html">ObrUpdate</a>( repositoryXml, obrXmlFile, project, mavenRepository, userConfig, log );
-<a name="141" href="#141">141</a> update.parseRepositoryXml();
-<a name="142" href="#142">142</a>
-<a name="143" href="#143">143</a> updateLocalBundleMetadata( project.getArtifact(), update );
-<a name="144" href="#144">144</a> <strong class="jxr_keyword">for</strong> ( Iterator i = attachedArtifacts.iterator(); i.hasNext(); )
-<a name="145" href="#145">145</a> {
-<a name="146" href="#146">146</a> updateLocalBundleMetadata( ( Artifact ) i.next(), update );
-<a name="147" href="#147">147</a> }
-<a name="148" href="#148">148</a>
-<a name="149" href="#149">149</a> update.writeRepositoryXml();
-<a name="150" href="#150">150</a> }
-<a name="151" href="#151">151</a> <strong class="jxr_keyword">catch</strong> ( Exception e )
-<a name="152" href="#152">152</a> {
-<a name="153" href="#153">153</a> log.warn( <span class="jxr_string">"Exception while updating local OBR: "</span> + e.getLocalizedMessage(), e );
-<a name="154" href="#154">154</a> }
-<a name="155" href="#155">155</a> }
-<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">private</strong> <strong class="jxr_keyword">void</strong> updateLocalBundleMetadata( Artifact artifact, ObrUpdate update ) <strong class="jxr_keyword">throws</strong> MojoExecutionException
-<a name="159" href="#159">159</a> {
-<a name="160" href="#160">160</a> <strong class="jxr_keyword">if</strong> ( !supportedProjectTypes.contains( artifact.getType() ) )
-<a name="161" href="#161">161</a> {
-<a name="162" href="#162">162</a> <strong class="jxr_keyword">return</strong>;
-<a name="163" href="#163">163</a> }
-<a name="164" href="#164">164</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">null</strong> == artifact.getFile() || artifact.getFile().isDirectory() )
-<a name="165" href="#165">165</a> {
-<a name="166" href="#166">166</a> getLog().error( <span class="jxr_string">"No artifact found, try \"mvn install bundle:install\""</span> );
-<a name="167" href="#167">167</a> <strong class="jxr_keyword">return</strong>;
-<a name="168" href="#168">168</a> }
-<a name="169" href="#169">169</a>
-<a name="170" href="#170">170</a> URI bundleJar = ObrUtils.getArtifactURI( localRepository, artifact );
-<a name="171" href="#171">171</a>
-<a name="172" href="#172">172</a> URI sourceJar = <strong class="jxr_keyword">null</strong>;
-<a name="173" href="#173">173</a> <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">null</strong> != m_sourceArtifact )
-<a name="174" href="#174">174</a> {
-<a name="175" href="#175">175</a> sourceJar = ObrUtils.getArtifactURI( localRepository, m_sourceArtifact );
-<a name="176" href="#176">176</a> }
-<a name="177" href="#177">177</a>
-<a name="178" href="#178">178</a> URI docJar = <strong class="jxr_keyword">null</strong>;
-<a name="179" href="#179">179</a> <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">null</strong> != m_docArtifact )
-<a name="180" href="#180">180</a> {
-<a name="181" href="#181">181</a> docJar = ObrUtils.getArtifactURI( localRepository, m_docArtifact );
-<a name="182" href="#182">182</a> }
-<a name="183" href="#183">183</a>
-<a name="184" href="#184">184</a> update.updateRepository( bundleJar, sourceJar, docJar );
-<a name="185" href="#185">185</a> }
-<a name="186" href="#186">186</a> }
+<a name="141" href="#141">141</a> <strong class="jxr_keyword">synchronized</strong> ( ObrUpdate.<strong class="jxr_keyword">class</strong> ) <em class="jxr_comment">// protect against concurrent in-process updates</em>
+<a name="142" href="#142">142</a> {
+<a name="143" href="#143">143</a> update.parseRepositoryXml();
+<a name="144" href="#144">144</a>
+<a name="145" href="#145">145</a> updateLocalBundleMetadata( project.getArtifact(), update );
+<a name="146" href="#146">146</a> <strong class="jxr_keyword">for</strong> ( Iterator i = attachedArtifacts.iterator(); i.hasNext(); )
+<a name="147" href="#147">147</a> {
+<a name="148" href="#148">148</a> updateLocalBundleMetadata( ( Artifact ) i.next(), update );
+<a name="149" href="#149">149</a> }
+<a name="150" href="#150">150</a>
+<a name="151" href="#151">151</a> update.writeRepositoryXml();
+<a name="152" href="#152">152</a> }
+<a name="153" href="#153">153</a> }
+<a name="154" href="#154">154</a> <strong class="jxr_keyword">catch</strong> ( Exception e )
+<a name="155" href="#155">155</a> {
+<a name="156" href="#156">156</a> log.warn( <span class="jxr_string">"Exception while updating local OBR: "</span> + e.getLocalizedMessage(), e );
+<a name="157" href="#157">157</a> }
+<a name="158" href="#158">158</a> }
+<a name="159" href="#159">159</a>
+<a name="160" href="#160">160</a>
+<a name="161" href="#161">161</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> updateLocalBundleMetadata( Artifact artifact, ObrUpdate update ) <strong class="jxr_keyword">throws</strong> MojoExecutionException
+<a name="162" href="#162">162</a> {
+<a name="163" href="#163">163</a> <strong class="jxr_keyword">if</strong> ( !supportedProjectTypes.contains( artifact.getType() ) )
+<a name="164" href="#164">164</a> {
+<a name="165" href="#165">165</a> <strong class="jxr_keyword">return</strong>;
+<a name="166" href="#166">166</a> }
+<a name="167" href="#167">167</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">null</strong> == artifact.getFile() || artifact.getFile().isDirectory() )
+<a name="168" href="#168">168</a> {
+<a name="169" href="#169">169</a> getLog().error( <span class="jxr_string">"No artifact found, try \"mvn install bundle:install\""</span> );
+<a name="170" href="#170">170</a> <strong class="jxr_keyword">return</strong>;
+<a name="171" href="#171">171</a> }
+<a name="172" href="#172">172</a>
+<a name="173" href="#173">173</a> URI bundleJar = ObrUtils.getArtifactURI( localRepository, artifact );
+<a name="174" href="#174">174</a>
+<a name="175" href="#175">175</a> URI sourceJar = <strong class="jxr_keyword">null</strong>;
+<a name="176" href="#176">176</a> <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">null</strong> != m_sourceArtifact )
+<a name="177" href="#177">177</a> {
+<a name="178" href="#178">178</a> sourceJar = ObrUtils.getArtifactURI( localRepository, m_sourceArtifact );
+<a name="179" href="#179">179</a> }
+<a name="180" href="#180">180</a>
+<a name="181" href="#181">181</a> URI docJar = <strong class="jxr_keyword">null</strong>;
+<a name="182" href="#182">182</a> <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">null</strong> != m_docArtifact )
+<a name="183" href="#183">183</a> {
+<a name="184" href="#184">184</a> docJar = ObrUtils.getArtifactURI( localRepository, m_docArtifact );
+<a name="185" href="#185">185</a> }
+<a name="186" href="#186">186</a>
+<a name="187" href="#187">187</a> update.updateRepository( bundleJar, sourceJar, docJar );
+<a name="188" href="#188">188</a> }
+<a name="189" href="#189">189</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/obrplugin/package-summary.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/package-summary.html?rev=1490866&r1=1490865&r2=1490866&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 Fri Jun 7 23:25:18 2013
@@ -127,6 +127,6 @@
</ul>
</div>
<hr />
- Copyright © 2006-2012 The Apache Software Foundation. All Rights Reserved.
+ Copyright © 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/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=1490866&r1=1490865&r2=1490866&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 Fri Jun 7 23:25:18 2013
@@ -62,6 +62,6 @@
</ul>
</div>
<hr />
- Copyright © 2006-2012 The Apache Software Foundation. All Rights Reserved.
+ Copyright © 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/maven/shared/osgi/DefaultMaven2OsgiConverter.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.html?rev=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.html Fri Jun 7 23:25:18 2013
@@ -43,7 +43,7 @@
<a name="33" href="#33">33</a>
<a name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.Artifact;
<a name="35" href="#35">35</a>
-<a name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> aQute.lib.osgi.Analyzer;
+<a name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Analyzer;
<a name="37" href="#37">37</a>
<a name="38" href="#38">38</a>
<a name="39" href="#39">39</a> <em class="jxr_javadoccomment">/**</em>
@@ -78,267 +78,274 @@
<a name="68" href="#68">68</a> <em class="jxr_javadoccomment"> * org.apache.maven:maven -> org.apache.maven</li></em>
<a name="69" href="#69">69</a> <em class="jxr_javadoccomment"> * <li>if artifactId starts with last section of groupId that portion is removed. eg.</em>
<a name="70" href="#70">70</a> <em class="jxr_javadoccomment"> * org.apache.maven:maven-core -> org.apache.maven.core</li></em>
-<a name="71" href="#71">71</a> <em class="jxr_javadoccomment"> * </ul></em>
-<a name="72" href="#72">72</a> <em class="jxr_javadoccomment"> */</em>
-<a name="73" href="#73">73</a> <strong class="jxr_keyword">public</strong> String getBundleSymbolicName( Artifact artifact )
-<a name="74" href="#74">74</a> {
-<a name="75" href="#75">75</a> <strong class="jxr_keyword">if</strong> ( ( artifact.getFile() != <strong class="jxr_keyword">null</strong> ) && artifact.getFile().isFile() )
-<a name="76" href="#76">76</a> {
-<a name="77" href="#77">77</a> Analyzer analyzer = <strong class="jxr_keyword">new</strong> Analyzer();
-<a name="78" href="#78">78</a>
-<a name="79" href="#79">79</a> JarFile jar = <strong class="jxr_keyword">null</strong>;
-<a name="80" href="#80">80</a> <strong class="jxr_keyword">try</strong>
-<a name="81" href="#81">81</a> {
-<a name="82" href="#82">82</a> jar = <strong class="jxr_keyword">new</strong> JarFile( artifact.getFile(), false );
-<a name="83" href="#83">83</a>
-<a name="84" href="#84">84</a> <strong class="jxr_keyword">if</strong> ( jar.getManifest() != <strong class="jxr_keyword">null</strong> )
-<a name="85" href="#85">85</a> {
-<a name="86" href="#86">86</a> String symbolicNameAttribute = jar.getManifest().getMainAttributes()
-<a name="87" href="#87">87</a> .getValue( Analyzer.BUNDLE_SYMBOLICNAME );
-<a name="88" href="#88">88</a> Map bundleSymbolicNameHeader = analyzer.parseHeader( symbolicNameAttribute );
-<a name="89" href="#89">89</a>
-<a name="90" href="#90">90</a> Iterator it = bundleSymbolicNameHeader.keySet().iterator();
-<a name="91" href="#91">91</a> <strong class="jxr_keyword">if</strong> ( it.hasNext() )
-<a name="92" href="#92">92</a> {
-<a name="93" href="#93">93</a> <strong class="jxr_keyword">return</strong> ( String ) it.next();
-<a name="94" href="#94">94</a> }
-<a name="95" href="#95">95</a> }
-<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> <a href="../../../../../org/apache/maven/shared/osgi/ManifestReadingException.html">ManifestReadingException</a>( <span class="jxr_string">"Error reading manifest in jar "</span>
-<a name="100" href="#100">100</a> + artifact.getFile().getAbsolutePath(), e );
-<a name="101" href="#101">101</a> }
-<a name="102" href="#102">102</a> <strong class="jxr_keyword">finally</strong>
-<a name="103" href="#103">103</a> {
-<a name="104" href="#104">104</a> <strong class="jxr_keyword">if</strong> ( jar != <strong class="jxr_keyword">null</strong> )
-<a name="105" href="#105">105</a> {
-<a name="106" href="#106">106</a> <strong class="jxr_keyword">try</strong>
-<a name="107" href="#107">107</a> {
-<a name="108" href="#108">108</a> jar.close();
-<a name="109" href="#109">109</a> }
-<a name="110" href="#110">110</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
-<a name="111" href="#111">111</a> {
-<a name="112" href="#112">112</a> }
-<a name="113" href="#113">113</a> }
-<a name="114" href="#114">114</a> }
-<a name="115" href="#115">115</a> }
-<a name="116" href="#116">116</a>
-<a name="117" href="#117">117</a> <strong class="jxr_keyword">int</strong> i = artifact.getGroupId().lastIndexOf( '.' );
-<a name="118" href="#118">118</a> <strong class="jxr_keyword">if</strong> ( ( i < 0 ) && ( artifact.getFile() != <strong class="jxr_keyword">null</strong> ) && artifact.getFile().isFile() )
-<a name="119" href="#119">119</a> {
-<a name="120" href="#120">120</a> String groupIdFromPackage = getGroupIdFromPackage( artifact.getFile() );
-<a name="121" href="#121">121</a> <strong class="jxr_keyword">if</strong> ( groupIdFromPackage != <strong class="jxr_keyword">null</strong> )
-<a name="122" href="#122">122</a> {
-<a name="123" href="#123">123</a> <strong class="jxr_keyword">return</strong> groupIdFromPackage;
-<a name="124" href="#124">124</a> }
-<a name="125" href="#125">125</a> }
-<a name="126" href="#126">126</a> String lastSection = artifact.getGroupId().substring( ++i );
-<a name="127" href="#127">127</a> <strong class="jxr_keyword">if</strong> ( artifact.getArtifactId().equals( lastSection ) )
-<a name="128" href="#128">128</a> {
-<a name="129" href="#129">129</a> <strong class="jxr_keyword">return</strong> artifact.getGroupId();
-<a name="130" href="#130">130</a> }
-<a name="131" href="#131">131</a> <strong class="jxr_keyword">if</strong> ( artifact.getArtifactId().startsWith( lastSection ) )
-<a name="132" href="#132">132</a> {
-<a name="133" href="#133">133</a> String artifactId = artifact.getArtifactId().substring( lastSection.length() );
-<a name="134" href="#134">134</a> <strong class="jxr_keyword">if</strong> ( Character.isLetterOrDigit( artifactId.charAt( 0 ) ) )
-<a name="135" href="#135">135</a> {
-<a name="136" href="#136">136</a> <strong class="jxr_keyword">return</strong> getBundleSymbolicName( artifact.getGroupId(), artifactId );
-<a name="137" href="#137">137</a> }
-<a name="138" href="#138">138</a> <strong class="jxr_keyword">else</strong>
-<a name="139" href="#139">139</a> {
-<a name="140" href="#140">140</a> <strong class="jxr_keyword">return</strong> getBundleSymbolicName( artifact.getGroupId(), artifactId.substring( 1 ) );
-<a name="141" href="#141">141</a> }
-<a name="142" href="#142">142</a> }
-<a name="143" href="#143">143</a> <strong class="jxr_keyword">return</strong> getBundleSymbolicName( artifact.getGroupId(), artifact.getArtifactId() );
-<a name="144" href="#144">144</a> }
-<a name="145" href="#145">145</a>
-<a name="146" href="#146">146</a>
-<a name="147" href="#147">147</a> <strong class="jxr_keyword">private</strong> String getGroupIdFromPackage( File artifactFile )
-<a name="148" href="#148">148</a> {
-<a name="149" href="#149">149</a> <strong class="jxr_keyword">try</strong>
-<a name="150" href="#150">150</a> {
-<a name="151" href="#151">151</a> <em class="jxr_comment">/*<em class="jxr_comment"> get package names from jar */</em></em>
-<a name="152" href="#152">152</a> Set packageNames = <strong class="jxr_keyword">new</strong> HashSet();
-<a name="153" href="#153">153</a> JarFile jar = <strong class="jxr_keyword">new</strong> JarFile( artifactFile, false );
-<a name="154" href="#154">154</a> Enumeration entries = jar.entries();
-<a name="155" href="#155">155</a> <strong class="jxr_keyword">while</strong> ( entries.hasMoreElements() )
-<a name="156" href="#156">156</a> {
-<a name="157" href="#157">157</a> ZipEntry entry = ( ZipEntry ) entries.nextElement();
-<a name="158" href="#158">158</a> <strong class="jxr_keyword">if</strong> ( entry.getName().endsWith( <span class="jxr_string">".class"</span> ) )
-<a name="159" href="#159">159</a> {
-<a name="160" href="#160">160</a> File f = <strong class="jxr_keyword">new</strong> File( entry.getName() );
-<a name="161" href="#161">161</a> String packageName = f.getParent();
-<a name="162" href="#162">162</a> <strong class="jxr_keyword">if</strong> ( packageName != <strong class="jxr_keyword">null</strong> )
-<a name="163" href="#163">163</a> {
-<a name="164" href="#164">164</a> packageNames.add( packageName );
-<a name="165" href="#165">165</a> }
-<a name="166" href="#166">166</a> }
-<a name="167" href="#167">167</a> }
-<a name="168" href="#168">168</a> jar.close();
-<a name="169" href="#169">169</a>
-<a name="170" href="#170">170</a> <em class="jxr_comment">/*<em class="jxr_comment"> find the top package */</em></em>
-<a name="171" href="#171">171</a> String[] groupIdSections = <strong class="jxr_keyword">null</strong>;
-<a name="172" href="#172">172</a> <strong class="jxr_keyword">for</strong> ( Iterator it = packageNames.iterator(); it.hasNext(); )
-<a name="173" href="#173">173</a> {
-<a name="174" href="#174">174</a> String packageName = ( String ) it.next();
-<a name="175" href="#175">175</a>
-<a name="176" href="#176">176</a> String[] packageNameSections = packageName.split( <span class="jxr_string">"\\"</span> + FILE_SEPARATOR );
-<a name="177" href="#177">177</a> <strong class="jxr_keyword">if</strong> ( groupIdSections == <strong class="jxr_keyword">null</strong> )
-<a name="178" href="#178">178</a> {
-<a name="179" href="#179">179</a> <em class="jxr_comment">/*<em class="jxr_comment"> first candidate */</em></em>
-<a name="180" href="#180">180</a> groupIdSections = packageNameSections;
-<a name="181" href="#181">181</a> }
-<a name="182" href="#182">182</a> <strong class="jxr_keyword">else</strong>
-<a name="183" href="#183">183</a> <em class="jxr_comment">// if ( packageNameSections.length < groupIdSections.length )</em>
-<a name="184" href="#184">184</a> {
-<a name="185" href="#185">185</a> <em class="jxr_comment">/*</em>
-<a name="186" href="#186">186</a> <em class="jxr_comment"> * find the common portion of current package and previous selected groupId</em>
-<a name="187" href="#187">187</a> <em class="jxr_comment"> */</em>
-<a name="188" href="#188">188</a> <strong class="jxr_keyword">int</strong> i;
-<a name="189" href="#189">189</a> <strong class="jxr_keyword">for</strong> ( i = 0; ( i < packageNameSections.length ) && ( i < groupIdSections.length ); i++ )
-<a name="190" href="#190">190</a> {
-<a name="191" href="#191">191</a> <strong class="jxr_keyword">if</strong> ( !packageNameSections[i].equals( groupIdSections[i] ) )
-<a name="192" href="#192">192</a> {
-<a name="193" href="#193">193</a> <strong class="jxr_keyword">break</strong>;
-<a name="194" href="#194">194</a> }
-<a name="195" href="#195">195</a> }
-<a name="196" href="#196">196</a> groupIdSections = <strong class="jxr_keyword">new</strong> String[i];
-<a name="197" href="#197">197</a> System.arraycopy( packageNameSections, 0, groupIdSections, 0, i );
-<a name="198" href="#198">198</a> }
-<a name="199" href="#199">199</a> }
-<a name="200" href="#200">200</a>
-<a name="201" href="#201">201</a> <strong class="jxr_keyword">if</strong> ( ( groupIdSections == <strong class="jxr_keyword">null</strong> ) || ( groupIdSections.length == 0 ) )
-<a name="202" href="#202">202</a> {
-<a name="203" href="#203">203</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="204" href="#204">204</a> }
-<a name="205" href="#205">205</a>
-<a name="206" href="#206">206</a> <em class="jxr_comment">/*<em class="jxr_comment"> only one section as id doesn't seem enough, so ignore it */</em></em>
-<a name="207" href="#207">207</a> <strong class="jxr_keyword">if</strong> ( groupIdSections.length == 1 )
-<a name="208" href="#208">208</a> {
-<a name="209" href="#209">209</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="210" href="#210">210</a> }
-<a name="211" href="#211">211</a>
-<a name="212" href="#212">212</a> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer();
-<a name="213" href="#213">213</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i = 0; i < groupIdSections.length; i++ )
-<a name="214" href="#214">214</a> {
-<a name="215" href="#215">215</a> sb.append( groupIdSections[i] );
-<a name="216" href="#216">216</a> <strong class="jxr_keyword">if</strong> ( i < groupIdSections.length - 1 )
-<a name="217" href="#217">217</a> {
-<a name="218" href="#218">218</a> sb.append( '.' );
-<a name="219" href="#219">219</a> }
-<a name="220" href="#220">220</a> }
-<a name="221" href="#221">221</a> <strong class="jxr_keyword">return</strong> sb.toString();
-<a name="222" href="#222">222</a> }
-<a name="223" href="#223">223</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
-<a name="224" href="#224">224</a> {
-<a name="225" href="#225">225</a> <em class="jxr_comment">/*<em class="jxr_comment"> we took all the precautions to avoid this */</em></em>
-<a name="226" href="#226">226</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException( e );
-<a name="227" href="#227">227</a> }
-<a name="228" href="#228">228</a> }
-<a name="229" href="#229">229</a>
-<a name="230" href="#230">230</a>
-<a name="231" href="#231">231</a> <strong class="jxr_keyword">public</strong> String getBundleFileName( Artifact artifact )
-<a name="232" href="#232">232</a> {
-<a name="233" href="#233">233</a> <strong class="jxr_keyword">return</strong> getBundleSymbolicName( artifact ) + <span class="jxr_string">"_"</span> + getVersion( artifact.getVersion() ) + <span class="jxr_string">".jar"</span>;
-<a name="234" href="#234">234</a> }
-<a name="235" href="#235">235</a>
+<a name="71" href="#71">71</a> <em class="jxr_javadoccomment"> * <li>if artifactId starts with groupId then the artifactId is removed. eg.</em>
+<a name="72" href="#72">72</a> <em class="jxr_javadoccomment"> * org.apache:org.apache.maven.core -> org.apache.maven.core</li></em>
+<a name="73" href="#73">73</a> <em class="jxr_javadoccomment"> * </ul></em>
+<a name="74" href="#74">74</a> <em class="jxr_javadoccomment"> */</em>
+<a name="75" href="#75">75</a> <strong class="jxr_keyword">public</strong> String getBundleSymbolicName( Artifact artifact )
+<a name="76" href="#76">76</a> {
+<a name="77" href="#77">77</a> <strong class="jxr_keyword">if</strong> ( ( artifact.getFile() != <strong class="jxr_keyword">null</strong> ) && artifact.getFile().isFile() )
+<a name="78" href="#78">78</a> {
+<a name="79" href="#79">79</a> Analyzer analyzer = <strong class="jxr_keyword">new</strong> Analyzer();
+<a name="80" href="#80">80</a>
+<a name="81" href="#81">81</a> JarFile jar = <strong class="jxr_keyword">null</strong>;
+<a name="82" href="#82">82</a> <strong class="jxr_keyword">try</strong>
+<a name="83" href="#83">83</a> {
+<a name="84" href="#84">84</a> jar = <strong class="jxr_keyword">new</strong> JarFile( artifact.getFile(), false );
+<a name="85" href="#85">85</a>
+<a name="86" href="#86">86</a> <strong class="jxr_keyword">if</strong> ( jar.getManifest() != <strong class="jxr_keyword">null</strong> )
+<a name="87" href="#87">87</a> {
+<a name="88" href="#88">88</a> String symbolicNameAttribute = jar.getManifest().getMainAttributes()
+<a name="89" href="#89">89</a> .getValue( Analyzer.BUNDLE_SYMBOLICNAME );
+<a name="90" href="#90">90</a> Map bundleSymbolicNameHeader = analyzer.parseHeader( symbolicNameAttribute );
+<a name="91" href="#91">91</a>
+<a name="92" href="#92">92</a> Iterator it = bundleSymbolicNameHeader.keySet().iterator();
+<a name="93" href="#93">93</a> <strong class="jxr_keyword">if</strong> ( it.hasNext() )
+<a name="94" href="#94">94</a> {
+<a name="95" href="#95">95</a> <strong class="jxr_keyword">return</strong> ( String ) it.next();
+<a name="96" href="#96">96</a> }
+<a name="97" href="#97">97</a> }
+<a name="98" href="#98">98</a> }
+<a name="99" href="#99">99</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
+<a name="100" href="#100">100</a> {
+<a name="101" href="#101">101</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/shared/osgi/ManifestReadingException.html">ManifestReadingException</a>( <span class="jxr_string">"Error reading manifest in jar "</span>
+<a name="102" href="#102">102</a> + artifact.getFile().getAbsolutePath(), e );
+<a name="103" href="#103">103</a> }
+<a name="104" href="#104">104</a> <strong class="jxr_keyword">finally</strong>
+<a name="105" href="#105">105</a> {
+<a name="106" href="#106">106</a> <strong class="jxr_keyword">if</strong> ( jar != <strong class="jxr_keyword">null</strong> )
+<a name="107" href="#107">107</a> {
+<a name="108" href="#108">108</a> <strong class="jxr_keyword">try</strong>
+<a name="109" href="#109">109</a> {
+<a name="110" href="#110">110</a> jar.close();
+<a name="111" href="#111">111</a> }
+<a name="112" href="#112">112</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
+<a name="113" href="#113">113</a> {
+<a name="114" href="#114">114</a> }
+<a name="115" href="#115">115</a> }
+<a name="116" href="#116">116</a> }
+<a name="117" href="#117">117</a> }
+<a name="118" href="#118">118</a>
+<a name="119" href="#119">119</a> <strong class="jxr_keyword">int</strong> i = artifact.getGroupId().lastIndexOf( '.' );
+<a name="120" href="#120">120</a> <strong class="jxr_keyword">if</strong> ( ( i < 0 ) && ( artifact.getFile() != <strong class="jxr_keyword">null</strong> ) && artifact.getFile().isFile() )
+<a name="121" href="#121">121</a> {
+<a name="122" href="#122">122</a> String groupIdFromPackage = getGroupIdFromPackage( artifact.getFile() );
+<a name="123" href="#123">123</a> <strong class="jxr_keyword">if</strong> ( groupIdFromPackage != <strong class="jxr_keyword">null</strong> )
+<a name="124" href="#124">124</a> {
+<a name="125" href="#125">125</a> <strong class="jxr_keyword">return</strong> groupIdFromPackage;
+<a name="126" href="#126">126</a> }
+<a name="127" href="#127">127</a> }
+<a name="128" href="#128">128</a> String lastSection = artifact.getGroupId().substring( ++i );
+<a name="129" href="#129">129</a> <strong class="jxr_keyword">if</strong> ( artifact.getArtifactId().equals( lastSection ) )
+<a name="130" href="#130">130</a> {
+<a name="131" href="#131">131</a> <strong class="jxr_keyword">return</strong> artifact.getGroupId();
+<a name="132" href="#132">132</a> }
+<a name="133" href="#133">133</a> <strong class="jxr_keyword">if</strong> ( artifact.getArtifactId().equals( artifact.getGroupId() )
+<a name="134" href="#134">134</a> || artifact.getArtifactId().startsWith( artifact.getGroupId() + <span class="jxr_string">"."</span> ) )
+<a name="135" href="#135">135</a> {
+<a name="136" href="#136">136</a> <strong class="jxr_keyword">return</strong> artifact.getArtifactId();
+<a name="137" href="#137">137</a> }
+<a name="138" href="#138">138</a> <strong class="jxr_keyword">if</strong> ( artifact.getArtifactId().startsWith( lastSection ) )
+<a name="139" href="#139">139</a> {
+<a name="140" href="#140">140</a> String artifactId = artifact.getArtifactId().substring( lastSection.length() );
+<a name="141" href="#141">141</a> <strong class="jxr_keyword">if</strong> ( Character.isLetterOrDigit( artifactId.charAt( 0 ) ) )
+<a name="142" href="#142">142</a> {
+<a name="143" href="#143">143</a> <strong class="jxr_keyword">return</strong> getBundleSymbolicName( artifact.getGroupId(), artifactId );
+<a name="144" href="#144">144</a> }
+<a name="145" href="#145">145</a> <strong class="jxr_keyword">else</strong>
+<a name="146" href="#146">146</a> {
+<a name="147" href="#147">147</a> <strong class="jxr_keyword">return</strong> getBundleSymbolicName( artifact.getGroupId(), artifactId.substring( 1 ) );
+<a name="148" href="#148">148</a> }
+<a name="149" href="#149">149</a> }
+<a name="150" href="#150">150</a> <strong class="jxr_keyword">return</strong> getBundleSymbolicName( artifact.getGroupId(), artifact.getArtifactId() );
+<a name="151" href="#151">151</a> }
+<a name="152" href="#152">152</a>
+<a name="153" href="#153">153</a>
+<a name="154" href="#154">154</a> <strong class="jxr_keyword">private</strong> String getGroupIdFromPackage( File artifactFile )
+<a name="155" href="#155">155</a> {
+<a name="156" href="#156">156</a> <strong class="jxr_keyword">try</strong>
+<a name="157" href="#157">157</a> {
+<a name="158" href="#158">158</a> <em class="jxr_comment">/*<em class="jxr_comment"> get package names from jar */</em></em>
+<a name="159" href="#159">159</a> Set packageNames = <strong class="jxr_keyword">new</strong> HashSet();
+<a name="160" href="#160">160</a> JarFile jar = <strong class="jxr_keyword">new</strong> JarFile( artifactFile, false );
+<a name="161" href="#161">161</a> Enumeration entries = jar.entries();
+<a name="162" href="#162">162</a> <strong class="jxr_keyword">while</strong> ( entries.hasMoreElements() )
+<a name="163" href="#163">163</a> {
+<a name="164" href="#164">164</a> ZipEntry entry = ( ZipEntry ) entries.nextElement();
+<a name="165" href="#165">165</a> <strong class="jxr_keyword">if</strong> ( entry.getName().endsWith( <span class="jxr_string">".class"</span> ) )
+<a name="166" href="#166">166</a> {
+<a name="167" href="#167">167</a> File f = <strong class="jxr_keyword">new</strong> File( entry.getName() );
+<a name="168" href="#168">168</a> String packageName = f.getParent();
+<a name="169" href="#169">169</a> <strong class="jxr_keyword">if</strong> ( packageName != <strong class="jxr_keyword">null</strong> )
+<a name="170" href="#170">170</a> {
+<a name="171" href="#171">171</a> packageNames.add( packageName );
+<a name="172" href="#172">172</a> }
+<a name="173" href="#173">173</a> }
+<a name="174" href="#174">174</a> }
+<a name="175" href="#175">175</a> jar.close();
+<a name="176" href="#176">176</a>
+<a name="177" href="#177">177</a> <em class="jxr_comment">/*<em class="jxr_comment"> find the top package */</em></em>
+<a name="178" href="#178">178</a> String[] groupIdSections = <strong class="jxr_keyword">null</strong>;
+<a name="179" href="#179">179</a> <strong class="jxr_keyword">for</strong> ( Iterator it = packageNames.iterator(); it.hasNext(); )
+<a name="180" href="#180">180</a> {
+<a name="181" href="#181">181</a> String packageName = ( String ) it.next();
+<a name="182" href="#182">182</a>
+<a name="183" href="#183">183</a> String[] packageNameSections = packageName.split( <span class="jxr_string">"\\"</span> + FILE_SEPARATOR );
+<a name="184" href="#184">184</a> <strong class="jxr_keyword">if</strong> ( groupIdSections == <strong class="jxr_keyword">null</strong> )
+<a name="185" href="#185">185</a> {
+<a name="186" href="#186">186</a> <em class="jxr_comment">/*<em class="jxr_comment"> first candidate */</em></em>
+<a name="187" href="#187">187</a> groupIdSections = packageNameSections;
+<a name="188" href="#188">188</a> }
+<a name="189" href="#189">189</a> <strong class="jxr_keyword">else</strong>
+<a name="190" href="#190">190</a> <em class="jxr_comment">// if ( packageNameSections.length < groupIdSections.length )</em>
+<a name="191" href="#191">191</a> {
+<a name="192" href="#192">192</a> <em class="jxr_comment">/*</em>
+<a name="193" href="#193">193</a> <em class="jxr_comment"> * find the common portion of current package and previous selected groupId</em>
+<a name="194" href="#194">194</a> <em class="jxr_comment"> */</em>
+<a name="195" href="#195">195</a> <strong class="jxr_keyword">int</strong> i;
+<a name="196" href="#196">196</a> <strong class="jxr_keyword">for</strong> ( i = 0; ( i < packageNameSections.length ) && ( i < groupIdSections.length ); i++ )
+<a name="197" href="#197">197</a> {
+<a name="198" href="#198">198</a> <strong class="jxr_keyword">if</strong> ( !packageNameSections[i].equals( groupIdSections[i] ) )
+<a name="199" href="#199">199</a> {
+<a name="200" href="#200">200</a> <strong class="jxr_keyword">break</strong>;
+<a name="201" href="#201">201</a> }
+<a name="202" href="#202">202</a> }
+<a name="203" href="#203">203</a> groupIdSections = <strong class="jxr_keyword">new</strong> String[i];
+<a name="204" href="#204">204</a> System.arraycopy( packageNameSections, 0, groupIdSections, 0, i );
+<a name="205" href="#205">205</a> }
+<a name="206" href="#206">206</a> }
+<a name="207" href="#207">207</a>
+<a name="208" href="#208">208</a> <strong class="jxr_keyword">if</strong> ( ( groupIdSections == <strong class="jxr_keyword">null</strong> ) || ( groupIdSections.length == 0 ) )
+<a name="209" href="#209">209</a> {
+<a name="210" href="#210">210</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="211" href="#211">211</a> }
+<a name="212" href="#212">212</a>
+<a name="213" href="#213">213</a> <em class="jxr_comment">/*<em class="jxr_comment"> only one section as id doesn't seem enough, so ignore it */</em></em>
+<a name="214" href="#214">214</a> <strong class="jxr_keyword">if</strong> ( groupIdSections.length == 1 )
+<a name="215" href="#215">215</a> {
+<a name="216" href="#216">216</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="217" href="#217">217</a> }
+<a name="218" href="#218">218</a>
+<a name="219" href="#219">219</a> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer();
+<a name="220" href="#220">220</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i = 0; i < groupIdSections.length; i++ )
+<a name="221" href="#221">221</a> {
+<a name="222" href="#222">222</a> sb.append( groupIdSections[i] );
+<a name="223" href="#223">223</a> <strong class="jxr_keyword">if</strong> ( i < groupIdSections.length - 1 )
+<a name="224" href="#224">224</a> {
+<a name="225" href="#225">225</a> sb.append( '.' );
+<a name="226" href="#226">226</a> }
+<a name="227" href="#227">227</a> }
+<a name="228" href="#228">228</a> <strong class="jxr_keyword">return</strong> sb.toString();
+<a name="229" href="#229">229</a> }
+<a name="230" href="#230">230</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
+<a name="231" href="#231">231</a> {
+<a name="232" href="#232">232</a> <em class="jxr_comment">/*<em class="jxr_comment"> we took all the precautions to avoid this */</em></em>
+<a name="233" href="#233">233</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException( e );
+<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> <strong class="jxr_keyword">public</strong> String getVersion( Artifact artifact )
-<a name="238" href="#238">238</a> {
-<a name="239" href="#239">239</a> <strong class="jxr_keyword">return</strong> getVersion( artifact.getVersion() );
-<a name="240" href="#240">240</a> }
-<a name="241" href="#241">241</a>
+<a name="237" href="#237">237</a>
+<a name="238" href="#238">238</a> <strong class="jxr_keyword">public</strong> String getBundleFileName( Artifact artifact )
+<a name="239" href="#239">239</a> {
+<a name="240" href="#240">240</a> <strong class="jxr_keyword">return</strong> getBundleSymbolicName( artifact ) + <span class="jxr_string">"_"</span> + getVersion( artifact.getVersion() ) + <span class="jxr_string">".jar"</span>;
+<a name="241" href="#241">241</a> }
<a name="242" href="#242">242</a>
-<a name="243" href="#243">243</a> <strong class="jxr_keyword">public</strong> String getVersion( String version )
-<a name="244" href="#244">244</a> {
-<a name="245" href="#245">245</a> <strong class="jxr_keyword">return</strong> cleanupVersion( version );
-<a name="246" href="#246">246</a> }
-<a name="247" href="#247">247</a>
-<a name="248" href="#248">248</a> <em class="jxr_javadoccomment">/**</em>
-<a name="249" href="#249">249</a> <em class="jxr_javadoccomment"> * Clean up version parameters. Other builders use more fuzzy definitions of</em>
-<a name="250" href="#250">250</a> <em class="jxr_javadoccomment"> * the version syntax. This method cleans up such a version to match an OSGi</em>
-<a name="251" href="#251">251</a> <em class="jxr_javadoccomment"> * version.</em>
-<a name="252" href="#252">252</a> <em class="jxr_javadoccomment"> *</em>
-<a name="253" href="#253">253</a> <em class="jxr_javadoccomment"> * @param VERSION_STRING</em>
-<a name="254" href="#254">254</a> <em class="jxr_javadoccomment"> * @return</em>
-<a name="255" href="#255">255</a> <em class="jxr_javadoccomment"> */</em>
-<a name="256" href="#256">256</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Pattern FUZZY_VERSION = Pattern.compile( <span class="jxr_string">"(\\d+)(\\.(\\d+)(\\.(\\d+))?)?([^a-zA-Z0-9](.*))?"</span>,
-<a name="257" href="#257">257</a> Pattern.DOTALL );
-<a name="258" href="#258">258</a>
-<a name="259" href="#259">259</a>
-<a name="260" href="#260">260</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">public</strong> String cleanupVersion( String version )
-<a name="261" href="#261">261</a> {
-<a name="262" href="#262">262</a> StringBuffer result = <strong class="jxr_keyword">new</strong> StringBuffer();
-<a name="263" href="#263">263</a> Matcher m = FUZZY_VERSION.matcher( version );
-<a name="264" href="#264">264</a> <strong class="jxr_keyword">if</strong> ( m.matches() )
-<a name="265" href="#265">265</a> {
-<a name="266" href="#266">266</a> String major = m.group( 1 );
-<a name="267" href="#267">267</a> String minor = m.group( 3 );
-<a name="268" href="#268">268</a> String micro = m.group( 5 );
-<a name="269" href="#269">269</a> String qualifier = m.group( 7 );
-<a name="270" href="#270">270</a>
-<a name="271" href="#271">271</a> <strong class="jxr_keyword">if</strong> ( major != <strong class="jxr_keyword">null</strong> )
-<a name="272" href="#272">272</a> {
-<a name="273" href="#273">273</a> result.append( major );
-<a name="274" href="#274">274</a> <strong class="jxr_keyword">if</strong> ( minor != <strong class="jxr_keyword">null</strong> )
-<a name="275" href="#275">275</a> {
-<a name="276" href="#276">276</a> result.append( <span class="jxr_string">"."</span> );
-<a name="277" href="#277">277</a> result.append( minor );
-<a name="278" href="#278">278</a> <strong class="jxr_keyword">if</strong> ( micro != <strong class="jxr_keyword">null</strong> )
-<a name="279" href="#279">279</a> {
-<a name="280" href="#280">280</a> result.append( <span class="jxr_string">"."</span> );
-<a name="281" href="#281">281</a> result.append( micro );
-<a name="282" href="#282">282</a> <strong class="jxr_keyword">if</strong> ( qualifier != <strong class="jxr_keyword">null</strong> )
-<a name="283" href="#283">283</a> {
-<a name="284" href="#284">284</a> result.append( <span class="jxr_string">"."</span> );
-<a name="285" href="#285">285</a> cleanupModifier( result, qualifier );
-<a name="286" href="#286">286</a> }
-<a name="287" href="#287">287</a> }
-<a name="288" href="#288">288</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( qualifier != <strong class="jxr_keyword">null</strong> )
-<a name="289" href="#289">289</a> {
-<a name="290" href="#290">290</a> result.append( <span class="jxr_string">".0."</span> );
-<a name="291" href="#291">291</a> cleanupModifier( result, qualifier );
-<a name="292" href="#292">292</a> }
-<a name="293" href="#293">293</a> <strong class="jxr_keyword">else</strong>
-<a name="294" href="#294">294</a> {
-<a name="295" href="#295">295</a> result.append( <span class="jxr_string">".0"</span> );
-<a name="296" href="#296">296</a> }
-<a name="297" href="#297">297</a> }
-<a name="298" href="#298">298</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( qualifier != <strong class="jxr_keyword">null</strong> )
-<a name="299" href="#299">299</a> {
-<a name="300" href="#300">300</a> result.append( <span class="jxr_string">".0.0."</span> );
-<a name="301" href="#301">301</a> cleanupModifier( result, qualifier );
-<a name="302" href="#302">302</a> }
-<a name="303" href="#303">303</a> <strong class="jxr_keyword">else</strong>
-<a name="304" href="#304">304</a> {
-<a name="305" href="#305">305</a> result.append( <span class="jxr_string">".0.0"</span> );
-<a name="306" href="#306">306</a> }
-<a name="307" href="#307">307</a> }
-<a name="308" href="#308">308</a> }
-<a name="309" href="#309">309</a> <strong class="jxr_keyword">else</strong>
-<a name="310" href="#310">310</a> {
-<a name="311" href="#311">311</a> result.append( <span class="jxr_string">"0.0.0."</span> );
-<a name="312" href="#312">312</a> cleanupModifier( result, version );
-<a name="313" href="#313">313</a> }
-<a name="314" href="#314">314</a> <strong class="jxr_keyword">return</strong> result.toString();
-<a name="315" href="#315">315</a> }
-<a name="316" href="#316">316</a>
-<a name="317" href="#317">317</a>
-<a name="318" href="#318">318</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> cleanupModifier( StringBuffer result, String modifier )
-<a name="319" href="#319">319</a> {
-<a name="320" href="#320">320</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i = 0; i < modifier.length(); i++ )
-<a name="321" href="#321">321</a> {
-<a name="322" href="#322">322</a> <strong class="jxr_keyword">char</strong> c = modifier.charAt( i );
-<a name="323" href="#323">323</a> <strong class="jxr_keyword">if</strong> ( ( c >= '0' && c <= '9' ) || ( c >= 'a' && c <= 'z' ) || ( c >= 'A' && c <= 'Z' ) || c == '_'
-<a name="324" href="#324">324</a> || c == '-' )
-<a name="325" href="#325">325</a> result.append( c );
-<a name="326" href="#326">326</a> <strong class="jxr_keyword">else</strong>
-<a name="327" href="#327">327</a> result.append( '_' );
-<a name="328" href="#328">328</a> }
-<a name="329" href="#329">329</a> }
-<a name="330" href="#330">330</a>
-<a name="331" href="#331">331</a> }
+<a name="243" href="#243">243</a>
+<a name="244" href="#244">244</a> <strong class="jxr_keyword">public</strong> String getVersion( Artifact artifact )
+<a name="245" href="#245">245</a> {
+<a name="246" href="#246">246</a> <strong class="jxr_keyword">return</strong> getVersion( artifact.getVersion() );
+<a name="247" href="#247">247</a> }
+<a name="248" href="#248">248</a>
+<a name="249" href="#249">249</a>
+<a name="250" href="#250">250</a> <strong class="jxr_keyword">public</strong> String getVersion( String version )
+<a name="251" href="#251">251</a> {
+<a name="252" href="#252">252</a> <strong class="jxr_keyword">return</strong> cleanupVersion( version );
+<a name="253" href="#253">253</a> }
+<a name="254" href="#254">254</a>
+<a name="255" href="#255">255</a> <em class="jxr_javadoccomment">/**</em>
+<a name="256" href="#256">256</a> <em class="jxr_javadoccomment"> * Clean up version parameters. Other builders use more fuzzy definitions of</em>
+<a name="257" href="#257">257</a> <em class="jxr_javadoccomment"> * the version syntax. This method cleans up such a version to match an OSGi</em>
+<a name="258" href="#258">258</a> <em class="jxr_javadoccomment"> * version.</em>
+<a name="259" href="#259">259</a> <em class="jxr_javadoccomment"> *</em>
+<a name="260" href="#260">260</a> <em class="jxr_javadoccomment"> * @param VERSION_STRING</em>
+<a name="261" href="#261">261</a> <em class="jxr_javadoccomment"> * @return</em>
+<a name="262" href="#262">262</a> <em class="jxr_javadoccomment"> */</em>
+<a name="263" href="#263">263</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Pattern FUZZY_VERSION = Pattern.compile( <span class="jxr_string">"(\\d+)(\\.(\\d+)(\\.(\\d+))?)?([^a-zA-Z0-9](.*))?"</span>,
+<a name="264" href="#264">264</a> Pattern.DOTALL );
+<a name="265" href="#265">265</a>
+<a name="266" href="#266">266</a>
+<a name="267" href="#267">267</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">public</strong> String cleanupVersion( String version )
+<a name="268" href="#268">268</a> {
+<a name="269" href="#269">269</a> StringBuffer result = <strong class="jxr_keyword">new</strong> StringBuffer();
+<a name="270" href="#270">270</a> Matcher m = FUZZY_VERSION.matcher( version );
+<a name="271" href="#271">271</a> <strong class="jxr_keyword">if</strong> ( m.matches() )
+<a name="272" href="#272">272</a> {
+<a name="273" href="#273">273</a> String major = m.group( 1 );
+<a name="274" href="#274">274</a> String minor = m.group( 3 );
+<a name="275" href="#275">275</a> String micro = m.group( 5 );
+<a name="276" href="#276">276</a> String qualifier = m.group( 7 );
+<a name="277" href="#277">277</a>
+<a name="278" href="#278">278</a> <strong class="jxr_keyword">if</strong> ( major != <strong class="jxr_keyword">null</strong> )
+<a name="279" href="#279">279</a> {
+<a name="280" href="#280">280</a> result.append( major );
+<a name="281" href="#281">281</a> <strong class="jxr_keyword">if</strong> ( minor != <strong class="jxr_keyword">null</strong> )
+<a name="282" href="#282">282</a> {
+<a name="283" href="#283">283</a> result.append( <span class="jxr_string">"."</span> );
+<a name="284" href="#284">284</a> result.append( minor );
+<a name="285" href="#285">285</a> <strong class="jxr_keyword">if</strong> ( micro != <strong class="jxr_keyword">null</strong> )
+<a name="286" href="#286">286</a> {
+<a name="287" href="#287">287</a> result.append( <span class="jxr_string">"."</span> );
+<a name="288" href="#288">288</a> result.append( micro );
+<a name="289" href="#289">289</a> <strong class="jxr_keyword">if</strong> ( qualifier != <strong class="jxr_keyword">null</strong> )
+<a name="290" href="#290">290</a> {
+<a name="291" href="#291">291</a> result.append( <span class="jxr_string">"."</span> );
+<a name="292" href="#292">292</a> cleanupModifier( result, qualifier );
+<a name="293" href="#293">293</a> }
+<a name="294" href="#294">294</a> }
+<a name="295" href="#295">295</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( qualifier != <strong class="jxr_keyword">null</strong> )
+<a name="296" href="#296">296</a> {
+<a name="297" href="#297">297</a> result.append( <span class="jxr_string">".0."</span> );
+<a name="298" href="#298">298</a> cleanupModifier( result, qualifier );
+<a name="299" href="#299">299</a> }
+<a name="300" href="#300">300</a> <strong class="jxr_keyword">else</strong>
+<a name="301" href="#301">301</a> {
+<a name="302" href="#302">302</a> result.append( <span class="jxr_string">".0"</span> );
+<a name="303" href="#303">303</a> }
+<a name="304" href="#304">304</a> }
+<a name="305" href="#305">305</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( qualifier != <strong class="jxr_keyword">null</strong> )
+<a name="306" href="#306">306</a> {
+<a name="307" href="#307">307</a> result.append( <span class="jxr_string">".0.0."</span> );
+<a name="308" href="#308">308</a> cleanupModifier( result, qualifier );
+<a name="309" href="#309">309</a> }
+<a name="310" href="#310">310</a> <strong class="jxr_keyword">else</strong>
+<a name="311" href="#311">311</a> {
+<a name="312" href="#312">312</a> result.append( <span class="jxr_string">".0.0"</span> );
+<a name="313" href="#313">313</a> }
+<a name="314" href="#314">314</a> }
+<a name="315" href="#315">315</a> }
+<a name="316" href="#316">316</a> <strong class="jxr_keyword">else</strong>
+<a name="317" href="#317">317</a> {
+<a name="318" href="#318">318</a> result.append( <span class="jxr_string">"0.0.0."</span> );
+<a name="319" href="#319">319</a> cleanupModifier( result, version );
+<a name="320" href="#320">320</a> }
+<a name="321" href="#321">321</a> <strong class="jxr_keyword">return</strong> result.toString();
+<a name="322" href="#322">322</a> }
+<a name="323" href="#323">323</a>
+<a name="324" href="#324">324</a>
+<a name="325" href="#325">325</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> cleanupModifier( StringBuffer result, String modifier )
+<a name="326" href="#326">326</a> {
+<a name="327" href="#327">327</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i = 0; i < modifier.length(); i++ )
+<a name="328" href="#328">328</a> {
+<a name="329" href="#329">329</a> <strong class="jxr_keyword">char</strong> c = modifier.charAt( i );
+<a name="330" href="#330">330</a> <strong class="jxr_keyword">if</strong> ( ( c >= '0' && c <= '9' ) || ( c >= 'a' && c <= 'z' ) || ( c >= 'A' && c <= 'Z' ) || c == '_'
+<a name="331" href="#331">331</a> || c == '-' )
+<a name="332" href="#332">332</a> result.append( c );
+<a name="333" href="#333">333</a> <strong class="jxr_keyword">else</strong>
+<a name="334" href="#334">334</a> result.append( '_' );
+<a name="335" href="#335">335</a> }
+<a name="336" href="#336">336</a> }
+<a name="337" href="#337">337</a>
+<a name="338" href="#338">338</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/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=1490866&r1=1490865&r2=1490866&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 Fri Jun 7 23:25:18 2013
@@ -72,6 +72,6 @@
</ul>
</div>
<hr />
- Copyright © 2006-2012 The Apache Software Foundation. All Rights Reserved.
+ Copyright © 2006-2013 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=1490866&r1=1490865&r2=1490866&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref/overview-summary.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref/overview-summary.html Fri Jun 7 23:25:18 2013
@@ -74,6 +74,6 @@
</div>
<hr />
- Copyright © 2006-2012 The Apache Software Foundation. All Rights Reserved.
+ Copyright © 2006-2013 The Apache Software Foundation. All Rights Reserved.
</body>
</html>
\ No newline at end of file