Commit b5d5183a authored by Andre Freyssinet's avatar Andre Freyssinet

Adds an all-in-one Rest test.

Adds a loopback Rest bridge test.
Fixes issues in sslconsumer and sslproducer targets.
parent c9403bce
......@@ -88,6 +88,7 @@
<classpath path="${felix.class.path}"/>
<!-- jvmarg line="-Dfelix.config.properties=file:config.properties -Dfr.dyade.aaa.agent.AgentServer.id=${sid} -Dcom.sun.management.jmxremote.port=9191 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -DTransaction.SyncOnWrite=false"/ -->
<!-- jvmarg line="-server -Xmx2G -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,address=5000,suspend=n -Dfelix.config.properties=file:config.properties -Dfr.dyade.aaa.agent.AgentServer.id=${sid} -Dcom.sun.management.jmxremote -DTransaction.SyncOnWrite=false"/ -->
<!-- jvmarg line="-Djetty.home.bundle=org.eclipse.jetty.osgi.boot -server -Xmx2G -Xdebug -Xnoagent -Djava.compiler=NONE -Dfelix.config.properties=file:config.properties -Dfr.dyade.aaa.agent.AgentServer.id=${sid} -Dcom.sun.management.jmxremote -DTransaction.SyncOnWrite=false"/ -->
<jvmarg line="-server -Xmx2G -Xdebug -Xnoagent -Djava.compiler=NONE -Dfelix.config.properties=file:config.properties -Dfr.dyade.aaa.agent.AgentServer.id=${sid} -Dcom.sun.management.jmxremote -DTransaction.SyncOnWrite=false"/>
<!-- jvmarg line="-server -Xmx1500m -Xincgc -Dfelix.config.properties=file:config.properties -Dfr.dyade.aaa.agent.AgentServer.id=${sid} -Dcom.sun.management.jmxremote"/ -->
<!-- jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y"/ -->
......@@ -411,6 +412,15 @@
</antcall>
</target>
<!-- Runs the rest test -->
<target name="rest.test" depends="init"
description="--> Runs the rest simple test">
<java classname="rest.RestTest" failonerror="no" fork="yes"
dir="${run.dir}">
<classpath path="${project.class.path}"/>
</java>
</target>
<!-- Runs the rest producer -->
<target name="rest.producer" depends="init"
description="--> Runs the rest sample producer">
......@@ -450,6 +460,50 @@
</java>
</target>
<!-- **************************************************
* Rest bridge Sample ** loopback **
************************************************** -->
<!-- Start Rest Bridge server loopback -->
<target name="restbridge_server_loopback" depends="simple_init"
description="--> Starts the rest bridge server">
<antcall target="server">
<param name="sid" value="0"/>
<param name="a3.conf" value="${conf.dir}/ngt_a3servers.xml"/>
<param name="osgi.conf" value="${conf.dir}/config_restbridge_loopback.properties"/>
</antcall>
</target>
<!-- Setup the bridge server configuration -->
<target name="restbridge_admin_loopbak" depends="simple_init"
description="--> Runs the rest bridge sample administration for loopback server">
<java classname="restbridge.AdminLoopback"
failonerror="no" fork="yes"
dir="${run.dir}">
<classpath path="${project.class.path}"/>
</java>
</target>
<!-- Runs the rest bridge producer -->
<target name="restbridge_producer_loopbak" depends="init"
description="--> Runs the rest bridge sample producer">
<java classname="restbridge.ProducerLoopback" failonerror="no" fork="yes"
dir="${run.dir}">
<classpath path="${project.class.path}"/>
<jvmarg line="-Dqueue=queueDist"/>
</java>
</target>
<!-- Runs the rest bridge consumer -->
<target name="restbridge_consumer_loopbak" depends="init"
description="--> Runs the rest bridge sample consumer">
<java classname="restbridge.ConsumerLoopback" failonerror="no" fork="yes"
dir="${run.dir}">
<classpath path="${project.class.path}"/>
<jvmarg line="-Dqueue=queueAcq"/>
</java>
</target>
<!-- **************************************************
* Rest bridge Sample
************************************************** -->
......@@ -1309,7 +1363,7 @@
failonerror="no" fork="yes"
dir="${run.dir}">
<classpath path="${project.class.path}"/>
<jvmarg line="-Dcom.sun.management.jmxremote -Dorg.objectweb.joram.keystore=${keystore} -Dorg.objectweb.joram.keystorepass=${keystore_pass}"/>
<jvmarg line="-Dcom.sun.management.jmxremote -Dorg.objectweb.joram.clientAuth=NEED -Dorg.objectweb.joram.keystore=${keystore} -Dorg.objectweb.joram.keystorepass=${keystore_pass}"/>
<arg line="0 s0"/>
</java>
</target>
......@@ -1366,22 +1420,24 @@
</target>
<!-- Runs the sslClassic consumer client -->
<target name="sslconsumer" depends="sslinit"
<target name="sslconsumer_queue" depends="sslinit"
description="--> Starts a Consumer client">
<java classname="classic.Consumer" failonerror="no" fork="yes"
dir="${run.dir}">
<classpath path="${project.class.path}"/>
<jvmarg line="-Dorg.objectweb.joram.keystore=${keystore} -Dorg.objectweb.joram.keystorepass=${keystore_pass}"/>
<arg line="queue"/>
</java>
</target>
<!-- Runs the sslClassic producer client -->
<target name="sslproducer" depends="sslinit"
<target name="sslproducer_queue" depends="sslinit"
description="--> Starts a Producer client">
<java classname="classic.Producer" failonerror="no" fork="yes"
dir="${run.dir}">
<classpath path="${project.class.path}"/>
<jvmarg line="-Dorg.objectweb.joram.keystore=${keystore} -Dorg.objectweb.joram.keystorepass=${keystore_pass}"/>
<arg line="queue"/>
</java>
</target>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment