Compare commits

...

3 Commits

Author SHA1 Message Date
Christian cfbc1ccc6b conflictos target 2020-09-28 14:06:11 -05:00
Christian d7b11e1732 errores target 2020-09-28 13:57:09 -05:00
Christian 9fb9e5da61 errores con target 2020-09-28 13:56:14 -05:00
23 changed files with 20 additions and 8 deletions

View File

@ -1,5 +1,5 @@
#Generated by Maven #Generated by Maven
#Tue Jul 28 11:32:06 ECT 2020 #Mon Sep 28 13:53:51 ECT 2020
groupId=com.qsoft groupId=com.qsoft
artifactId=werp-services artifactId=werp-services
version=1.0-SNAPSHOT version=1.0-SNAPSHOT

View File

@ -1,4 +1,4 @@
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Test set: com.qsoft.test.Tester Test set: com.qsoft.test.Tester
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.681 sec Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.279 sec

View File

@ -57,7 +57,7 @@ function toggleAllBoxes() {
<tr> <tr>
<td>Tests passed/Failed/Skipped:</td><td>0/0/0</td> <td>Tests passed/Failed/Skipped:</td><td>0/0/0</td>
</tr><tr> </tr><tr>
<td>Started on:</td><td>Tue Jul 28 11:32:00 ECT 2020</td> <td>Started on:</td><td>Mon Sep 28 13:53:41 ECT 2020</td>
</tr> </tr>
<tr><td>Total time:</td><td>0 seconds (7 ms)</td> <tr><td>Total time:</td><td>0 seconds (7 ms)</td>
</tr><tr> </tr><tr>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated by org.testng.reporters.JUnitXMLReporter --> <!-- Generated by org.testng.reporters.JUnitXMLReporter -->
<testsuite ignored="0" hostname="localhost.localdomain" failures="0" tests="0" time="0.007" errors="0" timestamp="28 jul. 2020 16:32:00 GMT"> <testsuite ignored="0" hostname="localhost.localdomain" failures="0" tests="0" time="0.007" errors="0" timestamp="28 sep. 2020 18:53:41 GMT">
</testsuite> </testsuite>

View File

@ -2,10 +2,10 @@
<testng-results ignored="0" total="0" passed="0" failed="0" skipped="0"> <testng-results ignored="0" total="0" passed="0" failed="0" skipped="0">
<reporter-output> <reporter-output>
</reporter-output> </reporter-output>
<suite started-at="2020-07-28T16:32:00Z" name="com.qsoft.test.Tester" finished-at="2020-07-28T16:32:00Z" duration-ms="7"> <suite started-at="2020-09-28T18:53:41Z" name="com.qsoft.test.Tester" finished-at="2020-09-28T18:53:41Z" duration-ms="7">
<groups> <groups>
</groups> </groups>
<test started-at="2020-07-28T16:32:00Z" name="Command line test" finished-at="2020-07-28T16:32:00Z" duration-ms="7"> <test started-at="2020-09-28T18:53:41Z" name="Command line test" finished-at="2020-09-28T18:53:41Z" duration-ms="7">
</test> <!-- Command line test --> </test> <!-- Command line test -->
</suite> <!-- com.qsoft.test.Tester --> </suite> <!-- com.qsoft.test.Tester -->
</testng-results> </testng-results>

View File

@ -1,4 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<servlet>
<servlet-name>com.qsoft.wmp.services.rest.ApplicationConfig</servlet-name>
<init-param>
<param-name>jersey.config.server.provider.classnames</param-name>
<param-value>org.glassfish.jersey.jackson.JacksonFeature</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>com.qsoft.wmp.services.rest.ApplicationConfig</servlet-name>
<url-pattern>/servicios/*</url-pattern>
</servlet-mapping>
</web-app> </web-app>

Binary file not shown.