felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r390223 - in /incubator/felix/trunk/org.osgi: ./ src/main/java/org/osgi/framework/ src/main/java/org/osgi/service/condpermadmin/ src/main/java/org/osgi/service/packageadmin/ src/main/java/org/osgi/service/permissionadmin/ src/main/java/org/...
Date Thu, 30 Mar 2006 19:37:43 GMT
Author: erodriguez
Date: Thu Mar 30 11:37:41 2006
New Revision: 390223

URL: http://svn.apache.org/viewcvs?rev=390223&view=rev
OSGi R4 Core updates:
o  Added package, about, license docs
o  Updated pom to package as bundle
o  Removed util tracker package

    incubator/felix/trunk/org.osgi/src/main/java/org/osgi/framework/package.html   (with props)
  (with props)
  (with props)
  (with props)
  (with props)
    incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/url/package.html   (with
    incubator/felix/trunk/org.osgi/src/main/resources/LICENSE   (with props)
    incubator/felix/trunk/org.osgi/src/main/resources/about.html   (with props)

Modified: incubator/felix/trunk/org.osgi/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.osgi/pom.xml?rev=390223&r1=390222&r2=390223&view=diff
--- incubator/felix/trunk/org.osgi/pom.xml (original)
+++ incubator/felix/trunk/org.osgi/pom.xml Thu Mar 30 11:37:41 2006
@@ -5,7 +5,31 @@
-  <packaging>jar</packaging>
-  <name>OSGi Framework API</name>
-  <artifactId>org.osgi</artifactId>
+  <name>OSGi R4 Core Bundle</name>
+  <artifactId>org.osgi.core</artifactId>
+  <packaging>osgi-bundle</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix.plugins</groupId>
+        <artifactId>maven-osgi-plugin</artifactId>
+        <version>${pom.version}</version>
+        <extensions>true</extensions>
+        <configuration>
+          <osgiManifest>
+            <bundleName>osgi.core</bundleName>
+            <bundleVendor>OSGi Alliance</bundleVendor>
+            <!--<bundleVersion>4</bundleVersion>-->
+            <bundleSymbolicName>osgi.core</bundleSymbolicName>
+            <bundleDescription>OSGi Service Platform Release 4 Core Interfaces and
+            <!--<bundleCopyright>Copyright (c) OSGi Alliance (2000, 2005). All Rights
+            <bundleCategory>osgi</bundleCategory>
+            <!--<bundleDocUrl>http://www.osgi.org/</bundleDocUrl>-->
+            <exportPackage>org.osgi.framework; specification-version="1.3", org.osgi.service.condpermadmin;
specification-version="1.0", org.osgi.service.packageadmin; specification-version="1.2", org.osgi.service.permissionadmin;
specification-version="1.2", org.osgi.service.startlevel; specification-version="1.0", org.osgi.service.url;
+            <!--<dynamicImportPackage>*</dynamicImportPackage>-->
+          </osgiManifest>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>

Added: incubator/felix/trunk/org.osgi/src/main/java/org/osgi/framework/package.html
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.osgi/src/main/java/org/osgi/framework/package.html?rev=390223&view=auto
--- incubator/felix/trunk/org.osgi/src/main/java/org/osgi/framework/package.html (added)
+++ incubator/felix/trunk/org.osgi/src/main/java/org/osgi/framework/package.html Thu Mar 30
11:37:41 2006
@@ -0,0 +1,11 @@
+<!-- $Header: /cvshome/build/org.osgi.framework/src/org/osgi/framework/package.html,v
1.2 2004/12/01 19:01:49 hargrave Exp $ -->
+<p>The OSGi Framework Package. Specification Version 1.3.
+<p>Bundles wishing to use this package must list the package
+in the Import-Package header of the bundle's manifest.
+For example:
+Import-Package: org.osgi.framework;version=1.3

Propchange: incubator/felix/trunk/org.osgi/src/main/java/org/osgi/framework/package.html
    svn:eol-style = native

Added: incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/condpermadmin/package.html
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/condpermadmin/package.html?rev=390223&view=auto
--- incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/condpermadmin/package.html
+++ incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/condpermadmin/package.html
Thu Mar 30 11:37:41 2006
@@ -0,0 +1,10 @@
+<!-- $Header: /cvshome/build/org.osgi.service.condpermadmin/src/org/osgi/service/condpermadmin/package.html,v
1.5 2005/08/05 01:35:14 hargrave Exp $ -->
+<P>The OSGi Conditional Permission Admin Specification Version 1.0.
+<p>Bundles wishing to use this package must list the package
+in the <TT>Import-Package</TT> header of the bundle's manifest.
+For example:
+Import-Package: org.osgi.service.condpermadmin; version=1.0

Propchange: incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/condpermadmin/package.html
    svn:eol-style = native

Added: incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/packageadmin/package.html
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/packageadmin/package.html?rev=390223&view=auto
--- incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/packageadmin/package.html
+++ incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/packageadmin/package.html
Thu Mar 30 11:37:41 2006
@@ -0,0 +1,11 @@
+<!-- $Header: /cvshome/build/org.osgi.service.packageadmin/src/org/osgi/service/packageadmin/package.html,v
1.2 2004/12/01 19:01:45 hargrave Exp $ -->
+<P>The OSGi Package Admin service Package. Specification Version 1.2.
+<p>Bundles wishing to use this package must list the package
+in the Import-Package header of the bundle's manifest.
+For example:
+Import-Package: org.osgi.service.packageadmin; version=1.2

Propchange: incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/packageadmin/package.html
    svn:eol-style = native

Added: incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/permissionadmin/package.html
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/permissionadmin/package.html?rev=390223&view=auto
--- incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/permissionadmin/package.html
+++ incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/permissionadmin/package.html
Thu Mar 30 11:37:41 2006
@@ -0,0 +1,11 @@
+<!-- $Header: /cvshome/build/org.osgi.service.permissionadmin/src/org/osgi/service/permissionadmin/package.html,v
1.3 2005/08/04 03:34:57 hargrave Exp $ -->
+<P>The OSGi Permission Admin service Package. Specification Version 1.2.
+<p>Bundles wishing to use this package must list the package
+in the Import-Package header of the bundle's manifest.
+For example:
+Import-Package: org.osgi.service.permissionadmin; version=1.2

Propchange: incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/permissionadmin/package.html
    svn:eol-style = native

Added: incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/startlevel/package.html
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/startlevel/package.html?rev=390223&view=auto
--- incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/startlevel/package.html
+++ incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/startlevel/package.html
Thu Mar 30 11:37:41 2006
@@ -0,0 +1,11 @@
+<!-- $Header: /cvshome/build/org.osgi.service.startlevel/src/org/osgi/service/startlevel/package.html,v
1.2 2004/12/01 19:01:29 hargrave Exp $ -->
+<P>The OSGi StartLevel service Package. Specification Version 1.0.
+<p>Bundles wishing to use this package must list the package
+in the Import-Package header of the bundle's manifest.
+For example:
+Import-Package: org.osgi.service.startlevel; version=1.0

Propchange: incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/startlevel/package.html
    svn:eol-style = native

Added: incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/url/package.html
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/url/package.html?rev=390223&view=auto
--- incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/url/package.html (added)
+++ incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/url/package.html Thu Mar
30 11:37:41 2006
@@ -0,0 +1,10 @@
+<!-- $Header: /cvshome/build/org.osgi.service.url/src/org/osgi/service/url/package.html,v
1.2 2004/12/01 19:01:44 hargrave Exp $ -->
+<P>The OSGi URL Stream and Content Handlers API Package. Specification Version 1.0.
+<p>Bundles wishing to use this package must list the package
+in the Import-Package header of the bundle's manifest.
+For example:
+Import-Package: org.osgi.service.url; version=1.0

Propchange: incubator/felix/trunk/org.osgi/src/main/java/org/osgi/service/url/package.html
    svn:eol-style = native

Added: incubator/felix/trunk/org.osgi/src/main/resources/LICENSE
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.osgi/src/main/resources/LICENSE?rev=390223&view=auto
--- incubator/felix/trunk/org.osgi/src/main/resources/LICENSE (added)
+++ incubator/felix/trunk/org.osgi/src/main/resources/LICENSE Thu Mar 30 11:37:41 2006
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+   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,
+      implied, including, without limitation, any warranties or conditions
+      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.
+   APPENDIX: How to apply the Apache License to your work.
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+   Copyright [yyyy] [name of copyright owner]
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Propchange: incubator/felix/trunk/org.osgi/src/main/resources/LICENSE
    svn:eol-style = native

Added: incubator/felix/trunk/org.osgi/src/main/resources/about.html
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.osgi/src/main/resources/about.html?rev=390223&view=auto
--- incubator/felix/trunk/org.osgi/src/main/resources/about.html (added)
+++ incubator/felix/trunk/org.osgi/src/main/resources/about.html Thu Mar 30 11:37:41 2006
@@ -0,0 +1,40 @@
+<!-- $Header: /cvshome/build/osgi/about.html,v 1.3 2006/03/14 01:21:34 hargrave Exp $
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<body lang="EN-US">
+<h2>About This Content</h2>
+<p>Copyright (c) 2000, 2005</p>
+<p>OSGi Alliance<br/>
+Bishop Ranch 6<br/>
+2400 Camino Ramon, Suite 375<br/>
+San Ramon, CA 94583 USA
+<p>All Rights Reserved.</p>
+<p>The OSGi Alliance makes available all content in this jar (&quot;Work&quot;).
 Unless otherwise indicated below, the Work is provided to you under the terms and conditions
of the
+Apache License, Version 2.0 (the &quot;License&quot;).  A copy of the License is
available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.</p>
+<p>Implementation of certain elements of the Content may be subject to third party
+intellectual property rights, including without limitation, patent rights (such a third party
+or may not be a member of the OSGi Alliance). The OSGi Alliance and its members are not responsible

+and shall not be held responsible in any manner for identifying or failing to identify any
+all such third party intellectual property rights.</p>
+<p>OSGi&trade; is a trademark, registered trademark, or service mark
+of The OSGi Alliance in the US and other countries. Java is a trademark,
+registered trademark, or service mark of Sun Microsystems, Inc. in the US
+and other countries. All other trademarks, registered trademarks, or
+service marks used in the Content are the property of their respective
+owners and are hereby recognized.</p>
\ No newline at end of file

Propchange: incubator/felix/trunk/org.osgi/src/main/resources/about.html
    svn:eol-style = native

View raw message