diff --git a/.classpath b/.classpath
index 81c8c83..04a46d9 100644
--- a/.classpath
+++ b/.classpath
@@ -28,6 +28,11 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss EAP 7.0 Runtime">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/.project b/.project
index 1095ebd..e4b57fb 100644
--- a/.project
+++ b/.project
@@ -51,12 +51,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
+			<name>org.fusesource.ide.project.RiderProjectBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.fusesource.ide.project.RiderProjectNature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 2f47a48..3ad62fc 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
 eclipse.preferences.version=1
-encoding/<project>=UTF-8
 encoding/apidoc.json=UTF-8
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index e96ed1a..bd4107e 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="templates-broker-0.0.1">
+    <wb-module deploy-name="templates-broker-1.1">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
index bd67822..ac76f18 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -9,9 +9,5 @@
       <attribute name="provider-id" value="jpa-no-op-library-provider"/>
     </node>
   </facet>
-  <facet id="jst.jsf">
-    <node name="libprov">
-      <attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
-    </node>
-  </facet>
+  <facet id="jst.jaxrs"/>
 </root>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 725fe3d..bf140f4 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
+  <runtime name="JBoss EAP 7.0 Runtime"/>
   <fixed facet="wst.jsdt.web"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.cdi" version="1.1"/>
@@ -8,4 +9,5 @@
   <installed facet="jst.jaxrs" version="2.0"/>
   <installed facet="jpt.jpa" version="2.1"/>
   <installed facet="java" version="1.8"/>
+  <installed facet="jst.jsf" version="2.2"/>
 </faceted-project>
diff --git a/src/main/webapp/WEB-INF/templates-ds.xml b/src/main/webapp/WEB-INF/templates-ds.xml
index eb89c06..908e8cc 100644
--- a/src/main/webapp/WEB-INF/templates-ds.xml
+++ b/src/main/webapp/WEB-INF/templates-ds.xml
@@ -18,4 +18,4 @@
 			<exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter"/>
 		</validation>
 	</datasource>
-</datasources>
\ No newline at end of file
+</datasources>
--
libgit2 0.21.2