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 2014/06/20 13:21:28 UTC

svn commit: r1604140 [3/5] - in /felix/trunk/bundleplugin/doc/site: ./ xref-test/org/apache/felix/bundleplugin/ xref/ xref/org/apache/felix/bundleplugin/ xref/org/apache/felix/bundleplugin/baseline/

Modified: felix/trunk/bundleplugin/doc/site/surefire-report.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/surefire-report.html?rev=1604140&r1=1604139&r2=1604140&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/surefire-report.html (original)
+++ felix/trunk/bundleplugin/doc/site/surefire-report.html Fri Jun 20 11:21:27 2014
@@ -94,7 +94,7 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <div class="section"><h2>Surefire Report<a name="Surefire_Report"></a></h2></div><div class="section"><h2><a name="Summary"></a>Summary<a name="Summary"></a></h2><div class="section">[<a href="#Summary">Summary</a>] [<a href="#Package_List">Package List</a>] [<a href="#Test_Cases">Test Cases</a>]</div><br /><table border="0" class="bodyTable"><tr class="a"><th>Tests</th><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="b"><td>22</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>3.57</td></tr></table><br />Note: failures are anticipated and checked for with assertions while errors are unanticipated.<br /></div><div class="section"><h2><a name="Package_List"></a>Package List<a name="Package_List"></a></h2><div class="section">[<a href="#Summary">Summary</a>] [<a href="#Package_List">Package List</a>] [<a href="#Test_Cases">Test Cases</a>]</div><br /><table border="0" class="bodyTable"><tr class="a"><th>Package</th><th>Tests</th
 ><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="b"><td><a href="#org.apache.maven.shared.osgi">org.apache.maven.shared.osgi</a></td><td>4</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>0.182</td></tr><tr class="a"><td><a href="#org.apache.felix.bundleplugin">org.apache.felix.bundleplugin</a></td><td>18</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>3.388</td></tr></table><br />Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.<div class="section"><h3><a name="org.apache.maven.shared.osgi"></a>org.apache.maven.shared.osgi<a name="org.apache.maven.shared.osgi"></a></h3><table border="0" class="bodyTable"><tr class="b"><th></th><th>Class</th><th>Tests</th><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="a"><td><a href="#org.apache.maven.shared.osgiMaven2OsgiConverterTest"><img src="images/icon_success_sml.gif" alt="" /></a></t
 d><td><a href="#org.apache.maven.shared.osgiMaven2OsgiConverterTest">Maven2OsgiConverterTest</a></td><td>4</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>0.182</td></tr></table></div><div class="section"><h3><a name="org.apache.felix.bundleplugin"></a>org.apache.felix.bundleplugin<a name="org.apache.felix.bundleplugin"></a></h3><table border="0" class="bodyTable"><tr class="b"><th></th><th>Class</th><th>Tests</th><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="a"><td><a href="#org.apache.felix.bundlepluginBlueprintComponentTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apache.felix.bundlepluginBlueprintComponentTest">BlueprintComponentTest</a></td><td>3</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>0.945</td></tr><tr class="b"><td><a href="#org.apache.felix.bundlepluginBundleAllPluginTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apache.felix.bundlepluginBu
 ndleAllPluginTest">BundleAllPluginTest</a></td><td>2</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>0.8</td></tr><tr class="a"><td><a href="#org.apache.felix.bundlepluginBundlePluginTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apache.felix.bundlepluginBundlePluginTest">BundlePluginTest</a></td><td>12</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>1.636</td></tr><tr class="b"><td><a href="#org.apache.felix.bundlepluginManifestWriterTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apache.felix.bundlepluginManifestWriterTest">ManifestWriterTest</a></td><td>1</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>0.007</td></tr></table></div><br /></div><div class="section"><h2><a name="Test_Cases"></a>Test Cases<a name="Test_Cases"></a></h2><div class="section">[<a href="#Summary">Summary</a>] [<a href="#Package_List">Package List</a>] [<a href="#Test_Cases">Test Cases</a>]</div><div class="section"><h3><a name="or
 g.apache.felix.bundlepluginBlueprintComponentTest"></a>BlueprintComponentTest<a name="BlueprintComponentTest"></a></h3><table border="0" class="bodyTable"><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testBlueprintServices</td><td>0.63</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testBlueprintGeneric</td><td>0.227</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testAnalyzer</td><td>0.037</td></tr></table></div><div class="section"><h3><a name="org.apache.felix.bundlepluginBundleAllPluginTest"></a>BundleAllPluginTest<a name="BundleAllPluginTest"></a></h3><table border="0" class="bodyTable"><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testSnapshotMatch</td><td>0.377</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testNoReBundling</td><td>0.417</td></tr></table></div><div class="section"><h3><a name="org.apache.felix.b
 undlepluginBundlePluginTest"></a>BundlePluginTest<a name="BundlePluginTest"></a></h3><table border="0" class="bodyTable"><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testConvertVersionToOsgi</td><td>0.338</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testReadExportedModules</td><td>0.227</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testTransformDirectives</td><td>0.039</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testDefaultPropertiesIncludeOrganization</td><td>0.051</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testVersion</td><td>0.048</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testPackageInfoDetection</td><td>0.037</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyPositiveClauses</td><td>0.16</td></tr><tr c
 lass="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyNegativeClauses</td><td>0.18</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyDuplicateKeys</td><td>0.175</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyMissingPositiveKey</td><td>0.133</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyMissingNegativeKey</td><td>0.188</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testPropertySanitizing</td><td>0.043</td></tr></table></div><div class="section"><h3><a name="org.apache.felix.bundlepluginManifestWriterTest"></a>ManifestWriterTest<a name="ManifestWriterTest"></a></h3><table border="0" class="bodyTable"><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testNiceManifest</td><td>0.006</td></tr></table></div><div class="section"><h3
 ><a name="org.apache.maven.shared.osgiMaven2OsgiConverterTest"></a>Maven2OsgiConverterTest<a name="Maven2OsgiConverterTest"></a></h3><table border="0" class="bodyTable"><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testConvertVersionToOsgi</td><td>0.041</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testGetBundleSymbolicName</td><td>0.058</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testGetBundleFileName</td><td>0.042</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testGetVersion</td><td>0.039</td></tr></table></div><br /></div><br />
+        <div class="section"><h2>Surefire Report<a name="Surefire_Report"></a></h2></div><div class="section"><h2><a name="Summary"></a>Summary<a name="Summary"></a></h2><div class="section">[<a href="#Summary">Summary</a>] [<a href="#Package_List">Package List</a>] [<a href="#Test_Cases">Test Cases</a>]</div><br /><table border="0" class="bodyTable"><tr class="a"><th>Tests</th><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="b"><td>22</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>4.01</td></tr></table><br />Note: failures are anticipated and checked for with assertions while errors are unanticipated.<br /></div><div class="section"><h2><a name="Package_List"></a>Package List<a name="Package_List"></a></h2><div class="section">[<a href="#Summary">Summary</a>] [<a href="#Package_List">Package List</a>] [<a href="#Test_Cases">Test Cases</a>]</div><br /><table border="0" class="bodyTable"><tr class="a"><th>Package</th><th>Tests</th
 ><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="b"><td><a href="#org.apache.maven.shared.osgi">org.apache.maven.shared.osgi</a></td><td>4</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>0.211</td></tr><tr class="a"><td><a href="#org.apache.felix.bundleplugin">org.apache.felix.bundleplugin</a></td><td>18</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>3.799</td></tr></table><br />Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.<div class="section"><h3><a name="org.apache.maven.shared.osgi"></a>org.apache.maven.shared.osgi<a name="org.apache.maven.shared.osgi"></a></h3><table border="0" class="bodyTable"><tr class="b"><th></th><th>Class</th><th>Tests</th><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="a"><td><a href="#org.apache.maven.shared.osgiMaven2OsgiConverterTest"><img src="images/icon_success_sml.gif" alt="" /></a></t
 d><td><a href="#org.apache.maven.shared.osgiMaven2OsgiConverterTest">Maven2OsgiConverterTest</a></td><td>4</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>0.211</td></tr></table></div><div class="section"><h3><a name="org.apache.felix.bundleplugin"></a>org.apache.felix.bundleplugin<a name="org.apache.felix.bundleplugin"></a></h3><table border="0" class="bodyTable"><tr class="b"><th></th><th>Class</th><th>Tests</th><th>Errors </th><th>Failures</th><th>Skipped</th><th>Success Rate</th><th>Time</th></tr><tr class="a"><td><a href="#org.apache.felix.bundlepluginBlueprintComponentTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apache.felix.bundlepluginBlueprintComponentTest">BlueprintComponentTest</a></td><td>3</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>1.207</td></tr><tr class="b"><td><a href="#org.apache.felix.bundlepluginBundleAllPluginTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apache.felix.bundlepluginBu
 ndleAllPluginTest">BundleAllPluginTest</a></td><td>2</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>0.911</td></tr><tr class="a"><td><a href="#org.apache.felix.bundlepluginBundlePluginTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apache.felix.bundlepluginBundlePluginTest">BundlePluginTest</a></td><td>12</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>1.673</td></tr><tr class="b"><td><a href="#org.apache.felix.bundlepluginManifestWriterTest"><img src="images/icon_success_sml.gif" alt="" /></a></td><td><a href="#org.apache.felix.bundlepluginManifestWriterTest">ManifestWriterTest</a></td><td>1</td><td>0</td><td>0</td><td>0</td><td>100%</td><td>0.008</td></tr></table></div><br /></div><div class="section"><h2><a name="Test_Cases"></a>Test Cases<a name="Test_Cases"></a></h2><div class="section">[<a href="#Summary">Summary</a>] [<a href="#Package_List">Package List</a>] [<a href="#Test_Cases">Test Cases</a>]</div><div class="section"><h3><a name="
 org.apache.felix.bundlepluginBlueprintComponentTest"></a>BlueprintComponentTest<a name="BlueprintComponentTest"></a></h3><table border="0" class="bodyTable"><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testBlueprintServices</td><td>0.781</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testBlueprintGeneric</td><td>0.312</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testAnalyzer</td><td>0.055</td></tr></table></div><div class="section"><h3><a name="org.apache.felix.bundlepluginBundleAllPluginTest"></a>BundleAllPluginTest<a name="BundleAllPluginTest"></a></h3><table border="0" class="bodyTable"><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testSnapshotMatch</td><td>0.49</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testNoReBundling</td><td>0.413</td></tr></table></div><div class="section"><h3><a name="org.apache.felix
 .bundlepluginBundlePluginTest"></a>BundlePluginTest<a name="BundlePluginTest"></a></h3><table border="0" class="bodyTable"><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testConvertVersionToOsgi</td><td>0.413</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testReadExportedModules</td><td>0.248</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testTransformDirectives</td><td>0.038</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testDefaultPropertiesIncludeOrganization</td><td>0.055</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testVersion</td><td>0.04</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testPackageInfoDetection</td><td>0.043</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyPositiveClauses</td><td>0.151</td></tr><tr
  class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyNegativeClauses</td><td>0.153</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyDuplicateKeys</td><td>0.132</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyMissingPositiveKey</td><td>0.151</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testEmbedDependencyMissingNegativeKey</td><td>0.204</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testPropertySanitizing</td><td>0.037</td></tr></table></div><div class="section"><h3><a name="org.apache.felix.bundlepluginManifestWriterTest"></a>ManifestWriterTest<a name="ManifestWriterTest"></a></h3><table border="0" class="bodyTable"><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testNiceManifest</td><td>0.007</td></tr></table></div><div class="section">
 <h3><a name="org.apache.maven.shared.osgiMaven2OsgiConverterTest"></a>Maven2OsgiConverterTest<a name="Maven2OsgiConverterTest"></a></h3><table border="0" class="bodyTable"><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testConvertVersionToOsgi</td><td>0.045</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testGetBundleSymbolicName</td><td>0.078</td></tr><tr class="a"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testGetBundleFileName</td><td>0.051</td></tr><tr class="b"><td><img src="images/icon_success_sml.gif" alt="" /></td><td>testGetVersion</td><td>0.035</td></tr></table></div><br /></div><br />
       </div>
     </div>
     <div class="clear">

Added: felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/ManifestWriterTest.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/ManifestWriterTest.html?rev=1604140&view=auto
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/ManifestWriterTest.html (added)
+++ felix/trunk/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/ManifestWriterTest.html Fri Jun 20 11:21:27 2014
@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+<title>ManifestWriterTest xref</title>
+<link type="text/css" rel="stylesheet" href="../../../../stylesheet.css" />
+</head>
+<body>
+<pre>
+
+<a name="1" href="#1">1</a>   <em class="jxr_comment">/*</em>
+<a name="2" href="#2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a name="3" href="#3">3</a>   <em class="jxr_comment"> * or more contributor license agreements.  See the NOTICE file</em>
+<a name="4" href="#4">4</a>   <em class="jxr_comment"> * distributed with this work for additional information</em>
+<a name="5" href="#5">5</a>   <em class="jxr_comment"> * regarding copyright ownership.  The ASF licenses this file</em>
+<a name="6" href="#6">6</a>   <em class="jxr_comment"> * to you under the Apache License, Version 2.0 (the</em>
+<a name="7" href="#7">7</a>   <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
+<a name="8" href="#8">8</a>   <em class="jxr_comment"> * with the License.  You may obtain a copy of the License at</em>
+<a name="9" href="#9">9</a>   <em class="jxr_comment"> *</em>
+<a name="10" href="#10">10</a>  <em class="jxr_comment"> *   <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a name="11" href="#11">11</a>  <em class="jxr_comment"> *</em>
+<a name="12" href="#12">12</a>  <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing,</em>
+<a name="13" href="#13">13</a>  <em class="jxr_comment"> * software distributed under the License is distributed on an</em>
+<a name="14" href="#14">14</a>  <em class="jxr_comment"> * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY</em>
+<a name="15" href="#15">15</a>  <em class="jxr_comment"> * KIND, either express or implied.  See the License for the</em>
+<a name="16" href="#16">16</a>  <em class="jxr_comment"> * specific language governing permissions and limitations</em>
+<a name="17" href="#17">17</a>  <em class="jxr_comment"> * under the License.</em>
+<a name="18" href="#18">18</a>  <em class="jxr_comment"> */</em>
+<a name="19" href="#19">19</a>  <strong class="jxr_keyword">package</strong> org.apache.felix.bundleplugin;
+<a name="20" href="#20">20</a>  
+<a name="21" href="#21">21</a>  <strong class="jxr_keyword">import</strong> java.io.ByteArrayInputStream;
+<a name="22" href="#22">22</a>  <strong class="jxr_keyword">import</strong> java.io.ByteArrayOutputStream;
+<a name="23" href="#23">23</a>  <strong class="jxr_keyword">import</strong> java.util.jar.Manifest;
+<a name="24" href="#24">24</a>  
+<a name="25" href="#25">25</a>  <strong class="jxr_keyword">import</strong> junit.framework.TestCase;
+<a name="26" href="#26">26</a>  
+<a name="27" href="#27">27</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/felix/bundleplugin/ManifestWriterTest.html">ManifestWriterTest</a> <strong class="jxr_keyword">extends</strong> TestCase
+<a name="28" href="#28">28</a>  {
+<a name="29" href="#29">29</a>  
+<a name="30" href="#30">30</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testNiceManifest() <strong class="jxr_keyword">throws</strong> Exception
+<a name="31" href="#31">31</a>      {
+<a name="32" href="#32">32</a>          <em class="jxr_comment">// This manifest has an export clause ending on char 73</em>
+<a name="33" href="#33">33</a>          Manifest manifest = <strong class="jxr_keyword">new</strong> Manifest();
+<a name="34" href="#34">34</a>          manifest.read(getClass().getResourceAsStream(<span class="jxr_string">"/test2.mf"</span>));
+<a name="35" href="#35">35</a>  
+<a name="36" href="#36">36</a>          ByteArrayOutputStream baos = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream();
+<a name="37" href="#37">37</a>          ManifestWriter.outputManifest( manifest, baos, <strong class="jxr_keyword">true</strong> );
+<a name="38" href="#38">38</a>  
+<a name="39" href="#39">39</a>          Manifest manifest2 = <strong class="jxr_keyword">new</strong> Manifest();
+<a name="40" href="#40">40</a>          manifest2.read(<strong class="jxr_keyword">new</strong> ByteArrayInputStream(baos.toByteArray()));
+<a name="41" href="#41">41</a>  
+<a name="42" href="#42">42</a>          assertEquals( toString(manifest, false), toString(manifest2, false) );
+<a name="43" href="#43">43</a>  
+<a name="44" href="#44">44</a>      }
+<a name="45" href="#45">45</a>  
+<a name="46" href="#46">46</a>      String toString(Manifest manifest, <strong class="jxr_keyword">boolean</strong> nice) <strong class="jxr_keyword">throws</strong> Exception
+<a name="47" href="#47">47</a>      {
+<a name="48" href="#48">48</a>          ByteArrayOutputStream baos = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream();
+<a name="49" href="#49">49</a>          ManifestWriter.outputManifest( manifest, baos, nice );
+<a name="50" href="#50">50</a>          <strong class="jxr_keyword">return</strong> baos.toString();
+<a name="51" href="#51">51</a>      }
+<a name="52" href="#52">52</a>  
+<a name="53" href="#53">53</a>  }
+</pre>
+<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
+</html>
+

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

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

Modified: felix/trunk/bundleplugin/doc/site/xref/allclasses-frame.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/allclasses-frame.html?rev=1604140&r1=1604139&r2=1604140&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref/allclasses-frame.html (original)
+++ felix/trunk/bundleplugin/doc/site/xref/allclasses-frame.html Fri Jun 20 11:21:27 2014
@@ -63,9 +63,6 @@
 				<a href="org/apache/felix/bundleplugin/baseline/DiffMessage.html" target="classFrame">DiffMessage</a>
 			</li>
 						<li>
-				<a href="aQute/bnd/osgi/Verifier.html" target="classFrame">EE</a>
-			</li>
-						<li>
 				<a href="org/apache/felix/bundleplugin/baseline/InfoComparator.html" target="classFrame">InfoComparator</a>
 			</li>
 						<li>
@@ -126,9 +123,6 @@
 				<a href="org/apache/felix/bundleplugin/baseline/DiffMessage.html" target="classFrame">Type</a>
 			</li>
 						<li>
-				<a href="aQute/bnd/osgi/Verifier.html" target="classFrame">Verifier</a>
-			</li>
-						<li>
 				<a href="org/apache/felix/bundleplugin/VersionCleanerPlugin.html" target="classFrame">VersionCleanerPlugin</a>
 			</li>
 						<li>

Added: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestWriter.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestWriter.html?rev=1604140&view=auto
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestWriter.html (added)
+++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestWriter.html Fri Jun 20 11:21:27 2014
@@ -0,0 +1,264 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+<title>ManifestWriter xref</title>
+<link type="text/css" rel="stylesheet" href="../../../../stylesheet.css" />
+</head>
+<body>
+<pre>
+
+<a name="1" href="#1">1</a>   <em class="jxr_comment">/*</em>
+<a name="2" href="#2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a name="3" href="#3">3</a>   <em class="jxr_comment"> * or more contributor license agreements.  See the NOTICE file</em>
+<a name="4" href="#4">4</a>   <em class="jxr_comment"> * distributed with this work for additional information</em>
+<a name="5" href="#5">5</a>   <em class="jxr_comment"> * regarding copyright ownership.  The ASF licenses this file</em>
+<a name="6" href="#6">6</a>   <em class="jxr_comment"> * to you under the Apache License, Version 2.0 (the</em>
+<a name="7" href="#7">7</a>   <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
+<a name="8" href="#8">8</a>   <em class="jxr_comment"> * with the License.  You may obtain a copy of the License at</em>
+<a name="9" href="#9">9</a>   <em class="jxr_comment"> *</em>
+<a name="10" href="#10">10</a>  <em class="jxr_comment"> *   <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a name="11" href="#11">11</a>  <em class="jxr_comment"> *</em>
+<a name="12" href="#12">12</a>  <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing,</em>
+<a name="13" href="#13">13</a>  <em class="jxr_comment"> * software distributed under the License is distributed on an</em>
+<a name="14" href="#14">14</a>  <em class="jxr_comment"> * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY</em>
+<a name="15" href="#15">15</a>  <em class="jxr_comment"> * KIND, either express or implied.  See the License for the</em>
+<a name="16" href="#16">16</a>  <em class="jxr_comment"> * specific language governing permissions and limitations</em>
+<a name="17" href="#17">17</a>  <em class="jxr_comment"> * under the License.</em>
+<a name="18" href="#18">18</a>  <em class="jxr_comment"> */</em>
+<a name="19" href="#19">19</a>  <strong class="jxr_keyword">package</strong> org.apache.felix.bundleplugin;
+<a name="20" href="#20">20</a>  
+<a name="21" href="#21">21</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a name="22" href="#22">22</a>  <strong class="jxr_keyword">import</strong> java.io.OutputStream;
+<a name="23" href="#23">23</a>  <strong class="jxr_keyword">import</strong> java.util.Arrays;
+<a name="24" href="#24">24</a>  <strong class="jxr_keyword">import</strong> java.util.HashSet;
+<a name="25" href="#25">25</a>  <strong class="jxr_keyword">import</strong> java.util.Map;
+<a name="26" href="#26">26</a>  <strong class="jxr_keyword">import</strong> java.util.Set;
+<a name="27" href="#27">27</a>  <strong class="jxr_keyword">import</strong> java.util.TreeMap;
+<a name="28" href="#28">28</a>  <strong class="jxr_keyword">import</strong> java.util.TreeSet;
+<a name="29" href="#29">29</a>  <strong class="jxr_keyword">import</strong> java.util.jar.Attributes;
+<a name="30" href="#30">30</a>  <strong class="jxr_keyword">import</strong> java.util.jar.Manifest;
+<a name="31" href="#31">31</a>  
+<a name="32" href="#32">32</a>  <strong class="jxr_keyword">import</strong> org.apache.felix.utils.manifest.Parser;
+<a name="33" href="#33">33</a>  <strong class="jxr_keyword">import</strong> org.osgi.framework.Constants;
+<a name="34" href="#34">34</a>  
+<a name="35" href="#35">35</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/felix/bundleplugin/ManifestWriter.html">ManifestWriter</a> {
+<a name="36" href="#36">36</a>  
+<a name="37" href="#37">37</a>      <em class="jxr_javadoccomment">/**</em>
+<a name="38" href="#38">38</a>  <em class="jxr_javadoccomment">     * Unfortunately we have to write our own manifest :-( because of a stupid</em>
+<a name="39" href="#39">39</a>  <em class="jxr_javadoccomment">     * bug in the manifest code. It tries to handle UTF-8 but the way it does it</em>
+<a name="40" href="#40">40</a>  <em class="jxr_javadoccomment">     * it makes the bytes platform dependent. So the following code outputs the</em>
+<a name="41" href="#41">41</a>  <em class="jxr_javadoccomment">     * manifest. A Manifest consists of</em>
+<a name="42" href="#42">42</a>  <em class="jxr_javadoccomment">     *</em>
+<a name="43" href="#43">43</a>  <em class="jxr_javadoccomment">     * &lt;pre&gt;</em>
+<a name="44" href="#44">44</a>  <em class="jxr_javadoccomment">     *   'Manifest-Version: 1.0\r\n'</em>
+<a name="45" href="#45">45</a>  <em class="jxr_javadoccomment">     *   main-attributes *</em>
+<a name="46" href="#46">46</a>  <em class="jxr_javadoccomment">     *   \r\n</em>
+<a name="47" href="#47">47</a>  <em class="jxr_javadoccomment">     *   name-section</em>
+<a name="48" href="#48">48</a>  <em class="jxr_javadoccomment">     *</em>
+<a name="49" href="#49">49</a>  <em class="jxr_javadoccomment">     *   main-attributes ::= attributes</em>
+<a name="50" href="#50">50</a>  <em class="jxr_javadoccomment">     *   attributes      ::= key ': ' value '\r\n'</em>
+<a name="51" href="#51">51</a>  <em class="jxr_javadoccomment">     *   name-section    ::= 'Name: ' name '\r\n' attributes</em>
+<a name="52" href="#52">52</a>  <em class="jxr_javadoccomment">     * &lt;/pre&gt;</em>
+<a name="53" href="#53">53</a>  <em class="jxr_javadoccomment">     *</em>
+<a name="54" href="#54">54</a>  <em class="jxr_javadoccomment">     * Lines in the manifest should not exceed 72 bytes (! this is where the</em>
+<a name="55" href="#55">55</a>  <em class="jxr_javadoccomment">     * manifest screwed up as well when 16 bit unicodes were used).</em>
+<a name="56" href="#56">56</a>  <em class="jxr_javadoccomment">     * &lt;p&gt;</em>
+<a name="57" href="#57">57</a>  <em class="jxr_javadoccomment">     * As a bonus, we can now sort the manifest!</em>
+<a name="58" href="#58">58</a>  <em class="jxr_javadoccomment">     */</em>
+<a name="59" href="#59">59</a>      <strong class="jxr_keyword">static</strong> byte[]	CONTINUE	= <strong class="jxr_keyword">new</strong> byte[] {
+<a name="60" href="#60">60</a>              '\r', '\n', ' '
+<a name="61" href="#61">61</a>      };
+<a name="62" href="#62">62</a>  
+<a name="63" href="#63">63</a>      <strong class="jxr_keyword">static</strong> Set&lt;String&gt; NICE_HEADERS = <strong class="jxr_keyword">new</strong> HashSet&lt;String&gt;(
+<a name="64" href="#64">64</a>              Arrays.asList(
+<a name="65" href="#65">65</a>                      Constants.IMPORT_PACKAGE,
+<a name="66" href="#66">66</a>                      Constants.DYNAMICIMPORT_PACKAGE,
+<a name="67" href="#67">67</a>                      Constants.IMPORT_SERVICE,
+<a name="68" href="#68">68</a>                      Constants.REQUIRE_CAPABILITY,
+<a name="69" href="#69">69</a>                      Constants.EXPORT_PACKAGE,
+<a name="70" href="#70">70</a>                      Constants.EXPORT_SERVICE,
+<a name="71" href="#71">71</a>                      Constants.PROVIDE_CAPABILITY
+<a name="72" href="#72">72</a>              )
+<a name="73" href="#73">73</a>      );
+<a name="74" href="#74">74</a>  
+<a name="75" href="#75">75</a>      <em class="jxr_javadoccomment">/**</em>
+<a name="76" href="#76">76</a>  <em class="jxr_javadoccomment">     * Main function to output a manifest properly in UTF-8.</em>
+<a name="77" href="#77">77</a>  <em class="jxr_javadoccomment">     *</em>
+<a name="78" href="#78">78</a>  <em class="jxr_javadoccomment">     * @param manifest</em>
+<a name="79" href="#79">79</a>  <em class="jxr_javadoccomment">     *            The manifest to output</em>
+<a name="80" href="#80">80</a>  <em class="jxr_javadoccomment">     * @param out</em>
+<a name="81" href="#81">81</a>  <em class="jxr_javadoccomment">     *            The output stream</em>
+<a name="82" href="#82">82</a>  <em class="jxr_javadoccomment">     * @throws IOException</em>
+<a name="83" href="#83">83</a>  <em class="jxr_javadoccomment">     *             when something fails</em>
+<a name="84" href="#84">84</a>  <em class="jxr_javadoccomment">     */</em>
+<a name="85" href="#85">85</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> outputManifest(Manifest manifest, OutputStream out, <strong class="jxr_keyword">boolean</strong> nice) <strong class="jxr_keyword">throws</strong> IOException {
+<a name="86" href="#86">86</a>          writeEntry(out, <span class="jxr_string">"Manifest-Version"</span>, <span class="jxr_string">"1.0"</span>, nice);
+<a name="87" href="#87">87</a>          attributes(manifest.getMainAttributes(), out, nice);
+<a name="88" href="#88">88</a>  
+<a name="89" href="#89">89</a>          TreeSet&lt;String&gt; keys = <strong class="jxr_keyword">new</strong> TreeSet&lt;String&gt;();
+<a name="90" href="#90">90</a>          <strong class="jxr_keyword">for</strong> (Object o : manifest.getEntries().keySet())
+<a name="91" href="#91">91</a>              keys.add(o.toString());
+<a name="92" href="#92">92</a>  
+<a name="93" href="#93">93</a>          <strong class="jxr_keyword">for</strong> (String key : keys) {
+<a name="94" href="#94">94</a>              write(out, 0, <span class="jxr_string">"\r\n"</span>);
+<a name="95" href="#95">95</a>              writeEntry(out, <span class="jxr_string">"Name"</span>, key, nice);
+<a name="96" href="#96">96</a>              attributes(manifest.getAttributes(key), out, nice);
+<a name="97" href="#97">97</a>          }
+<a name="98" href="#98">98</a>          out.flush();
+<a name="99" href="#99">99</a>      }
+<a name="100" href="#100">100</a> 
+<a name="101" href="#101">101</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="102" href="#102">102</a> <em class="jxr_javadoccomment">     * Write out an entry, handling proper unicode and line length constraints</em>
+<a name="103" href="#103">103</a> <em class="jxr_javadoccomment">     */</em>
+<a name="104" href="#104">104</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> writeEntry(OutputStream out, String name, String value, <strong class="jxr_keyword">boolean</strong> nice) <strong class="jxr_keyword">throws</strong> IOException {
+<a name="105" href="#105">105</a>         <strong class="jxr_keyword">if</strong> (nice &amp;&amp; NICE_HEADERS.contains(name)) {
+<a name="106" href="#106">106</a>             <strong class="jxr_keyword">int</strong> n = write(out, 0, name + <span class="jxr_string">": "</span>);
+<a name="107" href="#107">107</a>             String[] parts = Parser.parseDelimitedString(value, <span class="jxr_string">","</span>);
+<a name="108" href="#108">108</a>             <strong class="jxr_keyword">if</strong> (parts.length &gt; 1) {
+<a name="109" href="#109">109</a>                 write(out, 0, <span class="jxr_string">"\r\n "</span>);
+<a name="110" href="#110">110</a>                 n = 1;
+<a name="111" href="#111">111</a>             }
+<a name="112" href="#112">112</a>             <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; parts.length; i++) {
+<a name="113" href="#113">113</a>                 <strong class="jxr_keyword">if</strong> (i &lt; parts.length - 1) {
+<a name="114" href="#114">114</a>                     write(out, n, parts[i] + <span class="jxr_string">","</span>);
+<a name="115" href="#115">115</a>                     write(out, 0, <span class="jxr_string">"\r\n "</span>);
+<a name="116" href="#116">116</a>                 } <strong class="jxr_keyword">else</strong> {
+<a name="117" href="#117">117</a>                     write(out, n, parts[i]);
+<a name="118" href="#118">118</a>                     write(out, 0, <span class="jxr_string">"\r\n"</span>);
+<a name="119" href="#119">119</a>                 }
+<a name="120" href="#120">120</a>                 n = 1;
+<a name="121" href="#121">121</a>             }
+<a name="122" href="#122">122</a>         } <strong class="jxr_keyword">else</strong> {
+<a name="123" href="#123">123</a>             <strong class="jxr_keyword">int</strong> n = write(out, 0, name + <span class="jxr_string">": "</span>);
+<a name="124" href="#124">124</a>             write(out, n, value);
+<a name="125" href="#125">125</a>             write(out, 0, <span class="jxr_string">"\r\n"</span>);
+<a name="126" href="#126">126</a>         }
+<a name="127" href="#127">127</a>     }
+<a name="128" href="#128">128</a> 
+<a name="129" href="#129">129</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="130" href="#130">130</a> <em class="jxr_javadoccomment">     * Convert a string to bytes with UTF8 and then output in max 72 bytes</em>
+<a name="131" href="#131">131</a> <em class="jxr_javadoccomment">     *</em>
+<a name="132" href="#132">132</a> <em class="jxr_javadoccomment">     * @param out</em>
+<a name="133" href="#133">133</a> <em class="jxr_javadoccomment">     *            the output string</em>
+<a name="134" href="#134">134</a> <em class="jxr_javadoccomment">     * @param i</em>
+<a name="135" href="#135">135</a> <em class="jxr_javadoccomment">     *            the current width</em>
+<a name="136" href="#136">136</a> <em class="jxr_javadoccomment">     * @param s</em>
+<a name="137" href="#137">137</a> <em class="jxr_javadoccomment">     *            the string to output</em>
+<a name="138" href="#138">138</a> <em class="jxr_javadoccomment">     * @return the new width</em>
+<a name="139" href="#139">139</a> <em class="jxr_javadoccomment">     * @throws IOException</em>
+<a name="140" href="#140">140</a> <em class="jxr_javadoccomment">     *             when something fails</em>
+<a name="141" href="#141">141</a> <em class="jxr_javadoccomment">     */</em>
+<a name="142" href="#142">142</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">int</strong> write(OutputStream out, <strong class="jxr_keyword">int</strong> i, String s) <strong class="jxr_keyword">throws</strong> IOException {
+<a name="143" href="#143">143</a>         byte[] bytes = s.getBytes(<span class="jxr_string">"UTF8"</span>);
+<a name="144" href="#144">144</a>         <strong class="jxr_keyword">return</strong> write(out, i, bytes);
+<a name="145" href="#145">145</a>     }
+<a name="146" href="#146">146</a> 
+<a name="147" href="#147">147</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="148" href="#148">148</a> <em class="jxr_javadoccomment">     * Write the bytes but ensure that the line length does not exceed 72</em>
+<a name="149" href="#149">149</a> <em class="jxr_javadoccomment">     * characters. If it is more than 70 characters, we just put a cr/lf +</em>
+<a name="150" href="#150">150</a> <em class="jxr_javadoccomment">     * space.</em>
+<a name="151" href="#151">151</a> <em class="jxr_javadoccomment">     *</em>
+<a name="152" href="#152">152</a> <em class="jxr_javadoccomment">     * @param out</em>
+<a name="153" href="#153">153</a> <em class="jxr_javadoccomment">     *            The output stream</em>
+<a name="154" href="#154">154</a> <em class="jxr_javadoccomment">     * @param width</em>
+<a name="155" href="#155">155</a> <em class="jxr_javadoccomment">     *            The nr of characters output in a line before this method</em>
+<a name="156" href="#156">156</a> <em class="jxr_javadoccomment">     *            started</em>
+<a name="157" href="#157">157</a> <em class="jxr_javadoccomment">     * @param bytes</em>
+<a name="158" href="#158">158</a> <em class="jxr_javadoccomment">     *            the bytes to output</em>
+<a name="159" href="#159">159</a> <em class="jxr_javadoccomment">     * @return the nr of characters in the last line</em>
+<a name="160" href="#160">160</a> <em class="jxr_javadoccomment">     * @throws IOException</em>
+<a name="161" href="#161">161</a> <em class="jxr_javadoccomment">     *             if something fails</em>
+<a name="162" href="#162">162</a> <em class="jxr_javadoccomment">     */</em>
+<a name="163" href="#163">163</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">int</strong> write(OutputStream out, <strong class="jxr_keyword">int</strong> width, byte[] bytes) <strong class="jxr_keyword">throws</strong> IOException {
+<a name="164" href="#164">164</a>         <strong class="jxr_keyword">int</strong> w = width;
+<a name="165" href="#165">165</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; bytes.length; i++) {
+<a name="166" href="#166">166</a>             <strong class="jxr_keyword">if</strong> (w &gt;= 72) { <em class="jxr_comment">// we need to add the \n\r!</em>
+<a name="167" href="#167">167</a>                 out.write(CONTINUE);
+<a name="168" href="#168">168</a>                 w = 1;
+<a name="169" href="#169">169</a>             }
+<a name="170" href="#170">170</a>             out.write(bytes[i]);
+<a name="171" href="#171">171</a>             w++;
+<a name="172" href="#172">172</a>         }
+<a name="173" href="#173">173</a>         <strong class="jxr_keyword">return</strong> w;
+<a name="174" href="#174">174</a>     }
+<a name="175" href="#175">175</a> 
+<a name="176" href="#176">176</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="177" href="#177">177</a> <em class="jxr_javadoccomment">     * Output an Attributes map. We will sort this map before outputing.</em>
+<a name="178" href="#178">178</a> <em class="jxr_javadoccomment">     *</em>
+<a name="179" href="#179">179</a> <em class="jxr_javadoccomment">     * @param value</em>
+<a name="180" href="#180">180</a> <em class="jxr_javadoccomment">     *            the attrbutes</em>
+<a name="181" href="#181">181</a> <em class="jxr_javadoccomment">     * @param out</em>
+<a name="182" href="#182">182</a> <em class="jxr_javadoccomment">     *            the output stream</em>
+<a name="183" href="#183">183</a> <em class="jxr_javadoccomment">     * @throws IOException</em>
+<a name="184" href="#184">184</a> <em class="jxr_javadoccomment">     *             when something fails</em>
+<a name="185" href="#185">185</a> <em class="jxr_javadoccomment">     */</em>
+<a name="186" href="#186">186</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> attributes(Attributes value, OutputStream out, <strong class="jxr_keyword">boolean</strong> nice) <strong class="jxr_keyword">throws</strong> IOException {
+<a name="187" href="#187">187</a>         TreeMap&lt;String,String&gt; map = <strong class="jxr_keyword">new</strong> TreeMap&lt;String,String&gt;(String.CASE_INSENSITIVE_ORDER);
+<a name="188" href="#188">188</a>         <strong class="jxr_keyword">for</strong> (Map.Entry&lt;Object,Object&gt; entry : value.entrySet()) {
+<a name="189" href="#189">189</a>             map.put(entry.getKey().toString(), entry.getValue().toString());
+<a name="190" href="#190">190</a>         }
+<a name="191" href="#191">191</a> 
+<a name="192" href="#192">192</a>         map.remove(<span class="jxr_string">"Manifest-Version"</span>); <em class="jxr_comment">// get rid of</em>
+<a name="193" href="#193">193</a>         <em class="jxr_comment">// manifest</em>
+<a name="194" href="#194">194</a>         <em class="jxr_comment">// version</em>
+<a name="195" href="#195">195</a>         <strong class="jxr_keyword">for</strong> (Map.Entry&lt;String,String&gt; entry : map.entrySet()) {
+<a name="196" href="#196">196</a>             writeEntry(out, entry.getKey(), entry.getValue(), nice);
+<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">private</strong> <strong class="jxr_keyword">static</strong> Manifest clean(Manifest org) {
+<a name="201" href="#201">201</a> 
+<a name="202" href="#202">202</a>         Manifest result = <strong class="jxr_keyword">new</strong> Manifest();
+<a name="203" href="#203">203</a>         <strong class="jxr_keyword">for</strong> (Map.Entry&lt; ? , ? &gt; entry : org.getMainAttributes().entrySet()) {
+<a name="204" href="#204">204</a>             String nice = clean((String) entry.getValue());
+<a name="205" href="#205">205</a>             result.getMainAttributes().put(entry.getKey(), nice);
+<a name="206" href="#206">206</a>         }
+<a name="207" href="#207">207</a>         <strong class="jxr_keyword">for</strong> (String name : org.getEntries().keySet()) {
+<a name="208" href="#208">208</a>             Attributes attrs = result.getAttributes(name);
+<a name="209" href="#209">209</a>             <strong class="jxr_keyword">if</strong> (attrs == <strong class="jxr_keyword">null</strong>) {
+<a name="210" href="#210">210</a>                 attrs = <strong class="jxr_keyword">new</strong> Attributes();
+<a name="211" href="#211">211</a>                 result.getEntries().put(name, attrs);
+<a name="212" href="#212">212</a>             }
+<a name="213" href="#213">213</a> 
+<a name="214" href="#214">214</a>             <strong class="jxr_keyword">for</strong> (Map.Entry&lt; ? , ? &gt; entry : org.getAttributes(name).entrySet()) {
+<a name="215" href="#215">215</a>                 String nice = clean((String) entry.getValue());
+<a name="216" href="#216">216</a>                 attrs.put(entry.getKey(), nice);
+<a name="217" href="#217">217</a>             }
+<a name="218" href="#218">218</a>         }
+<a name="219" href="#219">219</a>         <strong class="jxr_keyword">return</strong> result;
+<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">private</strong> <strong class="jxr_keyword">static</strong> String clean(String s) {
+<a name="223" href="#223">223</a>         StringBuilder sb = <strong class="jxr_keyword">new</strong> StringBuilder(s);
+<a name="224" href="#224">224</a>         <strong class="jxr_keyword">boolean</strong> changed = false;
+<a name="225" href="#225">225</a>         <strong class="jxr_keyword">boolean</strong> replacedPrev = false;
+<a name="226" href="#226">226</a>         <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i=0; i&lt;sb.length(); i++) {
+<a name="227" href="#227">227</a>             <strong class="jxr_keyword">char</strong> c = s.charAt(i);
+<a name="228" href="#228">228</a>             <strong class="jxr_keyword">switch</strong>(c) {
+<a name="229" href="#229">229</a>             <strong class="jxr_keyword">case</strong> 0:
+<a name="230" href="#230">230</a>             <strong class="jxr_keyword">case</strong> '\n':
+<a name="231" href="#231">231</a>             <strong class="jxr_keyword">case</strong> '\r':
+<a name="232" href="#232">232</a>                 changed = <strong class="jxr_keyword">true</strong>;
+<a name="233" href="#233">233</a>                 <strong class="jxr_keyword">if</strong> ( !replacedPrev ) {
+<a name="234" href="#234">234</a>                     sb.replace(i, i+1, <span class="jxr_string">" "</span>);
+<a name="235" href="#235">235</a>                     replacedPrev= <strong class="jxr_keyword">true</strong>;
+<a name="236" href="#236">236</a>                 } <strong class="jxr_keyword">else</strong>
+<a name="237" href="#237">237</a>                     sb.delete(i, i+1);
+<a name="238" href="#238">238</a>                 <strong class="jxr_keyword">break</strong>;
+<a name="239" href="#239">239</a>             <strong class="jxr_keyword">default</strong>:
+<a name="240" href="#240">240</a>                 replacedPrev = false;
+<a name="241" href="#241">241</a>                 <strong class="jxr_keyword">break</strong>;
+<a name="242" href="#242">242</a>             }
+<a name="243" href="#243">243</a>         }
+<a name="244" href="#244">244</a>         <strong class="jxr_keyword">if</strong> ( changed)
+<a name="245" href="#245">245</a>             <strong class="jxr_keyword">return</strong> sb.toString();
+<a name="246" href="#246">246</a>         <strong class="jxr_keyword">else</strong>
+<a name="247" href="#247">247</a>             <strong class="jxr_keyword">return</strong> s;
+<a name="248" href="#248">248</a>     }
+<a name="249" href="#249">249</a> 
+<a name="250" href="#250">250</a> }
+</pre>
+<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
+</html>
+

Propchange: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestWriter.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestWriter.html
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ScrPlugin.html
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ScrPlugin.html?rev=1604140&view=auto
==============================================================================
--- felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ScrPlugin.html (added)
+++ felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ScrPlugin.html Fri Jun 20 11:21:27 2014
@@ -0,0 +1,187 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+<title>ScrPlugin xref</title>
+<link type="text/css" rel="stylesheet" href="../../../../stylesheet.css" />
+</head>
+<body>
+<pre>
+
+<a name="1" href="#1">1</a>   <em class="jxr_comment">/*</em>
+<a name="2" href="#2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a name="3" href="#3">3</a>   <em class="jxr_comment"> * or more contributor license agreements.  See the NOTICE file</em>
+<a name="4" href="#4">4</a>   <em class="jxr_comment"> * distributed with this work for additional information</em>
+<a name="5" href="#5">5</a>   <em class="jxr_comment"> * regarding copyright ownership.  The ASF licenses this file</em>
+<a name="6" href="#6">6</a>   <em class="jxr_comment"> * to you under the Apache License, Version 2.0 (the</em>
+<a name="7" href="#7">7</a>   <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
+<a name="8" href="#8">8</a>   <em class="jxr_comment"> * with the License.  You may obtain a copy of the License at</em>
+<a name="9" href="#9">9</a>   <em class="jxr_comment"> *</em>
+<a name="10" href="#10">10</a>  <em class="jxr_comment"> *   <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a name="11" href="#11">11</a>  <em class="jxr_comment"> *</em>
+<a name="12" href="#12">12</a>  <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing,</em>
+<a name="13" href="#13">13</a>  <em class="jxr_comment"> * software distributed under the License is distributed on an</em>
+<a name="14" href="#14">14</a>  <em class="jxr_comment"> * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY</em>
+<a name="15" href="#15">15</a>  <em class="jxr_comment"> * KIND, either express or implied.  See the License for the</em>
+<a name="16" href="#16">16</a>  <em class="jxr_comment"> * specific language governing permissions and limitations</em>
+<a name="17" href="#17">17</a>  <em class="jxr_comment"> * under the License.</em>
+<a name="18" href="#18">18</a>  <em class="jxr_comment"> */</em>
+<a name="19" href="#19">19</a>  <strong class="jxr_keyword">package</strong> org.apache.felix.bundleplugin;
+<a name="20" href="#20">20</a>  
+<a name="21" href="#21">21</a>  
+<a name="22" href="#22">22</a>  <strong class="jxr_keyword">import</strong> java.io.BufferedReader;
+<a name="23" href="#23">23</a>  <strong class="jxr_keyword">import</strong> java.io.ByteArrayInputStream;
+<a name="24" href="#24">24</a>  <strong class="jxr_keyword">import</strong> java.io.ByteArrayOutputStream;
+<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.InputStream;
+<a name="27" href="#27">27</a>  <strong class="jxr_keyword">import</strong> java.io.InputStreamReader;
+<a name="28" href="#28">28</a>  <strong class="jxr_keyword">import</strong> java.net.URL;
+<a name="29" href="#29">29</a>  <strong class="jxr_keyword">import</strong> java.util.ArrayList;
+<a name="30" href="#30">30</a>  <strong class="jxr_keyword">import</strong> java.util.Arrays;
+<a name="31" href="#31">31</a>  <strong class="jxr_keyword">import</strong> java.util.HashSet;
+<a name="32" href="#32">32</a>  <strong class="jxr_keyword">import</strong> java.util.LinkedHashMap;
+<a name="33" href="#33">33</a>  <strong class="jxr_keyword">import</strong> java.util.List;
+<a name="34" href="#34">34</a>  <strong class="jxr_keyword">import</strong> java.util.Map;
+<a name="35" href="#35">35</a>  <strong class="jxr_keyword">import</strong> java.util.Set;
+<a name="36" href="#36">36</a>  <strong class="jxr_keyword">import</strong> java.util.TreeSet;
+<a name="37" href="#37">37</a>  <strong class="jxr_keyword">import</strong> java.util.regex.Pattern;
+<a name="38" href="#38">38</a>  
+<a name="39" href="#39">39</a>  <strong class="jxr_keyword">import</strong> javax.xml.transform.Transformer;
+<a name="40" href="#40">40</a>  <strong class="jxr_keyword">import</strong> javax.xml.transform.TransformerFactory;
+<a name="41" href="#41">41</a>  <strong class="jxr_keyword">import</strong> javax.xml.transform.stream.StreamResult;
+<a name="42" href="#42">42</a>  <strong class="jxr_keyword">import</strong> javax.xml.transform.stream.StreamSource;
+<a name="43" href="#43">43</a>  
+<a name="44" href="#44">44</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Analyzer;
+<a name="45" href="#45">45</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Descriptors.PackageRef;
+<a name="46" href="#46">46</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Jar;
+<a name="47" href="#47">47</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Processor;
+<a name="48" href="#48">48</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.osgi.Resource;
+<a name="49" href="#49">49</a>  <strong class="jxr_keyword">import</strong> aQute.bnd.service.AnalyzerPlugin;
+<a name="50" href="#50">50</a>  <strong class="jxr_keyword">import</strong> aQute.libg.generics.Create;
+<a name="51" href="#51">51</a>  <strong class="jxr_keyword">import</strong> org.apache.felix.utils.manifest.Attribute;
+<a name="52" href="#52">52</a>  <strong class="jxr_keyword">import</strong> org.apache.felix.utils.manifest.Clause;
+<a name="53" href="#53">53</a>  <strong class="jxr_keyword">import</strong> org.osgi.framework.Constants;
+<a name="54" href="#54">54</a>  
+<a name="55" href="#55">55</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.felix.utils.manifest.Parser.parseHeader;
+<a name="56" href="#56">56</a>  
+<a name="57" href="#57">57</a>  
+<a name="58" href="#58">58</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/felix/bundleplugin/ScrPlugin.html">ScrPlugin</a> implements AnalyzerPlugin
+<a name="59" href="#59">59</a>  {
+<a name="60" href="#60">60</a>  
+<a name="61" href="#61">61</a>      Transformer transformer;
+<a name="62" href="#62">62</a>  
+<a name="63" href="#63">63</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/felix/bundleplugin/ScrPlugin.html">ScrPlugin</a>() <strong class="jxr_keyword">throws</strong> Exception
+<a name="64" href="#64">64</a>      {
+<a name="65" href="#65">65</a>          transformer = getTransformer( getClass().getResource( <span class="jxr_string">"scr.xsl"</span> ) );
+<a name="66" href="#66">66</a>      }
+<a name="67" href="#67">67</a>  
+<a name="68" href="#68">68</a>  
+<a name="69" href="#69">69</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> analyzeJar( Analyzer analyzer ) <strong class="jxr_keyword">throws</strong> Exception
+<a name="70" href="#70">70</a>      {
+<a name="71" href="#71">71</a>          Set&lt;String&gt; headers = Create.set();
+<a name="72" href="#72">72</a>  
+<a name="73" href="#73">73</a>          String bpHeader = analyzer.getProperty( <span class="jxr_string">"Service-Component"</span> );
+<a name="74" href="#74">74</a>  
+<a name="75" href="#75">75</a>          Map&lt;String, ? <strong class="jxr_keyword">extends</strong> Map&lt;String, String&gt;&gt; map = Processor.parseHeader( bpHeader, <strong class="jxr_keyword">null</strong> );
+<a name="76" href="#76">76</a>          <strong class="jxr_keyword">for</strong> ( String root : map.keySet() )
+<a name="77" href="#77">77</a>          {
+<a name="78" href="#78">78</a>              Resource resource = analyzer.getJar().getResource(root);
+<a name="79" href="#79">79</a>              <strong class="jxr_keyword">if</strong> ( resource != <strong class="jxr_keyword">null</strong> ) {
+<a name="80" href="#80">80</a>                  process(analyzer, root, resource, headers);
+<a name="81" href="#81">81</a>              }
+<a name="82" href="#82">82</a>          }
+<a name="83" href="#83">83</a>  
+<a name="84" href="#84">84</a>          <em class="jxr_comment">// Group and analyze</em>
+<a name="85" href="#85">85</a>          <strong class="jxr_keyword">for</strong> ( String str : headers )
+<a name="86" href="#86">86</a>          {
+<a name="87" href="#87">87</a>              <strong class="jxr_keyword">int</strong> idx = str.indexOf( ':' );
+<a name="88" href="#88">88</a>              <strong class="jxr_keyword">if</strong> ( idx &lt; 0 )
+<a name="89" href="#89">89</a>              {
+<a name="90" href="#90">90</a>                  analyzer.warning( ( <strong class="jxr_keyword">new</strong> StringBuilder( <span class="jxr_string">"Error analyzing services in scr resource: "</span> ) ).append( str ).toString() );
+<a name="91" href="#91">91</a>                  <strong class="jxr_keyword">continue</strong>;
+<a name="92" href="#92">92</a>              }
+<a name="93" href="#93">93</a>              String h = str.substring( 0, idx ).trim();
+<a name="94" href="#94">94</a>              String v = str.substring( idx + 1 ).trim();
+<a name="95" href="#95">95</a>  
+<a name="96" href="#96">96</a>              StringBuilder sb = <strong class="jxr_keyword">new</strong> StringBuilder();
+<a name="97" href="#97">97</a>              String header = analyzer.getProperty( h );
+<a name="98" href="#98">98</a>              <strong class="jxr_keyword">if</strong> (header != <strong class="jxr_keyword">null</strong> &amp;&amp; !header.isEmpty())
+<a name="99" href="#99">99</a>              {
+<a name="100" href="#100">100</a>                 sb.append(header);
+<a name="101" href="#101">101</a>                 sb.append(<span class="jxr_string">","</span>);
+<a name="102" href="#102">102</a>             }
+<a name="103" href="#103">103</a>             sb.append( v );
+<a name="104" href="#104">104</a>             analyzer.setProperty(h, sb.toString());
+<a name="105" href="#105">105</a>         }
+<a name="106" href="#106">106</a>         <strong class="jxr_keyword">return</strong> false;
+<a name="107" href="#107">107</a>     }
+<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">private</strong> <strong class="jxr_keyword">void</strong> process( Analyzer analyzer, String path, Resource resource, Set&lt;String&gt; headers )
+<a name="111" href="#111">111</a>     {
+<a name="112" href="#112">112</a>         InputStream in = <strong class="jxr_keyword">null</strong>;
+<a name="113" href="#113">113</a>         <strong class="jxr_keyword">try</strong>
+<a name="114" href="#114">114</a>         {
+<a name="115" href="#115">115</a>             in = resource.openInputStream();
+<a name="116" href="#116">116</a> 
+<a name="117" href="#117">117</a>             <em class="jxr_comment">// Retrieve headers</em>
+<a name="118" href="#118">118</a>             Set&lt;String&gt; set = analyze( in );
+<a name="119" href="#119">119</a>             headers.addAll( set );
+<a name="120" href="#120">120</a>         }
+<a name="121" href="#121">121</a>         <strong class="jxr_keyword">catch</strong> ( Exception e )
+<a name="122" href="#122">122</a>         {
+<a name="123" href="#123">123</a>             analyzer.error( ( <strong class="jxr_keyword">new</strong> StringBuilder( <span class="jxr_string">"Unexpected exception in processing scr resources("</span> ) )
+<a name="124" href="#124">124</a>                 .append( path ).append( <span class="jxr_string">"): "</span> ).append( e ).toString() );
+<a name="125" href="#125">125</a>         }
+<a name="126" href="#126">126</a>         <strong class="jxr_keyword">finally</strong>
+<a name="127" href="#127">127</a>         {
+<a name="128" href="#128">128</a>             <strong class="jxr_keyword">try</strong>
+<a name="129" href="#129">129</a>             {
+<a name="130" href="#130">130</a>                 <strong class="jxr_keyword">if</strong> ( in != <strong class="jxr_keyword">null</strong> )
+<a name="131" href="#131">131</a>                 {
+<a name="132" href="#132">132</a>                     in.close();
+<a name="133" href="#133">133</a>                 }
+<a name="134" href="#134">134</a>             }
+<a name="135" href="#135">135</a>             <strong class="jxr_keyword">catch</strong> ( IOException e )
+<a name="136" href="#136">136</a>             {
+<a name="137" href="#137">137</a>             }
+<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>     <strong class="jxr_keyword">public</strong> Set&lt;String&gt; analyze( InputStream in ) <strong class="jxr_keyword">throws</strong> Exception
+<a name="143" href="#143">143</a>     {
+<a name="144" href="#144">144</a>         Set&lt;String&gt; refers = <strong class="jxr_keyword">new</strong> HashSet&lt;String&gt;();
+<a name="145" href="#145">145</a>         ByteArrayOutputStream bout = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream();
+<a name="146" href="#146">146</a>         javax.xml.transform.Result r = <strong class="jxr_keyword">new</strong> StreamResult( bout );
+<a name="147" href="#147">147</a>         javax.xml.transform.Source s = <strong class="jxr_keyword">new</strong> StreamSource( in );
+<a name="148" href="#148">148</a>         transformer.transform( s, r );
+<a name="149" href="#149">149</a>         ByteArrayInputStream bin = <strong class="jxr_keyword">new</strong> ByteArrayInputStream( bout.toByteArray() );
+<a name="150" href="#150">150</a>         bout.close();
+<a name="151" href="#151">151</a>         BufferedReader br = <strong class="jxr_keyword">new</strong> BufferedReader( <strong class="jxr_keyword">new</strong> InputStreamReader( bin ) );
+<a name="152" href="#152">152</a>         <strong class="jxr_keyword">for</strong> ( String line = br.readLine(); line != <strong class="jxr_keyword">null</strong>; line = br.readLine() )
+<a name="153" href="#153">153</a>         {
+<a name="154" href="#154">154</a>             line = line.trim();
+<a name="155" href="#155">155</a>             <strong class="jxr_keyword">if</strong> ( line.length() &gt; 0 )
+<a name="156" href="#156">156</a>             {
+<a name="157" href="#157">157</a>                 refers.add( line );
+<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>         br.close();
+<a name="162" href="#162">162</a>         <strong class="jxr_keyword">return</strong> refers;
+<a name="163" href="#163">163</a>     }
+<a name="164" href="#164">164</a> 
+<a name="165" href="#165">165</a> 
+<a name="166" href="#166">166</a>     <strong class="jxr_keyword">protected</strong> Transformer getTransformer( URL url ) <strong class="jxr_keyword">throws</strong> Exception
+<a name="167" href="#167">167</a>     {
+<a name="168" href="#168">168</a>         TransformerFactory tf = TransformerFactory.newInstance();
+<a name="169" href="#169">169</a>         javax.xml.transform.Source source = <strong class="jxr_keyword">new</strong> StreamSource( url.openStream() );
+<a name="170" href="#170">170</a>         <strong class="jxr_keyword">return</strong> tf.newTransformer( source );
+<a name="171" href="#171">171</a>     }
+<a name="172" href="#172">172</a> 
+<a name="173" href="#173">173</a> }
+</pre>
+<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
+</html>
+

Propchange: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ScrPlugin.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ScrPlugin.html
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision