Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin' into mazz/json
Browse files Browse the repository at this point in the history
Conflicts:
	pom.xml
  • Loading branch information
jmazzitelli committed Apr 20, 2015
2 parents cb73de7 + b752723 commit ee47524
Show file tree
Hide file tree
Showing 40 changed files with 1,798 additions and 326 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ env:
- secure: BADgz+otMMO+gUlFNduU/mgFm1dOfv2ZWAYD3nO1nEwu7Y1QVUsqimHdlqntUcinILDVeD33oT27kElERvr7KyjfDEPSDAVUg5Y/5soezg/tBu0zi3iodAP2GynOMohS/Rfm4+3ajWuEe/Y2SYjFXgldMR9qjP+/31FsVtW8Op0=

after_success:
- test "${TRAVIS_BRANCH}" = "master" && test "${TRAVIS_PULL_REQUEST}" = "false" && mvn -s .travis.maven.settings.xml deploy -DskipTests
- test "${TRAVIS_BRANCH}" = "master" && test "${TRAVIS_PULL_REQUEST}" = "false" && mvn -s .travis.maven.settings.xml deploy -DskipTests && curl --data "build=true" -X POST https://registry.hub.docker.com/u/hawkular/hawkular/trigger/a6f68889-7d87-4b50-9d60-d402a4051612/
75 changes: 71 additions & 4 deletions kettle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,31 @@
<properties>
<kettle.build.type>production</kettle.build.type>
<nest.dist.zip.root.dir>wildfly-${version.org.wildfly}</nest.dist.zip.root.dir>
<hawkular.realm.template>hawkular-realm.json</hawkular.realm.template>

<checkstyle.suppressions.file>${basedir}/src/main/scripts/checkstyle-suppressions.xml</checkstyle.suppressions.file>

<!-- The versions of the components that go into our integration distribution -->
<version.org.hawkular.agent>1.0.0-SNAPSHOT</version.org.hawkular.agent>
<version.org.hawkular.nest>1.0.0-SNAPSHOT</version.org.hawkular.nest>
<version.org.hawkular.inventory>1.0.0-SNAPSHOT</version.org.hawkular.inventory>
<version.org.hawkular.inventory>0.0.1-SNAPSHOT</version.org.hawkular.inventory>
<version.org.hawkular.alerts>1.0.0-SNAPSHOT</version.org.hawkular.alerts>
<version.org.hawkular.metrics>0.3.0-SNAPSHOT</version.org.hawkular.metrics>
<version.org.hawkular.metrics>0.3.2-SNAPSHOT</version.org.hawkular.metrics>
<version.org.hawkular.console>1.0.0-SNAPSHOT</version.org.hawkular.console>
<version.org.hawkular.accounts>1.0.0-SNAPSHOT</version.org.hawkular.accounts>
<version.org.hawkular.pinger>1.0.0-SNAPSHOT</version.org.hawkular.pinger>
<version.org.hawkular.availCreator>1.0.0-SNAPSHOT</version.org.hawkular.availCreator>
<version.org.keycloak>1.1.0.Final</version.org.keycloak>
</properties>

<dependencies>
<dependency>
<groupId>org.hawkular.agent</groupId>
<artifactId>hawkular-monitor</artifactId>
<version>${version.org.hawkular.agent}</version>
<classifier>module</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.hawkular.nest</groupId>
<artifactId>hawkular-nest-distro</artifactId>
Expand All @@ -62,7 +75,13 @@
<dependency>
<groupId>org.hawkular</groupId>
<artifactId>hawkular-pinger</artifactId>
<version>${version.org.hawkular.inventory}</version>
<version>${version.org.hawkular.pinger}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.hawkular</groupId>
<artifactId>hawkular-avail-creator</artifactId>
<version>${version.org.hawkular.availCreator}</version>
<type>war</type>
</dependency>
<dependency>
Expand All @@ -79,7 +98,7 @@
</dependency>
<dependency>
<groupId>org.hawkular.alerts</groupId>
<artifactId>hawkular-notifiers-email</artifactId>
<artifactId>hawkular-actions-email</artifactId>
<version>${version.org.hawkular.alerts}</version>
<type>war</type>
</dependency>
Expand All @@ -101,6 +120,21 @@
<version>${version.org.hawkular.console}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.hawkular.accounts</groupId>
<artifactId>hawkular-accounts</artifactId>
<version>${version.org.hawkular.accounts}</version>
<type>war</type>
</dependency>

<!-- Keycloak-related dependencies -->
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-wildfly-adapter-dist</artifactId>
<version>${version.org.keycloak}</version>
<type>zip</type>
</dependency>

</dependencies>

<build>
Expand All @@ -119,6 +153,7 @@
<configuration>
<outputDirectory>${basedir}/target/nest</outputDirectory>
<includeArtifactIds>hawkular-nest-distro</includeArtifactIds>
<!-- just unpack the config file - its all we need -->
<includes>*/standalone/configuration/standalone.xml</includes>
</configuration>
</execution>
Expand Down Expand Up @@ -174,6 +209,10 @@
<name>kettle.build.type</name>
<value>${kettle.build.type}</value>
</parameter>
<parameter>
<name>uuid.hawkular.accounts.backend</name>
<value>${uuid.hawkular.accounts.backend}</value>
</parameter>
</parameters>
</transformationSet>
</transformationSets>
Expand Down Expand Up @@ -215,6 +254,32 @@
</resources>
</configuration>
</plugin>

<!-- Generate some keys for Keycloak integration, so that we don't ship with default credentials -->
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>1.3</version>
<executions>
<execution>
<id>set-custom-property</id>
<phase>initialize</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<source>
import java.util.UUID
def uuidBackend = UUID.randomUUID().toString()
def uuidUi = UUID.randomUUID().toString()
project.properties.setProperty('uuid.hawkular.accounts.backend', uuidBackend.toString())
project.properties.setProperty('uuid.hawkular.ui', uuidUi.toString())
</source>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand All @@ -224,6 +289,8 @@
<id>dev</id>
<properties>
<kettle.build.type>dev</kettle.build.type>
<!-- This special realm for dev purposes has a default user 'jdoe' with password 'password' -->
<hawkular.realm.template>hawkular-realm-for-dev.json</hawkular.realm.template>
</properties>
<build>
<plugins>
Expand Down
90 changes: 90 additions & 0 deletions kettle/src/main/resources/bin/standalone.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
#
# 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.
#

## -*- shell-script -*- ######################################################
## ##
## JBoss Bootstrap Script Configuration ##
## ##
##############################################################################

#
# This file is optional; it may be removed if not needed.
#

#
# Specify the maximum file descriptor limit, use "max" or "maximum" to use
# the default, as queried by the system.
#
# Defaults to "maximum"
#
#MAX_FD="maximum"

#
# Specify the profiler configuration file to load.
#
# Default is to not load profiler configuration file.
#
#PROFILER=""

#
# Specify the location of the Java home directory. If set then $JAVA will
# be defined to $JAVA_HOME/bin/java, else $JAVA will be "java".
#
#JAVA_HOME="/opt/java/jdk"

#
# Specify the exact Java VM executable to use.
#
#JAVA=""

if [ "x$JBOSS_MODULES_SYSTEM_PKGS" = "x" ]; then
JBOSS_MODULES_SYSTEM_PKGS="org.jboss.byteman"
fi

# Uncomment the following line to prevent manipulation of JVM options
# by shell scripts.
#
#PRESERVE_JAVA_OPTS=true

#
# Specify options to pass to the Java VM.
#
if [ "x$JAVA_OPTS" = "x" ]; then
JAVA_OPTS="-Xms64m -Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true"
JAVA_OPTS="$JAVA_OPTS -Djboss.modules.system.pkgs=$JBOSS_MODULES_SYSTEM_PKGS -Djava.awt.headless=true"
else
echo "JAVA_OPTS already set in environment; overriding default settings with values: $JAVA_OPTS"
fi

# Sample JPDA settings for remote socket debugging
#JAVA_OPTS="$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n"

# Sample JPDA settings for shared memory debugging
#JAVA_OPTS="$JAVA_OPTS -agentlib:jdwp=transport=dt_shmem,server=y,suspend=n,address=jboss"

# Uncomment to not use JBoss Modules lockless mode
#JAVA_OPTS="$JAVA_OPTS -Djboss.modules.lockless=false"

# Uncomment to gather JBoss Modules metrics
#JAVA_OPTS="$JAVA_OPTS -Djboss.modules.metrics=true"

# Uncomment this in order to be able to run WildFly on FreeBSD
# when you get "epoll_create function not implemented" message in dmesg output
#JAVA_OPTS="$JAVA_OPTS -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.PollSelectorProvider"

# Import our realm into Keycloak
JAVA_OPTS="$JAVA_OPTS -Dkeycloak.import=${JBOSS_HOME}/standalone/configuration/hawkular-realm.json"
87 changes: 87 additions & 0 deletions kettle/src/main/resources/bin/standalone.conf.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
@REM
@REM Copyright 2015 Red Hat, Inc. and/or its affiliates
@REM and other contributors as indicated by the @author tags.
@REM
@REM Licensed under the Apache License, Version 2.0 (the "License");
@REM you may not use this file except in compliance with the License.
@REM You may obtain a copy of the License at
@REM
@REM http://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing, software
@REM distributed under the License is distributed on an "AS IS" BASIS,
@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@REM See the License for the specific language governing permissions and
@REM limitations under the License.
@REM

rem ### -*- batch file -*- ######################################################
rem # ##
rem # JBoss Bootstrap Script Configuration ##
rem # ##
rem #############################################################################

rem # $Id: run.conf.bat 88820 2009-05-13 15:25:44Z dimitris@jboss.org $

rem #
rem # This batch file is executed by run.bat to initialize the environment
rem # variables that run.bat uses. It is recommended to use this file to
rem # configure these variables, rather than modifying run.bat itself.
rem #

rem Uncomment the following line to disable manipulation of JAVA_OPTS (JVM parameters)
rem set PRESERVE_JAVA_OPTS=true

if not "x%JAVA_OPTS%" == "x" (
echo "JAVA_OPTS already set in environment; overriding default settings with values: %JAVA_OPTS%"
goto JAVA_OPTS_SET
)

rem #
rem # Specify the JBoss Profiler configuration file to load.
rem #
rem # Default is to not load a JBoss Profiler configuration file.
rem #
rem set "PROFILER=%JBOSS_HOME%\bin\jboss-profiler.properties"

rem #
rem # Specify the location of the Java home directory (it is recommended that
rem # this always be set). If set, then "%JAVA_HOME%\bin\java" will be used as
rem # the Java VM executable; otherwise, "%JAVA%" will be used (see below).
rem #
rem set "JAVA_HOME=C:\opt\jdk1.6.0_23"

rem #
rem # Specify the exact Java VM executable to use - only used if JAVA_HOME is
rem # not set. Default is "java".
rem #
rem set "JAVA=C:\opt\jdk1.6.0_23\bin\java"

rem #
rem # Specify options to pass to the Java VM. Note, there are some additional
rem # options that are always passed by run.bat.
rem #

rem # JVM memory allocation pool parameters - modify as appropriate.
set "JAVA_OPTS=-Xms64M -Xmx512M -XX:MaxPermSize=256M"

rem # Prefer IPv4
set "JAVA_OPTS=%JAVA_OPTS% -Djava.net.preferIPv4Stack=true"

rem # Make Byteman classes visible in all module loaders
rem # This is necessary to inject Byteman rules into AS7 deployments
set "JAVA_OPTS=%JAVA_OPTS% -Djboss.modules.system.pkgs=org.jboss.byteman"

rem # Sample JPDA settings for remote socket debugging
rem set "JAVA_OPTS=%JAVA_OPTS% -agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n"

rem # Sample JPDA settings for shared memory debugging
rem set "JAVA_OPTS=%JAVA_OPTS% -agentlib:jdwp=transport=dt_shmem,address=jboss,server=y,suspend=n"

rem # Use JBoss Modules lockless mode
rem set "JAVA_OPTS=%JAVA_OPTS% -Djboss.modules.lockless=true"

rem # Import our realm into Keycloak
set "JAVA_OPTS=%JAVA_OPTS% -Dkeycloak.import=%JBOSS_HOME%\standalone\configuration\hawkular-realm.json"

:JAVA_OPTS_SET

0 comments on commit ee47524

Please sign in to comment.