Skip to content

Commit

Permalink
Merge pull request #53 from jpkrohling/HAWKULAR-286-AccountsInsideEAR
Browse files Browse the repository at this point in the history
HAWKULAR-286 - Accounts deployed inside EAR for alerts.
  • Loading branch information
lucasponce committed Jun 1, 2015
2 parents 7ecc2bc + 8b98edc commit 74bdd83
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 1 deletion.
11 changes: 11 additions & 0 deletions hawkular-alerts-ear/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@
<type>ejb</type>
</dependency>

<dependency>
<groupId>org.hawkular.accounts</groupId>
<artifactId>hawkular-accounts-api</artifactId>
<version>${version.org.hawkular.accounts}</version>
<type>ejb</type>
</dependency>

</dependencies>

<build>
Expand All @@ -86,6 +93,10 @@
<artifactId>hawkular-alerts-rest</artifactId>
<contextRoot>/hawkular/alerts</contextRoot>
</webModule>
<ejbModule>
<groupId>org.hawkular.accounts</groupId>
<artifactId>hawkular-accounts-api</artifactId>
</ejbModule>
</modules>
<fileNameMapping>no-version</fileNameMapping>
</configuration>
Expand Down
1 change: 1 addition & 0 deletions hawkular-alerts-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<groupId>org.hawkular.accounts</groupId>
<artifactId>hawkular-accounts-api</artifactId>
<version>${version.org.hawkular.accounts}</version>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down
32 changes: 32 additions & 0 deletions hawkular-alerts-rest/src/main/webapp/WEB-INF/jboss-ejb3.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2015 Red Hat, Inc. and/or its affiliates
and other contributors as indicated by the @author tags.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<jboss:jboss
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
xmlns:s="urn:security:1.1"
version="3.1" impl-version="2.0">

<assembly-descriptor>
<s:security>
<ejb-name>*</ejb-name>
<s:security-domain>keycloak</s:security-domain>
</s:security>
</assembly-descriptor>
</jboss:jboss>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<version.org.codehaus.groovy.maven>1.0</version.org.codehaus.groovy.maven>
<version.org.drools>6.1.0.Final</version.org.drools>
<version.org.hawkular>1.0.0-SNAPSHOT</version.org.hawkular>
<version.org.hawkular.accounts>1.0.1</version.org.hawkular.accounts>
<version.org.hawkular.accounts>1.0.4</version.org.hawkular.accounts>
<version.org.hawkular.bus>0.0.6</version.org.hawkular.bus>
<version.org.hawkular.nest>0.0.6</version.org.hawkular.nest>
<version.org.hawkular.metrics>0.3.3</version.org.hawkular.metrics>
Expand Down

0 comments on commit 74bdd83

Please sign in to comment.