Updates doc folders with new changelog files and update embedded documentation
Adds the ASM licence in the manipulator project
The maven-ipojo-plugin's architype targets the latest released version.
Adds a visibility test in the composite test suite.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@703957 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/plugin/doc/changelog.txt b/ipojo/plugin/doc/changelog.txt
index 8ca4f32..90f8294 100644
--- a/ipojo/plugin/doc/changelog.txt
+++ b/ipojo/plugin/doc/changelog.txt
@@ -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)
diff --git a/ipojo/plugin/doc/ipojo-maven-plug-in.html b/ipojo/plugin/doc/ipojo-maven-plug-in.html
index 4f60089..e5a2b4d 100644
--- a/ipojo/plugin/doc/ipojo-maven-plug-in.html
+++ b/ipojo/plugin/doc/ipojo-maven-plug-in.html
@@ -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>
diff --git a/ipojo/plugin/doc/media.data/site.css b/ipojo/plugin/doc/media.data/site.css
index 959ab0a..3c83712 100644
--- a/ipojo/plugin/doc/media.data/site.css
+++ b/ipojo/plugin/doc/media.data/site.css
@@ -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 }
diff --git a/ipojo/plugin/src/main/resources/archetype-resources/pom.xml b/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
index 5af4514..ce7e27d 100644
--- a/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
+++ b/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
@@ -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>