Author: ilgrosso
Date: Mon Sep 15 15:05:31 2014
New Revision: 1625049
URL: http://svn.apache.org/r1625049
Log:
[SYNCOPE-548] Allows easier management of external Activiti Modeler
Modified:
syncope/branches/1_2_X/console/pom.xml
syncope/branches/1_2_X/console/src/main/resources/console.properties
syncope/branches/1_2_X/console/src/main/resources/consoleContext.xml
syncope/branches/1_2_X/console/src/test/resources/console.properties
Modified: syncope/branches/1_2_X/console/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/console/pom.xml?rev=1625049&r1=1625048&r2=1625049&view=diff
==============================================================================
--- syncope/branches/1_2_X/console/pom.xml (original)
+++ syncope/branches/1_2_X/console/pom.xml Mon Sep 15 15:05:31 2014
@@ -213,7 +213,8 @@ under the License.
<phase>process-resources</phase>
<configuration>
<target>
- <unzip
src="${settings.localRepository}/org/activiti/activiti-webapp-explorer2/${activiti.version}/activiti-webapp-explorer2-${activiti.version}.war"
dest="${project.build.directory}/activiti-webapp-explorer2" />
+ <unzip
src="${settings.localRepository}/org/activiti/activiti-webapp-explorer2/${activiti.version}/activiti-webapp-explorer2-${activiti.version}.war"
+
dest="${project.build.directory}/activiti-webapp-explorer2" />
<mkdir dir="${activiti-modeler.directory}" />
@@ -223,8 +224,10 @@ under the License.
<exclude name="oryx.js" />
</fileset>
</copy>
- <copy
file="${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/plugins.xml"
todir="${activiti-modeler.directory}/editor" />
- <copy
file="${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/stencilset.json"
todir="${activiti-modeler.directory}/editor" />
+ <copy
file="${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/plugins.xml"
+ todir="${activiti-modeler.directory}/editor" />
+ <copy
file="${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/stencilset.json"
+ todir="${activiti-modeler.directory}/editor" />
<mkdir dir="${activiti-modeler.directory}/explorer" />
<copy todir="${activiti-modeler.directory}/explorer">
Modified: syncope/branches/1_2_X/console/src/main/resources/console.properties
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/console/src/main/resources/console.properties?rev=1625049&r1=1625048&r2=1625049&view=diff
==============================================================================
--- syncope/branches/1_2_X/console/src/main/resources/console.properties
(original)
+++ syncope/branches/1_2_X/console/src/main/resources/console.properties Mon
Sep 15 15:05:31 2014
@@ -18,3 +18,4 @@ scheme=http
host=localhost
port=8080
rootPath=/syncope/rest/
+activitiModelerDirectory=${activiti-modeler.directory}
\ No newline at end of file
Modified: syncope/branches/1_2_X/console/src/main/resources/consoleContext.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/console/src/main/resources/consoleContext.xml?rev=1625049&r1=1625048&r2=1625049&view=diff
==============================================================================
--- syncope/branches/1_2_X/console/src/main/resources/consoleContext.xml
(original)
+++ syncope/branches/1_2_X/console/src/main/resources/consoleContext.xml Mon
Sep 15 15:05:31 2014
@@ -62,7 +62,7 @@ under the License.
</bean>
<bean id="activitiModelerDirectory" class="java.lang.String">
- <constructor-arg value="${activiti-modeler.directory}"/>
+ <constructor-arg value="${activitiModelerDirectory}"/>
</bean>
<bean id="syncopeApplication"
class="org.apache.syncope.console.SyncopeApplication"/>
Modified: syncope/branches/1_2_X/console/src/test/resources/console.properties
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/console/src/test/resources/console.properties?rev=1625049&r1=1625048&r2=1625049&view=diff
==============================================================================
--- syncope/branches/1_2_X/console/src/test/resources/console.properties
(original)
+++ syncope/branches/1_2_X/console/src/test/resources/console.properties Mon
Sep 15 15:05:31 2014
@@ -18,3 +18,4 @@ scheme=http
host=localhost
port=9080
rootPath=/syncope/rest/
+activitiModelerDirectory=${activiti-modeler.directory}
\ No newline at end of file
