You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2014/11/05 23:24:29 UTC
svn commit: r1636989 - in /felix/sandbox/pderop/dependencymanager-prototype:
./ cnf/ cnf/bin/ cnf/buildrepo/biz.aQute.junit/
cnf/buildrepo/biz.aQute.launcher/ cnf/buildrepo/hamcrest-core/
cnf/buildrepo/junit/ cnf/cache/biz.aQute.junit/ cnf/cache/biz.aQ...
Author: pderop
Date: Wed Nov 5 22:24:27 2014
New Revision: 1636989
URL: http://svn.apache.org/r1636989
Log:
project cleanup (mostly adapted to new bndtools 2.4.0 REL).
Added:
felix/sandbox/pderop/dependencymanager-prototype/.gitignore
felix/sandbox/pderop/dependencymanager-prototype/build.gradle
felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/hamcrest-core/
felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/hamcrest-core/hamcrest-core-1.3.0.jar (with props)
felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/junit/
felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/junit/junit-4.11.0.jar (with props)
felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.junit/
felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.junit/biz.aQute.junit-1.3.0.jar (with props)
felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.junit/biz.aQute.junit-latest.jar (with props)
felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.launcher/
felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.launcher/biz.aQute.launcher-1.4.0.jar (with props)
felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.launcher/biz.aQute.launcher-latest.jar (with props)
felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/junit.bnd
felix/sandbox/pderop/dependencymanager-prototype/cnf/gradle/
felix/sandbox/pderop/dependencymanager-prototype/cnf/gradle/biz.aQute.bnd.gradle.jar (with props)
felix/sandbox/pderop/dependencymanager-prototype/cnf/localrepo/org.apache.felix.http.api/
felix/sandbox/pderop/dependencymanager-prototype/cnf/localrepo/org.apache.felix.http.api/org.apache.felix.http.api-2.3.0.jar (with props)
felix/sandbox/pderop/dependencymanager-prototype/cnf/localrepo/org.apache.felix.http.servlet-api/
felix/sandbox/pderop/dependencymanager-prototype/cnf/localrepo/org.apache.felix.http.servlet-api/org.apache.felix.http.servlet-api-1.0.0.jar (with props)
felix/sandbox/pderop/dependencymanager-prototype/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar (with props)
felix/sandbox/pderop/dependencymanager-prototype/gradle.properties
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/test/
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/test/
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/test/.gitignore
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/test/.gitignore
felix/sandbox/pderop/dependencymanager-prototype/settings.gradle
Removed:
felix/sandbox/pderop/dependencymanager-prototype/cnf/bin/
felix/sandbox/pderop/dependencymanager-prototype/cnf/build-template.xml
felix/sandbox/pderop/dependencymanager-prototype/cnf/build.properties
felix/sandbox/pderop/dependencymanager-prototype/cnf/build.xml
felix/sandbox/pderop/dependencymanager-prototype/cnf/localrepo/org.mockito.mockito-all/
felix/sandbox/pderop/dependencymanager-prototype/cnf/plugins/biz.aQute.bnd/
felix/sandbox/pderop/dependencymanager-prototype/cnf/plugins/biz.aQute.repository/biz.aQute.repository-2.1.0.jar
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/build.xml
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/bin/
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/bin_test/
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bin/
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/build.xml
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/build.xml
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/build.xml
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/build.xml
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/bin/
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/bin_test/
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/build.xml
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/bin/
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/build.xml
Modified:
felix/sandbox/pderop/dependencymanager-prototype/cnf/.gitignore
felix/sandbox/pderop/dependencymanager-prototype/cnf/build.bnd
felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-latest.jar
felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-latest.jar
felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/pluginpaths.bnd
felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/repositories.bnd
felix/sandbox/pderop/dependencymanager-prototype/cnf/localrepo/index.xml
felix/sandbox/pderop/dependencymanager-prototype/cnf/localrepo/index.xml.sha
felix/sandbox/pderop/dependencymanager-prototype/cnf/releaserepo/index.xml
felix/sandbox/pderop/dependencymanager-prototype/cnf/releaserepo/index.xml.sha
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/.classpath
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/.gitignore
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/bnd.bnd
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/.classpath
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/.settings/org.eclipse.jdt.core.prefs
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bnd.bnd
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/.gitignore
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/.gitignore
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/bnd.bnd
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/.classpath
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/.gitignore
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/bnd.bnd
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/.gitignore
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/bnd.bnd
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/.gitignore
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/bnd.bnd
Added: felix/sandbox/pderop/dependencymanager-prototype/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/.gitignore?rev=1636989&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/.gitignore (added)
+++ felix/sandbox/pderop/dependencymanager-prototype/.gitignore Wed Nov 5 22:24:27 2014
@@ -0,0 +1,3 @@
+/.gradle/
+/reports/
+/generated/
Added: felix/sandbox/pderop/dependencymanager-prototype/build.gradle
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/build.gradle?rev=1636989&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/build.gradle (added)
+++ felix/sandbox/pderop/dependencymanager-prototype/build.gradle Wed Nov 5 22:24:27 2014
@@ -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'
+ }
+}
Modified: felix/sandbox/pderop/dependencymanager-prototype/cnf/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/.gitignore?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/cnf/.gitignore (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/cnf/.gitignore Wed Nov 5 22:24:27 2014
@@ -1,2 +1,3 @@
/bin/
+/generated/
/cache/
Modified: felix/sandbox/pderop/dependencymanager-prototype/cnf/build.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/build.bnd?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/cnf/build.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/cnf/build.bnd Wed Nov 5 22:24:27 2014
@@ -16,10 +16,12 @@
#project.output: ${p-output}
#project.testpath: ${p-testpath;:}
-#-verbose: true
+#-verbose: false
#project: ${basedir}
#src: src
#bin: bin
+#testsrc: test
+#testbin: bin_test
#target-dir: generated
#target: ${project}/${target-dir}
#build: ${workspace}/cnf
@@ -30,10 +32,8 @@
## Java Compiler Options
#java: java
#javac: javac
-
javac.source: 1.7
javac.target: 1.7
-
#javac.debug: on
## Bnd Options
@@ -47,6 +47,11 @@ javac.target: 1.7
# -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
Modified: felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-latest.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-latest.jar?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-latest.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-latest.jar?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
Binary files - no diff available.
Added: felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/hamcrest-core/hamcrest-core-1.3.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/hamcrest-core/hamcrest-core-1.3.0.jar?rev=1636989&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/hamcrest-core/hamcrest-core-1.3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/zip
Added: felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/junit/junit-4.11.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/junit/junit-4.11.0.jar?rev=1636989&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/pderop/dependencymanager-prototype/cnf/buildrepo/junit/junit-4.11.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/zip
Added: felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.junit/biz.aQute.junit-1.3.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.junit/biz.aQute.junit-1.3.0.jar?rev=1636989&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.junit/biz.aQute.junit-1.3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/zip
Added: felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.junit/biz.aQute.junit-latest.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.junit/biz.aQute.junit-latest.jar?rev=1636989&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.junit/biz.aQute.junit-latest.jar
------------------------------------------------------------------------------
svn:mime-type = application/zip
Added: felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.launcher/biz.aQute.launcher-1.4.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.launcher/biz.aQute.launcher-1.4.0.jar?rev=1636989&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.launcher/biz.aQute.launcher-1.4.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/zip
Added: felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.launcher/biz.aQute.launcher-latest.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.launcher/biz.aQute.launcher-latest.jar?rev=1636989&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/pderop/dependencymanager-prototype/cnf/cache/biz.aQute.launcher/biz.aQute.launcher-latest.jar
------------------------------------------------------------------------------
svn:mime-type = application/zip
Added: felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/junit.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/junit.bnd?rev=1636989&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/junit.bnd (added)
+++ felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/junit.bnd Wed Nov 5 22:24:27 2014
@@ -0,0 +1,3 @@
+junit:\
+ junit;version=latest,\
+ hamcrest-core;version=latest
Modified: felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/pluginpaths.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/pluginpaths.bnd?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/pluginpaths.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/pluginpaths.bnd Wed Nov 5 22:24:27 2014
@@ -1 +1,2 @@
--pluginpath: ${plugin-dir}/biz.aQute.repository/biz.aQute.repository-2.1.0.jar
+-pluginpath:\
+ ${plugin-dir}/biz.aQute.repository/biz.aQute.repository.jar
\ No newline at end of file
Modified: felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/repositories.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/repositories.bnd?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/repositories.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/cnf/ext/repositories.bnd Wed Nov 5 22:24:27 2014
@@ -1,11 +1,12 @@
-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://github.com/bndtools/bundle-hub/raw/master/index.xml.gz,\
- aQute.lib.deployer.FileRepo; name=Build; location=${workspace}/cnf/buildrepo,\
- aQute.bnd.deployer.repository.FixedIndexedRepo; name=Felix Obr; locations=http://felix.apache.org/obr/releases.xml
-
+ 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,\
+ aQute.bnd.deployer.repository.FixedIndexedRepo; name=Felix Obr; locations=http://felix.apache.org/obr/releases.xml
+
#-baseline: *
--releaserepo: Release
#-baselinerepo: Felix Obr
--sources: false
+#-sources: false
+-releaserepo: Release
+
Added: felix/sandbox/pderop/dependencymanager-prototype/cnf/gradle/biz.aQute.bnd.gradle.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/gradle/biz.aQute.bnd.gradle.jar?rev=1636989&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/pderop/dependencymanager-prototype/cnf/gradle/biz.aQute.bnd.gradle.jar
------------------------------------------------------------------------------
svn:mime-type = application/zip
Modified: felix/sandbox/pderop/dependencymanager-prototype/cnf/localrepo/index.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/localrepo/index.xml?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/sandbox/pderop/dependencymanager-prototype/cnf/localrepo/index.xml.sha
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/localrepo/index.xml.sha?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/cnf/localrepo/index.xml.sha (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/cnf/localrepo/index.xml.sha Wed Nov 5 22:24:27 2014
@@ -1 +1 @@
-1396353437f0b897030ed543625b1ee24411c70269ce1dc67876f0f56f9a5bd5
\ No newline at end of file
+928ec126399e3d77047781c32dfacbf135702a25b2315d74087906102aacb33f
\ No newline at end of file
Added: felix/sandbox/pderop/dependencymanager-prototype/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-prototype/cnf/localrepo/org.apache.felix.http.api/org.apache.felix.http.api-2.3.0.jar?rev=1636989&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/pderop/dependencymanager-prototype/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-prototype/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-prototype/cnf/localrepo/org.apache.felix.http.servlet-api/org.apache.felix.http.servlet-api-1.0.0.jar?rev=1636989&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/pderop/dependencymanager-prototype/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-prototype/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar?rev=1636989&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/pderop/dependencymanager-prototype/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar
------------------------------------------------------------------------------
svn:mime-type = application/zip
Modified: felix/sandbox/pderop/dependencymanager-prototype/cnf/releaserepo/index.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/releaserepo/index.xml?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/sandbox/pderop/dependencymanager-prototype/cnf/releaserepo/index.xml.sha
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/cnf/releaserepo/index.xml.sha?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/cnf/releaserepo/index.xml.sha (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/cnf/releaserepo/index.xml.sha Wed Nov 5 22:24:27 2014
@@ -1 +1 @@
-97cfedf38e6ba2ee56e9575a1d7dcfcf57ae80625d5c88e71fbb6e78515c633d
\ No newline at end of file
+ebca8e263dc50b66bf38f211c0615eb96f79fe6384468a74cc36ae9737b97b93
\ No newline at end of file
Added: felix/sandbox/pderop/dependencymanager-prototype/gradle.properties
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/gradle.properties?rev=1636989&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/gradle.properties (added)
+++ felix/sandbox/pderop/dependencymanager-prototype/gradle.properties Wed Nov 5 22:24:27 2014
@@ -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-prototype/org.apache.felix.dependencymanager.annotation/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/.classpath?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/.gitignore?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/.gitignore (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/.gitignore Wed Nov 5 22:24:27 2014
@@ -1,3 +1,3 @@
-/generated/
/bin/
/bin_test/
+/generated/
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/bnd.bnd?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/bnd.bnd Wed Nov 5 22:24:27 2014
@@ -1,4 +1,4 @@
-Bundle-Version:0.0.0.${tstamp}
+Bundle-Version:4.0.0
-buildpath: \
osgi.core;version=4.2,\
de.twentyeleven.skysail.org.json-osgi;version=20080701.0,\
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/.classpath?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/.settings/org.eclipse.jdt.core.prefs?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/.settings/org.eclipse.jdt.core.prefs (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/.settings/org.eclipse.jdt.core.prefs Wed Nov 5 22:24:27 2014
@@ -1,6 +1,5 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
Added: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/test/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/test/.gitignore?rev=1636989&view=auto
==============================================================================
(empty)
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bnd.bnd?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bnd.bnd Wed Nov 5 22:24:27 2014
@@ -1,22 +1,20 @@
-runbundles: \
org.apache.felix.metatype;version=1.0.4,\
- org.mockito.mockito-all;version=1.9.0,\
org.apache.felix.gogo.runtime;version=0.10.0,\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.log;version=1.0.1,\
org.apache.felix.configadmin;version=1.8.1
--runee:JavaSE-1.7
--runvm:-ea
--runfw:org.apache.felix.framework
+-runee: JavaSE-1.7
+-runvm: -ea
+-runfw: org.apache.felix.framework
-buildpath: \
osgi.core;version='[4.2,5)',\
- org.mockito.mockito-all,\
org.apache.felix.gogo.runtime;version=0.10,\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
osgi.cmpn;version=4.2,\
- biz.aQute.junit;version=999999999.0
+ ${junit}
-runsystempackages: \
sun.reflect
-sub: \
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/.gitignore?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/.gitignore (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/.gitignore Wed Nov 5 22:24:27 2014
@@ -1,2 +1,2 @@
-/generated/
/bin/
+/generated/
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd Wed Nov 5 22:24:27 2014
@@ -4,7 +4,7 @@
org.apache.felix.dependencymanager.itest.api;version=latest,\
org.apache.felix.dependencymanager.annotation;version=latest,\
osgi.cmpn;version=4.2,\
- junit.osgi;version=3.8,\
+ ${junit},\
org.apache.felix.dependencymanager.runtime;version=latest
-runbundles: \
org.apache.felix.configadmin;version=1.8.0,\
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/.gitignore?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/.gitignore (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/.gitignore Wed Nov 5 22:24:27 2014
@@ -1,3 +1,3 @@
-/generated/
/bin/
/bin_test/
+/generated/
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/bnd.bnd?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/bnd.bnd Wed Nov 5 22:24:27 2014
@@ -1,13 +1,13 @@
Bundle-Version: 4.0.0
-Private-Package: \
- org.apache.felix.dm.runtime,\
- org.json
-buildpath: \
osgi.core;version=4.2,\
osgi.cmpn;version=4.2,\
org.apache.felix.dependencymanager;version=latest,\
de.twentyeleven.skysail.org.json-osgi;version=20080701.0
Bundle-Activator:org.apache.felix.dm.runtime.Activator
+Private-Package: \
+ org.apache.felix.dm.runtime,\
+ org.json
Export-Package: \
org.apache.felix.dm.runtime.api
Provide-Capability: osgi.extender; osgi.extender="org.apache.felix.dependencymanager.runtime";\
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/.classpath?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/.gitignore?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/.gitignore (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/.gitignore Wed Nov 5 22:24:27 2014
@@ -1,3 +1,3 @@
-/generated/
/bin/
/bin_test/
+/generated/
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/bnd.bnd?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/bnd.bnd Wed Nov 5 22:24:27 2014
@@ -1,4 +1,4 @@
-Bundle-Version: 1.0.0.${tstamp}
+Bundle-Version: 4.0.0
-buildpath: \
org.apache.felix.dependencymanager;version=latest,\
osgi.core;version=4.2,\
@@ -8,13 +8,13 @@ Bundle-Version: 1.0.0.${tstamp}
biz.aQute.bnd.annotation;version=2.3,\
org.apache.felix.dependencymanager.runtime;version=latest
-runfw: org.apache.felix.framework;version='[4.4.0,4.4.0]'
--runee: OSGi/Minimum-1.1
+-runee: JavaSE-1.7
-runbundles: \
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.metatype;version=1.0.4,\
org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.12.0,\
- org.apache.felix.gogo.runtime;version=0.10.0,\
+ org.apache.felix.gogo.command;version=0.14.0,\
+ org.apache.felix.gogo.runtime;version=0.12.0,\
org.apache.felix.gogo.shell;version=0.10.0,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
@@ -23,10 +23,12 @@ Bundle-Version: 1.0.0.${tstamp}
org.apache.felix.dependencymanager.samples.conf;version=latest,\
org.apache.felix.configadmin;version=1.8.0,\
org.apache.felix.dependencymanager.samples.device.api;version=latest,\
- org.apache.felix.webconsole;version=4.2.2,\
- org.apache.felix.http.jetty;version=2.0.4,\
org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0
+ biz.aQute.bndlib;version=2.3.0,\
+ org.apache.felix.webconsole;version=4.2.2,\
+ org.apache.felix.http.api;version=2.3.0,\
+ org.apache.felix.http.servlet-api;version=1.0.0,\
+ org.apache.felix.http.jetty;version=2.3.0
-runproperties: \
org.apache.felix.dependencymanager.parallel='!org.apache.felix.dependencymanager.samples.tpool, *',\
org.apache.felix.dependencymanager.runtime.log=warn,\
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/.gitignore?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/.gitignore (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/.gitignore Wed Nov 5 22:24:27 2014
@@ -1,3 +1,3 @@
-/generated/
/bin/
/bin_test/
+/generated/
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/bnd.bnd?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/bnd.bnd Wed Nov 5 22:24:27 2014
@@ -4,7 +4,7 @@
org.mockito.mockito-all,\
osgi.cmpn,\
org.apache.felix.dependencymanager;version=latest,\
- biz.aQute.junit;version=999999999.0
+ biz.aQute.junit
Private-Package: \
org.apache.felix.dm.shell
Bundle-Activator:org.apache.felix.dm.shell.Activator
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/.gitignore?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/.gitignore (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/.gitignore Wed Nov 5 22:24:27 2014
@@ -1,2 +1,3 @@
/bin/
+/bin_test/
/generated/
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/bnd.bnd?rev=1636989&r1=1636988&r2=1636989&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/bnd.bnd Wed Nov 5 22:24:27 2014
@@ -2,7 +2,7 @@
osgi.core;version=4.2,\
osgi.cmpn;version=4.2,\
org.mockito.mockito-all;version=1.9,\
- biz.aQute.junit;version=999999999.0
+ ${junit}
Private-Package: \
org.apache.felix.dm.impl,\
org.apache.felix.dm.impl.index,\
Added: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/test/.gitignore
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/test/.gitignore?rev=1636989&view=auto
==============================================================================
(empty)
Added: felix/sandbox/pderop/dependencymanager-prototype/settings.gradle
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/settings.gradle?rev=1636989&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/settings.gradle (added)
+++ felix/sandbox/pderop/dependencymanager-prototype/settings.gradle Wed Nov 5 22:24:27 2014
@@ -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)
+}