You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2018/08/17 20:05:44 UTC
[karaf] branch master updated: Fix karaf-profile-example
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new e1a4ede Fix karaf-profile-example
e1a4ede is described below
commit e1a4edeed1d7f72e3c68b70270ce867e4e4dea1c
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Fri Aug 17 22:05:33 2018 +0200
Fix karaf-profile-example
---
examples/karaf-profile-example/README.md | 10 +++++-----
.../karaf-profile-example-dynamic/pom.xml | 10 +++++-----
.../src/main/resources/loanbroker/bank1.profile/profile.cfg | 2 +-
.../src/main/resources/loanbroker/bank2.profile/profile.cfg | 2 +-
.../src/main/resources/loanbroker/bank3.profile/profile.cfg | 2 +-
.../src/main/resources/loanbroker/broker.profile/profile.cfg | 2 +-
.../karaf-profile-example/karaf-profile-example-static/pom.xml | 10 +++++-----
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/examples/karaf-profile-example/README.md b/examples/karaf-profile-example/README.md
index b839dd8..bc2ca64 100644
--- a/examples/karaf-profile-example/README.md
+++ b/examples/karaf-profile-example/README.md
@@ -54,10 +54,10 @@ mvn clean install
The `karaf-profile-example-dynamic` module uses the profile registry (using `<profileUri/>`) to create an assembly applying profiles as boot profiles:
* `karaf`
-* `example-loanbroker-bank1`
-* `example-loanbroker-bank2`
-* `example-loanbroker-bank3`
-* `example-loanbroker-broker`
+* `loanbroker-bank1`
+* `loanbroker-bank2`
+* `loanbroker-bank3`
+* `loanbroker-broker`
* `activemq-broker`
To build the distribution, simply do:
@@ -89,4 +89,4 @@ On a running Karaf instance, you can install the `profile` feature using:
karaf@root()> feature:install profile
```
-Then, you have new commands available in the shell, allowing you to create, edit, apply profiles.
\ No newline at end of file
+Then, you have new commands available in the shell, allowing you to create, edit, apply profiles.
diff --git a/examples/karaf-profile-example/karaf-profile-example-dynamic/pom.xml b/examples/karaf-profile-example/karaf-profile-example-dynamic/pom.xml
index 0b7579d..fc09612 100644
--- a/examples/karaf-profile-example/karaf-profile-example-dynamic/pom.xml
+++ b/examples/karaf-profile-example/karaf-profile-example-dynamic/pom.xml
@@ -106,17 +106,17 @@
</executions>
<configuration>
<profilesUris>
- <uri>jar:mvn:org.apache.karaf.demos.profiles/registry/${project.version}!/</uri>
+ <uri>jar:mvn:org.apache.karaf.examples/karaf-profile-example-registry/${project.version}!/</uri>
</profilesUris>
<bootFeatures>
<feature>deployer</feature>
</bootFeatures>
<bootProfiles>
<profile>karaf</profile>
- <profile>example-loanbroker-bank1</profile>
- <profile>example-loanbroker-bank2</profile>
- <profile>example-loanbroker-bank3</profile>
- <profile>example-loanbroker-broker</profile>
+ <profile>loanbroker-bank1</profile>
+ <profile>loanbroker-bank2</profile>
+ <profile>loanbroker-bank3</profile>
+ <profile>loanbroker-broker</profile>
<profile>activemq-broker</profile>
</bootProfiles>
</configuration>
diff --git a/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/bank1.profile/profile.cfg b/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/bank1.profile/profile.cfg
index 0fe0414..7ca25e0 100644
--- a/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/bank1.profile/profile.cfg
+++ b/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/bank1.profile/profile.cfg
@@ -15,6 +15,6 @@
# limitations under the License.
#
-attribute.parents = example-loanbroker-base
+attribute.parents = loanbroker-base
bundle.profile-bank1.xml=blueprint:profile:bank1.xml
diff --git a/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/bank2.profile/profile.cfg b/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/bank2.profile/profile.cfg
index 72c2ddd..9e0cedd 100644
--- a/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/bank2.profile/profile.cfg
+++ b/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/bank2.profile/profile.cfg
@@ -15,6 +15,6 @@
# limitations under the License.
#
-attribute.parents = example-loanbroker-base
+attribute.parents = loanbroker-base
bundle.profile-bank2.xml=blueprint:profile:bank2.xml
diff --git a/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/bank3.profile/profile.cfg b/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/bank3.profile/profile.cfg
index cd37032..81aa8d1 100644
--- a/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/bank3.profile/profile.cfg
+++ b/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/bank3.profile/profile.cfg
@@ -15,6 +15,6 @@
# limitations under the License.
#
-attribute.parents = example-loanbroker-base
+attribute.parents = loanbroker-base
bundle.profile-bank3.xml=blueprint:profile:bank3.xml
diff --git a/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/broker.profile/profile.cfg b/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/broker.profile/profile.cfg
index 74523af..003e96c 100644
--- a/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/broker.profile/profile.cfg
+++ b/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/loanbroker/broker.profile/profile.cfg
@@ -15,6 +15,6 @@
# limitations under the License.
#
-attribute.parents = example-loanbroker-base
+attribute.parents = loanbroker-base
bundle.profile-loanBroker.xml = blueprint:profile:loanBroker.xml
diff --git a/examples/karaf-profile-example/karaf-profile-example-static/pom.xml b/examples/karaf-profile-example/karaf-profile-example-static/pom.xml
index 4b88269..4ebacb0 100644
--- a/examples/karaf-profile-example/karaf-profile-example-static/pom.xml
+++ b/examples/karaf-profile-example/karaf-profile-example-static/pom.xml
@@ -122,14 +122,14 @@
<useReferenceUrls>true</useReferenceUrls>
<environment>static</environment>
<profilesUris>
- <uri>jar:mvn:org.apache.karaf.demos.profiles/registry/${project.version}!/</uri>
+ <uri>jar:mvn:org.apache.karaf.examples/karaf-profile-example-registry/${project.version}!/</uri>
</profilesUris>
<startupProfiles>
<profile>karaf</profile>
- <profile>example-loanbroker-bank1</profile>
- <profile>example-loanbroker-bank2</profile>
- <profile>example-loanbroker-bank3</profile>
- <profile>example-loanbroker-broker</profile>
+ <profile>loanbroker-bank1</profile>
+ <profile>loanbroker-bank2</profile>
+ <profile>loanbroker-bank3</profile>
+ <profile>loanbroker-broker</profile>
<profile>activemq-broker</profile>
</startupProfiles>
<blacklistedFeatures>