@@ -1,6 +1,6 @@
<#include "../../include/imports.ftl">

<#-- @ftlvariable name="item" type="org.onehippo.forge.camel.demo.beans.NewsDocument" -->
<#-- @ftlvariable name="item" type="com.bloomreach.forge.camel.demo.beans.NewsDocument" -->
<#-- @ftlvariable name="pageable" type="org.onehippo.cms7.essentials.components.paging.Pageable" -->
<#-- @ftlvariable name="cparam" type="org.onehippo.cms7.essentials.components.info.EssentialsNewsComponentInfo" -->
<#if pageable?? && pageable.items?has_content>
Expand Down Expand Up @@ -30,7 +30,7 @@
</div>
</#list>
<div class="has-new-content-button">
<@hst.manageContent documentTemplateQuery="new-news-document" rootPath="news" defaultPath="${currentYear}/${currentMonth}"/>
<@hst.manageContent documentTemplateQuery="new-news-document" folderTemplateQuery="new-news-folder" rootPath="news" defaultPath="${currentYear}/${currentMonth}"/>
</div>
<#if cparam.showPagination>
<#include "../../include/pagination.ftl">
Expand All @@ -39,9 +39,9 @@
<#-- @ftlvariable name="editMode" type="java.lang.Boolean"-->
<#elseif editMode>
<div>
<img src="<@hst.link path='/images/essentials/catalog-component-icons/news-list.png'/>"> Click to edit News List
<img src="<@hst.link path='/images/essentials/catalog-component-icons/news-list.svg'/>"> Click to edit News List
<div class="has-new-content-button">
<@hst.manageContent documentTemplateQuery="new-news-document" rootPath="news" defaultPath="${currentYear}/${currentMonth}"/>
<@hst.manageContent documentTemplateQuery="new-news-document" folderTemplateQuery="new-news-folder" rootPath="news" defaultPath="${currentYear}/${currentMonth}"/>
</div>
</div>
</#if>
@@ -1,6 +1,6 @@
<#include "../include/imports.ftl">

<#-- @ftlvariable name="document" type="org.onehippo.forge.camel.demo.beans.NewsDocument" -->
<#-- @ftlvariable name="document" type="com.bloomreach.forge.camel.demo.beans.NewsDocument" -->
<#if document??>
<@hst.link var="link" hippobean=document/>
<article class="has-edit-button">
Expand Down
@@ -1,6 +1,6 @@
<#include "../../include/imports.ftl">

<#-- @ftlvariable name="document" type="org.onehippo.forge.camel.demo.beans.NewsDocument" -->
<#-- @ftlvariable name="document" type="com.bloomreach.forge.camel.demo.beans.NewsDocument" -->
<#if document??>
<@hst.link var="link" hippobean=document/>
<article class="has-edit-button">
Expand Down

This file was deleted.

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions demo/site/components/pom.xml
Expand Up @@ -3,14 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onehippo.forge.camel-hippoevt</groupId>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo-site</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>camel-hippoevt-demo-components</artifactId>
<packaging>jar</packaging>
<name>Camel Hippo Event Bus Demo Site Components</name>
<description>Camel Hippo Event Bus Demo Site Components</description>
<name>Bloomreach Camel Event Bus Demo Site Components</name>
<description>Bloomreach Camel Event Bus Demo Site Components</description>

<dependencies>

Expand Down
@@ -1,4 +1,4 @@
package org.onehippo.forge.camel.demo.beans;
package com.bloomreach.forge.camel.demo.beans;

import org.hippoecm.hst.content.beans.Node;
import org.hippoecm.hst.content.beans.standard.HippoDocument;
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onehippo.forge.camel.demo.beans;
package com.bloomreach.forge.camel.demo.beans;

import org.hippoecm.hst.content.beans.standard.HippoHtml;

Expand All @@ -32,7 +32,7 @@ public class BaseHippoDocument extends BaseDocument {
* @return the title
*/
public String getTitle() {
return getProperty(TITLE);
return getSingleProperty(TITLE);
}

/**
Expand All @@ -41,7 +41,7 @@ public String getTitle() {
* @return the introduction
*/
public String getIntroduction() {
return getProperty(INTRODUCTION);
return getSingleProperty(INTRODUCTION);
}

/**
Expand Down
@@ -1,6 +1,6 @@
package org.onehippo.forge.camel.demo.beans;
package com.bloomreach.forge.camel.demo.beans;
/*
* Copyright 2014-2018 Hippo B.V. (http://www.onehippo.com)
* Copyright 2014-2019 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -46,7 +46,7 @@ public class EventsDocument extends BaseHippoDocument {
*/
@HippoEssentialsGenerated(internalName = "camelhippoevtdemo:title")
public String getTitle() {
return getProperty(TITLE);
return getSingleProperty(TITLE);
}

/**
Expand All @@ -56,7 +56,7 @@ public String getTitle() {
*/
@HippoEssentialsGenerated(internalName = "camelhippoevtdemo:date")
public Calendar getDate() {
return getProperty(DATE);
return getSingleProperty(DATE);
}

/**
Expand All @@ -66,7 +66,7 @@ public Calendar getDate() {
*/
@HippoEssentialsGenerated(internalName = "camelhippoevtdemo:introduction")
public String getIntroduction() {
return getProperty(INTRODUCTION);
return getSingleProperty(INTRODUCTION);
}

/**
Expand Down Expand Up @@ -96,7 +96,7 @@ public HippoHtml getContent() {
*/
@HippoEssentialsGenerated(internalName = "camelhippoevtdemo:location")
public String getLocation() {
return getProperty(LOCATION);
return getSingleProperty(LOCATION);
}

/**
Expand All @@ -106,7 +106,7 @@ public String getLocation() {
*/
@HippoEssentialsGenerated(internalName = "camelhippoevtdemo:enddate")
public Calendar getEndDate() {
return getProperty(END_DATE);
return getSingleProperty(END_DATE);
}

}
@@ -1,6 +1,6 @@
package org.onehippo.forge.camel.demo.beans;
package com.bloomreach.forge.camel.demo.beans;
/*
* Copyright 2014-2018 Hippo B.V. (http://www.onehippo.com)
* Copyright 2014-2019 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -47,7 +47,7 @@ public class NewsDocument extends BaseHippoDocument {
*/
@HippoEssentialsGenerated(internalName = "camelhippoevtdemo:title")
public String getTitle() {
return getProperty(TITLE);
return getSingleProperty(TITLE);
}

/**
Expand All @@ -57,7 +57,7 @@ public String getTitle() {
*/
@HippoEssentialsGenerated(internalName = "camelhippoevtdemo:date")
public Calendar getDate() {
return getProperty(DATE);
return getSingleProperty(DATE);
}

/**
Expand All @@ -67,7 +67,7 @@ public Calendar getDate() {
*/
@HippoEssentialsGenerated(internalName = "camelhippoevtdemo:introduction")
public String getIntroduction() {
return getProperty(INTRODUCTION);
return getSingleProperty(INTRODUCTION);
}

/**
Expand Down Expand Up @@ -97,7 +97,7 @@ public HippoHtml getContent() {
*/
@HippoEssentialsGenerated(internalName = "camelhippoevtdemo:location")
public String getLocation() {
return getProperty(LOCATION);
return getSingleProperty(LOCATION);
}

/**
Expand All @@ -107,7 +107,7 @@ public String getLocation() {
*/
@HippoEssentialsGenerated(internalName = "camelhippoevtdemo:author")
public String getAuthor() {
return getProperty(AUTHOR);
return getSingleProperty(AUTHOR);
}

/**
Expand All @@ -117,7 +117,7 @@ public String getAuthor() {
*/
@HippoEssentialsGenerated(internalName = "camelhippoevtdemo:source")
public String getSource() {
return getProperty(SOURCE);
return getSingleProperty(SOURCE);
}

}
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onehippo.forge.camel.demo.container;
package com.bloomreach.forge.camel.demo.container;

import java.util.Calendar;

Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onehippo.forge.camel.demo.rest.beans;
package com.bloomreach.forge.camel.demo.rest.beans;

import java.util.Calendar;

Expand All @@ -22,7 +22,7 @@

import org.hippoecm.hst.jaxrs.model.content.HippoDocumentRepresentation;
import org.hippoecm.hst.jaxrs.model.content.HippoHtmlRepresentation;
import org.onehippo.forge.camel.demo.beans.NewsDocument;
import com.bloomreach.forge.camel.demo.beans.NewsDocument;

@XmlRootElement(name = "news")
public class NewsRepresentation extends HippoDocumentRepresentation {
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onehippo.forge.camel.demo.rest.services;
package com.bloomreach.forge.camel.demo.rest.services;

import java.io.IOException;
import java.util.LinkedList;
Expand Down Expand Up @@ -45,8 +45,8 @@
import org.hippoecm.hst.core.linking.HstLink;
import org.hippoecm.hst.core.request.HstRequestContext;
import org.hippoecm.hst.jaxrs.services.AbstractResource;
import org.onehippo.forge.camel.demo.beans.BaseHippoDocument;
import org.onehippo.forge.camel.demo.util.HstLinkCreatorUtils;
import com.bloomreach.forge.camel.demo.beans.BaseHippoDocument;
import com.bloomreach.forge.camel.demo.util.HstLinkCreatorUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onehippo.forge.camel.demo.rest.services;
package com.bloomreach.forge.camel.demo.rest.services;

import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -29,7 +29,7 @@
import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.entity.StringEntity;
import org.onehippo.forge.camel.demo.beans.BaseHippoDocument;
import com.bloomreach.forge.camel.demo.beans.BaseHippoDocument;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onehippo.forge.camel.demo.rest.services;
package com.bloomreach.forge.camel.demo.rest.services;

import javax.jcr.ItemNotFoundException;
import javax.jcr.Node;
Expand All @@ -31,8 +31,8 @@
import org.hippoecm.hst.container.RequestContextProvider;
import org.hippoecm.hst.core.request.HstRequestContext;
import org.hippoecm.hst.jaxrs.services.AbstractResource;
import org.onehippo.forge.camel.demo.beans.NewsDocument;
import org.onehippo.forge.camel.demo.rest.beans.NewsRepresentation;
import com.bloomreach.forge.camel.demo.beans.NewsDocument;
import com.bloomreach.forge.camel.demo.rest.beans.NewsRepresentation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onehippo.forge.camel.demo.rest.services;
package com.bloomreach.forge.camel.demo.rest.services;

import java.io.IOException;
import java.util.List;
Expand All @@ -26,7 +26,7 @@
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.entity.StringEntity;
import org.onehippo.forge.camel.demo.beans.BaseHippoDocument;
import com.bloomreach.forge.camel.demo.beans.BaseHippoDocument;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onehippo.forge.camel.demo.util;
package com.bloomreach.forge.camel.demo.util;

import java.util.HashMap;
import java.util.LinkedHashMap;
Expand Down
Expand Up @@ -34,7 +34,7 @@
<!-- Solr Search Index Updater REST service -->
<bean class="org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider">
<constructor-arg>
<bean class="org.onehippo.forge.camel.demo.rest.services.SolrRestUpdateResource"
<bean class="com.bloomreach.forge.camel.demo.rest.services.SolrRestUpdateResource"
destroy-method="destroy">
<property name="baseUrl" value="http://localhost:8983/solr" />
<property name="coreName" value="collection1" />
Expand All @@ -45,7 +45,7 @@
<!-- Elastic Search Index Updater REST service -->
<bean class="org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider">
<constructor-arg>
<bean class="org.onehippo.forge.camel.demo.rest.services.ElasticSearchRestUpdateResource"
<bean class="com.bloomreach.forge.camel.demo.rest.services.ElasticSearchRestUpdateResource"
destroy-method="destroy">
<property name="baseUrl" value="http://localhost:9200" />
<property name="defaultIndexName" value="pages" />
Expand All @@ -57,7 +57,7 @@
<!-- Example News Document REST service -->
<bean class="org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider">
<constructor-arg>
<bean class="org.onehippo.forge.camel.demo.rest.services.NewsResource" />
<bean class="com.bloomreach.forge.camel.demo.rest.services.NewsResource" />
</constructor-arg>
</bean>

Expand Down
Expand Up @@ -21,7 +21,7 @@
<bean id="customResourceContainers" class="org.springframework.beans.factory.config.ListFactoryBean">
<property name="sourceList">
<list>
<bean class="org.onehippo.forge.camel.demo.container.RevisionTimePrefixedHippoGalleryImageSetContainer">
<bean class="com.bloomreach.forge.camel.demo.container.RevisionTimePrefixedHippoGalleryImageSetContainer">
<property name="primaryItem" value="hippogallery:original"/>
<property name="mappings">
<bean class="org.springframework.beans.factory.config.MapFactoryBean">
Expand Down
2 changes: 1 addition & 1 deletion demo/site/components/src/test/resources/log4j2.xml
Expand Up @@ -41,7 +41,7 @@
<Logger name="org.hippoecm.repository.export" level="info"/>

<!-- project logging -->
<Logger name="org.onehippo.forge.camel.demo" level="debug"/>
<Logger name="com.bloomreach.forge.camel.demo" level="debug"/>

<Root level="warn">
<AppenderRef ref="console"/>
Expand Down
8 changes: 4 additions & 4 deletions demo/site/pom.xml
Expand Up @@ -3,14 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onehippo.forge.camel-hippoevt</groupId>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>camel-hippoevt-demo-site</artifactId>
<packaging>pom</packaging>
<name>Camel Hippo Event Bus Demo Site</name>
<description>Camel Hippo Event Bus Demo Site</description>
<name>Bloomreach Camel Event Bus Demo Site</name>
<description>Bloomreach Camel Event Bus Demo Site</description>

<modules>
<module>components</module>
Expand Down
16 changes: 8 additions & 8 deletions demo/site/webapp/pom.xml
Expand Up @@ -3,30 +3,30 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onehippo.forge.camel-hippoevt</groupId>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo-site</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>camel-hippoevt-demo-webapp</artifactId>
<packaging>war</packaging>
<name>Camel Hippo Event Bus Demo Site Webapp</name>
<description>Camel Hippo Event Bus Demo Site Webapp</description>
<name>Bloomreach Camel Event Bus Demo Site Webapp</name>
<description>Bloomreach Camel Event Bus Demo Site Webapp</description>

<dependencies>
<dependency>
<groupId>org.onehippo.forge.camel-hippoevt</groupId>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo-repository-data-site</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onehippo.forge.camel-hippoevt</groupId>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo-repository-data-webfiles</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onehippo.forge.camel-hippoevt</groupId>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt-demo-components</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.onehippo.cms7.hst.toolkit-resources.addon</groupId>
Expand Down
@@ -1,3 +1,8 @@
# this file is used to be able to override defaults from
# this file is used to be able to set properties or override defaults from
# org/hippoecm/hst/site/container/SpringComponentManager.properties
#
# Properties which are environment (dev, test, acct, prod) specific should not be overriden here, but only properties
# which are the same regardless the environment
#
# Note that this file contains the overrides for the hst in the site webapp.
hst.configuration.rootPath = /hst:camelhippoevtdemo

This file was deleted.

Expand Up @@ -32,35 +32,23 @@
<div class="hippo-login-panel">
<form class="hippo-login-panel-form" name="signInForm" method="post" action="${loginProxyUrl}">
<h2>
<div class="hippo-global-hideme"><span>BloomReach Experience</span></div>
<div class="hippo-global-hideme"><span><fmt:message key="label.authen.required"/></span></div>
</h2>
<div class="hippo-login-form-container">
<table>
<tr>
<td>
<p>
<fmt:message key="message.authen.required">
<fmt:param value="<%=destination%>"/>
</fmt:message>
</td>
</tr>
<tr>
<td>
<p>
<a href="${loginFormUrl}"><fmt:message key="message.try.again"/></a>
<br/><br/>
<fmt:message key="message.page.auto.redirect.in.seconds">
<fmt:param value="<%=autoRedirectSeconds%>"/>
</fmt:message>
</p>
</td>
</tr>
</table>
<p>
<fmt:message key="message.authen.required">
<fmt:param value="<%=destination%>"/>
</fmt:message>
</p>
<p>
<a href="${loginFormUrl}"><fmt:message key="message.try.again"/></a>
<br/><br/>
<fmt:message key="message.page.auto.redirect.in.seconds">
<fmt:param value="<%=autoRedirectSeconds%>"/>
</fmt:message>
</p>
</div>
</form>
<div class="hippo-login-panel-copyright">
&copy; 1999-2018 BloomReach B.V.
</div>
</div>
</div>
</body>
Expand Down
Expand Up @@ -2,11 +2,11 @@
<%@ include file="/WEB-INF/jspf/htmlTags.jspf" %>
<% response.setStatus(403); %>
<html lang="en">
<head>
<meta charset="utf-8"/>
<title>403 error</title>
</head>
<body>
<h1>Forbidden</h1>
</body>
<head>
<meta charset="utf-8"/>
<title>403 Forbidden</title>
</head>
<body>
<h1>403 Forbidden</h1>
</body>
</html>
Expand Up @@ -6,12 +6,9 @@
<html lang="en">
<head>
<meta charset="utf-8"/>
<title>500 error</title>
<title>500 Internal Server Error</title>
</head>
<body>
<h1>Server error</h1>
<% out.println("<!-- An unexcepted error occurred. The name of the exception is:"); %>
<%= exception %>
<% out.println("-->"); %>
<h1>500 Internal Server Error</h1>
</body>
</html>
13 changes: 4 additions & 9 deletions demo/site/webapp/src/main/webapp/WEB-INF/web.xml
Expand Up @@ -6,8 +6,8 @@
id="site">


<display-name>Camel Hippo Event Bus Demo site</display-name>
<description>Camel Hippo Event Bus Demo site</description>
<display-name>Bloomreach Camel Event Bus Demo site</display-name>
<description>Bloomreach Camel Event Bus Demo site</description>

<jsp-config>
<jsp-property-group>
Expand Down Expand Up @@ -51,7 +51,7 @@
-->
<context-param>
<param-name>hst-beans-annotated-classes</param-name>
<param-value>classpath*:org/onehippo/forge/camel/demo/**/*.class
<param-value>classpath*:com/bloomreach/forge/camel/demo/**/*.class
,classpath*:org/onehippo/**/*.class
,classpath*:com/onehippo/**/*.class
,classpath*:org/onehippo/forge/**/*.class
Expand Down Expand Up @@ -231,15 +231,10 @@
</login-config>

<security-role>
<description>Default role of BloomReach Repository</description>
<description>Default role of Bloomreach Repository</description>
<role-name>everybody</role-name>
</security-role>

<error-page>
<error-code>400</error-code>
<location>/WEB-INF/jsp/errorpages/ErrorPage400.jsp</location>
</error-page>

<error-page>
<error-code>401</error-code>
<location>/WEB-INF/jsp/errorpages/ErrorPage401.jsp</location>
Expand Down
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion demo/src/main/assembly/common-lib-component.xml
Expand Up @@ -9,7 +9,6 @@
<include>javax.jcr:jcr</include>
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>javax.mail:mail</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
</includes>
</dependencySet>
</dependencySets>
Expand Down
Expand Up @@ -5,5 +5,9 @@
<source>repository-data/development/target/camel-hippoevt-demo-repository-data-development-${project.version}.jar</source>
<outputDirectory>shared/lib</outputDirectory>
</file>
<file>
<source>repository-data/site-development/target/camel-hippoevt-demo-repository-data-site-development-${project.version}.jar</source>
<outputDirectory>shared/lib</outputDirectory>
</file>
</files>
</component>
10 changes: 0 additions & 10 deletions demo/src/main/assembly/webapps-component.xml
@@ -1,11 +1,6 @@
<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
<files>
<file>
<source>solr/target/solr.war</source>
<outputDirectory>/webapps</outputDirectory>
<destName>solr.war</destName>
</file>
<file>
<source>cms/target/cms.war</source>
<outputDirectory>webapps</outputDirectory>
Expand All @@ -16,10 +11,5 @@
<outputDirectory>webapps</outputDirectory>
<destName>site.war</destName>
</file>
<file>
<source>hawtio/target/hawtio.war</source>
<outputDirectory>/webapps</outputDirectory>
<destName>hawtio.war</destName>
</file>
</files>
</component>
75 changes: 75 additions & 0 deletions demo/src/main/docker/Dockerfile
@@ -0,0 +1,75 @@
FROM ${docker.brxm.base.image}

LABEL PROJECT=${project.artifactId}

# Default JVM heap size variables
ENV JAVA_MINHEAP 256m
ENV JAVA_MAXHEAP 512m

# Default tomcat http max threads variable
ENV TOMCAT_MAXTHREADS 200

# Default repository settings
ENV REPO_PATH ${docker.brxm.project.path}/target/storage
ENV REPO_CONFIG ""
ENV REPO_BOOTSTRAP false
ENV REPO_AUTOEXPORT_ALLOWED false
ENV REPO_WORKSPACE_BUNDLE_CACHE 256
ENV REPO_VERSIONING_BUNDLE_CACHE 64

# Default database profile
ENV profile h2

# Default mysql variables
ENV MYSQL_DB_HOST mysql
ENV MYSQL_DB_PORT 3306
ENV MYSQL_DB_USER ${docker.db.username}
ENV MYSQL_DB_PASSWORD ${docker.db.password}
ENV MYSQL_DB_NAME ${docker.db.schema}
ENV MYSQL_DB_DRIVER com.mysql.cj.jdbc.Driver

# Default postgres variables
ENV POSTGRES_DB_HOST postgres
ENV POSTGRES_DB_PORT 5432
ENV POSTGRES_DB_USER ${docker.db.username}
ENV POSTGRES_DB_PASSWORD ${docker.db.password}
ENV POSTGRES_DB_NAME ${docker.db.schema}
ENV POSTGRES_DB_DRIVER org.postgresql.Driver

# Provide LUCENE_INDEX_FILE_PATH to initialize the local lucene index with a stored copy

# Prepare dirs
# Delete default & unused war files
# Define a non-root user with limited permissions
# Non-root user should own tomcat & /brxm dirs
# Install unzip for the lucene index export
RUN mkdir -p \
/brxm/bin \
/usr/local/tomcat/common/classes \
/usr/local/tomcat/shared/classes \
&& rm -rf \
/usr/local/tomcat/webapps/docs \
/usr/local/tomcat/webapps/examples \
/usr/local/tomcat/webapps/host-manager \
/usr/local/tomcat/webapps/manager \
/usr/local/tomcat/webapps/ROOT \
&& addgroup --gid ${docker.brxm.container.gid} ${docker.brxm.container.username} \
&& adduser --gid ${docker.brxm.container.gid} --uid ${docker.brxm.container.uid} ${docker.brxm.container.username} \
&& chown -R ${docker.brxm.container.username} /usr/local/tomcat /brxm \
&& apt-get update && apt-get install -y unzip

USER ${docker.brxm.container.username}

# In maven/ the files as specified in the <assembly> section are stored and need to be added manually
# COPY in reverse order of expected change frequency, for optimal docker build caching
COPY --chown=${docker.brxm.container.uid}:${docker.brxm.container.gid} maven/common /usr/local/tomcat/common/
COPY --chown=${docker.brxm.container.uid}:${docker.brxm.container.gid} maven/db-drivers /brxm/db-drivers
COPY --chown=${docker.brxm.container.uid}:${docker.brxm.container.gid} maven/scripts /brxm/bin
RUN chmod +x /brxm/bin/docker-entrypoint.sh

# Entrypoint script applies env-vars to config, then runs tomcat
ENTRYPOINT ["/brxm/bin/docker-entrypoint.sh"]

COPY --chown=${docker.brxm.container.uid}:${docker.brxm.container.gid} maven/conf /usr/local/tomcat/conf/
COPY --chown=${docker.brxm.container.uid}:${docker.brxm.container.gid} maven/shared /usr/local/tomcat/shared/
COPY --chown=${docker.brxm.container.uid}:${docker.brxm.container.gid} maven/webapps /usr/local/tomcat/webapps/
20 changes: 20 additions & 0 deletions demo/src/main/docker/DockerfileDev
@@ -0,0 +1,20 @@
FROM ${project.groupId}/${project.artifactId}:${project.version}

LABEL PROJECT=${project.artifactId}:dev-${project.version}

# Arguments used in setup-devuser.sh script file
ARG devusername=${docker.brxm.container.dev.username}
ARG devuid=${docker.brxm.container.dev.uid}
ARG devgid=${docker.brxm.container.dev.gid}

USER root

RUN chmod +x /brxm/bin/common/setup-devuser.sh
RUN /brxm/bin/common/setup-devuser.sh

USER ${docker.brxm.container.dev.uid}

COPY --chown=${docker.brxm.container.dev.uid}:${docker.brxm.container.dev.gid} maven/conf /usr/local/tomcat/conf/
COPY --chown=${docker.brxm.container.dev.uid}:${docker.brxm.container.dev.gid} maven/webapps /usr/local/tomcat/webapps/
COPY --chown=${docker.brxm.container.dev.uid}:${docker.brxm.container.dev.gid} maven/autoreload /usr/local/tomcat/shared/lib
${docker.brxm.copy.dev.libs.cmd}COPY --chown=${docker.brxm.container.dev.uid}:${docker.brxm.container.dev.gid} maven/shared /usr/local/tomcat/shared/
20 changes: 20 additions & 0 deletions demo/src/main/docker/assembly/conf-component-docker-dev.xml
@@ -0,0 +1,20 @@
<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
<files>
<file>
<source>conf/log4j2-dev.xml</source>
<outputDirectory>conf</outputDirectory>
<destName>log4j2.xml</destName>
</file>
<file>
<source>conf/platform-dev.properties</source>
<outputDirectory>conf</outputDirectory>
<destName>platform.properties</destName>
</file>
<file>
<source>conf/hst-dev.properties</source>
<outputDirectory>conf</outputDirectory>
<destName>hst.properties</destName>
</file>
</files>
</component>
51 changes: 51 additions & 0 deletions demo/src/main/docker/assembly/conf-component-docker.xml
@@ -0,0 +1,51 @@
<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
<files>
<file>
<source>conf/log4j2-docker.xml</source>
<outputDirectory>conf</outputDirectory>
<destName>log4j2.xml</destName>
</file>
<file>
<source>conf/context.xml</source>
<outputDirectory>conf</outputDirectory>
<destName>context-h2.xml</destName>
<filtered>false</filtered>
</file>
<file>
<source>conf/context-mysql.xml</source>
<outputDirectory>conf</outputDirectory>
<filtered>false</filtered>
</file>
<file>
<source>conf/repository-mysql.xml</source>
<outputDirectory>conf</outputDirectory>
<filtered>false</filtered>
</file>
<file>
<source>conf/context-postgres.xml</source>
<outputDirectory>conf</outputDirectory>
<filtered>false</filtered>
</file>
<file>
<source>conf/repository-postgres.xml</source>
<outputDirectory>conf</outputDirectory>
<filtered>false</filtered>
</file>
<file>
<source>conf/catalina-logging.properties</source>
<outputDirectory>conf</outputDirectory>
<destName>logging.properties</destName>
</file>
<file>
<source>conf/catalina.properties</source>
<outputDirectory>conf</outputDirectory>
<destName>catalina.properties</destName>
</file>
<file>
<source>conf/server.xml</source>
<outputDirectory>conf</outputDirectory>
<filtered>false</filtered>
</file>
</files>
</component>
25 changes: 25 additions & 0 deletions demo/src/main/docker/assembly/distribution-docker-dev.xml
@@ -0,0 +1,25 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>distribution-docker</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
<componentDescriptor>${project.basedir}/src/main/assembly/shared-lib-development-data-component.xml</componentDescriptor>
<componentDescriptor>${project.basedir}/src/main/docker/assembly/shared-lib-component-docker.xml</componentDescriptor>
<componentDescriptor>${project.basedir}/src/main/docker/assembly/conf-component-docker-dev.xml</componentDescriptor>
</componentDescriptors>
<dependencySets>
<dependencySet>
<unpack>true</unpack>
<outputDirectory>webapps/essentials</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<scope>provided</scope>
<includes>
<include>${project.groupId}:${project.artifactId}-essentials</include>
</includes>
</dependencySet>
</dependencySets>
</assembly>
19 changes: 19 additions & 0 deletions demo/src/main/docker/assembly/distribution-docker.xml
@@ -0,0 +1,19 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>distribution-docker</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
<componentDescriptor>${project.basedir}/src/main/assembly/common-lib-component.xml</componentDescriptor>
<componentDescriptor>${project.basedir}/src/main/assembly/shared-lib-component.xml</componentDescriptor>

<componentDescriptor>${project.basedir}/src/main/docker/assembly/conf-component-docker.xml</componentDescriptor>
<componentDescriptor>${project.basedir}/src/main/docker/assembly/webapps-component-docker.xml</componentDescriptor>
<componentDescriptor>${project.basedir}/src/main/docker/assembly/scripts-docker.xml</componentDescriptor>

<componentDescriptor>${project.basedir}/src/main/docker/assembly/docker-db-libs.xml</componentDescriptor>
</componentDescriptors>
</assembly>
21 changes: 21 additions & 0 deletions demo/src/main/docker/assembly/docker-db-libs.xml
@@ -0,0 +1,21 @@
<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
<dependencySets>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>db-drivers/postgres</outputDirectory>
<scope>provided</scope>
<includes>
<include>org.postgresql:postgresql</include>
</includes>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>db-drivers/mysql</outputDirectory>
<scope>provided</scope>
<includes>
<include>mysql:mysql-connector-java</include>
</includes>
</dependencySet>
</dependencySets>
</component>
13 changes: 13 additions & 0 deletions demo/src/main/docker/assembly/hcm-dev-component-docker.xml
@@ -0,0 +1,13 @@
<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
<files>
<file>
<source>repository-data/development/target/${artifactId}-repository-data-development-${dollar}{project.version}.jar</source>
<outputDirectory>hcm-dev</outputDirectory>
</file>
<file>
<source>repository-data/site-development/target/${artifactId}-repository-data-site-development-${dollar}{project.version}.jar</source>
<outputDirectory>hcm-dev</outputDirectory>
</file>
</files>
</component>
10 changes: 10 additions & 0 deletions demo/src/main/docker/assembly/scripts-docker.xml
@@ -0,0 +1,10 @@
<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">

<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/docker/scripts</directory>
<outputDirectory>scripts</outputDirectory>
</fileSet>
</fileSets>
</component>
13 changes: 13 additions & 0 deletions demo/src/main/docker/assembly/shared-lib-component-docker.xml
@@ -0,0 +1,13 @@
<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
<dependencySets>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>autoreload</outputDirectory>
<scope>provided</scope>
<includes>
<include>org.onehippo.cms7:hippo-services-autoreload</include>
</includes>
</dependencySet>
</dependencySets>
</component>
23 changes: 23 additions & 0 deletions demo/src/main/docker/assembly/webapps-component-docker.xml
@@ -0,0 +1,23 @@
<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
<dependencySets>
<dependencySet>
<unpack>true</unpack>
<outputDirectory>webapps/cms</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<scope>provided</scope>
<includes>
<include>${project.groupId}:${project.artifactId}-cms</include>
</includes>
</dependencySet>
<dependencySet>
<unpack>true</unpack>
<outputDirectory>webapps/site</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<scope>provided</scope>
<includes>
<include>${project.groupId}:${project.artifactId}-webapp</include>
</includes>
</dependencySet>
</dependencySets>
</component>
13 changes: 13 additions & 0 deletions demo/src/main/docker/scripts/common/setup-devuser.sh
@@ -0,0 +1,13 @@
#!/usr/bin/env bash

set -e

if ! id -g $devgid >/dev/null 2>&1; then
addgroup --gid $devgid $devusername
chown -R :$devgid /usr/local/tomcat /brxm
fi

if ! id -u $devuid >/dev/null 2>&1; then
adduser --gid $devgid --uid $devuid $devusername
chown -R $devuid /usr/local/tomcat /brxm
fi
43 changes: 43 additions & 0 deletions demo/src/main/docker/scripts/docker-entrypoint.sh
@@ -0,0 +1,43 @@
#!/usr/bin/env bash

set -e

# perform text replacements to apply environment vars properly to jackrabbit database configuration
source /brxm/bin/$profile/setup-db.sh

if [ "$profile" != "h2" ]
then
# initialize jackrabbit cluster node id by setting with an external value or with hostname.
repo_cluster_id=$REPO_CLUSTER_NODE_ID
if [ -z "$repo_cluster_id" ]
then
repo_cluster_id="$(hostname -f)"
fi
sed --in-place 's/@cluster.node.id@/'"$repo_cluster_id"'/' /usr/local/tomcat/conf/repository-$profile.xml

# set REPO_CONFIG variable if it is not set
repo_config=$REPO_CONFIG
if [ -z "$repo_config" ]
then
export REPO_CONFIG=file:/usr/local/tomcat/conf/repository-$profile.xml
fi
fi

# update tomcat http max threads variable
sed --in-place=.backup 's/@tomcat.max.threads@/'"$TOMCAT_MAXTHREADS"'/' /usr/local/tomcat/conf/server.xml

# use the appropriate database context info for the selected database type
cp /usr/local/tomcat/conf/context-$profile.xml /usr/local/tomcat/conf/context.xml

# copy setting environment variables script to the related tomcat folder
cp /brxm/bin/tomcat/setenv.sh /usr/local/tomcat/bin/setenv.sh

# Unzip the lucene index export if it exists
if [[ -e "${LUCENE_INDEX_FILE_PATH}" ]]; then
echo "Extracting the lucene index export zip..."
mkdir -p ${REPO_PATH}/workspaces/default/index/
unzip ${LUCENE_INDEX_FILE_PATH} -d ${REPO_PATH}/workspaces/default/index/
fi

# run tomcat
exec /usr/local/tomcat/bin/catalina.sh run
3 changes: 3 additions & 0 deletions demo/src/main/docker/scripts/h2/setup-db.sh
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

#No config patching is required
17 changes: 17 additions & 0 deletions demo/src/main/docker/scripts/mysql/setup-db.sh
@@ -0,0 +1,17 @@
#!/usr/bin/env bash

set -e

sed --in-place=.backup 's/@mysql.host@/'"$MYSQL_DB_HOST"'/' /usr/local/tomcat/conf/context-$profile.xml
sed --in-place 's/@mysql.port@/'"$MYSQL_DB_PORT"'/' /usr/local/tomcat/conf/context-$profile.xml
sed --in-place 's/@mysql.username@/'"$MYSQL_DB_USER"'/' /usr/local/tomcat/conf/context-$profile.xml
sed --in-place 's/@mysql.password@/'"$MYSQL_DB_PASSWORD"'/' /usr/local/tomcat/conf/context-$profile.xml
sed --in-place 's/@mysql.repo.db@/'"$MYSQL_DB_NAME"'/' /usr/local/tomcat/conf/context-$profile.xml
sed --in-place 's/@mysql.driver@/'"$MYSQL_DB_DRIVER"'/' /usr/local/tomcat/conf/context-$profile.xml

sed --in-place=.backup 's/@mysql.repo.db@/'"$MYSQL_DB_NAME"'/' /usr/local/tomcat/conf/repository-$profile.xml
sed --in-place 's/@repo.workspace.bundle.cache@/'"$REPO_WORKSPACE_BUNDLE_CACHE"'/' /usr/local/tomcat/conf/repository-$profile.xml
sed --in-place 's/@repo.versioning.bundle.cache@/'"$REPO_VERSIONING_BUNDLE_CACHE"'/' /usr/local/tomcat/conf/repository-$profile.xml

#copy db driver to /usr/local/tomcat/common/lib
cp -R /brxm/db-drivers/$profile/. /usr/local/tomcat/common/lib/
17 changes: 17 additions & 0 deletions demo/src/main/docker/scripts/postgres/setup-db.sh
@@ -0,0 +1,17 @@
#!/usr/bin/env bash

set -e

sed --in-place=.backup 's/@postgres.host@/'"$POSTGRES_DB_HOST"'/' /usr/local/tomcat/conf/context-$profile.xml
sed --in-place 's/@postgres.port@/'"$POSTGRES_DB_PORT"'/' /usr/local/tomcat/conf/context-$profile.xml
sed --in-place 's/@postgres.username@/'"$POSTGRES_DB_USER"'/' /usr/local/tomcat/conf/context-$profile.xml
sed --in-place 's/@postgres.password@/'"$POSTGRES_DB_PASSWORD"'/' /usr/local/tomcat/conf/context-$profile.xml
sed --in-place 's/@postgres.repo.db@/'"$POSTGRES_DB_NAME"'/' /usr/local/tomcat/conf/context-$profile.xml
sed --in-place 's/@postgres.driver@/'"$POSTGRES_DB_DRIVER"'/' /usr/local/tomcat/conf/context-$profile.xml

sed --in-place=.backup 's/@postgres.repo.db@/'"$POSTGRES_DB_NAME"'/' /usr/local/tomcat/conf/repository-$profile.xml
sed --in-place 's/@repo.workspace.bundle.cache@/'"$REPO_WORKSPACE_BUNDLE_CACHE"'/' /usr/local/tomcat/conf/repository-$profile.xml
sed --in-place 's/@repo.versioning.bundle.cache@/'"$REPO_VERSIONING_BUNDLE_CACHE"'/' /usr/local/tomcat/conf/repository-$profile.xml

#copy db driver to /usr/local/tomcat/common/lib
cp -R /brxm/db-drivers/$profile/. /usr/local/tomcat/common/lib/
39 changes: 39 additions & 0 deletions demo/src/main/docker/scripts/tomcat/setenv.sh
@@ -0,0 +1,39 @@
#!/bin/sh

# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You 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.

#
# ${CATALINA_BASE}/bin/setenv.sh
#
# This script is executed automatically by ${catalina.base}/catalina.sh.
#

# Repository configurations
REP_OPTS="-Drepo.path=${REPO_PATH} -Drepo.bootstrap=${REPO_BOOTSTRAP} -Drepo.config=${REPO_CONFIG} -Drepo.autoexport.allowed=${REPO_AUTOEXPORT_ALLOWED}"

# Logging configurations
L4J_OPTS="-Dlog4j.configurationFile=file://${CATALINA_HOME}/conf/log4j2.xml -DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector"

# JVM heap size options
JVM_OPTS="-server -Xms${JAVA_MINHEAP} -Xmx${JAVA_MAXHEAP} -XX:+UseG1GC -Djava.util.Arrays.useLegacyMergeSort=true"

# JVM garbage Collector options
VGC_OPTS="-verbosegc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:${CATALINA_HOME}/logs/gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=2048k"

# JVM heapdump options
DMP_OPTS="-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${CATALINA_HOME}/temp"

CATALINA_OPTS="${JVM_OPTS} ${VGC_OPTS} ${REP_OPTS} ${DMP_OPTS} ${L4J_OPTS}"
26 changes: 9 additions & 17 deletions pom.xml
Expand Up @@ -17,11 +17,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<name>Camel Hippo Event Bus Support</name>
<description>Camel Hippo Event Bus Support</description>
<groupId>org.onehippo.forge.camel-hippoevt</groupId>
<name>Bloomreach Camel Event Bus Support</name>
<description>Bloomreach Camel Event Bus Support</description>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<url>https://github.com/bloomreach-forge/camel-events-support/</url>

<properties>
Expand All @@ -30,17 +30,16 @@
<project.build.javaVersion>1.7</project.build.javaVersion>

<javax.jcr.version>2.0</javax.jcr.version>
<hippo.services.version>13.0.0</hippo.services.version>
<hippo.services.eventbus.version>13.0.0</hippo.services.eventbus.version>
<hippo.repository.version>13.0.0</hippo.repository.version>
<hippo.services.version>14.1.0</hippo.services.version>
<hippo.services.eventbus.version>14.1.0</hippo.services.eventbus.version>
<hippo.repository.version>14.1.0</hippo.repository.version>

<camel.version>2.24.1</camel.version>
<camel.version>2.25.3</camel.version>
<json-lib.version>2.4</json-lib.version>

<lib.junit.version>4.12</lib.junit.version>
<lib.junit.version>4.13.1</lib.junit.version>
<lib.easymock.version>3.0</lib.easymock.version>
<lib.slf4j.version>1.7.6</lib.slf4j.version>
<lib.log4j.version>1.2.17</lib.log4j.version>

<plugin.compiler.version>3.1</plugin.compiler.version>
<plugin.clean.version>2.5</plugin.clean.version>
Expand Down Expand Up @@ -213,13 +212,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${lib.log4j.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
21 changes: 20 additions & 1 deletion src/site/xdoc/component-hippoevent.xml
Expand Up @@ -52,13 +52,32 @@
<div class="brush: xml">
<source><![CDATA[
<dependency>
<groupId>org.onehippo.forge.camel-hippoevt</groupId>
<groupId>com.bloomreach.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt</artifactId>
<version>${camel-hippoevt.version}</version>
</dependency>
]]></source>
</div>

<br/>

<div class="alert alert-warning">
<p><em>NOTE:</em> The maven coordinate of the module has been changed to
<code>com.bloomreach.forge.camel-hippoevt:camel-hippoevt</code> since v3.0.</p>
<p>
For the previous versions, please use the following instead:
</p>
<div class="brush: xml">
<source><![CDATA[
<dependency>
<groupId>org.onehippo.forge.camel-hippoevt</groupId>
<artifactId>camel-hippoevt</artifactId>
<version>${camel-hippoevt.version}</version>
</dependency>
]]></source>
</div>
</div>

<subsection name="URI Format">
<div class="brush: plain">
<source><![CDATA[
Expand Down
8 changes: 7 additions & 1 deletion src/site/xdoc/demo-solr-integration.xml
Expand Up @@ -89,10 +89,16 @@
<br/>
</li>
<li>
In order to create the demo core, <code>collection1</code>, create the <code>server/solr/collection1</code> folder
For demo purpose, add a new core in the Solr Core Admin UI with the <code>name</code>, <code>collection1</code>,
and the <code>instanceDir</code>, <code>collection1</code> with the other fields with the default setting.
</li>
<li>
Or optionally you can create the demo core manually by creating the <code>server/solr/collection1</code> folder
under the 'solr-x.x.x' subfolder.
And copy all the files and directories in <code>server/solr/configsets/_default/conf/</code> folder
to the <code>server/solr/collection1/</code> folder.
<br/>
<em>Note:</em> This manual creation might not work in the latet version of Apache Solr.
</li>
<li>
Visit <a href="http://localhost:8983/solr/" target="_blank">http://localhost:8983/solr/</a>,
Expand Down
18 changes: 18 additions & 0 deletions src/site/xdoc/release-notes.xml
Expand Up @@ -35,6 +35,11 @@
Hippo CMS Release Version
</th>
</tr>
<tr>
<td>3.x</td>
<td>2.x</td>
<td>14.x</td>
</tr>
<tr>
<td>2.x</td>
<td>2.x</td>
Expand All @@ -52,6 +57,19 @@
</tr>
</table>
</section>
<section name="Release Notes (3.x)">
<subsection name="3.0.0">
<p class="smallinfo">Release Date: July 25, 2019</p>
<ul>
<li>[<a href='https://issues.onehippo.com/browse/HIPFORGE-393'>HIPFORGE-393</a>] - [Camel and Hippo] Upgrade for v14 compatibility<br/>
<em>Note</em>: The maven coordinate has been changed from
<code>org.onehippo.forge.camel-hippoevt:camel-hippoevt</code> to
<code>com.bloomreach.forge.camel-hippoevt:camel-hippoevt</code>.
See <a href="component-hippoevent.html">Hippo Event Component</a> for detail.
</li>
</ul>
</subsection>
</section>
<section name="Release Notes (2.x)">
<subsection name="2.0.2">
<p class="smallinfo">Release Date: July 25, 2019</p>
Expand Down