You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/07/16 14:26:29 UTC
[3/3] syncope git commit: Finalizing HotSwapAgent conf: requires
manual copy of generated JAR under cargo's WEB-INF/lib to reload HTML and
properties
Finalizing HotSwapAgent conf: requires manual copy of generated JAR under cargo's WEB-INF/lib to reload HTML and properties
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2cfafbbf
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2cfafbbf
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2cfafbbf
Branch: refs/heads/master
Commit: 2cfafbbfb774a4c4964ddcc7175deadfdd9be85c
Parents: 535e958
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jul 16 16:25:42 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jul 16 16:26:11 2018 +0200
----------------------------------------------------------------------
fit/console-reference/pom.xml | 12 +++++++-----
.../src/test/resources/hotswap-agent.properties | 18 ++++++------------
.../src/test/resources/hotswap-agent.properties | 1 -
fit/enduser-reference/pom.xml | 14 +++++++-------
.../src/test/resources/hotswap-agent.properties | 18 ++++++------------
5 files changed, 26 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/2cfafbbf/fit/console-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml
index 04902f2..7758c13 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -52,15 +52,16 @@ under the License.
</dependency>
<dependency>
- <groupId>org.apache.syncope.ext.camel</groupId>
- <artifactId>syncope-ext-camel-client-console</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.syncope.client</groupId>
<artifactId>syncope-client-console</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.syncope.ext.camel</groupId>
+ <artifactId>syncope-ext-camel-client-console</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.syncope.ext.saml2sp</groupId>
@@ -417,6 +418,7 @@ under the License.
<configuration>
<properties>
<cargo.jvmargs>
+ -Dwicket.configuration=development
-XXaltjvm=dcevm -javaagent:${settings.localRepository}/org/hotswapagent/hotswap-agent/${hotswap.version}/hotswap-agent-${hotswap.version}.jar=autoHotswap=true,disablePlugin=Spring
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
http://git-wip-us.apache.org/repos/asf/syncope/blob/2cfafbbf/fit/console-reference/src/test/resources/hotswap-agent.properties
----------------------------------------------------------------------
diff --git a/fit/console-reference/src/test/resources/hotswap-agent.properties b/fit/console-reference/src/test/resources/hotswap-agent.properties
index 8e57816..a2e489e 100644
--- a/fit/console-reference/src/test/resources/hotswap-agent.properties
+++ b/fit/console-reference/src/test/resources/hotswap-agent.properties
@@ -18,16 +18,10 @@
LOGGER=error
autoHotswap=true
-autoHotswap.port=8000
-extraClasspath=${basedir}/../console-reference/target/classes,\
-${basedir}/../../client/console/target/classes,\
-${basedir}/../../ext/camel/client-console/target/classes,\
-${basedir}/../../ext/saml2sp/client-console/target/classes,\
-${basedir}/../../ext/scimv2/client-console/target/classes,\
-${basedir}/../../ext/oidcclient/client-console/target/classes
-
-webappDir=${basedir}/../console-reference/src/main/webapp,\
-${basedir}/../../client/console/target/classes/META-INF/resources,\
-${basedir}/../../ext/saml2sp/client-console/target/classes,\
-${basedir}/../../ext/oidcclient/client-console/target/classes
+extraClasspath=\
+${basedir}/../../client/console/target/classes/org,\
+${basedir}/../../ext/camel/client-console/target/classes/org,\
+${basedir}/../../ext/saml2sp/client-console/target/classes/org,\
+${basedir}/../../ext/scimv2/client-console/target/classes/org,\
+${basedir}/../../ext/oidcclient/client-console/target/classes/org
http://git-wip-us.apache.org/repos/asf/syncope/blob/2cfafbbf/fit/core-reference/src/test/resources/hotswap-agent.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/resources/hotswap-agent.properties b/fit/core-reference/src/test/resources/hotswap-agent.properties
index 69c5f48..aa6d8e8 100644
--- a/fit/core-reference/src/test/resources/hotswap-agent.properties
+++ b/fit/core-reference/src/test/resources/hotswap-agent.properties
@@ -18,7 +18,6 @@
LOGGER=error
autoHotswap=true
-autoHotswap.port=8000
extraClasspath=${basedir}/../core-reference/target/classes,\
${basedir}/../../common/lib/target/classes,\
http://git-wip-us.apache.org/repos/asf/syncope/blob/2cfafbbf/fit/enduser-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml
index 6c3334a..2692849 100644
--- a/fit/enduser-reference/pom.xml
+++ b/fit/enduser-reference/pom.xml
@@ -41,13 +41,6 @@ under the License.
</properties>
<dependencies>
-
- <dependency>
- <groupId>org.apache.syncope.client</groupId>
- <artifactId>syncope-client-enduser</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -62,6 +55,12 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.apache.syncope.client</groupId>
+ <artifactId>syncope-client-enduser</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.syncope.ext.saml2sp</groupId>
<artifactId>syncope-ext-saml2sp-client-enduser</artifactId>
<version>${project.version}</version>
@@ -565,6 +564,7 @@ under the License.
<configuration>
<properties>
<cargo.jvmargs>
+ -Dwicket.configuration=development
-XXaltjvm=dcevm -javaagent:${settings.localRepository}/org/hotswapagent/hotswap-agent/${hotswap.version}/hotswap-agent-${hotswap.version}.jar=autoHotswap=true,disablePlugin=Spring
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
http://git-wip-us.apache.org/repos/asf/syncope/blob/2cfafbbf/fit/enduser-reference/src/test/resources/hotswap-agent.properties
----------------------------------------------------------------------
diff --git a/fit/enduser-reference/src/test/resources/hotswap-agent.properties b/fit/enduser-reference/src/test/resources/hotswap-agent.properties
index 4f08d6f..657efb9 100644
--- a/fit/enduser-reference/src/test/resources/hotswap-agent.properties
+++ b/fit/enduser-reference/src/test/resources/hotswap-agent.properties
@@ -18,16 +18,10 @@
LOGGER=error
autoHotswap=true
-autoHotswap.port=8000
-extraClasspath=${basedir}/../enduser-reference/target/classes,\
-${basedir}/../../client/enduser/target/classes,\
-${basedir}/../../ext/camel/client-enduser/target/classes,\
-${basedir}/../../ext/saml2sp/client-enduser/target/classes,\
-${basedir}/../../ext/scimv2/client-enduser/target/classes,\
-${basedir}/../../ext/oidcclient/client-enduser/target/classes
-
-webappDir=${basedir}/../enduser-reference/src/main/webapp,\
-${basedir}/../../client/enduser/target/classes/META-INF/resources,\
-${basedir}/../../ext/saml2sp/client-enduser/target/classes,\
-${basedir}/../../ext/oidcclient/client-enduser/target/classes
+extraClasspath=\
+${basedir}/../../client/enduser/target/classes/org,\
+${basedir}/../../ext/camel/client-enduser/target/classes/org,\
+${basedir}/../../ext/saml2sp/client-enduser/target/classes/org,\
+${basedir}/../../ext/scimv2/client-enduser/target/classes/org,\
+${basedir}/../../ext/oidcclient/client-enduser/target/classes/org