felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1649219 - in /felix/sandbox/pderop/dependencymanager-samples: ./ cnf/ cnf/bin/ cnf/buildrepo/ cnf/buildrepo/biz.aQute.junit/ cnf/buildrepo/biz.aQute.launcher/ cnf/buildrepo/ee.foundation/ cnf/buildrepo/ee.minimum/ cnf/buildrepo/hamcrest-co...
Date Sat, 03 Jan 2015 16:41:49 GMT
Author: pderop
Date: Sat Jan  3 16:41:47 2015
New Revision: 1649219

URL: http://svn.apache.org/r1649219
Log:
Extracted samples and benchmark from dependencymanager into dependencymanager-samples project.

Added:
    felix/sandbox/pderop/dependencymanager-samples/
    felix/sandbox/pderop/dependencymanager-samples/.gitignore
    felix/sandbox/pderop/dependencymanager-samples/build.gradle
    felix/sandbox/pderop/dependencymanager-samples/cnf/
    felix/sandbox/pderop/dependencymanager-samples/cnf/.classpath   (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/.gitignore
    felix/sandbox/pderop/dependencymanager-samples/cnf/.project   (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/bin/
    felix/sandbox/pderop/dependencymanager-samples/cnf/bin/.gitignore
    felix/sandbox/pderop/dependencymanager-samples/cnf/build.bnd
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/README.txt
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/biz.aQute.junit/
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-latest.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/biz.aQute.launcher/
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-latest.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.foundation/
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.foundation/ee.foundation-1.1.0.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.minimum/
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.minimum/ee.minimum-1.2.0.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.minimum/ee.minimum-1.2.1.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/hamcrest-core/
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/hamcrest-core/hamcrest-core-1.3.0.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/junit/
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/junit.osgi/
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/junit.osgi/junit.osgi-3.8.2.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/junit/junit-4.11.0.jar  
(with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.foundation/
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.foundation/org.osgi.ee.foundation-1.0.0.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.foundation/org.osgi.ee.foundation-1.0.1.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.minimum/
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.0.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.1.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.3.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.0.1.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.1.0.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.2.0.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.3.0.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.3.1.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-5.0.0.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/ext/
    felix/sandbox/pderop/dependencymanager-samples/cnf/ext/junit.bnd
    felix/sandbox/pderop/dependencymanager-samples/cnf/ext/pluginpaths.bnd
    felix/sandbox/pderop/dependencymanager-samples/cnf/ext/repositories.bnd
    felix/sandbox/pderop/dependencymanager-samples/cnf/gradle/
    felix/sandbox/pderop/dependencymanager-samples/cnf/gradle/biz.aQute.bnd.gradle.jar   (with
props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/
    felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml   (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml.sha
    felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.eventadmin/
    felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.4.3.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.http.api/
    felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.http.api/org.apache.felix.http.api-2.3.0.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.http.servlet-api/
    felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.http.servlet-api/org.apache.felix.http.servlet-api-1.0.0.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/plugins/
    felix/sandbox/pderop/dependencymanager-samples/cnf/plugins/biz.aQute.repository/
    felix/sandbox/pderop/dependencymanager-samples/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar
  (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/releaserepo/
    felix/sandbox/pderop/dependencymanager-samples/cnf/releaserepo/index.xml   (with props)
    felix/sandbox/pderop/dependencymanager-samples/cnf/src/
    felix/sandbox/pderop/dependencymanager-samples/cnf/src/.gitignore
    felix/sandbox/pderop/dependencymanager-samples/gradle.properties
    felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.benchmark/
      - copied from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/
    felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/
      - copied from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/
    felix/sandbox/pderop/dependencymanager-samples/settings.gradle
Modified:
    felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.benchmark/bnd.bnd
    felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/README
    felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/bnd.bnd

Added: felix/sandbox/pderop/dependencymanager-samples/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/.gitignore?rev=1649219&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/.gitignore (added)
+++ felix/sandbox/pderop/dependencymanager-samples/.gitignore Sat Jan  3 16:41:47 2015
@@ -0,0 +1,3 @@
+/.gradle/
+/reports/
+/generated/

Added: felix/sandbox/pderop/dependencymanager-samples/build.gradle
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/build.gradle?rev=1649219&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/build.gradle (added)
+++ felix/sandbox/pderop/dependencymanager-samples/build.gradle Sat Jan  3 16:41:47 2015
@@ -0,0 +1,20 @@
+/*
+ * Master Gradle build script
+ *
+ * Depends on bndWorkspace and bndURI properties set by settings.gradle.
+ */
+
+/* Add bnd as a script dependency */
+buildscript {
+  dependencies {
+    classpath files(bndURI)
+  }
+}
+
+/* Configure the subprojects */
+subprojects {
+  def bndProject = bndWorkspace.getProject(name)
+  if (bndProject != null) {
+    plugins.apply 'biz.aQute.bnd'
+  }
+}

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/.classpath?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/.classpath
------------------------------------------------------------------------------
    svn:mime-type = application/xml

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/.gitignore?rev=1649219&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/cnf/.gitignore (added)
+++ felix/sandbox/pderop/dependencymanager-samples/cnf/.gitignore Sat Jan  3 16:41:47 2015
@@ -0,0 +1,3 @@
+/bin/
+/generated/
+/cache/

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/.project
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/.project?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/.project
------------------------------------------------------------------------------
    svn:mime-type = application/xml

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/bin/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/bin/.gitignore?rev=1649219&view=auto
==============================================================================
    (empty)

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/build.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/build.bnd?rev=1649219&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/cnf/build.bnd (added)
+++ felix/sandbox/pderop/dependencymanager-samples/cnf/build.bnd Sat Jan  3 16:41:47 2015
@@ -0,0 +1,57 @@
+########################
+## BND BUILD SETTINGS ##
+########################
+
+
+## Global defaults are loaded from the bnd library (as shown below), place your
+## specific settings here. Additional settings are inherited from ext/*.bnd and
+## they will be overridden by anything you specify in this file.
+
+## General Options
+#project.dependson:     ${p-dependson;:}
+#project.bootclasspath: ${p-bootclasspath;:}
+#project.buildpath:     ${p-buildpath;:}
+#project.sourcepath:    ${p-sourcepath;:}
+#project.allsourcepath: ${p-allsourcepath;:}
+#project.output:        ${p-output}
+#project.testpath:      ${p-testpath;:}
+
+#-verbose:              false
+#project:               ${basedir}
+#src:                   src
+#bin:                   bin
+#testsrc:               test
+#testbin:               bin_test
+#target-dir:            generated
+#target:                ${project}/${target-dir}
+#build:                 ${workspace}/cnf
+#p:                     ${basename;${project}}
+#project.name:          ${p}
+#plugin-dir:            ${build}/plugins
+
+## Java Compiler Options
+#java:                  java
+#javac:                 javac
+javac.source:          1.7
+javac.target:          1.7
+#javac.debug:           on
+
+## Bnd Options
+#-sources:              true
+#-sourcepath:           ${project}/src
+
+
+## Properties from ext/*.bnd can be referenced in order to extend them. For
+## example, to add one additional plugin to the list defined in
+## ext/repositories.bnd:
+# -plugin: ${ext.repositories.-plugin}, org.example.MyPlugin
+
+
+## To enable baselining, uncomment the following lines:
+# -baseline: *
+
+
+## If you use git, you might want to uncomment the following lines:
+# Git-Descriptor:       ${system-allow-fail;git describe --dirty --always}
+# Git-SHA:              ${system-allow-fail;git rev-list -1 HEAD}
+# -diffignore:          Git-Descriptor,Git-SHA
\ No newline at end of file

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/README.txt
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/README.txt?rev=1649219&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/README.txt (added)
+++ felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/README.txt Sat Jan  3 16:41:47
2015
@@ -0,0 +1,6 @@
+WARNING
+=======
+
+This directory contains JAR file dependencies that are intended ONLY FOR BUILT-TIME usage.
+None are intended to be deployed as bundles into a running OSGi Framework, and indeed they
may cause
+unexpected errors if they are used at runtime.

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-latest.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-latest.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-latest.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-latest.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-latest.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-latest.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.foundation/ee.foundation-1.1.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.foundation/ee.foundation-1.1.0.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.foundation/ee.foundation-1.1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.minimum/ee.minimum-1.2.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.minimum/ee.minimum-1.2.0.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.minimum/ee.minimum-1.2.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.minimum/ee.minimum-1.2.1.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.minimum/ee.minimum-1.2.1.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/ee.minimum/ee.minimum-1.2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/hamcrest-core/hamcrest-core-1.3.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/hamcrest-core/hamcrest-core-1.3.0.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/hamcrest-core/hamcrest-core-1.3.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/junit.osgi/junit.osgi-3.8.2.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/junit.osgi/junit.osgi-3.8.2.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/junit.osgi/junit.osgi-3.8.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/junit/junit-4.11.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/junit/junit-4.11.0.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/junit/junit-4.11.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.foundation/org.osgi.ee.foundation-1.0.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.foundation/org.osgi.ee.foundation-1.0.0.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.foundation/org.osgi.ee.foundation-1.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.foundation/org.osgi.ee.foundation-1.0.1.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.foundation/org.osgi.ee.foundation-1.0.1.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.foundation/org.osgi.ee.foundation-1.0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.0.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.1.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.1.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.3.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.3.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.0.1.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.0.1.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.1.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.1.0.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.2.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.2.0.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.2.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.3.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.3.0.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.3.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.3.1.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.3.1.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-4.3.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-5.0.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-5.0.0.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/buildrepo/osgi.core/osgi.core-5.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/ext/junit.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/ext/junit.bnd?rev=1649219&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/cnf/ext/junit.bnd (added)
+++ felix/sandbox/pderop/dependencymanager-samples/cnf/ext/junit.bnd Sat Jan  3 16:41:47 2015
@@ -0,0 +1,3 @@
+junit:\
+	junit;version=latest,\
+	hamcrest-core;version=latest

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/ext/pluginpaths.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/ext/pluginpaths.bnd?rev=1649219&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/cnf/ext/pluginpaths.bnd (added)
+++ felix/sandbox/pderop/dependencymanager-samples/cnf/ext/pluginpaths.bnd Sat Jan  3 16:41:47
2015
@@ -0,0 +1,3 @@
+-pluginpath:\
+	${plugin-dir}/biz.aQute.repository/biz.aQute.repository.jar,\
+	${workspace}/cnf/localrepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.0.0.jar
\ No newline at end of file

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/ext/repositories.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/ext/repositories.bnd?rev=1649219&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/cnf/ext/repositories.bnd (added)
+++ felix/sandbox/pderop/dependencymanager-samples/cnf/ext/repositories.bnd Sat Jan  3 16:41:47
2015
@@ -0,0 +1,7 @@
+-plugin:\
+	aQute.bnd.deployer.repository.LocalIndexedRepo; name=Release;      local=${workspace}/cnf/releaserepo;pretty=true,\
+	aQute.bnd.deployer.repository.LocalIndexedRepo; name=Local;        local=${workspace}/cnf/localrepo;pretty=true,\
+	aQute.bnd.deployer.repository.FixedIndexedRepo; name=Bndtools Hub; locations=https://raw.githubusercontent.com/bndtools/bundle-hub/master/index.xml.gz,\
+	aQute.lib.deployer.FileRepo;                    name=Build;        location=${workspace}/cnf/buildrepo;latest=false
+
+-releaserepo: Release

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/gradle/biz.aQute.bnd.gradle.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/gradle/biz.aQute.bnd.gradle.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/gradle/biz.aQute.bnd.gradle.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml
------------------------------------------------------------------------------
    svn:mime-type = application/xml

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml.sha
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml.sha?rev=1649219&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml.sha (added)
+++ felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml.sha Sat Jan  3
16:41:47 2015
@@ -0,0 +1 @@
+4202b0a7e42b50587084d438536bece889b09d818c4dd236916e2e5da48a68f3
\ No newline at end of file

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.4.3.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.4.3.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.4.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.http.api/org.apache.felix.http.api-2.3.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.http.api/org.apache.felix.http.api-2.3.0.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.http.api/org.apache.felix.http.api-2.3.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.http.servlet-api/org.apache.felix.http.servlet-api-1.0.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.http.servlet-api/org.apache.felix.http.servlet-api-1.0.0.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.http.servlet-api/org.apache.felix.http.servlet-api-1.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/releaserepo/index.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/releaserepo/index.xml?rev=1649219&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-samples/cnf/releaserepo/index.xml
------------------------------------------------------------------------------
    svn:mime-type = application/xml

Added: felix/sandbox/pderop/dependencymanager-samples/cnf/src/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/src/.gitignore?rev=1649219&view=auto
==============================================================================
    (empty)

Added: felix/sandbox/pderop/dependencymanager-samples/gradle.properties
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/gradle.properties?rev=1649219&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/gradle.properties (added)
+++ felix/sandbox/pderop/dependencymanager-samples/gradle.properties Sat Jan  3 16:41:47 2015
@@ -0,0 +1,14 @@
+# cnf project name
+bnd_cnf=cnf
+
+# bnd_jar can also be a URL.
+bnd_jar=cnf/gradle/biz.aQute.bnd.gradle.jar
+
+# bnd_build can be set to the name of a "master" project whose dependencies will seed the
set of projects to build.
+bnd_build=
+
+# Default gradle task to build
+bnd_defaultTask=build
+
+# This should be false. It only needs to be true in rare cases.
+bnd_preCompileRefresh=false

Modified: felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.benchmark/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.benchmark/bnd.bnd?rev=1649219&r1=1648937&r2=1649219&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.benchmark/bnd.bnd
(original)
+++ felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.benchmark/bnd.bnd
Sat Jan  3 16:41:47 2015
@@ -1,3 +1,5 @@
+javac.source:          1.8
+javac.target:          1.8
 -buildpath:  \
 	org.apache.felix.dependencymanager;version=latest,\
 	osgi.core;version=4.2,\
@@ -7,5 +9,3 @@
 	*.bnd
 Export-Package:  \
 	org.apache.felix.dm.benchmark.scenario.impl
-javac.source:          1.8
-javac.target:          1.8

Modified: felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/README
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/README?rev=1649219&r1=1648937&r2=1649219&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/README
(original)
+++ felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/README
Sat Jan  3 16:41:47 2015
@@ -1,4 +1,28 @@
-This sub-project contains some examples using the Dependency Manager API and annotations.
-For more information, please take a look at each README files provided in each sample.
+This sub-project contains some examples using the Dependency Manager Api and annotations.
+
+To execute the samples under bndtools, click on the "org.apache.felix.dependencymanager.samples"
project, 
+then Run as "Bnd OSGi Run Launcher".
+
+Each samples displays some logs using the OSGi log service. 
+Just type:
+
+  log info
+
+To see a log for a given sample (for example org.apache.felix.dependencymanager.samples.device.api),
just type:
+
+  log info|grep org.apache.felix.dependencymanager.samples.device.api
+
+For more informations on each sample, please refer to each README files in the sample source
directories:
+
+  ./src/org/apache/felix/dependencymanager/samples/composite/README
+  ./src/org/apache/felix/dependencymanager/samples/tpool/README
+  ./src/org/apache/felix/dependencymanager/samples/customdep/README
+  ./src/org/apache/felix/dependencymanager/samples/device/api/README
+  ./src/org/apache/felix/dependencymanager/samples/device/annot/README
+  ./src/org/apache/felix/dependencymanager/samples/hello/api/README
+  ./src/org/apache/felix/dependencymanager/samples/hello/annot/README
+  ./src/org/apache/felix/dependencymanager/samples/conf/README
+  ./src/org/apache/felix/dependencymanager/samples/compositefactory/README
+  ./src/org/apache/felix/dependencymanager/samples/dictionary/api/README
+  ./src/org/apache/felix/dependencymanager/samples/dictionary/annot/README
 
-Each sample logs some messages using the OSGi log service.

Modified: felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/bnd.bnd?rev=1649219&r1=1648937&r2=1649219&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/bnd.bnd
(original)
+++ felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/bnd.bnd
Sat Jan  3 16:41:47 2015
@@ -1,12 +1,12 @@
 Bundle-Version: 4.0.0
 -buildpath:  \
-	org.apache.felix.dependencymanager.annotation;version=latest,\
-	biz.aQute.bnd.annotation;version=2.4,\
 	org.apache.felix.dependencymanager;version=latest,\
 	osgi.core;version=4.2,\
 	osgi.cmpn;version=4.2,\
 	org.apache.felix.gogo.runtime;version=latest,\
-	org.apache.felix.dependencymanager.runtime;version=latest
+	org.apache.felix.dependencymanager.runtime;version=latest,\
+	org.apache.felix.dependencymanager.annotation;version=latest,\
+	biz.aQute.bnd.annotation
 -runfw: org.apache.felix.framework;version='[4.4.0,4.4.0]'
 -runee: JavaSE-1.7
 -runbundles:  \
@@ -35,8 +35,7 @@ Bundle-Version: 4.0.0
 	org.apache.felix.dependencymanager.loglevel=2,\
 	org.apache.felix.log.maxSize=100000,\
 	org.apache.felix.log.storeDebug=true
--plugin: org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug;\
-	path:=${workspace}/org.apache.felix.dependencymanager.annotation/generated/org.apache.felix.dependencymanager.annotation.jar
+-plugin: org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug
 -sub:  \
 	*.bnd
 -metatype: *
\ No newline at end of file

Added: felix/sandbox/pderop/dependencymanager-samples/settings.gradle
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/settings.gradle?rev=1649219&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/settings.gradle (added)
+++ felix/sandbox/pderop/dependencymanager-samples/settings.gradle Sat Jan  3 16:41:47 2015
@@ -0,0 +1,127 @@
+/*
+ * Master Gradle initialization script
+ *
+ * Depends on bnd_* values from gradle.properties.
+ */
+
+import aQute.bnd.build.Workspace
+
+/* Add bnd as a script dependency */
+buildscript {
+  dependencies {
+    def bndURI = rootDir.toURI().resolve(bnd_jar)
+    if (bndURI.scheme != 'file') {
+      /* If not a local file, copy to a local file in cnf/cache */
+      def cnfCache = mkdir("${rootDir}/${bnd_cnf}/cache")
+      def bndJarFile = new File(cnfCache, 'biz.aQute.bnd.gradle.jar')
+      if (!bndJarFile.exists()) {
+        println "Downloading ${bndURI} to ${bndJarFile} ..."
+        bndURI.toURL().withInputStream { is ->
+          bndJarFile.withOutputStream { os ->
+            def bos = new BufferedOutputStream( os )
+            bos << is
+          }
+        }
+      }
+      bndURI = bndJarFile.toURI()
+    }
+    classpath files(bndURI)
+
+    /* After the rootProject is created, pass URI to projects */
+    gradle.rootProject { rootProject ->
+      rootProject.ext.bndURI = bndURI
+    }
+  }
+}
+
+/* Initialize the bnd workspace */
+def workspace = Workspace.getWorkspace(rootDir, bnd_cnf)
+if (workspace == null) {
+  throw new GradleException("Unable to load workspace ${rootDir}/${bnd_cnf}")
+}
+
+/* Add cnf project to the graph */
+include bnd_cnf
+
+/* Start with the declared build project name */
+def defaultProjectName = bnd_build
+
+/* If in a subproject, use the subproject name */
+for (def currentDir = startParameter.currentDir; currentDir != rootDir; currentDir = currentDir.parentFile)
{
+  defaultProjectName = currentDir.name
+}
+
+/* Build a set of project names we need to include from the specified tasks */
+def projectNames = startParameter.taskNames.collect { taskName ->
+  def elements = taskName.split(':')
+  switch (elements.length) {
+    case 1:
+      return defaultProjectName
+    case 2:
+      return elements[0].empty ? bnd_build : elements[0]
+    default:
+      return elements[0].empty ? elements[1] : elements[0]
+  }
+}.toSet()
+
+/* Include the default project name if in a subproject or no tasks specified */
+if ((startParameter.currentDir != rootDir) || projectNames.empty) {
+  projectNames += defaultProjectName
+}
+
+/* If bnd_build used but declared empty, add all non-private folders of rootDir */
+if (projectNames.remove('')) {
+  rootDir.eachDir {
+    def projectName = it.name
+    if (!projectName.startsWith('.')) {
+      projectNames += projectName
+    }
+  }
+}
+
+/* Add each project and its dependencies to the graph */
+projectNames.each { projectName ->
+  include projectName
+  def project = getBndProject(workspace, projectName)
+  project?.dependson.each {
+    include it.name
+  }
+}
+
+/* Get the bnd project for the specified project name */
+def getBndProject(Workspace workspace, String projectName) {
+  def project = workspace.getProject(projectName)
+  if (project == null) {
+    return null
+  }
+  project.prepare()
+  if (project.isValid()) {
+    return project
+  }
+
+  project.getInfo(workspace, "${rootDir} :")
+  def errorCount = 0
+  project.warnings.each {
+    println "Warning: ${it}"
+  }
+  project.errors.each {
+    println "Error  : ${it}"
+    errorCount++
+  }
+  if (!project.isOk()) {
+    def str = 'even though no errors were reported'
+    if (errorCount == 1) {
+      str = 'one error was reported'
+    } else if (errorCount > 1) {
+      str = "${errorCount} errors were reported"
+    }
+    throw new GradleException("Project ${rootDir}/${projectName} is invalid, ${str}")
+  }
+  throw new GradleException("Project ${rootDir}/${projectName} is not a valid bnd project")
+}
+
+/* After the rootProject is created, set up some properties. */
+gradle.rootProject { rootProject ->
+  rootProject.ext.bndWorkspace = workspace
+  rootProject.ext.cnf = rootProject.project(bnd_cnf)
+}



Mime
View raw message