You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ak...@apache.org on 2005/12/29 19:55:27 UTC

svn commit: r359874 - in /incubator/felix/site: ./ src/ src/site/ src/site/apt/ src/site/fml/ src/site/resources/ src/site/resources/images/ src/site/xdoc/

Author: akarasulu
Date: Thu Dec 29 10:55:21 2005
New Revision: 359874

URL: http://svn.apache.org/viewcvs?rev=359874&view=rev
Log:
checking in site contribution from Aaron in FELIX-41 attachment 1

Added:
    incubator/felix/site/
    incubator/felix/site/LICENSE
    incubator/felix/site/pom.xml
    incubator/felix/site/src/
    incubator/felix/site/src/site/
    incubator/felix/site/src/site/apt/
    incubator/felix/site/src/site/apt/format.apt
    incubator/felix/site/src/site/apt/index.apt
    incubator/felix/site/src/site/apt/osgi.apt
    incubator/felix/site/src/site/fml/
    incubator/felix/site/src/site/fml/faq.fml
    incubator/felix/site/src/site/resources/
    incubator/felix/site/src/site/resources/images/
    incubator/felix/site/src/site/resources/images/apache-felix.png   (with props)
    incubator/felix/site/src/site/resources/images/felix-logo-trim.jpg   (with props)
    incubator/felix/site/src/site/resources/images/felix-logo-trim.png   (with props)
    incubator/felix/site/src/site/resources/images/felix-logo.jpg   (with props)
    incubator/felix/site/src/site/site.xml
    incubator/felix/site/src/site/xdoc/
    incubator/felix/site/src/site/xdoc/r4.xml
    incubator/felix/site/src/site/xdoc/xdoc.xml

Added: incubator/felix/site/LICENSE
URL: http://svn.apache.org/viewcvs/incubator/felix/site/LICENSE?rev=359874&view=auto
==============================================================================
--- incubator/felix/site/LICENSE (added)
+++ incubator/felix/site/LICENSE Thu Dec 29 10:55:21 2005
@@ -0,0 +1,176 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+

Added: incubator/felix/site/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/site/pom.xml?rev=359874&view=auto
==============================================================================
--- incubator/felix/site/pom.xml (added)
+++ incubator/felix/site/pom.xml Thu Dec 29 10:55:21 2005
@@ -0,0 +1,111 @@
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.felix</groupId>
+  <artifactId>felix</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>Felix</name>
+  <url>http://incubator.apache.org/felix</url>
+
+  <issueManagement>
+    <system>Jira</system>
+    <url>http://issues.apache.org/jira/browse/FELIX</url>
+  </issueManagement>
+
+  <inceptionYear>2005</inceptionYear>
+
+  <mailingLists>
+    <mailingList>
+      <name>Felix Dev</name>
+      <subscribe>felix-dev-subscribe@incubator.apache.org</subscribe>
+      <unsubscribe>felix-dev-unsubscribe@incubator.apache.org</unsubscribe>
+      <archive>http://www.mail-archive.com/felix-dev%40incubator.apache.org/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Felix Commits</name>
+      <subscribe>felix-commits-subscribe@incubator.apache.org</subscribe>
+      <unsubscribe>felix-commits-unsubscribe@incubator.apache.org</unsubscribe>
+      <archive>http://www.mail-archive.com/felix-commits%40incubator.apache.org/</archive>
+    </mailingList>
+  </mailingLists>
+  
+  <developers>
+    <developer>
+      <id>akarasulu</id>
+      <name>Alex Karasulu</name>
+      <roles><role>Mentor</role></roles>
+    </developer>
+    <developer>
+      <id>bloritsch</id>
+      <name>Berin Loritsch</name>
+      <roles><role>Sponsoring Member</role></roles>
+    </developer>
+    <developer>
+      <id>cziegler</id>
+      <name>Carsten Ziegler</name>
+      <roles><role>Sponsoring Member</role></roles>
+    </developer>
+    <developer>
+      <id>erodriguez</id>
+      <name>Enrique Rodriguez</name>
+      <roles><role>Committer</role></roles>
+    </developer>
+    <developer>
+      <id>noel</id>
+      <name>Noel J. Bergman</name>
+      <roles><role>Sponsoring Member</role></roles>
+    </developer>
+    <developer>
+      <id>rickhall</id>
+      <name>Richard S. Hall</name>
+      <roles><role>Committer</role></roles>
+    </developer>
+    <developer>
+      <id>sylvain</id>
+      <name>Sylvain Wallez</name>
+      <roles><role>Sponsoring Member</role></roles>
+    </developer>
+    <developer>
+      <id>tbennett</id>
+      <name>Timothy Bennett</name>
+      <roles><role>Committer</role></roles>
+    </developer>
+    <developer>
+      <id>trustin</id>
+      <name>Trustin Lee</name>
+      <roles><role>Committer</role></roles>
+    </developer>
+  </developers>
+
+  <contributors/>
+
+  <licenses>
+    <license>
+      <name>Apache Software License, Version 2</name>
+      <url>./LICENSE</url>
+    </license>
+  </licenses>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/felix</connection>
+    <url>http://cvs.apache.org/viewcvs.cgi/incubator/felix/?root=Apache-SVN</url>
+  </scm>
+
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org</url>
+  </organization>
+
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <locales>en</locales>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: incubator/felix/site/src/site/apt/format.apt
URL: http://svn.apache.org/viewcvs/incubator/felix/site/src/site/apt/format.apt?rev=359874&view=auto
==============================================================================
--- incubator/felix/site/src/site/apt/format.apt (added)
+++ incubator/felix/site/src/site/apt/format.apt Thu Dec 29 10:55:21 2005
@@ -0,0 +1,596 @@
+
+The APT format
+~~~~~~~~~~~~~~
+
+  In the following section, boxes containing text in typewriter-like font are
+  examples of APT source.
+
+* Document structure
+~~~~~~~~~~~~~~~~~~~~
+
+  A short APT document is contained in a single text file. A longer document
+  may be contained in a ordered list of text files. For instance, first text
+  file contains section 1, second text file contains section 2, and so on.
+
+      [Note:] Splitting the APT document in several text files on a section
+              boundary is not mandatory. The split may occur anywhere.
+              However doing so is recommended because a text file containing a
+              section is by itself a valid APT document.
+
+  A file contains a sequence of paragraphs and ``displays'' (non paragraphs
+  such as tables) separated by open lines.
+
+  A paragraph is simply a sequence of consecutive text lines.
+
++------------------------------------------------------------------------+
+  First line of first paragraph.
+  Second line of first paragraph.
+  Third line of first paragraph.
+  
+  Line 1 of paragraph 2 (separated from first paragraph by an open line).
+  Line 2 of paragraph 2.
++------------------------------------------------------------------------+
+
+  The indentation of the first line of a paragraph is the main method used by
+  an APT processor to recognize the type of the paragraph. For example, a
+  section title must not be indented at all.
+
+  A ``plain'' paragraph must be indented by a certain amount of space. For
+  example, a plain paragraph which is not contained in a list may be indented
+  by two spaces.
+
++-------------------------------------------------+
+My section title (not indented).
+
+  My paragraph first line (indented by 2 spaces).
++-------------------------------------------------+
+
+  Indentation is not rigid. Any amount of space will do. You don't even need
+  to use a consistent indentation all over your document. What really matters
+  for an APT processor is whether the paragraph is not indented at all or,
+  when inside a list, whether a paragraph is more or less indented than the
+  first item of the list (more about this later).
+
++-------------------------------------------------------+
+    First paragraph has its first line indented by four
+spaces. Then the author did even bother to indent the
+other lines of the paragraph.
+
+  Second paragraph contains several lines which are all 
+  indented by two spaces. This style is much nicer than 
+  the one used for the previous paragraph.
++-------------------------------------------------------+
+
+  Note that tabs are expanded with a tab width set to 8.
+
+* Document elements
+~~~~~~~~~~~~~~~~~~~
+
+** Block level elements
+~~~~~~~~~~~~~~~~~~~~~~~
+
+*** Title
+~~~~~~~~~~
+
+  A title is optional. If used, it must appear as the first block of the
+  document.
+
++----------------------------------------------------------------------------+
+				    ------
+				    Title
+				    ------
+				    Author
+				    ------
+				     Date
++----------------------------------------------------------------------------+
+
+  A title block is indented (centering it is nicer). It begins with a line
+  containing at least 3 dashes (<<<--->>>).
+
+  After the first <<<--->>> line, one or several consecutive lines of text
+  (implicit line break after each line) specify the title of the document.
+
+  This text may immediately be followed by another <<<--->>> line and one or
+  several consecutive lines of text which specifies the author of the
+  document.
+
+  The author sub-block may optionaly be followed by a date sub-block using the
+  same syntax.
+
+  The following example is used for a document with an title and a date but
+  with no declared author.
+
++----------------------------------------------------------------------------+
+				    ------
+				    Title
+				    ------
+				    ------
+				     Date
+				    ------
++----------------------------------------------------------------------------+
+
+  The last line is ignored. It is just there to make the block nicer.
+
+*** Paragraph
+~~~~~~~~~~~~~
+
+  Paragraphs other than the title block may appear before the first section.
+
++----------------------+
+  Paragraph 1, line 1.
+  Paragraph 1, line 2.
+
+  Paragraph 2, line 1.
+  Paragraph 2, line 2.
++----------------------+
+
+  Paragraphs are indented. They have already been described in the {{document
+  structure}} section.
+
+*** Section
+~~~~~~~~~~~
+
+  Sections are created by inserting section titles into the document. Simple
+  documents need not contain sections.
+
++-----------------------------------+
+Section title
+
+* Sub-section title
+
+** Sub-sub-section title
+
+*** Sub-sub-sub-section title
+
+**** Sub-sub-sub-sub-section title
++-----------------------------------+
+
+  Section titles are not indented. A sub-section title begins with one
+  asterisk (<<<*>>>), a sub-sub-section title begins with two asterisks
+  (<<<**>>>), and so forth up to four sub-section levels.
+
+*** List
+~~~~~~~~
+
++---------------------------------------+
+      * List item 1.
+
+      * List item 2.
+
+	Paragraph contained in list item 2.
+
+	    * Sub-list item 1.
+
+	    * Sub-list item 2.
+
+      * List item 3.
++---------------------------------------+
+
+  List items are indented and begin with a asterisk (<<<*>>>). 
+
+  Plain paragraphs more indented than the first list item are nested in that
+  list. Displays such as tables (not indented) are always nested in the
+  current list.
+
+  To nest a list inside a list, indent its first item more than its parent
+  list. To end a list, add a paragraph or list item less indented than the
+  current list.
+
+  Section titles always end a list. Displays cannot end a list but the
+  <<<[]>>> pseudo-element may be used to force the end of a list.
+
++------------------------------------+
+      * List item 3.
+        Force end of list:
+
+      []
+
+--------------------------------------------
+Verbatim text not contained in list item 3
+--------------------------------------------
++------------------------------------+
+
+  In the previous example, without the <<<[]>>>, the verbatim text (not
+  indented as all displays) would have been contained in list item 3.
+
+  A single <<<[]>>> may be used to end several nested lists at the same
+  time. The indentation of <<<[]>>> may be used to specify exactly which
+  lists should be ended. Example:
+
++------------------------------------+
+      * List item 1.
+
+      * List item 2.
+
+	    * Sub-list item 1.
+
+	    * Sub-list item 2.
+
+	    []
+
+-------------------------------------------------------------------
+Verbatim text contained in list item 2, but not in sub-list item 2
+-------------------------------------------------------------------
++------------------------------------+
+
+  There are three kind of lists, the bulleted lists we have already described,
+  the numbered lists and the definition lists.
+
++-----------------------------------------+
+      [[1]] Numbered item 1.
+
+                [[A]] Numbered item A.
+
+                [[B]] Numbered item B.
+
+      [[2]] Numbered item 2.
++-----------------------------------------+
+
+  A numbered list item begins with a label beetween two square brackets. The
+  label of the first item establishes the numbering scheme for the whole list:
+
+      [<<<[[1\]\]>>>] Decimal numbering: 1, 2, 3, 4, etc.
+
+      [<<<[[a\]\]>>>] Lower-alpha numbering: a, b, c, d, etc.
+
+      [<<<[[A\]\]>>>] Upper-alpha numbering: A, B, C, D, etc.
+
+      [<<<[[i\]\]>>>] Lower-roman numbering: i, ii, iii, iv, etc.
+
+      [<<<[[I\]\]>>>] Upper-roman numbering: I, II, III, IV, etc.
+
+  The labels of the items other than the first one are ignored. It is
+  recommended to take the time to type the correct label for each item in
+  order to keep the APT source document readable.
+
++-------------------------------------------+
+      [Defined term 1] of definition list 2.
+
+      [Defined term 2] of definition list 2.
++-------------------------------------------+
+
+  A definition list item begins with a defined term: text between square
+  brackets.
+
+*** Verbatim text
+~~~~~~~~~~~~~~~~~
+
++----------------------------------------+
+----------------------------------------
+Verbatim 
+	 text,
+		preformatted,
+				escaped.
+----------------------------------------
++----------------------------------------+
+
+  A verbatim block is not indented. It begins with a non indented line
+  containing at least 3 dashes (<<<--->>>). It ends with a similar line.
+
+  <<<+-->>> instead of <<<--->>> draws a box around verbatim text.
+
+  Like in HTML, verbatim text is preformatted. Unlike HTML, verbatim text is
+  escaped: inside a verbatim display, markup is not interpreted by the APT
+  processor.
+
+*** Figure
+~~~~~~~~~~
+
++---------------------------+
+[Figure name] Figure caption
++---------------------------+
+
+  A figure block is not indented. It begins with the figure name between
+  square brackets. The figure name is optionally followed by some text: the
+  figure caption.
+
+  The figure name is the pathname of the file containing the figure but
+  without an extension. Example: if your figure is contained in
+  <<</home/joe/docs/mylogo.jpeg>>>, the figure name is
+  <<</home/joe/docs/mylogo>>>.
+
+  If the figure name comes from a relative pathname (recommended practice)
+  rather than from an absolute pathname, this relative pathname is taken to be
+  relative to the directory of the current APT document (a la HTML)
+  rather than relative to the current working directory.
+
+  Why not leave the file extension in the figure name? This is better
+  explained by an example. You need to convert an APT document to PostScript
+  and your figure name is <<</home/joe/docs/mylogo>>>. A APT processor will
+  first try to load <<</home/joe/docs/mylogo.eps>>>. When the desired format
+  is not found, a APT processor tries to convert one of the existing
+  formats. In our example, the APT processor tries to convert
+  <<</home/joe/docs/mylogo.jpeg>>> to encapsulated PostScript.
+
+*** Table
+~~~~~~~~~
+
+  A table block is not indented. It begins with a non indented line containing
+  an asterisk and at least 2 dashes (<<<*-->>>). It ends with a
+  similar line.
+
+  The first line is not only used to recognize a table but also to specify
+  column justification. In the following example, 
+
+      * the second asterisk (<<<*>>>) is used to specify that column 1 is
+        centered,
+
+      * the plus sign (<<<+>>>) specifies that column 2 is left aligned, 
+
+      * the colon (<<<:>>>) specifies that column 3 is right aligned.
+
+      []
+
++---------------------------------------------+
+*----------*--------------+----------------:
+| Centered | Left-aligned | Right-aligned  |
+| cell 1,1 | cell 1,2     | cell 1,3       |
+*----------*--------------+----------------:
+| cell 2,1 | cell 2,2     | cell 2,3       |
+*----------*--------------+----------------:
+Table caption
++---------------------------------------------+
+
+  Rows are separated by a non indented line beginning with <<<*-->>>.
+
+  An optional table caption (non indented text) may immediately follow the
+  table.
+
+  Rows may contain single line or multiple line cells. Each line of cell text
+  is separated from the adjacent cell by the pipe character (<<<|>>>).
+  (<<<|>>> may be used in the cell text if quoted: <<<\\|>>>.)
+
+  The last <<<|>>> is only used to make the table nicer.  The first <<<|>>> is
+  not only used to make the table nicer, but also to specify that a grid is to
+  be drawn around table cells.
+
+  The following example shows a simple table with no grid and no caption.
+
++---------------+
+*-----*------*
+ cell | cell
+*-----*------*
+ cell | cell
+*-----*------*
++---------------+
+
+*** Horizontal rule
+~~~~~~~~~~~~~~~~~~~
+
++---------------------+
+=====================
++---------------------+
+
+  A non indented line containing at least 3 equal signs (<<<===>>>).
+
+*** Page break
+~~~~~~~~~~~~~~
+
++---+
+^L
++---+
+
+  A non indented line containing a single form feed character (Control-L).
+
+** Text level elements
+~~~~~~~~~~~~~~~~~~~~~~
+
+*** Font
+~~~~~~~~
+
++-----------------------------------------------------+
+  <Italic> font. <<Bold>> font. <<<Monospaced>>> font.
++-----------------------------------------------------+
+
+  Text between \< and > must be rendered in italic. Text between \<\< and >>
+  must be rendered in bold. Text between \<\<\< and >>> must be rendered using
+  a monospaced, typewriter-like font.
+
+  Font elements may appear anywhere except inside other font elements.
+
+  It is not recommended to use font elements inside titles, section titles,
+  links and defined terms because a APT processor automatically applies
+  appropriate font styles to these elements.
+
+*** Anchor and link
+~~~~~~~~~~~~~~~~~~~
+
++-----------------------------------------------------------------+
+  {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. 
+  Link to {{{anchor}showing alternate text}}.
+  Link to {{{http://www.pixware.fr}Pixware home page}}.
++-----------------------------------------------------------------+
+
+  Text between curly braces (<<<\{}>>>) specifies an anchor. Text between
+  double curly braces (<<<\{\{}}>>>) specifies a link.
+
+  It is an error to create a link element that does not refer to an anchor of
+  the same name. The name of an anchor/link is its text with all non
+  alphanumeric characters stripped.
+
+  This rule does not apply to links to <external> anchors. Text beginning
+  with <<<http:/>>>, <<<https:/>>>, <<<ftp:/>>>, <<<file:/>>>, <<<mailto:>>>,
+  <<<../>>>, <<<./>>> (<<<..\\>>> and <<<.\\>>> on Windows) is recognized as
+  an external anchor name.
+
+  When the construct <<\{\{\{>><name><<}>><text><<}}>> is used, the link text
+  <text> may differ from the link name <name>.
+
+  Anchor/link elements may appear anywhere except inside other anchor/link
+  elements.
+
+  Section titles are implicitly defined anchors.
+
+*** Line break
+~~~~~~~~~~~~~~
+
++-------------+
+  Force line\
+  break.
++-------------+
+
+  A backslash character (<<<\\>>>) followed by a newline character.
+
+  Line breaks must not be used inside titles and tables (which are line
+  oriented blocks with implicit line breaks).
+
+*** Non breaking space
+~~~~~~~~~~~~~~~~~~~~~~
+
++----------------------+
+  Non\ breaking\ space.
++----------------------+
+
+  A backslash character (<<<\\>>>) followed by a space character.
+
+*** Special character
+~~~~~~~~~~~~~~~~~~~~~
+
++---------------------------------------------------------------------------+
+  Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\.
++---------------------------------------------------------------------------+
+
+  In certain contexts, these characters have a special meaning and therefore
+  must be escaped if needed as is. They are escaped by adding a backslash in
+  front of them. The backslash may itself be escaped by adding another
+  backslash in front of it.
+
+  Note that an asterisk, for example, needs to be escaped only if its begins a
+  paragraph. (<<<*>>> has no special meaning in the middle of a paragraph.)
+
++--------------------------------------+
+  Copyright symbol: \251, \xA9, \u00a9.
++--------------------------------------+
+
+  Latin-1 characters (whatever is the encoding of the APT document) may be
+  specified by their codes using a backslash followed by one to three octal
+  digits or by using the <<<\x>>><NN> notation, where <NN> are two hexadecimal
+  digits.
+
+  Unicode characters may be specified by their codes using the <<<\u>>><NNNN>
+  notation, where <NNNN> are four hexadecimal digits.
+
+*** Comment
+~~~~~~~~~~~
+
++---------------+
+~~Commented out.
++---------------+
+
+  Text found after two tildes (<<<\~~>>>) is ignored up to the end of line.
+
+  A line of <<<~>>> is often used to ``underline'' section titles in order to
+  make them stand out of other paragraphs.
+
+
+* The APT format at a glance
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+------------------------------------------------------------------------------
+				    ------
+				    Title
+				    ------
+				    Author
+				    ------
+				     Date
+
+  Paragraph 1, line 1.
+  Paragraph 1, line 2.
+
+  Paragraph 2, line 1.
+  Paragraph 2, line 2.
+
+Section title
+
+* Sub-section title
+
+** Sub-sub-section title
+
+*** Sub-sub-sub-section title
+
+**** Sub-sub-sub-sub-section title
+
+      * List item 1.
+
+      * List item 2.
+
+	Paragraph contained in list item 2.
+
+	    * Sub-list item 1.
+
+	    * Sub-list item 2.
+
+      * List item 3.
+        Force end of list:
+
+      []
+
++------------------------------------------+
+Verbatim text not contained in list item 3
++------------------------------------------+
+
+      [[1]] Numbered item 1.
+
+                [[A]] Numbered item A.
+
+                [[B]] Numbered item B.
+
+      [[2]] Numbered item 2.
+
+  List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]].
+
+      [Defined term 1] of definition list.
+
+      [Defined term 2] of definition list.
+
++-------------------------------+
+Verbatim text
+			in a box	
++-------------------------------+
+
+  --- instead of +-- suppresses the box around verbatim text.
+
+[Figure name] Figure caption
+
+*----------*--------------+----------------:
+| Centered | Left-aligned | Right-aligned  |
+| cell 1,1 | cell 1,2     | cell 1,3       |
+*----------*--------------+----------------:
+| cell 2,1 | cell 2,2     | cell 2,3       |
+*----------*--------------+----------------:
+Table caption
+
+  No grid, no caption:
+
+*-----*------*
+ cell | cell
+*-----*------*
+ cell | cell
+*-----*------*
+
+  Horizontal line:
+
+=======================================================================
+
+^L
+  New page.
+
+  <Italic> font. <<Bold>> font. <<<Monospaced>>> font.
+
+  {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. 
+  Link to {{{anchor}showing alternate text}}.
+  Link to {{{http://www.pixware.fr}Pixware home page}}.
+
+  Force line\
+  break.
+
+  Non\ breaking\ space.
+
+  Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\.
+
+  Copyright symbol: \251, \xA9, \u00a9.
+
+~~Commented out.
+
+------------------------------------------------------------------------------
+

Added: incubator/felix/site/src/site/apt/index.apt
URL: http://svn.apache.org/viewcvs/incubator/felix/site/src/site/apt/index.apt?rev=359874&view=auto
==============================================================================
--- incubator/felix/site/src/site/apt/index.apt (added)
+++ incubator/felix/site/src/site/apt/index.apt Thu Dec 29 10:55:21 2005
@@ -0,0 +1,43 @@
+ -----
+ Apache Felix
+ -----
+ The Felix Team
+ -----
+
+What is Felix?
+
+ Felix is a community effort to implement the OSGi R4 Service
+ Platform, which includes the OSGi framework and standard services, as
+ well as providing and supporting other interesting OSGi-related
+ technologies. The ultimate goal is to provide a completely compliant
+ implementation of the OSGi framework and standard services and to
+ support a community around this technology. Felix currently
+ implements a large portion of the OSGi 4 specification, but
+ additional work is necessary for full compliance. Despite this fact,
+ the OSGi framework functionality provided by Felix is very stable.
+
+ OSGi technology originally targeted embedded devices and home
+ services gateways, but it is ideally suited for any project that is
+ interested in principles of modularity, component-oriented, and/or
+ service-orientation. OSGi technology combines aspects of these
+ aforementioned principles to define a dynamic service deployment
+ framework that is amenable to remote management. As an example of a
+ simple use case, Felix can be easily embedded into other projects and
+ used as a plugin or dynamic extension mechanism; it serves this
+ purpose much better than other systems that are used for similar
+ purposes, such as Java Management Extensions (JMX).
+
+
+What is OSGi?
+
+ The term OSGi generally refers to either the OSGi Alliance
+ organization or the OSGi Service Platform technology. The OSGi
+ Alliance is an independent corporation whose purpose is to define a
+ specification to deliver services over wide-area networks to
+ local-area networks and devices. The OSGi Alliance has numerous
+ corporate and individual participants who are ultimately responsible
+ for defining the features of the OSGi Service Platform. The OSGi
+ Alliance releases a detailed specification describing the features
+ and capabilities of its OSGi Service Platform, which can then be
+ freely implemented by anyone. For more more information on OSGi or to
+ retrieve the specification, refer to the OSGi Alliance web site.

Added: incubator/felix/site/src/site/apt/osgi.apt
URL: http://svn.apache.org/viewcvs/incubator/felix/site/src/site/apt/osgi.apt?rev=359874&view=auto
==============================================================================
--- incubator/felix/site/src/site/apt/osgi.apt (added)
+++ incubator/felix/site/src/site/apt/osgi.apt Thu Dec 29 10:55:21 2005
@@ -0,0 +1,169 @@
+ -----
+ Apache Felix
+ -----
+ The Felix Team
+ -----
+
+Why OSGi?
+
+ * standardized by the OSGi Alliance (7 years of real-world experience, 4th major version coming soon)
+
+ * 12 implementations, 3 OSS with active communities
+
+ * written specification endorsed by 70 major companies like IBM, Cisco, and many others
+
+ * container of choice for embedding: mobile phones, telematics, appliances, and now Eclipse
+
+ * dynamic hot-plug of components
+
+ * dynamic reconfiguration of installed components
+
+ * remote provisioning and software updates
+
+ * many excellent bundles available from the community, relevant to ApacheDS (MX4J bundles, Jetty bundles)
+
+ * working implementation of ApacheDS in the sandbox
+
+OSGi and OBR Repositories
+
+ * http://oscar-osgi.sourceforge.net/repo/repository.xml
+
+ * http://www-adele.imag.fr/~donsez/dev/osgi/repository.html
+
+ * http://ares.insa-lyon.fr/~sfrenot/devel/
+
+Oscar with ApacheDS
+
+ [[1]] Download and install the Oscar OSGi container from http://forge.objectweb.org/project/showfiles.php?group_id=113
+
+ [[2]] Install. Oscar GUI mode is shitty. You'll probably be happier with the console prompt.
+
++------------------------------------------------------------------------+
+     bash-2.05b# java -jar oscar-1.0.3.jar
++------------------------------------------------------------------------+
+
+ [[3]] Make the Oscar bash script executable.
+
++------------------------------------------------------------------------+
+     bash-2.05b# cd Oscar
+     bash-2.05b# chmod 744 oscar.sh
++------------------------------------------------------------------------+
+
+ [[4]] Start Oscar and pick any profile name.
+
++------------------------------------------------------------------------+
+     bash-2.05b# ./oscar.sh
+     Welcome to Oscar.
+     =================
+
+     Enter profile name: [myprofile]
++------------------------------------------------------------------------+
+
+
+Oscar Bundle Caches
+
+ The default bundle cache stores a set of installed bundles into a
+ profile directory. By default, the bundle cache uses a cache
+ directory (~/.oscar) to store all profiles. You can use the
+ ${oscar.cache.profile} property to set the profile name and
+ ${oscar.cache.dir} property to set the cache directory, resulting in
+ the profile directory of ${oscar.cache.dir}/${oscar.cache.profile}.
+
+ If you want to specify your own profile directory completely you can
+ use the ${oscar.cache.profiledir} property and then Oscar will use
+ this directory explicitly and everything else will be ignored.
+
+ The default bundle cache will not error if the profile directory
+ already exists. However, if the profile directory does not exist,
+ then it will be created. Generally, if an error occurs during cache
+ or profile directory creation it is usually an access control issue
+ or perhaps the path to the profile directory is messed up.
+
+ The profile directories are never deleted by Oscar. You must do this
+ yourself. You can, however, uninstall individual bundles to delete
+ them from the profile.
+
+OSGi in Eclipse
+
+ "RCP applications can take advantage of dynamic plug-ins, that is,
+ plug-ins that come and go at runtime. This provides flexibility to
+ the RCP application delivery model. A large application can be
+ deployed progressively as plug-ins are loaded or on demand when extra
+ functionality is needed. This technology was originally designed for
+ mobile phone provisioning as part of the OSGi Service Platform, and
+ later implemented in Eclipse by the Equinox project team. Eclipse is
+ an active participant in OSGi, and Eclipse 3.1 includes several
+ features slated for version 4 of the OSGi standard."
+
+Launching the Eclipse Runtime
+
++------------------------------------------------------------------------+
+    bash-2.05b# java -cp osgi.jar:core.jar:defaultAdaptor.jar:console.jar:resolver.jar org.eclipse.osgi.framework.launcher.Launcher -console:99 &
++------------------------------------------------------------------------+
+
+Eclipse Runtime Installer
+
+ Take a look at org.eclipse.core.runtime.adaptor.EclipseStarter.
+
+ The bundles automatically installed and started are specified by the
+ system property:
+ 
++------------------------------------------------------------------------+
+      osgi.bundles = jarName[@&lt;startLevel&gt;[:start]]
++------------------------------------------------------------------------+
+
+ For an example, see the configuration/config.ini shipped with eclipse.
+
+ Note that if you want to reuse startup.jar you can then reuse the
+ config.ini file I was mentioning before.
+
+ The way to think of this is that the config.ini file is setting a
+ mess of System properties. You can put whatever you want in
+ there. For more information on the system properties we care about,
+ check out: http://help.eclipse.org/help30/topic/org.eclipse.platform.doc.isv/reference/misc/runtime-options.html
+
+ Note that really startup.jar does two things, create a class loader
+ to load the framework and setup some System properties. If you want
+ your own main (or to run Eclipse from your program) you don't have to
+ do the classloader work (as long as the framework is on the app
+ classpath) and setting the system properties is pretty easy.
+
+Eclipse Plugin Development Environment (PDE)
+ 
+ If you could turn off the Extensions and Extension Points tabs and
+ filter a few of the options in the wizards (e.g. trimming the
+ Templates), you would essentially have a pure OSGi bundle development
+ environment.
+
+  * If you don't create Extensions or Extension Points then the plugin.xml is not created
+
+  * Fragments are part of OSGi R4
+
+  * If you look at a manifest.mf and see "Eclipse" in the headers or "x-" in the attributes/directives then it is extra. If not, it is standard.
+
+ Other than that, Eclipse plugins are OSGi bundles.
+
+JMX Subsystem
+ A quick-start session is :
+
++------------------------------------------------------------------------+
+  -> obr start "log reader"
+  -> obr start "JMX-MX4J Agent Service"
+  -> obr start "RMI registry"
+  -> obr start "JMX-MX4J RMI connector"
+  -> obr start "OSGi Mbean"
+  -> obr start "Remote logger"
+  -> obr start "Remote Shell GUI" 
+  -> obr start "Remote Components"
++------------------------------------------------------------------------+
+
+
+ Then click on "Servers" and on ip. It should work !
+
+ http://citi.insa-lyon.fr/~sfrenot/devel/
+
+To connect by MC4J:
+
+ * choose connection type JSR160
+
+ * service:jmx:rmi:///jndi/rmi://localhost:1099/jrmp
\ No newline at end of file

Added: incubator/felix/site/src/site/fml/faq.fml
URL: http://svn.apache.org/viewcvs/incubator/felix/site/src/site/fml/faq.fml?rev=359874&view=auto
==============================================================================
--- incubator/felix/site/src/site/fml/faq.fml (added)
+++ incubator/felix/site/src/site/fml/faq.fml Thu Dec 29 10:55:21 2005
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<faqs id="General FAQ">
+  <part id="General">
+    <faq id="where">
+      <question>Where did Maven come from?</question>
+      <answer>
+        <p>
+          Maven was created by a group of software developers who were tired
+          of wasting their time fiddling around with builds and wanted to get
+          down to brass tacks and actually develop software!
+        </p>
+      </answer>
+    </faq>
+    <faq id="why">
+      <question>Why is maven so wildly popular?</question>
+      <answer>
+        <p>
+          Maven saves you so much time in your software development efforts that
+          you will have time to learn a second language, relax ten hours a
+          day, and train for that marathon you've always wanted to run!
+        </p>
+      </answer>
+    </faq>
+  </part>
+</faqs>

Added: incubator/felix/site/src/site/resources/images/apache-felix.png
URL: http://svn.apache.org/viewcvs/incubator/felix/site/src/site/resources/images/apache-felix.png?rev=359874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/felix/site/src/site/resources/images/apache-felix.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/felix/site/src/site/resources/images/felix-logo-trim.jpg
URL: http://svn.apache.org/viewcvs/incubator/felix/site/src/site/resources/images/felix-logo-trim.jpg?rev=359874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/felix/site/src/site/resources/images/felix-logo-trim.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/felix/site/src/site/resources/images/felix-logo-trim.png
URL: http://svn.apache.org/viewcvs/incubator/felix/site/src/site/resources/images/felix-logo-trim.png?rev=359874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/felix/site/src/site/resources/images/felix-logo-trim.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/felix/site/src/site/resources/images/felix-logo.jpg
URL: http://svn.apache.org/viewcvs/incubator/felix/site/src/site/resources/images/felix-logo.jpg?rev=359874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/felix/site/src/site/resources/images/felix-logo.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/felix/site/src/site/site.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/site/src/site/site.xml?rev=359874&view=auto
==============================================================================
--- incubator/felix/site/src/site/site.xml (added)
+++ incubator/felix/site/src/site/site.xml Thu Dec 29 10:55:21 2005
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Felix">
+  <bannerLeft>
+    <name>Felix</name>
+    <src>images/apache-felix.png</src>
+    <href>http://incubator.apache.org/felix</href>
+  </bannerLeft>
+  <bannerRight>
+    <src>images/felix-logo.jpg</src>
+  </bannerRight>
+  <body>
+    <links>
+      <item name="Apache" href="http://www.apache.org/" />
+      <item name="Incubator" href="http://incubator.apache.org/"/>
+      <item name="Felix" href="http://incubator.apache.org/felix"/>
+    </links>
+
+    <menu name="Apache Felix">
+      <item name="About" href="index.html"/>
+      <!--  <item name="FAQ" href="faq.html"/> -->
+      <item name="Status" href="http://incubator.apache.org/projects/felix.html"/>     
+    </menu>
+
+    <menu name="OSGi">
+      <item name="About OSGi" href="osgi.html"/>
+      <item name="R4 Specification" href="r4.html"/>
+    </menu>
+
+    ${reports}
+
+  </body>
+</project>

Added: incubator/felix/site/src/site/xdoc/r4.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/site/src/site/xdoc/r4.xml?rev=359874&view=auto
==============================================================================
--- incubator/felix/site/src/site/xdoc/r4.xml (added)
+++ incubator/felix/site/src/site/xdoc/r4.xml Thu Dec 29 10:55:21 2005
@@ -0,0 +1,164 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>OSGi R4 and Felix</title>
+    <author>The Felix Team</author>
+  </properties>
+  <body>
+    <section name="OSGi Service Platform Specification Release 4 API">
+<table>
+<tr>
+<th> API Package </th>
+<th> Description </th>
+<th> Implementation Contributor </th>
+</tr>
+<tr>
+<td> org.osgi.framework  </td>
+<td> The OSGi Framework Package. </td>
+<td> Richard Hall (LSR/UJF) </td>
+</tr>
+<tr>
+<td> org.osgi.service.cm  </td>
+<td> The OSGi Configuration Admin service Package. </td>
+<td> Apache Directory Project </td>
+</tr>
+<tr>
+<td> org.osgi.service.component  </td>
+<td> The OSGi Service Component Package. </td>
+<td> Pending, To Be Announced </td>
+</tr>
+<tr>
+<td> org.osgi.service.condpermadmin  </td>
+<td> The OSGi Conditional Permission Admin Specification Version 1.0. </td>
+<td> Reference </td>
+</tr>
+<tr>
+<td> org.osgi.service.device  </td>
+<td> The OSGi Device Access Package. </td>
+<td>  </td>
+</tr>
+<tr>
+<td> org.osgi.service.event  </td>
+<td> The OSGi Event Admin Specification Version 1.0. </td>
+<td> Pending, To Be Announced </td>
+</tr>
+<tr>
+<td> org.osgi.service.http  </td>
+<td> The OSGi Http Service Package. </td>
+<td> Rob Walker, Richard Hall </td>
+</tr>
+<tr>
+<td> org.osgi.service.io  </td>
+<td> The OSGi IO Connector Specification Version 1.0. </td>
+<td> Pending, To Be Announced </td>
+</tr>
+<tr>
+<td> org.osgi.service.log  </td>
+<td> The OSGi Log Service Package. </td>
+<td> Pending, To Be Announced </td>
+</tr>
+<tr>
+<td> org.osgi.service.metatype  </td>
+<td> The OSGi Metatype Package. </td>
+<td>  </td>
+</tr>
+<tr>
+<td> org.osgi.service.packageadmin  </td>
+<td> The OSGi Package Admin service Package. </td>
+<td> Richard Hall (LSR/UJF) </td>
+</tr>
+<tr>
+<td> org.osgi.service.permissionadmin  </td>
+<td> The OSGi Permission Admin service Package. </td>
+<td> Reference </td>
+</tr>
+<tr>
+<td> org.osgi.service.prefs  </td>
+<td> The OSGi Preferences Service Package. </td>
+<td> Apache Directory Project </td>
+</tr>
+<tr>
+<td> org.osgi.service.provisioning  </td>
+<td> The OSGi Provisioning Service Package. </td>
+<td>  </td>
+</tr>
+<tr>
+<td> org.osgi.service.startlevel  </td>
+<td> The OSGi StartLevel service Package. </td>
+<td> Richard Hall (LSR/UJF) </td>
+</tr>
+<tr>
+<td> org.osgi.service.upnp  </td>
+<td> The OSGi UPnP API Package. </td>
+<td> Domoware </td>
+</tr>
+<tr>
+<td>  </td>
+<td> OSGi UPnP Base Driver </td>
+<td> Domoware </td>
+</tr>
+<tr>
+<td>  </td>
+<td> OSGi UPnP Base Driver Extra </td>
+<td> Domoware </td>
+</tr>
+<tr>
+<td>  </td>
+<td> Control Point </td>
+<td> Domoware </td>
+</tr>
+<tr>
+<td>  </td>
+<td> Clock Device </td>
+<td> Domoware </td>
+</tr>
+<tr>
+<td>  </td>
+<td> TV Device </td>
+<td> Domoware </td>
+</tr>
+<tr>
+<td>  </td>
+<td> Standard BinaryLight Device </td>
+<td> Domoware </td>
+</tr>
+<tr>
+<td> org.osgi.service.url  </td>
+<td> The OSGi URL Stream and Content Handlers API Package. </td>
+<td> Richard Hall (LSR/UJF) </td>
+</tr>
+<tr>
+<td> org.osgi.service.useradmin  </td>
+<td> The OSGi User Admin service Package. </td>
+<td> Apache Directory Project </td>
+</tr>
+<tr>
+<td> org.osgi.service.wireadmin  </td>
+<td> The OSGi Wire Admin service Package. </td>
+<td> Pending, To Be Announced </td>
+</tr>
+<tr>
+<td> org.osgi.util.measurement  </td>
+<td> The OSGi Measurement Package. </td>
+<td> Reference </td>
+</tr>
+<tr>
+<td> org.osgi.util.position  </td>
+<td> The OSGi Position Package. </td>
+<td> Reference </td>
+</tr>
+<tr>
+<td> org.osgi.util.tracker  </td>
+<td> The OSGi Service Tracker Package. </td>
+<td> Reference </td>
+</tr>
+<tr>
+<td> org.osgi.util.xml  </td>
+<td> The OSGi XML Parser service Package. </td>
+<td> Reference </td>
+</tr>
+</table>
+    </section>
+  </body>
+</document>
+

Added: incubator/felix/site/src/site/xdoc/xdoc.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/site/src/site/xdoc/xdoc.xml?rev=359874&view=auto
==============================================================================
--- incubator/felix/site/src/site/xdoc/xdoc.xml (added)
+++ incubator/felix/site/src/site/xdoc/xdoc.xml Thu Dec 29 10:55:21 2005
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>Welcome</title>
+    <author email="dev@maven.apache.org">The Maven Team</author>
+  </properties>
+  <body>
+    <section name="Welcome to an XDOC file!">
+      <p>
+        This is some text for the xdoc file.
+      </p>
+    </section>
+  </body>
+</document>
+