You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2008/10/13 09:33:07 UTC
svn commit: r703957 [7/7] - in /felix/trunk/ipojo: ./ annotations/doc/
annotations/doc/media.data/ ant/doc/ ant/doc/media.data/ arch/doc/
arch/doc/media.data/ composite/doc/ core/doc/
core/doc/lifecycle-callback-handler.data/ core/doc/media.data/ core/...
Added: felix/trunk/ipojo/handler/whiteboard/doc/white-board-pattern-handler.html
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/whiteboard/doc/white-board-pattern-handler.html?rev=703957&view=auto
==============================================================================
--- felix/trunk/ipojo/handler/whiteboard/doc/white-board-pattern-handler.html (added)
+++ felix/trunk/ipojo/handler/whiteboard/doc/white-board-pattern-handler.html Mon Oct 13 00:33:03 2008
@@ -0,0 +1,165 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<HTML>
+
+<!-- Mirrored Site: felix.apache.org. File: /site/white-board-pattern-handler.html. Date: Mon, 13 Oct 2008 06:52:59 GMT -->
+<HEAD>
+ <TITLE>Apache Felix - White Board Pattern Handler</TITLE>
+ <LINK rel="stylesheet" href="media.data/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="index.html"><IMG border="0" alt="Apache Felix" src="media.data/logo.png"></A></DIV><DIV class="header"><A href="http://www.apache.org/"><IMG border="0" alt="Apache" src="media.data/apache.png"></A></DIV></DIV>
+ <DIV class="menu">
+
<UL>
+ <LI><A href="news.html" title="news">news</A></LI>
+ <LI><A href="license.html" title="license">license</A></LI>
+ <LI><SPAN class="nobr"><A href="downloads.html" title="Visit page outside Confluence" rel="nofollow">downloads<SUP><IMG class="rendericon" src="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+ <LI><A href="documentation.html" title="documentation">documentation</A></LI>
+ <LI><A href="mailinglists.html" title="mailinglists">mailing lists</A></LI>
+ <LI><A href="contributing.html" title="Contributing">contributing</A></LI>
+ <LI><SPAN class="nobr"><A href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow">asf<SUP><IMG class="rendericon" src="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></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="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></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="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>
+<!-- ApacheCon Ad -->
+<IFRAME src="http://www.apache.org/ads/button.html" style="border-width:0; float: left" frameborder="0" scrolling="no" width="135" height="135"></IFRAME>
+<P style="height: 100px">
+<!-- ApacheCon Ad --></LI>
+</UL>
+ </DIV>
+ <DIV class="main">
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="80%">
+<H1><A name="WhiteBoardPatternHandler-Thewhiteboardpatternhandler"></A>The white board pattern handler</H1>
+<P>The objective of this handler is to simplify the development of white-board architecture. This architecture-style is based is very close to the extender architecture style but use services instead of bundles.<BR>
+A whiteboard is based on two different roles:</P>
+<UL class="alternate" type="square">
+ <LI>A consumer looking to special services or a services published with a special mark</LI>
+ <LI>Looked services</LI>
+</UL>
+
+
+<P>More information on this pattern is available in this <SPAN class="nobr"><A href="http://www.osgi.org/wiki/uploads/Links/whiteboard.pdf" title="Visit page outside Confluence" rel="nofollow">document<SUP><IMG class="rendericon" src="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+Implementing a white board pattern could be complex as the extender needs to track these services dynamically. Indeed looked services can be highly dynamic; they can arrive, leave or be modified at runtime.<BR>
+Several services specified in the OSGi specification use white board pattern such as the Device Access Manager.</P>
+<H2><A name="WhiteBoardPatternHandler-Usingthehandler"></A>Using the handler</H2>
+<P>First of all, you need to configure the component type to use the handler such as:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-xml"><SPAN class="code-tag"><ipojo <SPAN class="code-keyword">xmlns:wbp</SPAN>=<SPAN class="code-quote">"org.apache.felix.ipojo.white-board-pattern"</SPAN>></SPAN>
+ <component
+ className=<SPAN class="code-quote">"org.apache.felix.ipojo.test.FooWhiteBoardPattern"</SPAN>
+ >
+ <wbp:wbp
+ filter=<SPAN class="code-quote">"(my.property=1)"</SPAN>
+ onArrival=<SPAN class="code-quote">"onArrival"</SPAN>
+ onDeparture=<SPAN class="code-quote">"onDeparture"</SPAN>
+ onModification=<SPAN class="code-quote">"onModification"</SPAN>
+ />
+
+ <SPAN class="code-tag"><provides/></SPAN>
+ <SPAN class="code-tag"></component></SPAN></PRE>
+</DIV></DIV>
+<P>Notice that, this handler is an external handler. So, it uses the "org.apache.felix.ipojo.white-board-patter" namespace.<BR>
+Once described, you can implement your component. The methods specified methods will be called when a matching services arrives or leaves or are modified. The modification callback is optional. A matching service is detected by confronting the service reference against the specified filter.<BR>
+The filter can target specific service interface (with the objectclass property) or property values.<BR>
+In the previous example, these methods could be: </P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"><SPAN class="code-keyword">public</SPAN> class FooWhiteBoardPattern <SPAN class="code-keyword">implements</SPAN> Observable {
+ List list = <SPAN class="code-keyword">new</SPAN> ArrayList();
+ <SPAN class="code-object">int</SPAN> modifications = 0;
+ <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">synchronized</SPAN> void onArrival(ServiceReference ref) {
+ list.add(ref);
+ }
+ <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">synchronized</SPAN> void onDeparture(ServiceReference ref) {
+ list.remove(ref);
+ }
+ <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">synchronized</SPAN> void onModification(ServiceReference ref) {
+ modifications = modifications + 1;
+ }
+ <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">synchronized</SPAN> Map getObservations() {
+ Map map = <SPAN class="code-keyword">new</SPAN> HashMap();
+ map.put(<SPAN class="code-quote">"list"</SPAN>, list);
+ map.put(<SPAN class="code-quote">"modifications"</SPAN>, <SPAN class="code-keyword">new</SPAN> <SPAN class="code-object">Integer</SPAN>(modifications));
+ <SPAN class="code-keyword">return</SPAN> map;
+ }</PRE>
+</DIV></DIV>
+<P>All method received the arriving, leaving or modified service reference.</P>
+<H2><A name="WhiteBoardPatternHandler-Configuration"></A>Configuration</H2>
+<P>The handler has only three mandatory attributes:</P>
+<UL>
+ <LI>Filter: filter use to discover matching filter.</LI>
+ <LI>onArrival: declaring the method to invoke when a matching service arrives</LI>
+ <LI>onDeparture: declaring the method to invoke when a matching service leaves</LI>
+</UL>
+
+
+<P>The onModification attribute is optional. This method is called when an injected service reference is modified but stills valid against the filter.</P>
+<TABLE cellpadding="5" width="85%" cellspacing="8px" class="noteMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="../../cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>
+<P>The implementation will be notified of arrivals, modifications and departures, despite the instance is invalid. Indeed, the implementation must release all objects created from another bundle as soon it leaves.</P></TD></TR></TABLE>
+<H2><A name="WhiteBoardPatternHandler-Download"></A>Download</H2>
+<P>The handler is available on the <A href="download.html" title="Download">download</A> page.<BR>
+Sources are available on the Felix trunk at the following location: <SPAN class="nobr"><A href="http://svn.apache.org/repos/asf/felix/trunk/ipojo/handler/whiteboard" title="Visit page outside Confluence" rel="nofollow">http://svn.apache.org/repos/asf/felix/trunk/ipojo/handler/whiteboard<SUP><IMG class="rendericon" src="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P></TD>
+<TD class="confluenceTd" valign="top" width="20%">
+<H6><A name="WhiteBoardPatternHandler-Overview"></A><B>Overview</B></H6>
+<UL>
+ <LI><A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home Page</A></LI>
+ <LI><A href="apache-felix-ipojo-feature-overview.html" title="Apache Felix iPOJO Feature Overview">iPOJO Feature Overview</A></LI>
+ <LI><A href="download.html" title="Download">Download & Install </A></LI>
+</UL>
+
+
+<H6><A name="WhiteBoardPatternHandler-GettingStarted"></A><B>Getting Started</B></H6>
+<UL>
+ <LI><A href="ipojo-in-10-minutes.html" title="iPOJO in 10 minutes">iPOJO in 10 minutes</A></LI>
+ <LI><A href="ipojo-hello-word-maven-based-tutorial.html" title="iPOJO Hello Word (Maven-Based) tutorial">iPOJO Hello Word (Maven-Based) tutorial</A></LI>
+ <LI><A href="ipojo-advanced-tutorial.html" title="iPOJO Advanced Tutorial">iPOJO Advanced Tutorial</A></LI>
+</UL>
+
+
+<H6><A name="WhiteBoardPatternHandler-UserGuide"></A><B>User Guide</B></H6>
+<UL>
+ <LI><A href="describing-components.html" title="Describing components">Describing components (handler list) </A></LI>
+ <LI><A href="how-to-use-ipojo-annotations.html" title="How to use iPOJO Annotations">How to use iPOJO Annotations</A></LI>
+ <LI><A href="using-xml-schemas.html" title="Using XML Schemas">Using XML Schemas</A></LI>
+ <LI><A href="ipojo-advanced-topics.html" title="iPOJO Advanced Topics">Advanced Topics</A></LI>
+ <LI><A href="ipojo-faq.html" title="iPOJO FAQ">FAQ</A></LI>
+</UL>
+
+
+<H6><A name="WhiteBoardPatternHandler-Tools"></A><B>Tools</B></H6>
+<UL>
+ <LI><A href="ipojo-eclipse-plug-in.html" title="iPOJO Eclipse Plug-in">iPOJO Eclipse Plug-in</A></LI>
+ <LI><A href="ipojo-ant-task.html" title="iPOJO Ant Task">iPOJO Ant Task</A></LI>
+ <LI><A href="ipojo-maven-plug-in.html" title="iPOJO Maven Plug-in">iPOJO Maven Plug-in</A></LI>
+ <LI><A href="ipojo-concepts-overview.html" title="iPOJO Concepts Overview">iPOJO concepts overview</A></LI>
+</UL>
+
+
+<H6><A name="WhiteBoardPatternHandler-DeveloperGuide"></A><B>Developer Guide</B></H6>
+<UL>
+ <LI>API: <SPAN class="nobr"><A href="http://people.apache.org/~clement/ipojo/api/0.8/" title="Visit page outside Confluence" rel="nofollow">0.8<SUP><IMG class="rendericon" src="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+ <LI><A href="how-to-write-your-own-handler.html" title="How to write your own handler">How to write your own handler</A></LI>
+ <LI><A href="how-to-use-ipojo-manipulation-metadata.html" title="How to use iPOJO Manipulation Metadata">How to use iPOJO Manipulation Metadata</A></LI>
+</UL>
+
+
+<H6><A name="WhiteBoardPatternHandler-Misc%26Contact"></A><B>Misc & Contact</B></H6>
+<UL>
+ <LI><A href="apache-felix-ipojo-issuestracker.html" title="apache-felix-ipojo-issuestracker">Issues Tracker</A></LI>
+ <LI><A href="apache-felix-ipojo-supportedvms.html" title="apache-felix-ipojo-supportedVMs">Supported JVMs</A></LI>
+ <LI><A href="apache-felix-ipojo-supportedosgi.html" title="apache-felix-ipojo-supportedOSGi">Supported OSGi Implementations</A></LI>
+ <LI><A href="future-ideas.html" title="Future Ideas">Future Ideas</A></LI>
+ <LI><A href="contact.html" title="Contact">Contact</A></LI>
+ <LI><A href="related-works.html" title="Related Works">Related Works</A></LI>
+ <LI><A href="article-presentations.html" title="Article & Presentations">Article & Presentations</A></LI>
+</UL>
+
+
+<HR>
+<DIV class="" align="center">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/createrssfeed.action?types=blogpost&statuses=created&statuses=modified&spaces=FELIX&labelString=iPOJO&rssType=atom&maxResults=10&timeSpan=5&publicFeed=true&title=iPOJO%20Atom%20Feed" title="Stay tuned!" rel="nofollow"><IMG src="../../cwiki.apache.org/confluence/images/icons/feed-icon-32x32.png" align="absmiddle" border="0"><SUP><IMG class="rendericon" src="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P></DIV></TD></TR></TBODY></TABLE>
+ </DIV>
+ </BODY>
+
+<!-- Mirrored Site: felix.apache.org. File: /site/white-board-pattern-handler.html. Date: Mon, 13 Oct 2008 06:52:59 GMT -->
+</HTML>
Added: felix/trunk/ipojo/manipulator/LICENSE.asm
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/LICENSE.asm?rev=703957&view=auto
==============================================================================
--- felix/trunk/ipojo/manipulator/LICENSE.asm (added)
+++ felix/trunk/ipojo/manipulator/LICENSE.asm Mon Oct 13 00:33:03 2008
@@ -0,0 +1,28 @@
+
+ ASM: a very small and fast Java bytecode manipulation framework
+ Copyright (c) 2000-2005 INRIA, France Telecom
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
Modified: felix/trunk/ipojo/manipulator/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/doc/changelog.txt?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/doc/changelog.txt (original)
+++ felix/trunk/ipojo/manipulator/doc/changelog.txt Mon Oct 13 00:33:03 2008
@@ -1,3 +1,18 @@
+Changes from 0.8.0 to 1.0.0
+---------------------------
+** Bug
+ * [FELIX-649] - "Expecting to find object/array on stack" Error when asking for instance of an iPOJO component (2008-07-28)
+ * [FELIX-697] - Generation of a duplicated field when using generics (2008-10-07)
+ * [FELIX-739] - iPOJO and annotations support when manipulating (2008-10-06)
+ * [FELIX-751] - Wrong access for setter methods (2008-10-03)
+
+** Improvement
+ * [FELIX-655] - Add a 'from' attribute in the service dependencies (2008-08-01)
+ * [FELIX-678] - Improve missing fields detection during the packaging process (2008-08-11)
+ * [FELIX-687] - Support inner and nested classes (2008-08-20)
+ * [FELIX-716] - Provide XML schemas for iPOJO descriptors (2008-09-08)
+
+
Version 0.8.0
-------------
-* [2008-05-16] Initial release
\ No newline at end of file
+ * Initial release (2008-05-16)
\ No newline at end of file
Modified: felix/trunk/ipojo/manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/pom.xml?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/pom.xml Mon Oct 13 00:33:03 2008
@@ -75,6 +75,7 @@
</Private-Package>
<Include-Resource>
META-INF/LICENCE=LICENSE,
+ META-INF/LICENCE.asm=LICENCE.asm,
META-INF/NOTICE=NOTICE
</Include-Resource>
</instructions>
Modified: felix/trunk/ipojo/metadata/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/metadata/doc/changelog.txt?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/metadata/doc/changelog.txt (original)
+++ felix/trunk/ipojo/metadata/doc/changelog.txt Mon Oct 13 00:33:03 2008
@@ -1,3 +1,8 @@
+Changes from 0.8.0 to 1.0.0
+---------------------------
+** Improvement
+ * Update to latest version (2008-05-19)
+
Version 0.8.0
-------------
-* [2008-05-16] Initial release
\ No newline at end of file
+ * Initial release (2008-05-16)
\ No newline at end of file
Modified: felix/trunk/ipojo/plugin/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/doc/changelog.txt?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/plugin/doc/changelog.txt (original)
+++ felix/trunk/ipojo/plugin/doc/changelog.txt Mon Oct 13 00:33:03 2008
@@ -1,3 +1,8 @@
+Changes from 0.8.0 to 1.0.0
+---------------------------
+** Improvement
+ * Embed the latest manipulator (2008-05-26)
+
Version 0.8.0
-------------
-* [2008-05-16] Initial release
\ No newline at end of file
+ * Initial release (2008-05-16)
Modified: felix/trunk/ipojo/plugin/doc/ipojo-maven-plug-in.html
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/doc/ipojo-maven-plug-in.html?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/plugin/doc/ipojo-maven-plug-in.html (original)
+++ felix/trunk/ipojo/plugin/doc/ipojo-maven-plug-in.html Mon Oct 13 00:33:03 2008
@@ -2,31 +2,31 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<HTML>
-
+<!-- Mirrored Site: felix.apache.org. File: /site/ipojo-maven-plug-in.html. Date: Mon, 13 Oct 2008 06:52:45 GMT -->
<HEAD>
<TITLE>Apache Felix - iPOJO Maven Plug-in</TITLE>
- <LINK rel="stylesheet" href="http://felix.apache.org/site/media.data/site.css" type="text/css" media="all">
+ <LINK rel="stylesheet" href="media.data/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 border="0" alt="Apache Felix" src="http://felix.apache.org/site/media.data/logo.png"></A></DIV><DIV class="header"><A href="http://www.apache.org/"><IMG border="0" alt="Apache" src="http://felix.apache.org/site/media.data/apache.png"></A></DIV></DIV>
+ <DIV class="title"><DIV class="logo"><A href="index.html"><IMG border="0" alt="Apache Felix" src="media.data/logo.png"></A></DIV><DIV class="header"><A href="http://www.apache.org/"><IMG border="0" alt="Apache" src="media.data/apache.png"></A></DIV></DIV>
<DIV class="menu">
<UL>
- <LI><A href="http://felix.apache.org/site/news.html" title="news">news</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="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></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><A href="http://felix.apache.org/site/contributing.html" title="Contributing">contributing</A></LI>
- <LI><SPAN class="nobr"><A href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow">asf<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></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="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></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="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>
+ <LI><A href="news.html" title="news">news</A></LI>
+ <LI><A href="license.html" title="license">license</A></LI>
+ <LI><SPAN class="nobr"><A href="downloads.html" title="Visit page outside Confluence" rel="nofollow">downloads<SUP><IMG class="rendericon" src="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+ <LI><A href="documentation.html" title="documentation">documentation</A></LI>
+ <LI><A href="mailinglists.html" title="mailinglists">mailing lists</A></LI>
+ <LI><A href="contributing.html" title="Contributing">contributing</A></LI>
+ <LI><SPAN class="nobr"><A href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow">asf<SUP><IMG class="rendericon" src="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></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="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></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="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>
<!-- ApacheCon Ad -->
<IFRAME src="http://www.apache.org/ads/button.html" style="border-width:0; float: left" frameborder="0" scrolling="no" width="135" height="135"></IFRAME>
<P style="height: 100px">
<!-- ApacheCon Ad --></LI>
</UL>
- </DIV>
+ </DIV>
<DIV class="main">
<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
<TD class="confluenceTd" valign="top" width="80%">
@@ -43,26 +43,9 @@
<FONT color="red"> </FONT> <FONT color="red"><name>$YOUR_PROJECT_NAME</name></FONT></P>
<P><FONT color="red"> </FONT> <FONT color="red"><dependencies></FONT><BR>
-<FONT color="red"> </FONT> <FONT color="red">$YOUR_MAVEN_DEPENDECIES</FONT><BR>
+<FONT color="red"> </FONT> <FONT color="red">$YOUR_MAVEN_DEPENDENCIES</FONT><BR>
<FONT color="red"> </FONT> <FONT color="red"></dependencies></FONT></P>
-<P> <!-- To download automatically the iPOJO Maven Plugin --><BR>
- <pluginRepositories><BR>
- <pluginRepository><BR>
- <id>apache.snapshots</id><BR>
- <name>snapshot plugins</name><BR>
- <url><BR>
- <SPAN class="nobr"><A href="http://people.apache.org/repo/m2-snapshot-repository" title="Visit page outside Confluence" rel="nofollow">http://people.apache.org/repo/m2-snapshot-repository<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
- </url><BR>
- <releases><BR>
- <enabled>false</enabled><BR>
- </releases><BR>
- <snapshots><BR>
- <enabled>true</enabled><BR>
- </snapshots><BR>
- </pluginRepository><BR>
- </pluginRepositories></P>
-
<P> <build><BR>
<plugins><BR>
<!-- BND Maven Plugin Configuration --><BR>
@@ -82,7 +65,7 @@
<plugin><BR>
<groupId>org.apache.felix</groupId><BR>
<artifactId>maven-ipojo-plugin</artifactId><BR>
- <version>0.8.0-SNAPSHOT</version><BR>
+ <version>0.8.0</version><BR>
<executions><BR>
<execution><BR>
<goals><BR>
@@ -146,7 +129,7 @@
<P><plugin><BR>
<groupId>org.apache.felix</groupId><BR>
<artifactId>maven-ipojo-plugin</artifactId><BR>
- <version>0.8.0-SNAPSHOT</version><BR>
+ <version>0.8.0</version><BR>
<executions><BR>
<execution><BR>
<goals><BR>
@@ -166,7 +149,7 @@
<P><plugin><BR>
<groupId>org.apache.felix</groupId><BR>
<artifactId>maven-ipojo-plugin</artifactId><BR>
- <version>0.8.0-SNAPSHOT</version><BR>
+ <version>0.8.0</version><BR>
<executions><BR>
<execution><BR>
<goals><BR>
@@ -178,72 +161,91 @@
</execution><BR>
</executions><BR>
</plugin></P>
-</DIV></DIV></TD>
+</DIV></DIV>
+<H2><A name="iPOJOMavenPlug-in-GeneratetheskeletonofyouriPOJObundle"></A>Generate the skeleton of your iPOJO bundle</H2>
+<P>The maven-ipojo-plugin provides a way to generate the skeleton of your project. To generate this structure, just launch the following command:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">mvn org.apache.maven.plugins:maven-archetype-plugin:create
+-DarchetypeArtifactId=maven-ipojo-plugin
+-DarchetypeGroupId=org.apache.felix
+-DartifactId=ARTIFACT_NAME_OF_YOUR_PROJECT
+-DgroupId=GROUP_ID_OF_YOUR_PROJECT
+-DarchetypeVersion=VERSION_OF_YOUR_PROJECT
+-DpackageName=PACKAGE_NAME</PRE>
+</DIV></DIV>
+<P>This command generates :</P>
+<UL>
+ <LI>a pom file (to fill out),</LI>
+ <LI>the src/main/java and src/main/resources folders,</LI>
+ <LI>the structure of your package name.</LI>
+</UL>
+
+
+<P>The src/main/resources folder contains a metadata.xml file to fill out.</P>
+
+<P><EM>Note:</EM> the maven-ipojo-plugin archetype gerenrate a pom file using the latest released version of the mavne-ipojo-plugin.</P>
+</TD>
<TD class="confluenceTd" valign="top" width="20%">
-<FORM method="get" class="confluence-searchbox marginlessForm " action="http://felix.apache.org/confluence/dosearchsite.action">
- <INPUT type="hidden" name="searchQuery.spaceKey" value="FELIX">
- <INPUT type="text" name="searchQuery.queryString">
- <INPUT type="submit" value="Search">
-</FORM>
-<HR>
<H6><A name="iPOJOMavenPlug-in-Overview"></A><B>Overview</B></H6>
<UL>
- <LI><A href="http://felix.apache.org/site/apache-felix-ipojo.html" title="Apache Felix iPOJO">Home Page</A></LI>
- <LI><A href="http://felix.apache.org/site/apache-felix-ipojo-feature-overview.html" title="Apache Felix iPOJO Feature Overview">iPOJO Feature Overview</A></LI>
- <LI><A href="http://felix.apache.org/site/download.html" title="Download">Download & Install </A></LI>
+ <LI><A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home Page</A></LI>
+ <LI><A href="apache-felix-ipojo-feature-overview.html" title="Apache Felix iPOJO Feature Overview">iPOJO Feature Overview</A></LI>
+ <LI><A href="download.html" title="Download">Download & Install </A></LI>
</UL>
<H6><A name="iPOJOMavenPlug-in-GettingStarted"></A><B>Getting Started</B></H6>
<UL>
- <LI><A href="http://felix.apache.org/site/ipojo-in-10-minutes.html" title="iPOJO in 10 minutes">iPOJO in 10 minutes</A></LI>
- <LI><A href="http://felix.apache.org/site/ipojo-hello-word-maven-based-tutorial.html" title="iPOJO Hello Word (Maven-Based) tutorial">iPOJO Hello Word (Maven-Based) tutorial</A></LI>
- <LI><A href="http://felix.apache.org/site/ipojo-advanced-tutorial.html" title="iPOJO Advanced Tutorial">iPOJO Advanced Tutorial</A></LI>
+ <LI><A href="ipojo-in-10-minutes.html" title="iPOJO in 10 minutes">iPOJO in 10 minutes</A></LI>
+ <LI><A href="ipojo-hello-word-maven-based-tutorial.html" title="iPOJO Hello Word (Maven-Based) tutorial">iPOJO Hello Word (Maven-Based) tutorial</A></LI>
+ <LI><A href="ipojo-advanced-tutorial.html" title="iPOJO Advanced Tutorial">iPOJO Advanced Tutorial</A></LI>
</UL>
<H6><A name="iPOJOMavenPlug-in-UserGuide"></A><B>User Guide</B></H6>
<UL>
- <LI><A href="http://felix.apache.org/site/describing-components.html" title="Describing components">Describing components</A></LI>
- <LI><A href="http://felix.apache.org/site/how-to-use-ipojo-annotations.html" title="How to use iPOJO Annotations">How to use iPOJO Annotations</A></LI>
- <LI><A href="http://felix.apache.org/site/ipojo-advanced-topics.html" title="iPOJO Advanced Topics">Advanced Topics</A></LI>
- <LI><A href="http://felix.apache.org/site/ipojo-faq.html" title="iPOJO FAQ">FAQ</A></LI>
+ <LI><A href="describing-components.html" title="Describing components">Describing components (handler list) </A></LI>
+ <LI><A href="how-to-use-ipojo-annotations.html" title="How to use iPOJO Annotations">How to use iPOJO Annotations</A></LI>
+ <LI><A href="using-xml-schemas.html" title="Using XML Schemas">Using XML Schemas</A></LI>
+ <LI><A href="ipojo-advanced-topics.html" title="iPOJO Advanced Topics">Advanced Topics</A></LI>
+ <LI><A href="ipojo-faq.html" title="iPOJO FAQ">FAQ</A></LI>
</UL>
<H6><A name="iPOJOMavenPlug-in-Tools"></A><B>Tools</B></H6>
<UL>
- <LI><A href="http://felix.apache.org/site/ipojo-eclipse-plug-in.html" title="iPOJO Eclipse Plug-in">iPOJO Eclipse Plug-in</A></LI>
- <LI><A href="http://felix.apache.org/site/ipojo-ant-task.html" title="iPOJO Ant Task">iPOJO Ant Task</A></LI>
+ <LI><A href="ipojo-eclipse-plug-in.html" title="iPOJO Eclipse Plug-in">iPOJO Eclipse Plug-in</A></LI>
+ <LI><A href="ipojo-ant-task.html" title="iPOJO Ant Task">iPOJO Ant Task</A></LI>
<LI><A href="#" title="iPOJO Maven Plug-in">iPOJO Maven Plug-in</A></LI>
- <LI><A href="http://felix.apache.org/site/ipojo-concepts-overview.html" title="iPOJO Concepts Overview">iPOJO concepts overview</A></LI>
+ <LI><A href="ipojo-concepts-overview.html" title="iPOJO Concepts Overview">iPOJO concepts overview</A></LI>
</UL>
<H6><A name="iPOJOMavenPlug-in-DeveloperGuide"></A><B>Developer Guide</B></H6>
<UL>
- <LI><A href="http://felix.apache.org/site/how-to-write-your-own-handler.html" title="How to write your own handler">How to write your own handler</A></LI>
- <LI><A href="http://felix.apache.org/site/how-to-use-ipojo-manipulation-metadata.html" title="How to use iPOJO Manipulation Metadata">How to use iPOJO Manipulation Metadata</A></LI>
+ <LI>API: <SPAN class="nobr"><A href="http://people.apache.org/~clement/ipojo/api/0.8/" title="Visit page outside Confluence" rel="nofollow">0.8<SUP><IMG class="rendericon" src="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+ <LI><A href="how-to-write-your-own-handler.html" title="How to write your own handler">How to write your own handler</A></LI>
+ <LI><A href="how-to-use-ipojo-manipulation-metadata.html" title="How to use iPOJO Manipulation Metadata">How to use iPOJO Manipulation Metadata</A></LI>
</UL>
<H6><A name="iPOJOMavenPlug-in-Misc%26Contact"></A><B>Misc & Contact</B></H6>
<UL>
- <LI><A href="http://felix.apache.org/site/apache-felix-ipojo-issuestracker.html" title="apache-felix-ipojo-issuestracker">Issues Tracker</A></LI>
- <LI><A href="http://felix.apache.org/site/apache-felix-ipojo-supportedvms.html" title="apache-felix-ipojo-supportedVMs">Supported JVMs</A></LI>
- <LI><A href="http://felix.apache.org/site/apache-felix-ipojo-supportedosgi.html" title="apache-felix-ipojo-supportedOSGi">Supported OSGi Implementations</A></LI>
- <LI><A href="http://felix.apache.org/site/future-ideas.html" title="Future Ideas">Future Ideas</A></LI>
- <LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=FELIX&title=Contact&linkCreation=true&fromPageId=82824" title="Create Page: Contact" class="createlink">Contact<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
- <LI><A href="http://felix.apache.org/site/related-works.html" title="Related Works">Related Works</A></LI>
- <LI><A href="http://felix.apache.org/site/article-presentations.html" title="Article & Presentations">Article & Presentations</A></LI>
+ <LI><A href="apache-felix-ipojo-issuestracker.html" title="apache-felix-ipojo-issuestracker">Issues Tracker</A></LI>
+ <LI><A href="apache-felix-ipojo-supportedvms.html" title="apache-felix-ipojo-supportedVMs">Supported JVMs</A></LI>
+ <LI><A href="apache-felix-ipojo-supportedosgi.html" title="apache-felix-ipojo-supportedOSGi">Supported OSGi Implementations</A></LI>
+ <LI><A href="future-ideas.html" title="Future Ideas">Future Ideas</A></LI>
+ <LI><A href="contact.html" title="Contact">Contact</A></LI>
+ <LI><A href="related-works.html" title="Related Works">Related Works</A></LI>
+ <LI><A href="article-presentations.html" title="Article & Presentations">Article & Presentations</A></LI>
</UL>
<HR>
<DIV class="" align="center">
-<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/createrssfeed.action?types=blogpost&statuses=created&statuses=modified&spaces=FELIX&labelString=iPOJO&rssType=atom&maxResults=10&timeSpan=5&publicFeed=true&title=iPOJO%20Atom%20Feed" title="Stay tuned!" rel="nofollow"><IMG src="http://cwiki.apache.org/confluence/images/icons/feed-icon-32x32.png" align="absmiddle" border="0"><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P></DIV></TD></TR></TBODY></TABLE>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/createrssfeed.action?types=blogpost&statuses=created&statuses=modified&spaces=FELIX&labelString=iPOJO&rssType=atom&maxResults=10&timeSpan=5&publicFeed=true&title=iPOJO%20Atom%20Feed" title="Stay tuned!" rel="nofollow"><IMG src="../../cwiki.apache.org/confluence/images/icons/feed-icon-32x32.png" align="absmiddle" border="0"><SUP><IMG class="rendericon" src="../../cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P></DIV></TD></TR></TBODY></TABLE>
</DIV>
</BODY>
-
+<!-- Mirrored Site: felix.apache.org. File: /site/ipojo-maven-plug-in.html. Date: Mon, 13 Oct 2008 06:52:45 GMT -->
</HTML>
Modified: felix/trunk/ipojo/plugin/doc/media.data/site.css
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/doc/media.data/site.css?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/plugin/doc/media.data/site.css (original)
+++ felix/trunk/ipojo/plugin/doc/media.data/site.css Mon Oct 13 00:33:03 2008
@@ -11,7 +11,7 @@
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; }
+.title { position: absolute; left: 1px; right: 1px; top:25px; height: 81px; background: url(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 }
Modified: felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/pom.xml?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/pom.xml (original)
+++ felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/pom.xml Mon Oct 13 00:33:03 2008
@@ -6,22 +6,6 @@
<version>${version}</version>
<name>$YOUR_PROJECT_NAME</name>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>snapshot plugins</name>
- <url>
- http://people.apache.org/repo/m2-snapshot-repository
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<plugins>
<plugin>
@@ -41,7 +25,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/pom.xml?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/pom.xml (original)
+++ felix/trunk/ipojo/pom.xml Mon Oct 13 00:33:03 2008
@@ -88,6 +88,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
+ <show>private</show>
</configuration>
</plugin>
</plugins>
Modified: felix/trunk/ipojo/tests/composite/service-instance/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/pom.xml?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/pom.xml (original)
+++ felix/trunk/ipojo/tests/composite/service-instance/pom.xml Mon Oct 13 00:33:03 2008
@@ -73,8 +73,9 @@
${pom.artifactId}
</Bundle-SymbolicName>
<Private-Package>
- org.apache.felix.ipojo.test.composite.instantiator*, org.apache.felix.ipojo.test.composite.instance
+ org.apache.felix.ipojo.test.composite.instantiator*, org.apache.felix.ipojo.test.composite.instance, org.apache.felix.ipojo.test.instance
</Private-Package>
+ <Export-Package>org.apache.felix.ipojo.test.instance.service</Export-Package>
<Test-Suite>
org.apache.felix.ipojo.test.composite.instantiator.InstantiatorTestSuite
</Test-Suite>
Added: felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/InstanceScopeTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/InstanceScopeTest.java?rev=703957&view=auto
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/InstanceScopeTest.java (added)
+++ felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/InstanceScopeTest.java Mon Oct 13 00:33:03 2008
@@ -0,0 +1,77 @@
+package org.apache.felix.ipojo.test.composite.instance;
+
+import java.util.Properties;
+
+import org.apache.felix.ipojo.ComponentInstance;
+import org.apache.felix.ipojo.ServiceContext;
+import org.apache.felix.ipojo.architecture.Architecture;
+import org.apache.felix.ipojo.composite.CompositeFactory;
+import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.test.composite.service.CheckService;
+import org.apache.felix.ipojo.test.composite.util.Utils;
+import org.apache.felix.ipojo.test.instance.service.Service;
+import org.osgi.framework.ServiceReference;
+
+public class InstanceScopeTest extends OSGiTestCase {
+
+ CompositeFactory factory;
+ ComponentInstance instance;
+
+ public void setUp() {
+ factory = (CompositeFactory) Utils.getFactoryByName(context, "SCOPE-scope");
+ assertNotNull("Factory", factory);
+ try {
+ instance = factory.createComponentInstance(null);
+ } catch (Exception e) {
+ fail("Fail instantiation : " + e.getMessage());
+ }
+
+
+ }
+
+ public void tearDown() {
+ instance.dispose();
+ instance = null;
+ }
+
+ public void testScope() {
+ ServiceReference ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), instance.getInstanceName());
+ assertNotNull("Check architecture availability", ref);
+ Architecture arch = (Architecture) context.getService(ref);
+ assertTrue("Validity", arch.getInstanceDescription().getState() == ComponentInstance.VALID);
+
+ // Get internal service
+ ServiceContext sc = Utils.getServiceContext(instance);
+ ServiceReference ref2 = Utils.getServiceReference(sc, CheckService.class.getName(), null);
+ assertNotNull("Check CheckService availability", ref2);
+ CheckService svc = (CheckService) sc.getService(ref2);
+ Properties props = svc.getProps();
+ assertEquals("Check props - 1", 1, ((Integer) props.get("1")).intValue());
+ assertEquals("Check props - 2", 2, ((Integer) props.get("2")).intValue());
+ assertEquals("Check props - 3", 3, ((Integer) props.get("3")).intValue());
+
+ }
+
+ public void testGlobalUnavailability() {
+ ServiceReference ref2 = Utils.getServiceReference(context, Service.class.getName(), null);
+ assertNull("Check Service unavailability", ref2);
+ }
+
+ public void testScopeUnvailability() {
+ CompositeFactory factory2 = (CompositeFactory) Utils.getFactoryByName(context, "SCOPE-badscope");
+ assertNotNull("Factory", factory2);
+ ComponentInstance instance2 = null;
+ try {
+ instance2 = factory2.createComponentInstance(null);
+ } catch (Exception e) {
+ fail("Fail instantiation : " + e.getMessage());
+ }
+ //System.out.println(instance2.getInstanceDescription().getDescription());
+
+ assertEquals("Check invalidity", ComponentInstance.INVALID, instance2.getState());
+
+ }
+
+
+
+}
Modified: felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/InstantiatorTestSuite.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/InstantiatorTestSuite.java?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/InstantiatorTestSuite.java (original)
+++ felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/InstantiatorTestSuite.java Mon Oct 13 00:33:03 2008
@@ -21,6 +21,7 @@
import junit.framework.Test;
import org.apache.felix.ipojo.junit4osgi.OSGiTestSuite;
+import org.apache.felix.ipojo.test.composite.instance.InstanceScopeTest;
import org.apache.felix.ipojo.test.composite.instance.SimpleInstance;
import org.osgi.framework.BundleContext;
@@ -34,6 +35,7 @@
ots.addTestSuite(OptionalMultipleInstantiation.class);
ots.addTestSuite(ConfigurableInstantiation.class);
ots.addTestSuite(SimpleInstance.class);
+ ots.addTestSuite(InstanceScopeTest.class);
return ots;
}
Added: felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/instance/ServiceConsumer.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/instance/ServiceConsumer.java?rev=703957&view=auto
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/instance/ServiceConsumer.java (added)
+++ felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/instance/ServiceConsumer.java Mon Oct 13 00:33:03 2008
@@ -0,0 +1,27 @@
+package org.apache.felix.ipojo.test.instance;
+
+import java.util.Properties;
+
+import org.apache.felix.ipojo.test.composite.service.CheckService;
+import org.apache.felix.ipojo.test.instance.service.Service;
+
+public class ServiceConsumer implements CheckService {
+
+ private Service service;
+ private Properties props = new Properties();
+
+ public ServiceConsumer() {
+ props.put("1", new Integer(service.count()));
+ props.put("2", new Integer(service.count()));
+ props.put("3", new Integer(service.count()));
+ }
+
+ public boolean check() {
+ return service.count() > 0;
+ }
+
+ public Properties getProps() {
+ return props;
+ }
+
+}
Added: felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/instance/ServiceProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/instance/ServiceProvider.java?rev=703957&view=auto
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/instance/ServiceProvider.java (added)
+++ felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/instance/ServiceProvider.java Mon Oct 13 00:33:03 2008
@@ -0,0 +1,15 @@
+package org.apache.felix.ipojo.test.instance;
+
+import org.apache.felix.ipojo.test.instance.service.Service;
+
+
+public class ServiceProvider implements Service {
+
+ private int i = 0;
+
+ public int count() {
+ i++;
+ return i;
+ }
+
+}
Added: felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/instance/service/Service.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/instance/service/Service.java?rev=703957&view=auto
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/instance/service/Service.java (added)
+++ felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/instance/service/Service.java Mon Oct 13 00:33:03 2008
@@ -0,0 +1,7 @@
+package org.apache.felix.ipojo.test.instance.service;
+
+public interface Service {
+
+ public int count();
+
+}
Modified: felix/trunk/ipojo/tests/composite/service-instance/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/src/main/resources/metadata.xml?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/composite/service-instance/src/main/resources/metadata.xml Mon Oct 13 00:33:03 2008
@@ -56,5 +56,20 @@
<property name="strAProp" value="{a,b,c}"/>
</instance>
</comp:composite>
-
+
+ <!-- Scope test -->
+ <component name="SCOPE-provider" classname="org.apache.felix.ipojo.test.instance.ServiceProvider">
+ <provides/>
+ </component>
+ <component name="SCOPE-cons" classname="org.apache.felix.ipojo.test.instance.ServiceConsumer">
+ <provides/>
+ <requires field="service"/>
+ </component>
+ <comp:composite name="SCOPE-scope">
+ <instance component="SCOPE-provider"/>
+ <instance component="SCOPE-cons"/>
+ </comp:composite>
+ <comp:composite name="SCOPE-badscope">
+ <instance component="SCOPE-cons"/>
+ </comp:composite>
</ipojo>
Modified: felix/trunk/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/FactoryTestSuite.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/FactoryTestSuite.java?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/FactoryTestSuite.java (original)
+++ felix/trunk/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/FactoryTestSuite.java Mon Oct 13 00:33:03 2008
@@ -32,6 +32,7 @@
ots.addTestSuite(ConfigAdminTest.class);
ots.addTestSuite(ObedienceTest.class);
ots.addTestSuite(FactoryProps.class);
+ // ots.addTestSuite(EmptyArrayTest.class);
return ots;
}
Modified: felix/trunk/ipojo/tests/core/factories/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/factories/src/main/resources/metadata.xml?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/factories/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/core/factories/src/main/resources/metadata.xml Mon Oct 13 00:33:03 2008
@@ -76,4 +76,14 @@
<controller field="m_controller"/>
</component>
<instance component="org.apache.felix.ipojo.test.scenarios.component.SimpleType" name="SimpleInstance"/>
+
+ <!-- Check Banana[]Â injection -->
+ <component classname="org.apache.felix.ipojo.test.scenarios.component.EmptyArrayTest">
+ <provides>
+ <property name="service.bananas" field="bananas" value="no-value"/>
+ </provides>
+ <properties>
+ <property name="ban" method="setBananas"/>
+ </properties>
+ </component>
</ipojo>
Modified: felix/trunk/ipojo/tests/manipulator/primitives/src/main/java/org/apache/felix/ipojo/test/scenarios/component/Manipulation23Tester.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/primitives/src/main/java/org/apache/felix/ipojo/test/scenarios/component/Manipulation23Tester.java?rev=703957&r1=703956&r2=703957&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/primitives/src/main/java/org/apache/felix/ipojo/test/scenarios/component/Manipulation23Tester.java (original)
+++ felix/trunk/ipojo/tests/manipulator/primitives/src/main/java/org/apache/felix/ipojo/test/scenarios/component/Manipulation23Tester.java Mon Oct 13 00:33:03 2008
@@ -114,7 +114,12 @@
public void setShort(short s) { this.s = s; }
- public void setShorts(short[] ss) { this.ss = ss; }
+ public void setShorts(short[] ss) {
+ this.ss = new short[ss.length];
+ for (int i = 0; i < ss.length; i++) {
+ this.ss[i] = ss[i];
+ }
+ }
// This method has been added to test an issue when autoboxing.
public void setLong(long l, String s) {