You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/10/31 00:48:28 UTC
[1/2] git commit: CXF-6073: cxf-wsn installation in Karaf fails
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 3a8c85dc0 -> b12aa387c
CXF-6073: cxf-wsn installation in Karaf fails
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/76864c69
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/76864c69
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/76864c69
Branch: refs/heads/2.7.x-fixes
Commit: 76864c69b8967dc4b7cbba46a5bcffd263ad6b4f
Parents: 3a8c85d
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Thu Oct 30 21:59:48 2014 +0100
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 19:48:21 2014 -0400
----------------------------------------------------------------------
osgi/karaf/features/src/main/resources/features.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/76864c69/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 17ccf9a..a2b80bd 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -361,6 +361,8 @@
cxf.wsn.activemq = vm:localhost
cxf.wsn.rootUrl = http://0.0.0.0:8182
cxf.wsn.context = /wsn
+ cxf.wsn.activemq.username = karaf
+ cxf.wsn.activemq.password = karaf
</config>
<feature version="[5.4,6)">activemq</feature>
[2/2] git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b12aa387
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b12aa387
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b12aa387
Branch: refs/heads/2.7.x-fixes
Commit: b12aa387c22dc9dfffe48a252ad05fb96ae10208
Parents: 76864c6
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 19:48:22 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 19:48:22 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b12aa387/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 29783c8..3d44e6a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2118,6 +2118,7 @@ M e03882f5dc5f3543273aa53d0c9a62bd9ad454b5
M e0be73d83783888e49ad4216f11671fe78c176b7
M e1ef05eb5825ae458d1afadffa737ff7fcd9466f
M e287ef60298137f84537f60816af95ee44ae18eb
+M e29275a20b048bd98f9eaa9b75f7453b26dbdf26
M e2be25572d59a5c3ec3ff333d9a1641c1f3a2e6c
M e35e48b16250868b6b1bfa1bd26506eab902312d
M e3d8ccc09f6c540dc1d377ffb42b2d867ee86ac8