You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ci...@apache.org on 2016/01/18 01:30:55 UTC
[1/2] incubator-brooklyn git commit: [BROOKLYN-183] Add karaf features
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master e431e6ad3 -> f7cf0bc20
[BROOKLYN-183] Add karaf features
Add brooklyn-software-base, brooklyn-software-winrm and brooklyn-policy features.
Ignore for now python imports in brooklyn-software-base.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c022c6ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c022c6ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c022c6ef
Branch: refs/heads/master
Commit: c022c6ef5450ed790632076711bafd365ff974d2
Parents: e431e6a
Author: Cristian Tarsoaga <cr...@gmail.com>
Authored: Sat Jan 16 03:26:52 2016 +0200
Committer: Cristian Tarsoaga <cr...@gmail.com>
Committed: Sat Jan 16 03:33:26 2016 +0200
----------------------------------------------------------------------
.../karaf/features/src/main/feature/feature.xml | 18 ++++++++++++++++++
brooklyn-server/software/base/pom.xml | 4 ++++
2 files changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c022c6ef/brooklyn-server/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/karaf/features/src/main/feature/feature.xml b/brooklyn-server/karaf/features/src/main/feature/feature.xml
index 384bc7d..49a90e6 100644
--- a/brooklyn-server/karaf/features/src/main/feature/feature.xml
+++ b/brooklyn-server/karaf/features/src/main/feature/feature.xml
@@ -197,4 +197,22 @@
<!--<feature version="${project.version}">brooklyn-core</feature>-->
</feature>
+ <feature name="brooklyn-software-winrm" version="${project.version}" description="Brooklyn WinRM Software Entities">
+ <bundle>mvn:org.apache.brooklyn/brooklyn-software-winrm/${project.version}</bundle>
+ <feature>brooklyn-core</feature>
+ <bundle dependency="true">wrap:mvn:io.cloudsoft.windows/winrm4j/${winrm4j.version}</bundle>
+ </feature>
+
+ <feature name="brooklyn-policy" version="${project.version}" description="Brooklyn Policies">
+ <bundle>mvn:org.apache.brooklyn/brooklyn-policy/${project.version}</bundle>
+ <feature>brooklyn-core</feature>
+ </feature>
+
+ <feature name="brooklyn-software-base" version="${project.version}" description="Brooklyn Software Base">
+ <bundle>mvn:org.apache.brooklyn/brooklyn-software-base/${project.version}</bundle>
+ <feature>brooklyn-software-winrm</feature>
+ <feature>brooklyn-policy</feature>
+ <!-- python dependency required but not supported since karaf cannot handle its runtime bindings -->
+ </feature>
+
</features>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c022c6ef/brooklyn-server/software/base/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/software/base/pom.xml b/brooklyn-server/software/base/pom.xml
index 556e982..51ae966 100644
--- a/brooklyn-server/software/base/pom.xml
+++ b/brooklyn-server/software/base/pom.xml
@@ -163,6 +163,10 @@
<configuration>
<instructions>
<Include-Resource>{maven-resources}, target/classes/brooklyn-jmxmp-agent-shaded-${project.version}.jar, target/classes/brooklyn-jmxrmi-agent-${project.version}.jar</Include-Resource>
+ <Import-Package>
+ !org.python.core,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
[2/2] incubator-brooklyn git commit: This closes #1152
Posted by ci...@apache.org.
This closes #1152
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f7cf0bc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f7cf0bc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f7cf0bc2
Branch: refs/heads/master
Commit: f7cf0bc20a141b28ff59bed91bb31f404ff34e45
Parents: e431e6a c022c6e
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Mon Jan 18 02:30:04 2016 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Mon Jan 18 02:30:04 2016 +0200
----------------------------------------------------------------------
.../karaf/features/src/main/feature/feature.xml | 18 ++++++++++++++++++
brooklyn-server/software/base/pom.xml | 4 ++++
2 files changed, 22 insertions(+)
----------------------------------------------------------------------