Author: veithen
Date: Sat Aug 26 15:11:24 2017
New Revision: 1806306
URL: http://svn.apache.org/viewvc?rev=1806306&view=rev
Log:
AXIS2-5793: Merge r1806303-1806305 to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/systests/echo/
- copied from r1806303, axis/axis2/java/core/trunk/systests/echo/
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
axis/axis2/java/core/branches/1_7/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp
axis/axis2/java/core/branches/1_7/systests/echo/pom.xml
axis/axis2/java/core/branches/1_7/systests/pom.xml
axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml
axis/axis2/java/core/branches/1_7/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 26 15:11:24 2017
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1735801,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1779069,1779074,1780290,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1799068,1800495,1
803414,1805563,1806088
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1735801,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1779069,1779074,1780290,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1799068,1800495,1
803414,1805563,1806088,1806303-1806305
Modified:
axis/axis2/java/core/branches/1_7/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java?rev=1806306&r1=1806305&r2=1806306&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
Sat Aug 26 15:11:24 2017
@@ -91,7 +91,7 @@ final class AdminActions {
try {
if (configContext.getAxisConfiguration().getRepository() != null) {
File repoDir =
- new
File(configContext.getAxisConfiguration().getRepository().getFile());
+ new
File(configContext.getAxisConfiguration().getRepository().toURI());
serviceDir = new File(repoDir, "services");
if (!serviceDir.exists()) {
serviceDir.mkdirs();
Modified:
axis/axis2/java/core/branches/1_7/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp?rev=1806306&r1=1806305&r2=1806306&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp
(original)
+++
axis/axis2/java/core/branches/1_7/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp
Sat Aug 26 15:11:24 2017
@@ -81,7 +81,7 @@
<p>Service Description : <%=serviceDescription%><br>
Service EPR : <%=prefix + axisService.getName()%><br>
Service Status : <%=axisService.isActive() ? "Active" : "InActive"%>
-<form method="post" action="<c:url value="axis2-admin/deleteService"/>"><input
type="hidden" name="serviceName" value="<%=serviceName%>"><input type="submit"
value="Remove Service"></form></p>
+<form name="<%=serviceName%>" method="post" action="<c:url
value="axis2-admin/deleteService"/>"><input type="hidden" name="serviceName"
value="<%=serviceName%>"><input type="submit" value="Remove Service"></form></p>
<%
Collection engagedModules = axisService.getEngagedModules();
String moduleName;
Modified: axis/axis2/java/core/branches/1_7/systests/echo/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/systests/echo/pom.xml?rev=1806306&r1=1806303&r2=1806306&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/systests/echo/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/systests/echo/pom.xml Sat Aug 26 15:11:24
2017
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>systests</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.7-SNAPSHOT</version>
</parent>
<artifactId>echo</artifactId>
<packaging>aar</packaging>
Modified: axis/axis2/java/core/branches/1_7/systests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/systests/pom.xml?rev=1806306&r1=1806305&r2=1806306&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/systests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/systests/pom.xml Sat Aug 26 15:11:24 2017
@@ -41,6 +41,7 @@
</build>
<modules>
+ <module>echo</module>
<module>webapp-tests</module>
</modules>
</project>
Modified: axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml?rev=1806306&r1=1806305&r2=1806306&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml Sat Aug 26
15:11:24 2017
@@ -35,6 +35,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>echo</artifactId>
+ <version>${project.version}</version>
+ <type>aar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<scope>test</scope>
@@ -69,6 +76,7 @@
<artifactId>alta-maven-plugin</artifactId>
<executions>
<execution>
+ <id>war-location</id>
<goals>
<goal>generate-properties</goal>
</goals>
@@ -84,6 +92,22 @@
</artifacts>
</configuration>
</execution>
+ <execution>
+ <id>aar-location</id>
+ <goals>
+ <goal>generate-test-resources</goal>
+ </goals>
+ <configuration>
+ <name>echo-service-location.txt</name>
+ <value>%file%</value>
+ <dependencySet>
+ <scope>test</scope>
+ <includes>
+ <include>*:echo:aar:*</include>
+ </includes>
+ </dependencySet>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
Modified:
axis/axis2/java/core/branches/1_7/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java?rev=1806306&r1=1806305&r2=1806306&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java
(original)
+++
axis/axis2/java/core/branches/1_7/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java
Sat Aug 26 15:11:24 2017
@@ -20,6 +20,7 @@ package org.apache.axis2.webapp;
import static com.google.common.truth.Truth.assertThat;
+import org.apache.commons.io.IOUtils;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -59,6 +60,33 @@ public class AxisAdminServletITCase {
}
@Test
+ public void testUploadRemoveService() throws Exception {
+ tester.clickLinkWithText("Upload Service");
+ String echoServiceLocation =
IOUtils.toString(AxisAdminServletITCase.class.getResource("/echo-service-location.txt"));
+ tester.setTextField("filename", echoServiceLocation);
+ tester.clickButtonWithText(" Upload ");
+ tester.assertMatch("File echo-.+\\.aar successfully uploaded");
+ int attempt = 0;
+ while (true) {
+ attempt++;
+ tester.clickLinkWithText("Available Services");
+ try {
+ tester.assertFormPresent("Echo");
+ break;
+ } catch (AssertionError ex) {
+ if (attempt < 30) {
+ Thread.sleep(1000);
+ } else {
+ throw ex;
+ }
+ }
+ }
+ tester.setWorkingForm("Echo");
+ tester.submit();
+ tester.assertTextPresent("Service 'Echo' has been successfully
removed.");
+ }
+
+ @Test
public void testEditServiceParameters() {
tester.clickLinkWithText("Edit Parameters");
tester.selectOption("axisService", "Version");
