Changes to activiti rest such it can produce an executable war

modules/activiti-webapp-rest2/pom.xml

@@ -12,7 +12,7 @@
     <relativePath>../..</relativePath>
     <version>5.15.1-SNAPSHOT</version>
   </parent>
-
+  
   <build>
     <plugins>
       <plugin>
@@ -103,6 +103,34 @@
     </pluginManagement>
   </build>
 
+  <profiles>
+    <profile>
+	  <id>buildExecutableWar</id>
+	    <build>
+		  <plugins>
+            <plugin>
+              <groupId>org.apache.tomcat.maven</groupId>
+			  <artifactId>tomcat7-maven-plugin</artifactId>
+			  <version>2.1</version>
+			  <configuration>
+			    <path>/</path>
+			    <protocol>org.apache.coyote.http11.Http11NioProtocol</protocol>
+			  </configuration>
+			  <executions>
+			    <execution>
+				  <id>tomcat-run</id>
+				  <goals>
+				    <goal>exec-war-only</goal>
+				  </goals>
+				  <phase>package</phase>
+				</execution>
+			  </executions>
+			</plugin>
+		  </plugins>
+	  </build>
+    </profile>
+  </profiles>
+  
   <dependencies>
     <dependency>
       <groupId>org.activiti</groupId>

modules/activiti-webapp-rest2/src/main/resources/activiti-context.xml

@@ -14,13 +14,17 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
         <property name="createDemoModels" value="true" />
 	</bean>
 
-	<bean id="dbProperties"
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="location" value="classpath:db.properties" />
-		<!-- Allow other PropertyPlaceholderConfigurer to run as well -->
+	<bean id="dbProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+	    <property name="locations">
+            <list>
+                <value>classpath:db.properties</value>
+                <value>file:activiti-rest.properties</value>
+            </list>
+        </property>
 		<property name="ignoreUnresolvablePlaceholders" value="true" />
+		<property name="ignoreResourceNotFound" value="true" />
 	</bean>
-
+	
 	<bean id="dataSource"
 		class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
 		<property name="driverClass" value="${jdbc.driver}" />