Skip to content

Commit a28c461

Browse files
jaimecaserojaimecasero
committed
using web.xml with annocationScan prevention
1 parent a185817 commit a28c461

67 files changed

Lines changed: 133 additions & 0 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/RvdProjectsMigratorDisabled.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,11 @@ public static WebArchive createWebArchiveRestcomm() throws Exception {
121121
.asSingle(WebArchive.class);
122122
archive = archive.merge(restcommArchive);
123123
archive.delete("/WEB-INF/sip.xml");
124+
archive.delete("/WEB-INF/web.xml");
124125
archive.delete("/WEB-INF/conf/restcomm.xml");
125126
archive.delete("/WEB-INF/data/hsql/restcomm.script");
126127
archive.addAsWebInfResource("sip.xml");
128+
archive.addAsWebInfResource("web.xml");
127129
archive.addAsWebInfResource("restcomm_workspaceMigrationDisabled.xml", "conf/restcomm.xml");
128130
archive.addAsWebInfResource("restcomm.script_projectMigratorWorkspaceMigratedTest", "data/hsql/restcomm.script");
129131
String source = "src/test/resources/workspace-migration-scenarios/migrated";

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/AccountsEndpointClosingTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,11 @@ public static WebArchive createWebArchiveNoGw() {
140140
.asSingle(WebArchive.class);
141141
archive = archive.merge(restcommArchive);
142142
archive.delete("/WEB-INF/sip.xml");
143+
archive.delete("/WEB-INF/web.xml");
143144
archive.delete("/WEB-INF/conf/restcomm.xml");
144145
archive.delete("/WEB-INF/data/hsql/restcomm.script");
145146
archive.addAsWebInfResource("sip.xml");
147+
archive.addAsWebInfResource("web.xml");
146148
archive.addAsWebInfResource("restcomm-accountRemoval.xml", "conf/restcomm.xml");
147149
archive.addAsWebInfResource("restcomm.script_account_removal_test", "data/hsql/restcomm.script");
148150
logger.info("Packaged Test App");

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/AccountsEndpointTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,9 +779,11 @@ public static WebArchive createWebArchiveNoGw() {
779779
.asSingle(WebArchive.class);
780780
archive = archive.merge(restcommArchive);
781781
archive.delete("/WEB-INF/sip.xml");
782+
archive.delete("/WEB-INF/web.xml");
782783
archive.delete("/WEB-INF/conf/restcomm.xml");
783784
archive.delete("/WEB-INF/data/hsql/restcomm.script");
784785
archive.addAsWebInfResource("sip.xml");
786+
archive.addAsWebInfResource("web.xml");
785787
archive.addAsWebInfResource("restcomm.xml", "conf/restcomm.xml");
786788
archive.addAsWebInfResource("restcomm.script_accounts_test", "data/hsql/restcomm.script");
787789
logger.info("Packaged Test App");

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/AccountsMigrationEndpointTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,11 @@ public static WebArchive createWebArchiveNoGw() {
139139
.asSingle(WebArchive.class);
140140
archive = archive.merge(restcommArchive);
141141
archive.delete("/WEB-INF/sip.xml");
142+
archive.delete("/WEB-INF/web.xml");
142143
archive.delete("/WEB-INF/conf/restcomm.xml");
143144
archive.delete("/WEB-INF/data/hsql/restcomm.script");
144145
archive.addAsWebInfResource("sip.xml");
146+
archive.addAsWebInfResource("web.xml");
145147
archive.addAsWebInfResource("restcomm.xml", "conf/restcomm.xml");
146148
archive.addAsWebInfResource("restcomm.script_accounts_migration_test", "data/hsql/restcomm.script");
147149
logger.info("Packaged Test App");

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/ApplicationsEndpointTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,11 @@ public static WebArchive createWebArchiveNoGw() {
235235
.asSingle(WebArchive.class);
236236
archive = archive.merge(restcommArchive);
237237
archive.delete("/WEB-INF/sip.xml");
238+
archive.delete("/WEB-INF/web.xml");
238239
archive.delete("/WEB-INF/conf/restcomm.xml");
239240
archive.delete("/WEB-INF/data/hsql/restcomm.script");
240241
archive.addAsWebInfResource("sip.xml");
242+
archive.addAsWebInfResource("web.xml");
241243
archive.addAsWebInfResource("restcomm.xml", "conf/restcomm.xml");
242244
archive.addAsWebInfResource("restcomm.script-applications", "data/hsql/restcomm.script");
243245
logger.info("Packaged Test App");

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/CallsEndpointTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,11 @@ public static WebArchive createWebArchiveNoGw() {
278278
.asSingle(WebArchive.class);
279279
archive = archive.merge(restcommArchive);
280280
archive.delete("/WEB-INF/sip.xml");
281+
archive.delete("/WEB-INF/web.xml");
281282
archive.delete("/WEB-INF/conf/restcomm.xml");
282283
archive.delete("/WEB-INF/data/hsql/restcomm.script");
283284
archive.addAsWebInfResource("sip.xml");
285+
archive.addAsWebInfResource("web.xml");
284286
archive.addAsWebInfResource("restcomm.xml", "conf/restcomm.xml");
285287
archive.addAsWebInfResource("restcomm_with_Data.script", "data/hsql/restcomm.script");
286288
logger.info("Packaged Test App");

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/ClientsEndpointTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,11 @@ public static WebArchive createWebArchiveNoGw() {
314314
.asSingle(WebArchive.class);
315315
archive = archive.merge(restcommArchive);
316316
archive.delete("/WEB-INF/sip.xml");
317+
archive.delete("/WEB-INF/web.xml");
317318
archive.delete("/WEB-INF/conf/restcomm.xml");
318319
archive.delete("/WEB-INF/data/hsql/restcomm.script");
319320
archive.addAsWebInfResource("sip.xml");
321+
archive.addAsWebInfResource("web.xml");
320322
archive.addAsWebInfResource("restcomm.xml", "conf/restcomm.xml");
321323
archive.addAsWebInfResource("restcomm.script_clients_test", "data/hsql/restcomm.script");
322324
return archive;

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/ConferenceEndpointTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,11 @@ public static WebArchive createWebArchiveNoGw() {
7272
.asSingle(WebArchive.class);
7373
archive = archive.merge(restcommArchive);
7474
archive.delete("/WEB-INF/sip.xml");
75+
archive.delete("/WEB-INF/web.xml");
7576
archive.delete("/WEB-INF/conf/restcomm.xml");
7677
archive.delete("/WEB-INF/data/hsql/restcomm.script");
7778
archive.addAsWebInfResource("sip.xml");
79+
archive.addAsWebInfResource("web.xml");
7880
archive.addAsWebInfResource("restcomm.xml", "conf/restcomm.xml");
7981
archive.addAsWebInfResource("restcomm_with_Data.script", "data/hsql/restcomm.script");
8082
logger.info("Packaged Test App");

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/ConferenceParticipantsEndpointTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,11 @@ public static WebArchive createWebArchiveNoGw() {
113113
.asSingle(WebArchive.class);
114114
archive = archive.merge(restcommArchive);
115115
archive.delete("/WEB-INF/sip.xml");
116+
archive.delete("/WEB-INF/web.xml");
116117
archive.delete("/WEB-INF/conf/restcomm.xml");
117118
archive.delete("/WEB-INF/data/hsql/restcomm.script");
118119
archive.addAsWebInfResource("sip.xml");
120+
archive.addAsWebInfResource("web.xml");
119121
archive.addAsWebInfResource("restcomm.xml", "conf/restcomm.xml");
120122
archive.addAsWebInfResource("restcomm_with_Data.script", "data/hsql/restcomm.script");
121123
logger.info("Packaged Test App");

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/CorsRelaxTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,11 @@ public static WebArchive createWebArchiveNoGw() {
102102
.asSingle(WebArchive.class);
103103
archive = archive.merge(restcommArchive);
104104
archive.delete("/WEB-INF/sip.xml");
105+
archive.delete("/WEB-INF/web.xml");
105106
archive.delete("/WEB-INF/conf/restcomm.xml");
106107
archive.delete("/WEB-INF/data/hsql/restcomm.script");
107108
archive.addAsWebInfResource("sip.xml");
109+
archive.addAsWebInfResource("web.xml");
108110
archive.addAsWebInfResource("restcomm-corsRelax.xml", "conf/restcomm.xml");
109111
archive.addAsWebInfResource("restcomm.script", "data/hsql/restcomm.script");
110112
logger.info("Packaged Test App");

0 commit comments

Comments
 (0)