From commitsjeanneramirez@example.net Wed Jan 02 08:56:42 2008 Return-Path: <commitsjeanneramirez@example.net> Delivered-To: jeanneramirez@example.net Received: (qmail 16572 invoked from network); 2 Jan 2008 08:56:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jan 2008 08:56:42 -0000 Received: (qmail 56912 invoked by uid 500); 2 Jan 2008 08:56:30 -0000 Delivered-To: jeanneramirez@example.net Received: (qmail 56893 invoked by uid 500); 2 Jan 2008 08:56:30 -0000 Mailing-List: contact jeanneramirez@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jeanneramirez@example.net> List-Unsubscribe: <mailto:jeanneramirez@example.net> List-Post: <mailto:jeanneramirez@example.net> List-Id: <commits.felix.apache.org> Reply-To: jeanneramirez@example.net Delivered-To: mailing list jeanneramirez@example.net Received: (qmail 56884 invoked by uid 99); 2 Jan 2008 08:56:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 00:56:29 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 08:56:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ACCD81A9838; Wed, 2 Jan 2008 00:56:08 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608044 - in /felix/trunk: bundleplugin/doc/ maven-obr-plugin/doc/ maven-obr-plugin/doc/maven-obr-plugin_files/ Date: Wed, 02 Jan 2008 08:56:08 -0000 To: jeanneramirez@example.net From: jeanneramirez@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <jeanneramirez@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: mcculls Date: Wed Jan 2 00:56:07 2008 New Revision: 608044 URL: http://svn.apache.org/viewvc?rev=608044&view=rev Log: Update plugin docs with latest HTML Added: felix/trunk/maven-obr-plugin/doc/maven-obr-plugin.html (with props) felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/ felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/apache.png (with props) felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/linkext7.gif (with props) felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/logo.png (with props) felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/site.css (with props) Modified: felix/trunk/bundleplugin/doc/maven-bundle-plugin-bnd.html Modified: felix/trunk/bundleplugin/doc/maven-bundle-plugin-bnd.html URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/maven-bundle-plugin-bnd.html?rev=608044&r1=608043&r2=608044&view=diff ============================================================================== --- felix/trunk/bundleplugin/doc/maven-bundle-plugin-bnd.html (original) +++ felix/trunk/bundleplugin/doc/maven-bundle-plugin-bnd.html Wed Jan 2 00:56:07 2008 @@ -171,6 +171,8 @@ variable substitution will be performed on the resource, where variables in the resources are denoted with "${ ... }" syntax.</p> +<p>By default the bundle plugin converts the project's Maven resource directories into a single <tt>&lt;Include-Resource&gt;</tt> instruction. If you specify your own <tt>&lt;Include-Resource&gt;</tt> instruction, this will replace the generated one. To include the generated list of Maven resources in your own <tt>&lt;Include-Resource&gt;</tt> instruction just add {<tt>maven-resources</tt>} to the list and it will be expanded automatically.</p> + <h3><a name="MavenBundlePlugin(BND)-{{&lt;ImportPackage&gt;}}"></a><tt>&lt;Import-Package&gt;</tt></h3> <p>The <tt>&lt;Import-Package&gt;</tt> instruction is a list of @@ -194,7 +196,7 @@ <li><tt>&lt;Export-Package&gt;</tt> is assumed to be "<tt>${groupId}.${artifactId}.*</tt>", unless <tt>&lt;Private-Package&gt;</tt> is specified, then <tt>&lt;Export-Package&gt;</tt> is assumed to be empty.</li> <li><tt>&lt;Private-Package&gt;</tt> is assumed to be empty by default.</li> <li><tt>&lt;Import-Package&gt;</tt> is assumed to be "<tt>*</tt>", which imports everything referred to by the bundle content, but not contained in the bundle.</li> - <li><tt>&lt;Include-Resource&gt;</tt> is assumed to be "<tt>src/main/resources/</tt>", + <li><tt>&lt;Include-Resource&gt;</tt> is generated from the project's Maven resources, typically "<tt>src/main/resources/</tt>", which will copy the specified project directory hierarchy into the resulting bundle JAR file, mirroring standard Maven behavior.</li> <li><tt>&lt;Bundle-Version&gt;</tt> is assumed to be "<tt>${pom.version</tt>}" with '-' character separator of the qualifier replaced with a '.' character.</li> @@ -206,7 +208,7 @@ </ul> -<p>Since the plugin creates bundles for OSGi R4, it hard codes <tt>Bundle-ManifestVersion</tt> +<p>Since the plugin creates bundles for OSGi R4, it hard-codes <tt>Bundle-ManifestVersion</tt> to be '2'. Additionally, it generates imports for every export to ensure package substitutability, which is very important when working with collaborating services. It is possible to override any of these @@ -241,7 +243,7 @@ &lt;dependency&gt; &lt;groupId&gt;org.apache.felix&lt;/groupId&gt; &lt;artifactId&gt;org.osgi.core&lt;/artifactId&gt; - &lt;version&gt;0.8.0-incubator&lt;/version&gt; + &lt;version&gt;1.0.0&lt;/version&gt; &lt;/dependency&gt; &lt;/dependencies&gt; &lt;build&gt; @@ -467,9 +469,11 @@ <p>The default goal <tt>bundle</tt> will be initialized by setting the &lt;packaging&gt; entry to "bundle".</p> +<h1><a name="MavenBundlePlugin(BND)-Thefollowingfeaturesareonlyavailableinthe1.1.0SNAPSHOTversion"></a>The following features are only available in the 1.1.0-SNAPSHOT version</h1> + <h1><a name="MavenBundlePlugin(BND)-Embeddingdependencies"></a>Embedding dependencies</h1> -<p>The Maven Bundle Plugin supports embedding project dependencies into the built bundle using the <tt>&lt;Embed-Dependency&gt;</tt> instruction listing all dependencies in standard Bundle manifest header syntax:</p> +<p>The Maven Bundle Plugin supports embedding of selected project dependencies inside the bundle by using the <tt>&lt;Embed-Dependency&gt;</tt> instruction:</p> <div class="code"><div class="codeContent"> <pre class="code-xml"><span class="code-tag">&lt;Embed-Dependency&gt;</span>dependencies<span class="code-tag">&lt;/Embed-Dependency&gt;</span></pre> @@ -485,6 +489,8 @@ </pre> </div></div> +<p>The plugin uses the <tt>&lt;Embed-Dependency&gt;</tt> instruction to transform the project dependencies into <tt>&lt;Include-Resource&gt;</tt> and <tt>&lt;Bundle-ClassPath&gt;</tt> clauses, which are then appended to the current set of instructions and passed onto BND.</p> + <p>some examples:</p> <div class="code"><div class="codeContent"> @@ -495,7 +501,7 @@ <span class="code-tag">&lt;Embed-Dependency&gt;</span>aopalliance;scope=!test;inline=true<span class="code-tag">&lt;/Embed-Dependency&gt;</span></pre> </div></div> -<p>By default matched dependencies are embedded in the bundle under as <tt>artifactId-version.jar</tt>. This behaviour can be modified using the following instructions:</p> +<p>By default matched dependencies are embedded in the bundle as <tt>artifactId-version.jar</tt>. This behaviour can be modified using the following instructions:</p> <ul> <li><tt>&lt;Embed-StripVersion&gt;true&lt;/Embed-StripVersion&gt;</tt> - removes the version from the file (ie. <em>artifactId.jar</em>)</li> @@ -518,6 +524,15 @@ <pre class="code-xml"><span class="code-tag">&lt;Embed-Dependency&gt;</span>*;scope=compile|runtime;inline=true<span class="code-tag">&lt;/Embed-Dependency&gt;</span></pre> </div></div> +<h2><a name="MavenBundlePlugin(BND)-EmbedDependencyandExportPackage"></a>Embed-Dependency and Export-Package</h2> + +<p>If you embed a dependency with <tt>&lt;Embed-Dependency&gt;</tt>, and your <tt>&lt;Export-Package&gt;</tt> or <tt>&lt;Private-Package&gt;</tt> instructions match packages inside the embedded jar, you will see some duplication inside the bundle. This is because the <tt>&lt;Export-Package&gt;</tt> and <tt>&lt;Private-Package&gt;</tt> +instructions will result in classes being inlined in the bundle, even +though they also exist inside the embedded jar. If you want to export +packages from an embedded dependency without such duplication then you +can either inline the dependency, or use a new BND instruction called <tt>&lt;_exportcontents&gt;</tt>.</p> + +<p><tt>&lt;_exportcontents&gt;</tt> behaves just like Export-Package, except it doesn't change the content of the bundle, just what content should be exported.</p> <h1><a name="MavenBundlePlugin(BND)-OBRintegration"></a>OBR integration</h1> Added: felix/trunk/maven-obr-plugin/doc/maven-obr-plugin.html URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/doc/maven-obr-plugin.html?rev=608044&view=auto ============================================================================== --- felix/trunk/maven-obr-plugin/doc/maven-obr-plugin.html (added) +++ felix/trunk/maven-obr-plugin/doc/maven-obr-plugin.html Wed Jan 2 00:56:07 2008 @@ -0,0 +1,378 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html><head><title>Apache Felix - Maven Obr Plugin</title> + + + + + <link rel="stylesheet" href="maven-obr-plugin_files/site.css" type="text/css" media="all"> + <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"></head><body> + <div class="title"><div class="logo"><a href="http://felix.apache.org/site/index.html"><img alt="Apache Felix" src="maven-obr-plugin_files/logo.png" border="0"></a></div><div class="header"><a href="http://www.apache.org/"><img alt="Apache" src="maven-obr-plugin_files/apache.png" border="0"></a></div></div> + <div class="menu"> +<ul> + <li><a href="http://felix.apache.org/site/index.html" title="Index">home</a></li> + <li><a href="http://felix.apache.org/site/news.html" title="news">news</a></li> + <li><a href="http://felix.apache.org/site/status.html" title="status">status</a></li> + <li><a href="http://felix.apache.org/site/license.html" title="license">license</a></li> + <li><span class="nobr"><a href="http://felix.apache.org/site/downloads.cgi" title="Visit page outside Confluence" rel="nofollow">downloads<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></li> + <li><a href="http://felix.apache.org/site/documentation.html" title="documentation">documentation</a></li> + <li><a href="http://felix.apache.org/site/mailinglists.html" title="mailinglists">mailing lists</a></li> + <li><span class="nobr"><a href="http://cwiki.apache.org/confluence/x/O-" title="Visit page outside Confluence" rel="nofollow">wiki<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></li> + <li><a href="http://felix.apache.org/site/committers.html" title="committers">committers</a></li> + <li><a href="http://felix.apache.org/site/faq.html" title="faq">faq</a></li> + <li><a href="http://felix.apache.org/site/roadmap.html" title="roadmap">roadmap</a></li> + <li><a href="http://felix.apache.org/site/sourcecode.html" title="sourcecode">source code</a></li> + <li><a href="http://felix.apache.org/site/codingstandards.html" title="codingstandards">coding standards</a></li> + <li><a href="http://felix.apache.org/site/issuetracking.html" title="issuetracking">issue tracking</a></li> + <li><a href="http://felix.apache.org/site/dependencies.html" title="dependencies">dependencies</a></li> + <li><span class="nobr"><a href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow">apache software foundation<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></li> + <li><span class="nobr"><a href="http://www.apache.org/foundation/sponsorship.html" title="Visit page outside Confluence" rel="nofollow">sponsorship<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></li> + <li><span class="nobr"><a href="http://www.apache.org/foundation/thanks.html" title="Visit page outside Confluence" rel="nofollow">sponsors<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></li> +</ul> </div> + <div class="main"> +<p>This Maven plug-in aims to automate OBR (<span class="nobr"><a href="http://www2.osgi.org/Repository/HomePage" title="Visit page outside Confluence" rel="nofollow">OSGi Bundle Repository<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span>) +management. It creates a local OBR repository and can create a remote +OBR to distribute bundles. This plug-in allows you to install your +bundles inside an OBR repository at the same time you install it in +your Maven repository. It can also deploy your bundle in a remote Maven +repository when you deploy your Maven artefact. The plug-in computes +capabilities and requirements and edits the repository description file +to add (or update) the bundle description.</p> + +<h2><a name="MavenObrPlugin-Features:"></a>Features:</h2> + +<p>The plug-in allows:</p> +<ul> + <li>Installing Maven artefact inside an OBR repository, +automatically or manually (for legacy bundles). This OBR could be +remote or local.</li> + <li>Discovering bundle capabilities and requirements</li> + <li>Customizing bundle descriptions</li> +</ul> + + +<h2><a name="MavenObrPlugin-Howtousetheplugin?"></a>How to use the plug-in?</h2> + +<p>The plug-in offers five Maven goals:</p> +<ul> + <li>A: The standard 'install' goal: it will install your bundle +in the repository at the same time it install it in your Maven +repository.</li> + <li>B: An 'install-file' goal which takes a jar file, +and installs it in the local Maven repository and update&nbsp; the +remote repository descriptor file.</li> + <li>C: A 'deploy' goal which upload a bundle on a remote repository and update the remote repository descriptor file.</li> + <li>D: A 'deploy-file' goal which upload jar file on a remote repository and update the remote repository descriptor file.&nbsp;</li> + <li>E : A 'clean' goal cleaning the local obr repository. &nbsp;&nbsp;&nbsp; &nbsp;</li> +</ul> + + +<h3><a name="MavenObrPlugin-A:InstallingbundlesinalocalOBRrepository"></a>A: Installing bundles in a local OBR repository</h3> + +<p>The plug-in can create a local OBR repository at the root of the +local Maven repository. At each time the artefact is installed in the +local maven repository (by using the 'mvn install' command), a local +OBR repository is updated to contain the description of the artefact. +This feature is automated inside the <span class="nobr"><a href="http://felix.apache.org/site/maven-bundle-plugin-bnd.html" title="Visit page outside Confluence" rel="nofollow">maven-bundle-plugin<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span>.</p> + +<h3><a name="MavenObrPlugin-B:InstallinganexistingMavenartefactinalocalOBRrepository"></a>B: Installing an existing Maven artefact in a local OBR repository</h3> + +<p>This second way, to use the plug-in is to add an already existing bundle in the OBR. The bundle <b>must</b> +be already in the Maven local repository (you can use the Maven +install:install-file plug-in to install an external bundle in your +Maven repository).<br> +To use this goal, the user must provide information in command line:</p> +<table class="confluenceTable"><tbody> +<tr> +<td class="confluenceTd"> Variable name (prefixed by --D) </td> +<td class="confluenceTd"> status </td> +<td class="confluenceTd"> description </td> +</tr> +<tr> +<td class="confluenceTd"> file </td> +<td class="confluenceTd"> require </td> +<td class="confluenceTd"> Path to the jar file (used to install bundle only) </td> +</tr> +<tr> +<td class="confluenceTd"> artefactId </td> +<td class="confluenceTd"> require </td> +<td class="confluenceTd"> artefactId of the bundle Use to determine +path to the jar file in local maven Repository use as symbolic name if +it isn't define in manifest </td> +</tr> +<tr> +<td class="confluenceTd"> groupId </td> +<td class="confluenceTd"> require </td> +<td class="confluenceTd"> groupId of the bundle Use to determine path to the jar file on local maven repository </td> +</tr> +<tr> +<td class="confluenceTd"> version </td> +<td class="confluenceTd"> require </td> +<td class="confluenceTd"> Version of the bundle Use to determine path to the jar file on local maven repository </td> +</tr> +<tr> +<td class="confluenceTd"> packaging </td> +<td class="confluenceTd"> require </td> +<td class="confluenceTd"> File type Use by maven to install the file (used to install bundle only) </td> +</tr> +<tr> +<td class="confluenceTd"> repository-path </td> +<td class="confluenceTd"> optional </td> +<td class="confluenceTd"> Path to the repository descriptor file (if not define: default path is : MavenRepo\repository.xml </td> +</tr> +<tr> +<td class="confluenceTd"> obr-file </td> +<td class="confluenceTd"> optional </td> +<td class="confluenceTd"> Path to the obr.xml, file which describe +capabilities requirement and category given manually by user. (if not +define: nothing is added to the resource description). </td> +</tr> +</tbody></table> + +<h4><a name="MavenObrPlugin-Exampleofcommandline:"></a>Example of command line:</h4> + +<p>mvn homega.tools:obrPlugin:install-file \<br> +-Drepository-path=<span class="nobr"><a href="file:///c:repository.xml" title="Visit page outside Confluence" rel="nofollow">file:/c:\repository.xml<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span> \<br> +-obr-file=<span class="nobr"><a href="file:///c:projecthomegaobr.xml" title="Visit page outside Confluence" rel="nofollow">file:/c:\project\homega\obr.xml<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span> \<br> +-DartifactId=multicast.discovery \<br> +-DgroupId=<font color="black">homega.utils</font> <font color="black">{color}</font><br> +<font color="black">-Dversion=1.0.0</font></p> + +<p>By using this command, the plug-in will look at the artefact +MavenRepo\homega\utils\multicast.discovery\1.0.0\multicast.discovery-1.0.0.jar +<br clear="all"></p> + +<p>Then it will compute bundle description by using <span class="nobr"><a href="http://www2.osgi.org/Repository/BIndex" title="Visit page outside Confluence" rel="nofollow">bindex <sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span>and information from the command line (artifactId, groupId, version, and obr file (if set)).</p> + +<h4><a name="MavenObrPlugin-"></a><font color="black">Note:</font></h4> + +<p><font color="black">As said previously, the plug-in does not install +the file in the Maven repository but target an already install +artefact. However, it is possible to install the bundle in the +repository and to add it in the OBR repository file in one command:</font><br> +<font color="black">&nbsp;mvn install:install-file homega.tools:obrPlugin:install-file {color}</font><br> +<font color="black">-Dfile=</font><font color="black"><span class="nobr"><a href="file:///c:projethomegamulticast.discovery-1.0.0.jar" title="Visit page outside Confluence" rel="nofollow">file:/c:\projet\homega\multicast.discovery-1.0.0.jar<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></font> <font color="black">{color}</font><br> +<font color="black">-Drepository-path=</font><font color="black"><span class="nobr"><a href="file:///c:repository.xml" title="Visit page outside Confluence" rel="nofollow">file:/c:\repository.xml<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></font> <font color="black">{color}</font><br> +<font color="black">-Dobr-file=</font><font color="black"><span class="nobr"><a href="file:///c:projecthomegaobr.xml" title="Visit page outside Confluence" rel="nofollow">file:/c:\project\homega\obr.xml<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></font> <font color="black">{color}</font><br> +<font color="black">-DartifactId=multicast.discovery {color}</font><br> +<font color="black">-DgroupId=</font><font color="black">homega.utils</font> <font color="black">{color}</font><br> +<font color="black">-Dversion=1.0.0 {color}</font><br> +<font color="black">-Dpackaging=jar</font></p> + +<h3><a name="MavenObrPlugin-"></a><font color="black">C: Deploying a bundle on a remote OBR</font></h3> + +<p><font color="black">To use the deploy goal, you must change your pom.xml:</font></p> +<ul> + <li><font color="black">Add the "</font><font color="black">deployment"</font> <font color="black">goal</font></li> +</ul> + + +<ul> + <li> + <ul> + <li><font color="black">Indicate the repository-name +property. This is the name of the repository descriptor file (this +property is optional; default value is "repository.xml"). This file is +located on url provided by user.</font><br> +<font color="teal">&lt;</font><font color="#3f7f7f">plugin</font><font color="teal">&gt;</font><br> +<font color="teal">&nbsp;&nbsp;&nbsp; &lt;</font><font color="#3f7f7f">groupId</font><font color="teal">&gt;</font><font color="black">org.apache.felix</font><font color="teal">&lt;/</font><font color="#3f7f7f">groupId</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">artifactId</font><font color="teal">&gt;</font><font color="black">maven-obr-plugin</font><font color="teal">&lt;/</font><font color="#3f7f7f">artifactId</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">configuration</font><font color="teal">&gt;</font><br> +<font color="black">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;</font> <font color="teal">&lt;</font><font color="#3f7f7f">repository-name</font><font color="teal">&gt;</font><font color="black">repository.xml</font><font color="teal">&lt;/</font><font color="#3f7f7f">repository-name</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;/</font><font color="#3f7f7f">configuration</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">executions</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">execution</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">goals</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">goal</font><font color="teal">&gt;</font><font color="black">deployment</font><font color="teal">&lt;/</font><font color="#3f7f7f">goal</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;/</font><font color="#3f7f7f">goals</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;/</font><font color="#3f7f7f">execution</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;/</font><font color="#3f7f7f">executions</font><font color="teal">&gt;</font><br> +<font color="teal">&lt;/</font><font color="#3f7f7f">plugin</font><font color="teal">&gt;</font></li> + <li>You must also configure where the plugin will upload bundles and repository descriptor file. You could do it in maven as this:<br> +&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">distributionManagement</font><font color="teal">&gt;</font><br> +<font color="teal">&nbsp;&nbsp;&nbsp; &lt;</font><font color="#3f7f7f">repository</font><font color="teal">&gt;</font><br> +<font color="teal">&nbsp;&nbsp;&nbsp;&nbsp; &lt;</font><font color="#3f7f7f">id</font><font color="teal">&gt;</font><font color="black">ftp-repository</font><font color="teal">&lt;/</font><font color="#3f7f7f">id</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">name</font><font color="teal">&gt;</font><font color="black">RepoName</font><font color="teal">&lt;/</font><font color="#3f7f7f">name</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">url</font><font color="teal">&gt;</font><font color="black"><span class="nobr"><a href="ftp://ftp.youraddress.com/obr" title="Visit page outside Confluence" rel="nofollow">ftp://ftp.youraddress.com/obr<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></font><font color="teal">&lt;/</font><font color="#3f7f7f">url</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp; <font color="teal">&lt;/</font><font color="#3f7f7f">repository</font><font color="teal">&gt;</font><br> +&nbsp; <font color="teal">&lt;/</font><font color="#3f7f7f">distributionManagement</font><font color="teal">&gt;</font></li> + <li>Now maven will upload your bundle on this ftp site.</li> + </ul> + </li> + <li>Launch the 'mvn deploy' command</li> +</ul> + + +<p>In fact, all protocols are not supported by maven. For example ftp +protocol as describe above require wagon plugin to run correctly. So +you could add this part in your pom.xml to use wagon in ftp protocol:</p> + +<p><font color="teal">&lt;</font><font color="#3f7f7f">build</font><font color="teal">&gt;</font><br> +<font color="teal">&nbsp;&nbsp;&nbsp;&nbsp; &lt;</font><font color="#3f7f7f">extensions</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">extension</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">groupId</font><font color="teal">&gt;</font><font color="black">org.apache.maven.wagon</font><font color="teal">&lt;/</font><font color="#3f7f7f">groupId</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">artifactId</font><font color="teal">&gt;</font><font color="black">wagon-ftp</font><font color="teal">&lt;/</font><font color="#3f7f7f">artifactId</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">version</font><font color="teal">&gt;</font><font color="black">1.0-alpha-6</font><font color="teal">&lt;/</font><font color="#3f7f7f">version</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;/</font><font color="#3f7f7f">extension</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp; <font color="teal">&lt;/</font><font color="#3f7f7f">extensions</font><font color="teal">&gt;</font></p> + +<p>By this way, the deploy goal supports all protocols supported by wagon.</p> + +<h3><a name="MavenObrPlugin-D:DeploynonmavenbundleonaremoteOBRrepository"></a>D: Deploy non maven bundle on a remote OBR repository</h3> + +<p>This goal is useful if you want add a non-maven project on your +remote repository, for example a legacy bundles.The command line is +compozed by :</p> +<table class="confluenceTable"><tbody> +<tr> +<td class="confluenceTd"> Variable name (preceded by --D) </td> +<td class="confluenceTd"> status </td> +<td class="confluenceTd"> description </td> +</tr> +<tr> +<td class="confluenceTd"> file </td> +<td class="confluenceTd"> require </td> +<td class="confluenceTd"> Path to the jar file </td> +</tr> +<tr> +<td class="confluenceTd"> artefactId </td> +<td class="confluenceTd"> require </td> +<td class="confluenceTd"> artefactId of the bundle Use to determine +path to the jar file in local maven Repository use as symbolic name if +it isn't define in manifest </td> +</tr> +<tr> +<td class="confluenceTd"> groupId </td> +<td class="confluenceTd"> require </td> +<td class="confluenceTd"> groupId of the bundle Use to determine path to the jar file on local maven repository </td> +</tr> +<tr> +<td class="confluenceTd"> version </td> +<td class="confluenceTd"> require </td> +<td class="confluenceTd"> Version of the bundle Use to determine path to the jar file on local maven repository </td> +</tr> +<tr> +<td class="confluenceTd"> packaging </td> +<td class="confluenceTd"> require </td> +<td class="confluenceTd"> File type Use by maven to install the file (used to install bundle only) </td> +</tr> +<tr> +<td class="confluenceTd"> url </td> +<td class="confluenceTd"> require </td> +<td class="confluenceTd"> url to the remote server </td> +</tr> +<tr> +<td class="confluenceTd"> uniqueVersion </td> +<td class="confluenceTd"> optional </td> +<td class="confluenceTd"> Set it to false to avoid unique filename when you upload </td> +</tr> +<tr> +<td class="confluenceTd"> repositoryId </td> +<td class="confluenceTd"> optional </td> +<td class="confluenceTd"> Name of the repository use to upload file </td> +</tr> +<tr> +<td class="confluenceTd"> obr-file </td> +<td class="confluenceTd"> optional </td> +<td class="confluenceTd"> Path to the obr.xml, file which describe +capabilities requirement and category given manually by user. (if not +define: nothing is added to the resource description). </td> +</tr> +</tbody></table> + +<h4><a name="MavenObrPlugin-Exampleofcompletecommandline:"></a>Example of complete command line:</h4> + +<p>mvn deploy:deploy-file homega.tools:obrPlugin:deploy-file \<br> +-DartifactId=echo2<br> +-DgroupId=tools<br> +-Dversion=2.0.0<br> +-Dpackaging=jar<br> +-DrepositoryId=ftp-repository<br> +-DuniqueVersion=false<br> +-Durl=<span class="nobr"><a href="ftp://ftp.plop-plop.net/obr" title="Visit page outside Confluence" rel="nofollow">ftp://ftp.plop-plop.net/obr<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span><br> +-Dobr-file=c:\obr.xml<br> +-Dfile=echo2.jar</p> + +<p>To upload your file, you must create a small pom file declaring a +repositoryManagement to indicates which remote server you use and the +component to use for the protocol transfer. This file must contain also +groupId, artifactId version and packaging information (in fact those +data are redundant with the command line, so you could omit them in +command line).<br> +<em>Example of additional pom.xml:</em><br> +<font color="teal">&lt;</font><font color="#3f7f7f">project</font><font color="teal">&gt;</font><br> +&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">modelVersion</font><font color="teal">&gt;</font><font color="black">4.0.0</font><font color="teal">&lt;/</font><font color="#3f7f7f">modelVersion</font><font color="teal">&gt;</font><br> +&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">packaging</font><font color="teal">&gt;</font><font color="black">jar</font><font color="teal">&lt;/</font><font color="#3f7f7f">packaging</font><font color="teal">&gt;</font><br> +&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">groupId</font><font color="teal">&gt;</font><font color="black">tools</font><font color="teal">&lt;/</font><font color="#3f7f7f">groupId</font><font color="teal">&gt;</font><br> +&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">artifactId</font><font color="teal">&gt;</font><font color="black">echo2</font><font color="teal">&lt;/</font><font color="#3f7f7f">artifactId</font><font color="teal">&gt;</font><br> +&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">version</font><font color="teal">&gt;</font><font color="black">2.0.0</font><font color="teal">&lt;/</font><font color="#3f7f7f">version</font><font color="teal">&gt;</font><br> +&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">distributionManagement</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">repository</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">id</font><font color="teal">&gt;</font><font color="black">ftp-repository</font><font color="teal">&lt;/</font><font color="#3f7f7f">id</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">name</font><font color="teal">&gt;</font><font color="black">RepoName</font><font color="teal">&lt;/</font><font color="#3f7f7f">name</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">url</font><font color="teal">&gt;</font><font color="black"><span class="nobr"><a href="ftp://ftp.plop-plop.net/obr" title="Visit page outside Confluence" rel="nofollow">ftp://ftp.plop-plop.net/obr<sup><img class="rendericon" src="maven-obr-plugin_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></font><font color="teal">&lt;/</font><font color="#3f7f7f">url</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp; <font color="teal">&lt;/</font><font color="#3f7f7f">repository</font><font color="teal">&gt;</font><br> +&nbsp; <font color="teal">&lt;/</font><font color="#3f7f7f">distributionManagement</font><font color="teal">&gt;</font><br> +&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">build</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">extensions</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">extension</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">groupId</font><font color="teal">&gt;</font><font color="black">org.apache.maven.wagon</font><font color="teal">&lt;/</font><font color="#3f7f7f">groupId</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">artifactId</font><font color="teal">&gt;</font><font color="black">wagon-ftp</font><font color="teal">&lt;/</font><font color="#3f7f7f">artifactId</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;</font><font color="#3f7f7f">version</font><font color="teal">&gt;</font><font color="black">1.0-alpha-6</font><font color="teal">&lt;/</font><font color="#3f7f7f">version</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font color="teal">&lt;/</font><font color="#3f7f7f">extension</font><font color="teal">&gt;</font><br> +&nbsp;&nbsp;&nbsp; <font color="teal">&lt;/</font><font color="#3f7f7f">extensions</font><font color="teal">&gt;</font><br> +&nbsp; <font color="teal">&lt;/</font><font color="#3f7f7f">build</font><font color="teal">&gt;</font><br> +<font color="teal">&lt;/</font><font color="#3f7f7f">project</font><font color="teal">&gt;</font></p> + +<h4><a name="MavenObrPlugin-Concurrentupdates&amp;nbsp;"></a>Concurrent updates&nbsp;</h4> + +<p>As the obr file is remote, several uploads can occur at the same +time. However, the obr repository is centralized in one file, so +concurrent modification need to be avoided. To achieve this, the +plug-in&nbsp; implement a locking systems. At each time the plug-in try +to modify the file, it set a lock on it. If it can't take the lock, it +will wait and retry. After 3 tries, the upload process failed.</p> + +<h3><a name="MavenObrPlugin-E:Cleaningthelocalobrrepository&amp;nbsp;"></a>E: Cleaning the local obr repository&nbsp;</h3> + +<p>Sometimes, you would like to clean your obr repository because it +contains no more existing bundles. This case often occurs when +artifacts were deleted manually from the maven repository. The plug-in +provides a simple goal to look for missing bundle and to remove them +from the obr repository.</p> + +<p>To launch this feature, launch the following command from a folder +of one of your bundle 'mvn org.apache.felix:maven-obr-plugin:clean'.</p> + +<h2><a name="MavenObrPlugin-Howtheplugincomputethedescriptionofthebundle"></a>How the plug-in compute the description of the bundle</h2> + +<p>The description of the bundle comes from three different sources:</p> +<ul> + <li>Bindex : Bindex is a tool analyzing&nbsp; a bundle manifest to generate OBR description</li> + <li>The Pom file : by analyzing the pom file, some information are collected (symbolic name ...)</li> + <li>The obr.xml file : this file contains customized description of the bundle</li> +</ul> + + +<p>In order to create the bundle description, the plug-in gets +information from bindex, the pom.xml and the obr.xml file. Information +can be overridden:<br> +Bindex<br> +| (overrides)<br> +Pom.xml<br> +| (overrides)<br> +Obr.xml</p> + +<p>A warning message is displayed each time already existing +information is overridden. In case of install-file goal, the +information given by user (i.e.: artefactId, groupId, version) is +considered as pom.xml properties.</p> + +<h2><a name="MavenObrPlugin-Knownissues&amp;limitations:"></a>Known issues &amp; limitations:</h2> + +<p>1.&nbsp;&nbsp;&nbsp; Do not support relative paths when you specify the repository descriptor in command line use.<br> +2.&nbsp;&nbsp;&nbsp; obr.xml (file given by the user to describe some +properties not found by Bindex) must be correct, because the plug-in +does not check the syntax.</p> + </div> + +</body></html> \ No newline at end of file Propchange: felix/trunk/maven-obr-plugin/doc/maven-obr-plugin.html ------------------------------------------------------------------------------ svn:eol-style = native Added: felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/apache.png URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/apache.png?rev=608044&view=auto ============================================================================== Binary file - no diff available. Propchange: felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/apache.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/linkext7.gif URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/linkext7.gif?rev=608044&view=auto ============================================================================== Binary file - no diff available. Propchange: felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/linkext7.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/logo.png URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/logo.png?rev=608044&view=auto ============================================================================== Binary file - no diff available. Propchange: felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/logo.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/site.css URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/site.css?rev=608044&view=auto ============================================================================== --- felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/site.css (added) +++ felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/site.css Wed Jan 2 00:56:07 2008 @@ -0,0 +1,25 @@ +/* @override http://felix.apache.org/site/media.data/site.css */ + +body { background-color: #ffffff; color: #3b3b3b; font-family: Tahoma, Arial, sans-serif; font-size: 10pt; line-height: 140% } +h1, h2, h3, h4, h5, h6 { font-weight: normal; color: #000000; line-height: 100%; margin-top: 0px} +h1 { font-size: 200% } +h2 { font-size: 175% } +h3 { font-size: 150% } +h4 { font-size: 140% } +h5 { font-size: 130% } +h6 { font-size: 120% } +a { color: #1980af } +a:visited { color: #1980af } +a:hover { color: #1faae9 } +.title { position: absolute; left: 1px; right: 1px; top:25px; height: 81px; background: url(http://felix.apache.org/site/media.data/gradient.png) repeat-x; background-position: bottom; } +.logo { position: absolute; width: 15em; height: 81px; text-align: center; } +.header { text-align: right; margin-right: 20pt; margin-top: 30pt;} +.menu { border-top: 10px solid #f9bb00; position: absolute; top: 107px; left: 1px; width: 15em; bottom: 0px; padding: 0px; background-color: #fcfcfc } +.menu ul { background-color: #fdf5d9; list-style: none; padding-left: 4em; margin-top: 0px; padding-top: 2em; padding-bottom: 2em; margin-left: 0px; color: #4a4a43} +.menu a { text-decoration: none; color: #4a4a43 } +.main { position: absolute; border-top: 10px solid #cde0ea; top: 107px; left: 15em; right: 1px; margin-left: 2px; padding-right: 4em; padding-left: 1em; padding-top: 1em;} +.code { background-color: #eeeeee; border: solid 1px black; padding: 0.5em } +.code-keyword { color: #880000 } +.code-quote { color: #008800 } +.code-object { color: #0000dd } +.code-java { margin: 0em } \ No newline at end of file Propchange: felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/site.css ------------------------------------------------------------------------------ svn:eol-style = native From commitsjeanneramirez@example.net Wed Jan 02 09:10:36 2008 Return-Path: <commitsjeanneramirez@example.net> Delivered-To: jeanneramirez@example.net Received: (qmail 18509 invoked from network); 2 Jan 2008 09:10:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jan 2008 09:10:36 -0000 Received: (qmail 62565 invoked by uid 500); 2 Jan 2008 09:10:25 -0000 Delivered-To: jeanneramirez@example.net Received: (qmail 62544 invoked by uid 500); 2 Jan 2008 09:10:25 -0000 Mailing-List: contact jeanneramirez@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jeanneramirez@example.net> List-Unsubscribe: <mailto:jeanneramirez@example.net> List-Post: <mailto:jeanneramirez@example.net> List-Id: <commits.felix.apache.org> Reply-To: jeanneramirez@example.net Delivered-To: mailing list jeanneramirez@example.net Received: (qmail 62535 invoked by uid 99); 2 Jan 2008 09:10:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 01:10:25 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [83.161.120.155] (HELO mail.atlassian.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 09:10:13 +0000 Received: (qmail 28724 invoked from network); 2 Jan 2008 09:10:04 -0000 Received: from unknown (HELO mail.atlassian.com) (83.161.120.155) by 63-246-22-40.contegix.com with SMTP; 2 Jan 2008 09:10:04 -0000 Received: from atlassian13.managed.contegix.com (63-246-22-52.contegix.com [83.161.120.155]) by mail.atlassian.com (Postfix) with ESMTP id E20331864360 for <jeanneramirez@example.net>; Wed, 2 Jan 2008 03:10:03 -0600 (CST) Message-ID: <jeanneramirez@example.net> Date: Wed, 2 Jan 2008 03:10:03 -0600 (CST) From: Atlassian Open Source Bamboo Integration Server <jeanneramirez@example.net> To: jeanneramirez@example.net Subject: [OSS Bamboo] Apache Felix - Default build 374 was SUCCESSFUL (with 31 tests). Change made by Stuart McCulloch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org The project Apache Felix - Default has the following 1 change by 1 author: *Stuart McCulloch* made the following changes at Comment: Update plugin docs with latest HTML > /felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/site.css (608044) > /felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files (608044) > /felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/apache.png (608044) > /felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/logo.png (608044) > /felix/trunk/maven-obr-plugin/doc/maven-obr-plugin.html (608044) > /felix/trunk/bundleplugin/doc/maven-bundle-plugin-bnd.html (608044) > /felix/trunk/maven-obr-plugin/doc/maven-obr-plugin_files/linkext7.gif (608044) --------------------------------------------------------------------------------------- All 31 tests passed. Click http://opensource.bamboo.atlassian.com/browse/FELIX-DEF-374 to find out more. Thanks, Bamboo From commitsjeanneramirez@example.net Wed Jan 02 10:13:40 2008 Return-Path: <commitsjeanneramirez@example.net> Delivered-To: jeanneramirez@example.net Received: (qmail 30397 invoked from network); 2 Jan 2008 10:13:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jan 2008 10:13:40 -0000 Received: (qmail 19889 invoked by uid 500); 2 Jan 2008 10:13:28 -0000 Delivered-To: jeanneramirez@example.net Received: (qmail 19869 invoked by uid 500); 2 Jan 2008 10:13:28 -0000 Mailing-List: contact jeanneramirez@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jeanneramirez@example.net> List-Unsubscribe: <mailto:jeanneramirez@example.net> List-Post: <mailto:jeanneramirez@example.net> List-Id: <commits.felix.apache.org> Reply-To: jeanneramirez@example.net Delivered-To: mailing list jeanneramirez@example.net Received: (qmail 19860 invoked by uid 99); 2 Jan 2008 10:13:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 02:13:28 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 10:13:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0464F1A984D; Wed, 2 Jan 2008 02:13:09 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608072 - in /felix/trunk: commons/pom/ scrplugin/src/main/java/org/apache/felix/scrplugin/ scrplugin/src/main/java/org/apache/felix/scrplugin/om/ scrplugin/src/main/java/org/apache/felix/scrplugin/tags/ scrplugin/src/main/java/org/apache/f... Date: Wed, 02 Jan 2008 10:13:07 -0000 To: jeanneramirez@example.net From: jeanneramirez@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <jeanneramirez@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Wed Jan 2 02:13:06 2008 New Revision: 608072 URL: http://svn.apache.org/viewvc?rev=608072&view=rev Log: FIXED - issue FELIX-444: Improve implemented service detection https://issues.apache.org/jira/browse/FELIX-444 Modified: felix/trunk/commons/pom/pom.xml felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Service.java felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java Modified: felix/trunk/commons/pom/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/commons/pom/pom.xml?rev=608072&r1=608071&r2=608072&view=diff ============================================================================== --- felix/trunk/commons/pom/pom.xml (original) +++ felix/trunk/commons/pom/pom.xml Wed Jan 2 02:13:06 2008 @@ -44,12 +44,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-6</version> + <version>2.0-beta-7</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> - <version>1.0-alpha-3</version> + <version>1.0-alpha-4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java?rev=608072&r1=608071&r2=608072&view=diff ============================================================================== --- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java (original) +++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java Wed Jan 2 02:13:06 2008 @@ -19,36 +19,15 @@ package org.apache.felix.scrplugin; import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import org.apache.felix.scrplugin.om.Component; -import org.apache.felix.scrplugin.om.Components; -import org.apache.felix.scrplugin.om.Implementation; -import org.apache.felix.scrplugin.om.Interface; -import org.apache.felix.scrplugin.om.Property; -import org.apache.felix.scrplugin.om.Reference; -import org.apache.felix.scrplugin.om.Service; -import org.apache.felix.scrplugin.om.metatype.AttributeDefinition; -import org.apache.felix.scrplugin.om.metatype.Designate; -import org.apache.felix.scrplugin.om.metatype.MTObject; -import org.apache.felix.scrplugin.om.metatype.MetaData; -import org.apache.felix.scrplugin.om.metatype.OCD; -import org.apache.felix.scrplugin.tags.JavaClassDescription; -import org.apache.felix.scrplugin.tags.JavaClassDescriptorManager; -import org.apache.felix.scrplugin.tags.JavaField; -import org.apache.felix.scrplugin.tags.JavaTag; -import org.apache.felix.scrplugin.tags.ModifiableJavaClassDescription; +import java.util.*; + +import org.apache.felix.scrplugin.om.*; +import org.apache.felix.scrplugin.om.metatype.*; +import org.apache.felix.scrplugin.tags.*; import org.apache.felix.scrplugin.xml.ComponentDescriptorIO; import org.apache.felix.scrplugin.xml.MetaTypeIO; import org.apache.maven.model.Resource; -import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugin.*; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.StringUtils; import org.osgi.service.cm.ConfigurationAdmin; @@ -420,17 +399,7 @@ String name = services[i].getNamedParameter(Constants.SERVICE_INTERFACE); if (StringUtils.isEmpty(name)) { - while (description != null) { - JavaClassDescription[] interfaces = description.getImplementedInterfaces(); - for (int j=0; interfaces != null && j < interfaces.length; j++) { - final Interface interf = new Interface(services[i]); - interf.setInterfacename(interfaces[j].getName()); - service.addInterface(interf); - } - - // try super class - description = description.getSuperClass(); - } + this.addInterfaces(service, services[i], description); } else { final Interface interf = new Interface(services[i]); interf.setInterfacename(name); @@ -441,6 +410,26 @@ } service.setServicefactory(serviceFactory); + } + + /** + * Recursively add interfaces to the service. + */ + protected void addInterfaces(final Service service, final JavaTag serviceTag, final JavaClassDescription description) + throws MojoExecutionException { + if ( description != null ) { + JavaClassDescription[] interfaces = description.getImplementedInterfaces(); + for (int j=0; j < interfaces.length; j++) { + final Interface interf = new Interface(serviceTag); + interf.setInterfacename(interfaces[j].getName()); + service.addInterface(interf); + // recursivly add interfaces implemented by this interface + this.addInterfaces(service, serviceTag, interfaces[j]); + } + + // try super class + this.addInterfaces(service, serviceTag, description.getSuperClass()); + } } /** Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Service.java URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Service.java?rev=608072&r1=608071&r2=608072&view=diff ============================================================================== --- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Service.java (original) +++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Service.java Wed Jan 2 02:13:06 2008 @@ -18,9 +18,7 @@ */ package org.apache.felix.scrplugin.om; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.util.*; import org.apache.maven.plugin.MojoExecutionException; @@ -32,7 +30,8 @@ protected String servicefactory; - protected List interfaces = new ArrayList(); + /** The list of implemented interfaces. */ + protected final List interfaces = new ArrayList(); /** * Default constructor. @@ -57,12 +56,31 @@ return this.interfaces; } - public void setInterfaces(List interfaces) { - this.interfaces = interfaces; + /** + * Search for an implemented interface. + * @param name The name of the interface. + * @return The interface if it is implemented by this service or null. + */ + public Interface findInterface(String name) { + final Iterator i = this.interfaces.iterator(); + while ( i.hasNext() ) { + final Interface current = (Interface)i.next(); + if ( current.getInterfacename().equals(name) ) { + return current; + } + } + return null; } + /** + * Add an interface to the list of interfaces. + * @param interf The interface. + */ public void addInterface(Interface interf) { - this.interfaces.add(interf); + // add interface only once + if ( this.findInterface(interf.getInterfacename()) == null ) { + this.interfaces.add(interf); + } } /** Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java?rev=608072&r1=608071&r2=608072&view=diff ============================================================================== --- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java (original) +++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java Wed Jan 2 02:13:06 2008 @@ -27,6 +27,8 @@ */ public interface JavaClassDescription { + JavaClassDescription[] EMPTY_RESULT = new JavaClassDescription[0]; + /** * Get the java class tag with the name. * @param name @@ -60,6 +62,12 @@ JavaField[] getFields(); + /** + * Returns an array of the implemented interfaces of this class. + * @return An array containing the interfaces or an empty array + * if this class does not implement any interface. + * @throws MojoExecutionException + */ JavaClassDescription[] getImplementedInterfaces() throws MojoExecutionException; /** Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java?rev=608072&r1=608071&r2=608072&view=diff ============================================================================== --- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java (original) +++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java Wed Jan 2 02:13:06 2008 @@ -18,21 +18,13 @@ */ package org.apache.felix.scrplugin.tags.cl; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.lang.reflect.*; +import java.util.*; import org.apache.felix.scrplugin.Constants; import org.apache.felix.scrplugin.om.Component; import org.apache.felix.scrplugin.om.Reference; -import org.apache.felix.scrplugin.tags.JavaClassDescription; -import org.apache.felix.scrplugin.tags.JavaClassDescriptorManager; -import org.apache.felix.scrplugin.tags.JavaField; -import org.apache.felix.scrplugin.tags.JavaMethod; -import org.apache.felix.scrplugin.tags.JavaTag; +import org.apache.felix.scrplugin.tags.*; import org.apache.maven.plugin.MojoExecutionException; /** @@ -72,8 +64,8 @@ */ public JavaClassDescription[] getImplementedInterfaces() throws MojoExecutionException { Class[] implemented = clazz.getInterfaces(); - if (implemented == null || implemented.length == 0) { - return null; + if (implemented.length == 0) { + return JavaClassDescription.EMPTY_RESULT; } JavaClassDescription[] jcd = new JavaClassDescription[implemented.length]; Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java?rev=608072&r1=608071&r2=608072&view=diff ============================================================================== --- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java (original) +++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java Wed Jan 2 02:13:06 2008 @@ -18,32 +18,18 @@ */ package org.apache.felix.scrplugin.tags.qdox; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.io.*; +import java.util.*; -import org.apache.felix.scrplugin.tags.JavaClassDescription; -import org.apache.felix.scrplugin.tags.JavaClassDescriptorManager; +import org.apache.felix.scrplugin.tags.*; import org.apache.felix.scrplugin.tags.JavaField; import org.apache.felix.scrplugin.tags.JavaMethod; -import org.apache.felix.scrplugin.tags.JavaTag; -import org.apache.felix.scrplugin.tags.ModifiableJavaClassDescription; import org.apache.maven.plugin.MojoExecutionException; -import org.objectweb.asm.ClassAdapter; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.Label; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; +import org.objectweb.asm.*; import org.objectweb.asm.tree.ClassNode; -import com.thoughtworks.qdox.model.DocletTag; -import com.thoughtworks.qdox.model.JavaClass; +import com.thoughtworks.qdox.model.*; import com.thoughtworks.qdox.model.JavaParameter; -import com.thoughtworks.qdox.model.JavaSource; import com.thoughtworks.qdox.model.Type; /** @@ -142,7 +128,7 @@ throws MojoExecutionException { final JavaClass[] interfaces = this.javaClass.getImplementedInterfaces(); if ( interfaces == null || interfaces.length == 0 ) { - return new JavaClassDescription[0]; + return JavaClassDescription.EMPTY_RESULT; } final JavaClassDescription[] descs = new JavaClassDescription[interfaces.length]; for(int i=0;i<interfaces.length; i++) { From commitsjeanneramirez@example.net Wed Jan 02 10:15:01 2008 Return-Path: <commitsjeanneramirez@example.net> Delivered-To: jeanneramirez@example.net Received: (qmail 30672 invoked from network); 2 Jan 2008 10:15:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jan 2008 10:15:01 -0000 Received: (qmail 21681 invoked by uid 500); 2 Jan 2008 10:14:50 -0000 Delivered-To: jeanneramirez@example.net Received: (qmail 21652 invoked by uid 500); 2 Jan 2008 10:14:50 -0000 Mailing-List: contact jeanneramirez@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jeanneramirez@example.net> List-Unsubscribe: <mailto:jeanneramirez@example.net> List-Post: <mailto:jeanneramirez@example.net> List-Id: <commits.felix.apache.org> Reply-To: jeanneramirez@example.net Delivered-To: mailing list jeanneramirez@example.net Received: (qmail 21640 invoked by uid 99); 2 Jan 2008 10:14:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 02:14:50 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 10:14:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A88831A984D; Wed, 2 Jan 2008 02:14:38 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608073 - /felix/trunk/pom/ Date: Wed, 02 Jan 2008 10:14:38 -0000 To: jeanneramirez@example.net From: jeanneramirez@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <jeanneramirez@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Wed Jan 2 02:14:35 2008 New Revision: 608073 URL: http://svn.apache.org/viewvc?rev=608073&view=rev Log: Ignore target directory. Modified: felix/trunk/pom/ (props changed) Propchange: felix/trunk/pom/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Jan 2 02:14:35 2008 @@ -0,0 +1 @@ +target From commitsjeanneramirez@example.net Wed Jan 02 10:16:20 2008 Return-Path: <commitsjeanneramirez@example.net> Delivered-To: jeanneramirez@example.net Received: (qmail 30896 invoked from network); 2 Jan 2008 10:16:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jan 2008 10:16:20 -0000 Received: (qmail 22072 invoked by uid 500); 2 Jan 2008 10:16:06 -0000 Delivered-To: jeanneramirez@example.net Received: (qmail 22046 invoked by uid 500); 2 Jan 2008 10:16:06 -0000 Mailing-List: contact jeanneramirez@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jeanneramirez@example.net> List-Unsubscribe: <mailto:jeanneramirez@example.net> List-Post: <mailto:jeanneramirez@example.net> List-Id: <commits.felix.apache.org> Reply-To: jeanneramirez@example.net Delivered-To: mailing list jeanneramirez@example.net Received: (qmail 22037 invoked by uid 99); 2 Jan 2008 10:16:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 02:16:06 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [83.161.120.155] (HELO mail.atlassian.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 10:15:41 +0000 Received: (qmail 20904 invoked from network); 2 Jan 2008 10:15:45 -0000 Received: from unknown (HELO mail.atlassian.com) (83.161.120.155) by 63-246-22-40.contegix.com with SMTP; 2 Jan 2008 10:15:45 -0000 Received: from atlassian13.managed.contegix.com (63-246-22-52.contegix.com [83.161.120.155]) by mail.atlassian.com (Postfix) with ESMTP id A83D91864324 for <jeanneramirez@example.net>; Wed, 2 Jan 2008 04:15:45 -0600 (CST) Message-ID: <jeanneramirez@example.net> Date: Wed, 2 Jan 2008 04:15:45 -0600 (CST) From: Atlassian Open Source Bamboo Integration Server <jeanneramirez@example.net> To: jeanneramirez@example.net Subject: [OSS Bamboo] Apache Felix - Default build 375 was SUCCESSFUL (with 31 tests). Change made by cziegeler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org The project Apache Felix - Default has the following 1 change by 1 author: *cziegeler* made the following changes at Comment: FIXED - issue FELIX-444: Improve implemented service detection https://issues.apache.org/jira/browse/FELIX-444 > /felix/trunk/commons/pom/pom.xml (608072) > /felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java (608072) > /felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java (608072) > /felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Service.java (608072) > /felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java (608072) > /felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java (608072) --------------------------------------------------------------------------------------- All 31 tests passed. Click http://opensource.bamboo.atlassian.com/browse/FELIX-DEF-375 to find out more. Thanks, Bamboo From commitsjeanneramirez@example.net Wed Jan 02 10:19:10 2008 Return-Path: <commitsjeanneramirez@example.net> Delivered-To: jeanneramirez@example.net Received: (qmail 31161 invoked from network); 2 Jan 2008 10:19:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jan 2008 10:19:10 -0000 Received: (qmail 22971 invoked by uid 500); 2 Jan 2008 10:18:59 -0000 Delivered-To: jeanneramirez@example.net Received: (qmail 22944 invoked by uid 500); 2 Jan 2008 10:18:59 -0000 Mailing-List: contact jeanneramirez@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jeanneramirez@example.net> List-Unsubscribe: <mailto:jeanneramirez@example.net> List-Post: <mailto:jeanneramirez@example.net> List-Id: <commits.felix.apache.org> Reply-To: jeanneramirez@example.net Delivered-To: mailing list jeanneramirez@example.net Received: (qmail 22935 invoked by uid 99); 2 Jan 2008 10:18:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 02:18:58 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [83.161.120.155] (HELO mail.atlassian.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 10:18:46 +0000 Received: (qmail 21506 invoked from network); 2 Jan 2008 10:18:38 -0000 Received: from unknown (HELO mail.atlassian.com) (83.161.120.155) by 63-246-22-40.contegix.com with SMTP; 2 Jan 2008 10:18:38 -0000 Received: from atlassian13.managed.contegix.com (63-246-22-52.contegix.com [83.161.120.155]) by mail.atlassian.com (Postfix) with ESMTP id 5EE88186438F for <jeanneramirez@example.net>; Wed, 2 Jan 2008 04:18:38 -0600 (CST) Message-ID: <jeanneramirez@example.net> Date: Wed, 2 Jan 2008 04:18:38 -0600 (CST) From: Atlassian Open Source Bamboo Integration Server <jeanneramirez@example.net> To: jeanneramirez@example.net Subject: [OSS Bamboo] Apache Felix - Default build 376 was SUCCESSFUL (with 31 tests). Change made by cziegeler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org The project Apache Felix - Default has the following 1 change by 1 author: *cziegeler* made the following changes at Comment: Ignore target directory. > /felix/trunk/pom (608073) --------------------------------------------------------------------------------------- All 31 tests passed. Click http://opensource.bamboo.atlassian.com/browse/FELIX-DEF-376 to find out more. Thanks, Bamboo From commitsjeanneramirez@example.net Wed Jan 02 11:06:10 2008 Return-Path: <commitsjeanneramirez@example.net> Delivered-To: jeanneramirez@example.net Received: (qmail 37497 invoked from network); 2 Jan 2008 11:06:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jan 2008 11:06:10 -0000 Received: (qmail 59473 invoked by uid 500); 2 Jan 2008 11:05:59 -0000 Delivered-To: jeanneramirez@example.net Received: (qmail 59447 invoked by uid 500); 2 Jan 2008 11:05:59 -0000 Mailing-List: contact jeanneramirez@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jeanneramirez@example.net> List-Unsubscribe: <mailto:jeanneramirez@example.net> List-Post: <mailto:jeanneramirez@example.net> List-Id: <commits.felix.apache.org> Reply-To: jeanneramirez@example.net Delivered-To: mailing list jeanneramirez@example.net Received: (qmail 59438 invoked by uid 99); 2 Jan 2008 11:05:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 03:05:59 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 11:05:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7CDA91A984D; Wed, 2 Jan 2008 03:05:47 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608078 - /felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java Date: Wed, 02 Jan 2008 11:05:46 -0000 To: jeanneramirez@example.net From: jeanneramirez@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <jeanneramirez@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Wed Jan 2 03:05:42 2008 New Revision: 608078 URL: http://svn.apache.org/viewvc?rev=608078&view=rev Log: RESOLVED - issue FELIX-445: Bind/Unbind methods are not found in inherited classes https://issues.apache.org/jira/browse/FELIX-445 Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java?rev=608078&r1=608077&r2=608078&view=diff ============================================================================== --- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java (original) +++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java Wed Jan 2 03:05:42 2008 @@ -78,7 +78,8 @@ /** * @see org.apache.felix.scrplugin.tags.JavaClassDescription#getMethodBySignature(java.lang.String, java.lang.String[]) */ - public JavaMethod getMethodBySignature(String name, String[] parameters) { + public JavaMethod getMethodBySignature(String name, String[] parameters) + throws MojoExecutionException { Class[] classParameters = null; if ( parameters != null ) { classParameters = new Class[parameters.length]; @@ -98,6 +99,10 @@ } if ( m != null ) { return new ClassLoaderJavaMethod(m); + } + // try super class + if ( this.getSuperClass() != null ) { + return this.getSuperClass().getMethodBySignature(name, parameters); } return null; } From commitsjeanneramirez@example.net Wed Jan 02 11:10:38 2008 Return-Path: <commitsjeanneramirez@example.net> Delivered-To: jeanneramirez@example.net Received: (qmail 38800 invoked from network); 2 Jan 2008 11:10:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jan 2008 11:10:38 -0000 Received: (qmail 75458 invoked by uid 500); 2 Jan 2008 11:10:27 -0000 Delivered-To: jeanneramirez@example.net Received: (qmail 75436 invoked by uid 500); 2 Jan 2008 11:10:27 -0000 Mailing-List: contact jeanneramirez@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jeanneramirez@example.net> List-Unsubscribe: <mailto:jeanneramirez@example.net> List-Post: <mailto:jeanneramirez@example.net> List-Id: <commits.felix.apache.org> Reply-To: jeanneramirez@example.net Delivered-To: mailing list jeanneramirez@example.net Received: (qmail 75427 invoked by uid 99); 2 Jan 2008 11:10:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 03:10:26 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [83.161.120.155] (HELO mail.atlassian.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 11:10:02 +0000 Received: (qmail 1242 invoked from network); 2 Jan 2008 11:10:06 -0000 Received: from unknown (HELO mail.atlassian.com) (83.161.120.155) by 63-246-22-40.contegix.com with SMTP; 2 Jan 2008 11:10:06 -0000 Received: from atlassian13.managed.contegix.com (63-246-22-52.contegix.com [83.161.120.155]) by mail.atlassian.com (Postfix) with ESMTP id B1EF1186436D for <jeanneramirez@example.net>; Wed, 2 Jan 2008 05:10:05 -0600 (CST) Message-ID: <jeanneramirez@example.net> Date: Wed, 2 Jan 2008 05:10:05 -0600 (CST) From: Atlassian Open Source Bamboo Integration Server <jeanneramirez@example.net> To: jeanneramirez@example.net Subject: [OSS Bamboo] Apache Felix - Default build 377 was SUCCESSFUL (with 31 tests). Change made by cziegeler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org The project Apache Felix - Default has the following 1 change by 1 author: *cziegeler* made the following changes at Comment: RESOLVED - issue FELIX-445: Bind/Unbind methods are not found in inherited classes https://issues.apache.org/jira/browse/FELIX-445 > /felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java (608078) --------------------------------------------------------------------------------------- All 31 tests passed. Click http://opensource.bamboo.atlassian.com/browse/FELIX-DEF-377 to find out more. Thanks, Bamboo From commitsjeanneramirez@example.net Wed Jan 02 15:31:21 2008 Return-Path: <commitsjeanneramirez@example.net> Delivered-To: jeanneramirez@example.net Received: (qmail 68019 invoked from network); 2 Jan 2008 15:31:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jan 2008 15:31:19 -0000 Received: (qmail 30110 invoked by uid 500); 2 Jan 2008 15:31:08 -0000 Delivered-To: jeanneramirez@example.net Received: (qmail 30094 invoked by uid 500); 2 Jan 2008 15:31:08 -0000 Mailing-List: contact jeanneramirez@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jeanneramirez@example.net> List-Unsubscribe: <mailto:jeanneramirez@example.net> List-Post: <mailto:jeanneramirez@example.net> List-Id: <commits.felix.apache.org> Reply-To: jeanneramirez@example.net Delivered-To: mailing list jeanneramirez@example.net Received: (qmail 30085 invoked by uid 99); 2 Jan 2008 15:31:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 07:31:08 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 15:30:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 86D271A9850; Wed, 2 Jan 2008 07:30:46 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608127 - in /felix/trunk/upnp: basedriver/ basedriver/src/main/java/org/apache/felix/upnp/basedriver/ basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/ basedriver/src/main/java/org/apache/felix/upnp/basedriver/controlle... Date: Wed, 02 Jan 2008 15:30:44 -0000 To: jeanneramirez@example.net From: jeanneramirez@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <jeanneramirez@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: furfari Date: Wed Jan 2 07:30:40 2008 New Revision: 608127 URL: http://svn.apache.org/viewvc?rev=608127&view=rev Log: Modified dependency graph for: - basedriver; dependency with extra bundle is not more needed. Now the basedriver directly exports the interfaces of the services it registers with the framework (DriverController.java and DevicesInfo.java) - extra bundle provides only common utilities to write OSGi/UPnP Device services. It is used by the examples - tv, clock and bynarylight use the extra packages (except for UPnpSubscriber; to do later) - tester use the basedriver packages for forcing MSearch and Debugging and for resolving relative URLs Added thread name to TVFrame.class and ClockFrame.class Added: felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/DevicesInfo.java felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/DriverController.java felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/util/ felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/util/Constants.java felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/util/Converter.java felix/trunk/upnp/basedriver/src/main/java/org/apache/xerces/ felix/trunk/upnp/basedriver/src/main/java/org/apache/xerces/impl/ felix/trunk/upnp/basedriver/src/main/java/org/apache/xerces/impl/dv/ felix/trunk/upnp/basedriver/src/main/java/org/apache/xerces/impl/dv/util/ felix/trunk/upnp/basedriver/src/main/java/org/apache/xerces/impl/dv/util/Base64.java felix/trunk/upnp/basedriver/src/main/java/org/apache/xerces/impl/dv/util/HexBin.java Removed: felix/trunk/upnp/extra/src/main/java/org/apache/felix/upnp/extra/controller/ felix/trunk/upnp/extra/src/main/java/org/apache/felix/upnp/extra/util/Constants.java felix/trunk/upnp/extra/src/main/java/org/apache/felix/upnp/extra/util/Converter.java felix/trunk/upnp/extra/src/main/java/org/apache/xerces/ Modified: felix/trunk/upnp/basedriver/pom.xml felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/impl/DriverControllerImpl.java felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/MyCtrlPoint.java felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPStateVariableImpl.java felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/DeviceSetup.java felix/trunk/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockFrame.java felix/trunk/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvFrame.java felix/trunk/upnp/tester/pom.xml felix/trunk/upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DriverProxy.java felix/trunk/upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/ActionPanel.java Modified: felix/trunk/upnp/basedriver/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/pom.xml?rev=608127&r1=608126&r2=608127&view=diff ============================================================================== --- felix/trunk/upnp/basedriver/pom.xml (original) +++ felix/trunk/upnp/basedriver/pom.xml Wed Jan 2 07:30:40 2008 @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.apache.felix</groupId> @@ -18,16 +19,21 @@ <id>snap.domoware.isti.cnr.it</id> <name>Domoware Snapshot Repository</name> <url>http://domoware.isti.cnr.it/maven2-snap</url> - <releases><enabled>false</enabled></releases> + <releases> + <enabled>false</enabled> + </releases> </repository> <!-- For release (no snapshots jars or non-apache jars) --> <repository> <id>release.domoware.isti.cnr.it</id> <name>Domoware Release Repository</name> <url>http://domoware.isti.cnr.it/maven2</url> - <snapshots><enabled>false</enabled></snapshots> + <snapshots> + <enabled>false</enabled> + </snapshots> </repository> - </repositories> <!-- <url>http://maven.apache.org</url> --> + </repositories> + <!-- <url>http://maven.apache.org</url> --> <profiles> @@ -39,46 +45,57 @@ <value>jdk13</value> </property> </activation> - <dependencies> - <dependency> - <groupId>it.cnr.isti.domoware.cyberdomo</groupId> - <artifactId>upnp-stack-jdk13</artifactId> - <version>1.8.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>1.1.0-SNAPSHOT</version> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Name>${pom.name}</Bundle-Name> - <Bundle-Activator>org.apache.felix.upnp.basedriver.Activator</Bundle-Activator> - <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor> - <Bundle-Author><![CDATA[Matteo Demuru <jeanneramirez@example.net>,Francesco Furfari <jeanneramirez@example.net>,Stefano "Kismet" Lenzi <jeanneramirez@example.net>]]></Bundle-Author> - <Bundle-Description> - A Bundle implementation of the UPnP Service Specification R4 - </Bundle-Description> - <Bundle-SymbolicName>org.apache.felix.upnp.basedriver</Bundle-SymbolicName> - <!--Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive--> - <Export-Package> - org.apache.felix.upnp.extra.* - </Export-Package> - <Import-Package> - org.osgi.* - </Import-Package> - <Private-Package> - org.apache.felix.upnp.basedriver.*, org.kxml2.io, org.xmlpull.v1, org.cybergarage.*, org.apache.xerces.impl.dv.util - </Private-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> + <dependency> + <groupId>it.cnr.isti.domoware.cyberdomo</groupId> + <artifactId>upnp-stack-jdk13</artifactId> + <version>1.8.0-SNAPSHOT</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>1.1.0-SNAPSHOT</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Name>${pom.name}</Bundle-Name> + <Bundle-Activator> + org.apache.felix.upnp.basedriver.Activator + </Bundle-Activator> + <Bundle-Vendor> + Apache Software Foundation + </Bundle-Vendor> + <Bundle-Author> + <![CDATA[Matteo Demuru <jeanneramirez@example.net>,Francesco Furfari <jeanneramirez@example.net>,Stefano "Kismet" Lenzi <jeanneramirez@example.net>]]> + </Bundle-Author> + <Bundle-Description> + A Bundle implementation of the UPnP Service + Specification R4 + </Bundle-Description> + <Bundle-SymbolicName> + org.apache.felix.upnp.basedriver + </Bundle-SymbolicName> + <!--Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive--> + <Export-Package> + org.apache.felix.upnp.basedriver.controller.*, + org.apache.felix.upnp.basedriver.util.*, + org.apache.xerces.impl.dv.util.* + + </Export-Package> + <Import-Package>org.osgi.*</Import-Package> + <Private-Package> + org.apache.felix.upnp.basedriver.*, org.kxml2.io, + org.xmlpull.v1, org.cybergarage.* + </Private-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </profile> <profile> @@ -86,45 +103,57 @@ <activation> <activeByDefault>true</activeByDefault> </activation> - <dependencies> - <dependency> - <groupId>it.cnr.isti.domoware.cyberdomo</groupId> - <artifactId>upnp-stack</artifactId> - <version>1.8.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>1.1.0-SNAPSHOT</version> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Name>${pom.name}</Bundle-Name> - <Bundle-Activator>org.apache.felix.upnp.basedriver.Activator</Bundle-Activator> - <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor> - <Bundle-Author><![CDATA[Matteo Demuru <jeanneramirez@example.net>,Francesco Furfari <jeanneramirez@example.net>,Stefano "Kismet" Lenzi <jeanneramirez@example.net>]]></Bundle-Author> - <Bundle-Description> - A Bundle implementation of the UPnP Service Specification R4 - </Bundle-Description> - <Bundle-SymbolicName>org.apache.felix.upnp.basedriver</Bundle-SymbolicName> - <Export-Package> - org.apache.felix.upnp.extra.* - </Export-Package> - <Import-Package> - org.osgi.*, javax.xml.parsers, org.w3c.dom, org.xml.sax - </Import-Package> - <Private-Package> - org.apache.felix.upnp.basedriver.*, org.cybergarage.*,org.apache.xerces.impl.dv.util - </Private-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - + <dependencies> + <dependency> + <groupId>it.cnr.isti.domoware.cyberdomo</groupId> + <artifactId>upnp-stack</artifactId> + <version>1.8.0-SNAPSHOT</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>1.1.0-SNAPSHOT</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Name>${pom.name}</Bundle-Name> + <Bundle-Activator> + org.apache.felix.upnp.basedriver.Activator + </Bundle-Activator> + <Bundle-Vendor> + Apache Software Foundation + </Bundle-Vendor> + <Bundle-Author> + <![CDATA[Matteo Demuru <jeanneramirez@example.net>,Francesco Furfari <jeanneramirez@example.net>,Stefano "Kismet" Lenzi <jeanneramirez@example.net>]]> + </Bundle-Author> + <Bundle-Description> + A Bundle implementation of the UPnP Service + Specification R4 + </Bundle-Description> + <Bundle-SymbolicName> + org.apache.felix.upnp.basedriver + </Bundle-SymbolicName> + <Export-Package> + org.apache.felix.upnp.basedriver.controller.*, + org.apache.felix.upnp.basedriver.util.*, + org.apache.xerces.impl.dv.util.* + </Export-Package> + <Import-Package> + org.osgi.*, javax.xml.parsers, org.w3c.dom, + org.xml.sax + </Import-Package> + <Private-Package> + org.apache.felix.upnp.basedriver.*, + org.cybergarage.* + </Private-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </profile> </profiles> @@ -141,11 +170,6 @@ <artifactId>org.osgi.compendium</artifactId> <version>0.9.0-SNAPSHOT</version> <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.upnp.extra</artifactId> - <version>0.3.0-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java?rev=608127&r1=608126&r2=608127&view=diff ============================================================================== --- felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java (original) +++ felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java Wed Jan 2 07:30:40 2008 @@ -25,6 +25,8 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; +import org.apache.felix.upnp.basedriver.controller.DevicesInfo; +import org.apache.felix.upnp.basedriver.controller.DriverController; import org.apache.felix.upnp.basedriver.controller.impl.DriverControllerImpl; import org.apache.felix.upnp.basedriver.export.RootDeviceExportingQueue; import org.apache.felix.upnp.basedriver.export.RootDeviceListener; @@ -36,8 +38,6 @@ import org.apache.felix.upnp.basedriver.importer.core.event.thread.Notifier; import org.apache.felix.upnp.basedriver.importer.core.event.thread.SubScriber; import org.apache.felix.upnp.basedriver.tool.Logger; -import org.apache.felix.upnp.extra.controller.DevicesInfo; -import org.apache.felix.upnp.extra.controller.DriverController; /* * @author <a href="mailto:jeanneramirez@example.net">Felix Project Team</a> Added: felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/DevicesInfo.java URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/DevicesInfo.java?rev=608127&view=auto ============================================================================== --- felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/DevicesInfo.java (added) +++ felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/DevicesInfo.java Wed Jan 2 07:30:40 2008 @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.felix.upnp.basedriver.controller; + +/* +* @author <a href="mailto:jeanneramirez@example.net">Felix Project Team</a> +*/ +public interface DevicesInfo{ + /** + * + * Allow you to get the URL that poinr to the XML description of + * a device specified by UUID. + * + * @param udn the UUID that identify a device + * @return The String that rappresent the URL that point to the description of the Device + */ + public String getLocationURL(String udn); + + /** + * + * Allow you to get the URL that poinr to the XML description of + * a service specified by ServiceId and UUID of the device that + * contain the service + * + * @param udn the UUID of the device that contain the service + * @param serviceId the ServiceId of the service + * @return The String that rappresent the URL that point to the description of the Service + */ + public String getSCPDURL(String udn,String serviceId); + + /** + * Allow you to get the absolue URL of a link that is conatin in a device + * + * @param udn the UUID of the UPnP Device + * @param link the relative link that you want to resolve + * @return The String that rappresent the absolute URL to the resourse specified by link + */ + public String resolveRelativeUrl(String udn, String link); + +} Added: felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/DriverController.java URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/DriverController.java?rev=608127&view=auto ============================================================================== --- felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/DriverController.java (added) +++ felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/DriverController.java Wed Jan 2 07:30:40 2008 @@ -0,0 +1,79 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.felix.upnp.basedriver.controller; + +//import java.net.InetAddress; + +/* +* @author <a href="mailto:jeanneramirez@example.net">Felix Project Team</a> +*/ +public interface DriverController { + /** + * String for searching all the device on UPnP Network + */ + public final static String ALL_DEVICE = "ssdp:all"; + + /** + * String for searching only root device on UPnP Network + */ + public final static String ROOT_DEVICE = "upnp:rootdevice"; + /* + public InetAddress[] getBindAddress(); + + public void setBindAddress(InetAddress[] IPs); + */ + + /** + * Set how much messages should be sent by UPnP Base Driver + * for debugging purpose + * + * @param n the level of log that you want to set + */ + public void setLogLevel(int n); + + /** + * + * @return the actual value of log level + */ + public int getLogLevel(); + + /** + * Set if the message of the UPnP Stack should be reported or not + * + * @param b true if you want show messages from UPnP Stack false otherwise + */ + public void setCyberDebug(boolean b); + + /** + * + * @return true if the reporting of UPnP Stack message is active false otherwise + */ + public boolean getCyberDebug(); + + /** + * Sent a search message on the UPnP Network, and refresh the device + * founded by UPnP Base Driver + * + * @param target The SSDP string used for the search + */ + public void search(String target); + + +} Modified: felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/impl/DriverControllerImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/impl/DriverControllerImpl.java?rev=608127&r1=608126&r2=608127&view=diff ============================================================================== --- felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/impl/DriverControllerImpl.java (original) +++ felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/impl/DriverControllerImpl.java Wed Jan 2 07:30:40 2008 @@ -25,8 +25,8 @@ import org.apache.felix.upnp.basedriver.Activator; import org.apache.felix.upnp.basedriver.importer.core.MyCtrlPoint; import org.apache.felix.upnp.basedriver.tool.Logger; -import org.apache.felix.upnp.extra.controller.DevicesInfo; -import org.apache.felix.upnp.extra.controller.DriverController; +import org.apache.felix.upnp.basedriver.controller.DevicesInfo; +import org.apache.felix.upnp.basedriver.controller.DriverController; /* * @author <a href="mailto:jeanneramirez@example.net">Felix Project Team</a> Modified: felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java?rev=608127&r1=608126&r2=608127&view=diff ============================================================================== --- felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java (original) +++ felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java Wed Jan 2 07:30:40 2008 @@ -40,7 +40,7 @@ import org.osgi.service.upnp.UPnPStateVariable; import org.apache.felix.upnp.basedriver.Activator; -import org.apache.felix.upnp.extra.util.Converter; +import org.apache.felix.upnp.basedriver.util.Converter; /* * @author <a href="mailto:jeanneramirez@example.net">Felix Project Team</a> */ Modified: felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java?rev=608127&r1=608126&r2=608127&view=diff ============================================================================== --- felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java (original) +++ felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java Wed Jan 2 07:30:40 2008 @@ -30,7 +30,7 @@ import org.osgi.service.upnp.UPnPEventListener; -import org.apache.felix.upnp.extra.util.Converter; +import org.apache.felix.upnp.basedriver.util.Converter; /* * @author <a href="mailto:jeanneramirez@example.net">Felix Project Team</a> Modified: felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java?rev=608127&r1=608126&r2=608127&view=diff ============================================================================== --- felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java (original) +++ felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java Wed Jan 2 07:30:40 2008 @@ -40,7 +40,7 @@ import org.osgi.service.upnp.UPnPService; import org.apache.felix.upnp.basedriver.Activator; -import org.apache.felix.upnp.extra.util.Converter; +import org.apache.felix.upnp.basedriver.util.Converter; /* * @author <a href="mailto:jeanneramirez@example.net">Felix Project Team</a> Modified: felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/MyCtrlPoint.java URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/MyCtrlPoint.java?rev=608127&r1=608126&r2=608127&view=diff ============================================================================== --- felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/MyCtrlPoint.java (original) +++ felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/MyCtrlPoint.java Wed Jan 2 07:30:40 2008 @@ -65,7
{'source': 'Apache Software Foundation Public Mail Archives'}