Modified: axis/axis2/java/core/branches/hermetic-tests/modules/webapp/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/webapp/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/modules/webapp/pom.xml (original) +++ axis/axis2/java/core/branches/hermetic-tests/modules/webapp/pom.xml Thu Dec 27 18:42:33 2018 @@ -41,11 +41,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-java2wsdl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> @@ -66,11 +61,6 @@ </dependency> <dependency> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-jaxbri</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.axis2</groupId> <artifactId>axis2-xmlbeans</artifactId> <version>${project.version}</version> </dependency> @@ -127,6 +117,14 @@ <scope>provided</scope> </dependency> <dependency> + <!-- Not required for the Maven build, but necessary to avoid errors when + importing the project into an IDE. --> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-mtompolicy</artifactId> <version>${project.version}</version> @@ -143,6 +141,72 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>axis2-transport-http</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-transport-http-hc3</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>axis2-transport-local</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>axis2-transport-jms</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>axis2-transport-mail</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>axis2-transport-tcp</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>axis2-transport-udp</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>axis2-transport-xmpp</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>jivesoftware</groupId> + <artifactId>smack</artifactId> + </exclusion> + <exclusion> + <groupId>jivesoftware</groupId> + <artifactId>smackx</artifactId> + </exclusion> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <!-- codegen is required for Rampart because of AXIS2-4265 --> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-codegen</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.axis2</groupId> <artifactId>mex</artifactId> <version>${project.version}</version> @@ -164,12 +228,16 @@ <artifactId>taglibs-standard-impl</artifactId> <version>1.2.5</version> </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-jaxb</artifactId> + </dependency> </dependencies> <build> <finalName>axis2-${project.version}</finalName> <resources> <resource> - <directory>../kernel/conf</directory> + <directory>${project.build.directory}/kernel/conf</directory> <includes> <include>*.properties</include> </includes> @@ -210,9 +278,9 @@ </plugin> <plugin> <!-- Compile the JSPs so that syntax errors are detected during the build. --> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-jspc-maven-plugin</artifactId> - <version>8.1.16.v20140903</version> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jspc-maven-plugin</artifactId> + <version>9.4.12.v20180830</version> <executions> <execution> <goals> @@ -249,6 +317,24 @@ </resources> </configuration> </execution> + <execution> + <id>copy-kernel-conf-properties</id> + <phase>generate-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/kernel/conf</outputDirectory> + <resources> + <resource> + <directory>../kernel/conf</directory> + <includes> + <include>*.properties</include> + </includes> + </resource> + </resources> + </configuration> + </execution> </executions> </plugin> <plugin> @@ -281,8 +367,6 @@ WEB-INF/lib/spring-context-*.jar, WEB-INF/lib/spring-core-*.jar, WEB-INF/lib/spring-web-*.jar, - WEB-INF/lib/ant-*.jar, - WEB-INF/lib/ant-launcher-*.jar, WEB-INF/lib/aopalliance-*.jar, WEB-INF/lib/bsf-*.jar, WEB-INF/lib/FastInfoset-*.jar,
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/webapp/scripts/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/webapp/scripts/build.xml?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/modules/webapp/scripts/build.xml (original) +++ axis/axis2/java/core/branches/hermetic-tests/modules/webapp/scripts/build.xml Thu Dec 27 18:42:33 2018 @@ -72,15 +72,21 @@ <war destfile="dist/axis2.war" webxml="webapp/WEB-INF/web.xml"> <lib dir="lib"> <include name="**" /> + <exclude name="endorsed/**" /> <exclude name="**servlet**" /> - <exclude name="ant*.jar" /> - <exclude name="axis2-adb-codegen*.jar"/> + <exclude name="axis2-ant-plugin-*.jar" /> + <exclude name="axis2-*-codegen-*.jar"/> + <exclude name="axis2-java2wsdl-*.jar"/> <!-- codegen is required for Rampart because of AXIS2-4265 --> <!-- exclude name="axis2-codegen*.jar"/ --> - <exclude name="jibx-bind*.jar"/> + <exclude name="commons-cli-*.jar" /> + <exclude name="jibx-bind-*.jar" /> + <exclude name="bcel-*.jar" /> + <exclude name="qdox-*.jar" /> </lib> <webinf dir="${temp}/WEB-INF" /> <fileset dir="${temp}"> + <include name="org/apache/axis2/soapmonitor/applet/**/*" /> <include name="**/axis2-web/**" /> </fileset> </war> Modified: axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java (original) +++ axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java Thu Dec 27 18:42:33 2018 @@ -47,7 +47,6 @@ import javax.servlet.http.HttpServletReq import javax.xml.namespace.QName; import java.io.File; import java.util.Collection; -import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -91,7 +90,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(); @@ -104,10 +103,8 @@ final class AdminActions { } } - protected void populateSessionInformation(HttpServletRequest req) { - HashMap services = configContext.getAxisConfiguration().getServices(); - req.getSession().setAttribute(Constants.SERVICE_MAP, services); - req.getSession().setAttribute(Constants.SERVICE_PATH, configContext.getServicePath()); + protected void populateRequestAttributes(HttpServletRequest req) { + req.setAttribute("configContext", configContext); } @Action(name=INDEX) @@ -354,7 +351,7 @@ final class AdminActions { Map<String,AxisModule> modules = configContext.getAxisConfiguration().getModules(); req.getSession().setAttribute(Constants.MODULE_MAP, modules); - populateSessionInformation(req); + populateRequestAttributes(req); req.getSession().setAttribute(Constants.ENGAGE_STATUS, null); @@ -446,7 +443,7 @@ final class AdminActions { @Action(name="selectServiceParaEdit") public View selectServiceParaEdit(HttpServletRequest req) { - populateSessionInformation(req); + populateRequestAttributes(req); req.getSession().setAttribute(Constants.SELECT_SERVICE_TYPE, "SERVICE_PARAMETER"); req.setAttribute("action", EDIT_SERVICE_PARAMETERS); return new View(SELECT_SERVICE_JSP_NAME); @@ -454,7 +451,7 @@ final class AdminActions { @Action(name="listOperation") public View listOperation(HttpServletRequest req) { - populateSessionInformation(req); + populateRequestAttributes(req); req.getSession().setAttribute(Constants.SELECT_SERVICE_TYPE, "MODULE"); req.setAttribute("action", ENGAGE_TO_OPERATION); return new View(SELECT_SERVICE_JSP_NAME); @@ -462,7 +459,7 @@ final class AdminActions { @Action(name=ACTIVATE_SERVICE) public View activateService(HttpServletRequest req) { - populateSessionInformation(req); + populateRequestAttributes(req); return new View("activateService.jsp"); } @@ -480,7 +477,7 @@ final class AdminActions { @Action(name=DEACTIVATE_SERVICE) public View deactivateService(HttpServletRequest req) { - populateSessionInformation(req); + populateRequestAttributes(req); return new View("deactivateService.jsp"); } @@ -526,7 +523,7 @@ final class AdminActions { @Action(name="listServiceGroups") public View listServiceGroups(HttpServletRequest req) { Iterator<AxisServiceGroup> serviceGroups = configContext.getAxisConfiguration().getServiceGroups(); - populateSessionInformation(req); + populateRequestAttributes(req); req.getSession().setAttribute(Constants.SERVICE_GROUP_MAP, serviceGroups); return new View("listServiceGroups.jsp"); @@ -534,7 +531,7 @@ final class AdminActions { @Action(name=LIST_SERVICES) public View listServices(HttpServletRequest req) { - populateSessionInformation(req); + populateRequestAttributes(req); req.getSession().setAttribute(Constants.ERROR_SERVICE_MAP, configContext.getAxisConfiguration().getFaultyServices()); @@ -625,7 +622,7 @@ final class AdminActions { @Action(name="selectService") public View selectService(HttpServletRequest req) { - populateSessionInformation(req); + populateRequestAttributes(req); req.getSession().setAttribute(Constants.SELECT_SERVICE_TYPE, "VIEW"); req.setAttribute("action", VIEW_OPERATION_SPECIFIC_CHAINS); return new View(SELECT_SERVICE_JSP_NAME); Modified: axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp (original) +++ axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp Thu Dec 27 18:42:33 2018 @@ -52,17 +52,9 @@ <tr> <td style="width: 35%">Select a Service :</td><td style="width:65%"> <select name="axisService"> - <% - HashMap services = (HashMap)request.getSession().getAttribute(Constants.SERVICE_MAP); - Collection serviceCol = services.values(); - for (Iterator iterator = serviceCol.iterator(); iterator.hasNext();) { - AxisService axisService = (AxisService)iterator.next(); - String serviceName = axisService.getName(); - %> <option value="<%=serviceName%>"><%=serviceName%></option> - <% - } - request.getSession().setAttribute(Constants.SERVICE_MAP,null); - %> + <c:forEach var="service" items="${requestScope.configContext.axisConfiguration.services.values()}"> + <option value="${service.name}"><c:out value="${service.name}"/></option> + </c:forEach> </select> </td> </tr> Modified: axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/activateService.jsp URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/activateService.jsp?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/activateService.jsp (original) +++ axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/activateService.jsp Thu Dec 27 18:42:33 2018 @@ -35,20 +35,20 @@ </tr> <tr> <% -HashMap services = (HashMap)request.getSession().getAttribute(Constants.SERVICE_MAP); -Collection col = services.values(); String html = ""; int count = 0; - -for (Iterator iterator = col.iterator(); iterator.hasNext();) { - AxisService axisServices = (AxisService) iterator.next(); +%> +<c:forEach var="service" items="${requestScope.configContext.axisConfiguration.services.values()}"> +<% + AxisService axisServices = (AxisService) pageContext.getAttribute("service"); if(!axisServices.isActive()){ count++; html += "<option value='" + axisServices.getName() + "'>"; html += axisServices.getName() + "</option>"; } -} -request.getSession().setAttribute(Constants.SERVICE_MAP,null); +%> +</c:forEach> +<% if (count > 0) { %> Modified: axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/deactivateService.jsp URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/deactivateService.jsp?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/deactivateService.jsp (original) +++ axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/deactivateService.jsp Thu Dec 27 18:42:33 2018 @@ -35,20 +35,20 @@ </tr> <tr> <% -HashMap services = (HashMap)request.getSession().getAttribute(Constants.SERVICE_MAP); -Collection col = services.values(); String html = ""; int count = 0; - -for (Iterator iterator = col.iterator(); iterator.hasNext();) { - AxisService axisServices = (AxisService) iterator.next(); +%> +<c:forEach var="service" items="${requestScope.configContext.axisConfiguration.services.values()}"> +<% + AxisService axisServices = (AxisService) pageContext.getAttribute("service"); if(axisServices.isActive()){ count++; html += "<option value='" + axisServices.getName() + "'>"; html += axisServices.getName() + "</option>"; } -} -request.getSession().setAttribute(Constants.SERVICE_MAP,null); +%> +</c:forEach> +<% if (count > 0) { %> Modified: axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/engageToService.jsp URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/engageToService.jsp?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/engageToService.jsp (original) +++ axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/engageToService.jsp Thu Dec 27 18:42:33 2018 @@ -84,23 +84,9 @@ <tr> <td> <select name="axisService"> - <% - - HashMap services = (HashMap)request.getSession().getAttribute(Constants.SERVICE_MAP); - Collection serviceCol = services.values(); - for (Iterator iterator = serviceCol.iterator(); iterator.hasNext();) { - AxisService axisService = (AxisService)iterator.next(); - String serviceName = axisService.getName(); - - %> - <option value="<%=serviceName%>"><%=serviceName%> - </option> - <% - - } - request.getSession().setAttribute(Constants.SERVICE_MAP,null); - - %> + <c:forEach var="service" items="${requestScope.configContext.axisConfiguration.services.values()}"> + <option value="${service.name}"><c:out value="${service.name}"/></option> + </c:forEach> </select> </td> </tr> Modified: axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp (original) +++ axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp Thu Dec 27 18:42:33 2018 @@ -23,9 +23,6 @@ org.apache.axis2.description.AxisModule" %> <%@ page import="org.apache.axis2.description.AxisOperation" %> <%@ page import="org.apache.axis2.description.AxisService" %> -<%@ page import="org.apache.axis2.description.Parameter" %> -<%@ page import="org.apache.axis2.engine.AxisConfiguration" %> -<%@ page import="org.apache.axis2.util.JavaUtils" %> <%@ page import="java.util.Collection" %> <%@ page import="java.util.Enumeration" %> <%@ page import="java.util.HashMap" %> @@ -39,40 +36,16 @@ <% String prefix = request.getAttribute("frontendHostUrl") + (String)request.getAttribute(Constants.SERVICE_PATH) + "/"; %> <% - HashMap serviceMap = (HashMap) request.getSession().getAttribute(Constants.SERVICE_MAP); - request.getSession().setAttribute(Constants.SERVICE_MAP, null); Hashtable errornessservice = (Hashtable) request.getSession().getAttribute(Constants.ERROR_SERVICE_MAP); boolean status = false; - if (serviceMap != null && !serviceMap.isEmpty()) { - Iterator operations; - String serviceName; - Collection servicecol = serviceMap.values(); - for (Iterator iterator = servicecol.iterator(); iterator.hasNext();) { - AxisService axisService = (AxisService) iterator.next(); - operations = axisService.getOperations(); - serviceName = axisService.getName(); -%><h2><a style="color:blue" href="<%=prefix + axisService.getName()%>?wsdl"><%=serviceName%></a></h2> -<% - // do we need to enable REST in the main servlet so that it handles both REST and SOAP messages - boolean disableREST = false; - AxisConfiguration axisConfiguration = axisService.getAxisConfiguration(); - - Parameter parameter ; - - // do we need to completely disable REST support - parameter = axisConfiguration.getParameter(Constants.Configuration.DISABLE_REST); - if (parameter != null) { - disableREST = !JavaUtils.isFalseExplicitly(parameter.getValue()); - } - if (!disableREST) { %> - +<c:forEach var="service" items="${requestScope.configContext.axisConfiguration.services.values()}"> <% -%> + AxisService axisService = (AxisService) pageContext.getAttribute("service"); + Iterator operations = axisService.getOperations(); + String serviceName = axisService.getName(); +%><h2><a style="color:blue" href="<%=prefix + axisService.getName()%>?wsdl"><%=serviceName%></a></h2> <% - } - - String serviceDescription = axisService.getDocumentation(); if (serviceDescription == null || "".equals(serviceDescription)) { serviceDescription = "No description available for this service"; @@ -81,7 +54,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; @@ -150,8 +123,9 @@ Service Status : <%=axisService.isActive </ul> <% status = true; - } - } +%> +</c:forEach> +<% if (errornessservice != null) { if (errornessservice.size() > 0) { request.getSession().setAttribute(Constants.IS_FAULTY, Constants.IS_FAULTY); Modified: axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/listSingleService.jsp URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/listSingleService.jsp?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/listSingleService.jsp (original) +++ axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/listSingleService.jsp Thu Dec 27 18:42:33 2018 @@ -20,9 +20,6 @@ <%@ page import="org.apache.axis2.Constants, org.apache.axis2.description.AxisOperation" %> <%@ page import="org.apache.axis2.description.AxisService" %> -<%@ page import="org.apache.axis2.description.Parameter" %> -<%@ page import="org.apache.axis2.engine.AxisConfiguration" %> -<%@ page import="org.apache.axis2.util.JavaUtils" %> <%@ page import="java.util.Hashtable" %> <%@ page import="java.util.Iterator" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> @@ -56,22 +53,6 @@ <span style="color:black"><%=prefix + axisService.getName()%></span> </p> <% - boolean disableREST = false; - AxisConfiguration axisConfiguration = axisService.getAxisConfiguration(); - - Parameter parameter; - - // do we need to completely disable REST support - parameter = axisConfiguration.getParameter(Constants.Configuration.DISABLE_REST); - if (parameter != null) { - disableREST = !JavaUtils.isFalseExplicitly(parameter.getValue()); - } - if (!disableREST ) { -%> -<% - } - - String serviceDescription = axisService.getDocumentation(); if (serviceDescription == null || "".equals(serviceDescription)) { serviceDescription = "No description available for this service"; Modified: axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/listServices.jsp URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/listServices.jsp?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/listServices.jsp (original) +++ axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/listServices.jsp Thu Dec 27 18:42:33 2018 @@ -17,14 +17,12 @@ ~ under the License. --%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> <%@ page session="false" %> <%@ page import="org.apache.axis2.Constants, org.apache.axis2.description.AxisOperation" %> <%@ page import="org.apache.axis2.description.AxisService" %> -<%@ page import="org.apache.axis2.description.Parameter" %> -<%@ page import="org.apache.axis2.engine.AxisConfiguration" %> <%@ page import="org.apache.axis2.util.Utils" %> -<%@ page import="org.apache.axis2.util.JavaUtils" %> <%@ page import="java.util.Collection" %> <%@ page import="java.util.Enumeration" %> <%@ page import="java.util.HashMap" %> @@ -46,41 +44,17 @@ <% String prefix = request.getAttribute("frontendHostUrl") + (String)request.getAttribute(Constants.SERVICE_PATH) + "/"; %> <% - HashMap serviceMap = (HashMap) request.getAttribute(Constants.SERVICE_MAP); Hashtable errornessservice = (Hashtable) request.getAttribute(Constants.ERROR_SERVICE_MAP); boolean status = false; - if (serviceMap != null && !serviceMap.isEmpty()) { - Iterator opItr; - //HashMap operations; - String serviceName; - Collection servicecol = serviceMap.values(); - // Collection operationsList; - for (Iterator iterator = servicecol.iterator(); iterator.hasNext();) { - AxisService axisService = (AxisService) iterator.next(); +%> +<c:forEach var="service" items="${requestScope.configContext.axisConfiguration.services.values()}"> +<% + AxisService axisService = (AxisService) pageContext.getAttribute("service"); if (!Utils.isHiddenService(axisService)) { - opItr = axisService.getOperations(); - //operationsList = operations.values(); - serviceName = axisService.getName(); + Iterator opItr = axisService.getOperations(); + String serviceName = axisService.getName(); %><h2><a style="color:blue" href="<%=prefix + axisService.getName()%>?wsdl"><%=serviceName%></a></h2> <% - boolean disableREST = false; - AxisConfiguration axisConfiguration = axisService.getAxisConfiguration(); - - Parameter parameter ; - - // do we need to completely disable REST support - parameter = axisConfiguration.getParameter(Constants.Configuration.DISABLE_REST); - if (parameter != null) { - disableREST = !JavaUtils.isFalseExplicitly(parameter.getValue()); - } - - if (!disableREST ) { - -%> -<% - } - - String serviceDescription = axisService.getDocumentation(); if (serviceDescription == null || "".equals(serviceDescription)) { serviceDescription = "No description available for this service"; @@ -107,8 +81,9 @@ <% status = true; } - } - } +%> +</c:forEach> +<% if (errornessservice != null) { if (errornessservice.size() > 0) { request.setAttribute(Constants.IS_FAULTY, Constants.IS_FAULTY); Modified: axis/axis2/java/core/branches/hermetic-tests/modules/xmlbeans/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/xmlbeans/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/modules/xmlbeans/pom.xml (original) +++ axis/axis2/java/core/branches/hermetic-tests/modules/xmlbeans/pom.xml Thu Dec 27 18:42:33 2018 @@ -33,7 +33,7 @@ <dependencies> <dependency> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-codegen</artifactId> + <artifactId>axis2-kernel</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -41,12 +41,20 @@ <artifactId>xmlbeans</artifactId> </dependency> <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-xmlbeans-codegen</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> Modified: axis/axis2/java/core/branches/hermetic-tests/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/pom.xml (original) +++ axis/axis2/java/core/branches/hermetic-tests/pom.xml Thu Dec 27 18:42:33 2018 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>18</version> + <version>20</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.axis2</groupId> @@ -59,6 +59,7 @@ <module>modules/samples/version</module> <module>modules/soapmonitor/servlet</module> <module>modules/soapmonitor/module</module> + <module>modules/schema-validation</module> <module>modules/spring</module> <module>modules/testutils</module> <module>modules/tool/maven-shared</module> @@ -77,8 +78,9 @@ <module>modules/tool/archetype/quickstart-webapp</module> <module>modules/webapp</module> <module>modules/xmlbeans</module> + <module>modules/xmlbeans-codegen</module> <module>modules/scripting</module> - <module>modules/jaxbri</module> + <module>modules/jaxbri-codegen</module> <module>modules/metadata</module> <module>modules/saaj</module> <module>modules/jaxws</module> @@ -143,20 +145,22 @@ </build> </profile> <profile> - <id>doclint-java8-disable</id> + <id>doclint-java7</id> + <activation> + <jdk>(,1.8)</jdk> + </activation> + <properties> + <javadoc.nolint.param /> + </properties> + </profile> + <profile> + <id>doclint-java8</id> <activation> <jdk>[1.8,)</jdk> </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> - </plugin> - </plugins> - </build> + <properties> + <javadoc.nolint.param>-Xdoclint:none</javadoc.nolint.param> + </properties> </profile> </profiles> <mailingLists> @@ -505,10 +509,10 @@ </site> </distributionManagement> <properties> - <neethi.version>3.0.4-SNAPSHOT</neethi.version> + <neethi.version>3.1.2-SNAPSHOT</neethi.version> <woden.version>1.0M11-SNAPSHOT</woden.version> <axiom.version>1.3.0-SNAPSHOT</axiom.version> - <xmlschema.version>2.2.3-SNAPSHOT</xmlschema.version> + <xmlschema.version>2.2.5-SNAPSHOT</xmlschema.version> <ant.version>1.7.0</ant.version> <antlr.version>2.7.7</antlr.version> <bsf.version>2.4.0</bsf.version> @@ -524,25 +528,23 @@ <httpcore.version>4.4.6</httpcore.version> <httpclient.version>4.5.3</httpclient.version> <intellij.version>5.0</intellij.version> - <jaxb.api.version>2.2.6</jaxb.api.version> - <jaxbri.version>2.2.6</jaxbri.version> + <jaxb.api.version>2.3.1</jaxb.api.version> + <jaxbri.version>2.3.1</jaxbri.version> <jettison.version>1.3.8</jettison.version> <jibx.version>1.3.1</jibx.version> <log4j.version>1.2.15</log4j.version> <maven.archiver.version>3.0.2</maven.archiver.version> <maven.version>3.3.9</maven.version> <maven.plugin.descriptor.version>2.0.7</maven.plugin.descriptor.version> - <maven.archetype.plugin.version>2.2</maven.archetype.plugin.version> <plexus.classworlds.version>2.4</plexus.classworlds.version> <plexus.utils.version>1.4.9</plexus.utils.version> <rhino.version>1.6R7</rhino.version> <servlet.api.version>2.3</servlet.api.version> <slf4j.version>1.7.22</slf4j.version> <spring.version>2.5.1</spring.version> - <tomcat.version>6.0.16</tomcat.version> <wsdl4j.version>1.6.2</wsdl4j.version> <xalan.version>2.7.0</xalan.version> - <xmlbeans.version>2.5.0</xmlbeans.version> + <xmlbeans.version>2.6.0</xmlbeans.version> <xml_resolver.version>1.2</xml_resolver.version> <xmlunit.version>1.3</xmlunit.version> <commons.lang.version>2.3</commons.lang.version> @@ -550,9 +552,8 @@ <!-- The build failing if tests are skipped is very annoying --> <failIfNoTests>false</failIfNoTests> <m2Repository>'${settings.localRepository}'</m2Repository> - <geronimo-spec.jta.version>1.1</geronimo-spec.jta.version> - <jaxws.tools.version>2.2.6</jaxws.tools.version> - <jaxws.rt.version>2.2.6</jaxws.rt.version> + <jaxws.tools.version>2.3.1</jaxws.tools.version> + <jaxws.rt.version>2.3.1</jaxws.rt.version> <jsr311.api.version>1.1.1</jsr311.api.version> <!-- This variable is used in some Xdocs and is substituted using Velocity. Note that @@ -575,6 +576,13 @@ <enabled>false</enabled> </releases> </pluginRepository> + <pluginRepository> + <id>sonatype-snapshots</id> + <url>https://oss.sonatype.org/content/repositories/snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> </pluginRepositories> <dependencyManagement> <dependencies> @@ -584,16 +592,6 @@ <version>${fi.version}</version> </dependency> <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tribes</artifactId> - <version>${tomcat.version}</version> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>juli</artifactId> - <version>${tomcat.version}</version> - </dependency> - <dependency> <groupId>xml-resolver</groupId> <artifactId>xml-resolver</artifactId> <version>${xml_resolver.version}</version> @@ -610,8 +608,13 @@ </exclusions> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>com.sun.activation</groupId> + <artifactId>javax.activation</artifactId> + <version>1.2.0</version> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> <version>${jaxbri.version}</version> </dependency> <dependency> @@ -623,16 +626,11 @@ <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>${jaxb.api.version}</version> - <exclusions> - <exclusion> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </exclusion> - </exclusions> + </dependency> + <dependency> + <groupId>javax.xml.soap</groupId> + <artifactId>javax.xml.soap-api</artifactId> + <version>1.3.8</version> </dependency> <dependency> <groupId>com.sun.xml.ws</groupId> @@ -640,27 +638,14 @@ <version>${jaxws.tools.version}</version> </dependency> <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>${jaxws.rt.version}</version> + </dependency> + <dependency> <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-rt</artifactId> <version>${jaxws.rt.version}</version> - <exclusions> - <exclusion> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.soap</groupId> - <artifactId>saaj-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.messaging.saaj</groupId> - <artifactId>saaj-impl</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -751,6 +736,11 @@ </dependency> <dependency> <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-jaxb</artifactId> + <version>${axiom.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>testutils</artifactId> <version>${axiom.version}</version> </dependency> @@ -946,11 +936,6 @@ <version>${maven.plugin.descriptor.version}</version> </dependency> <dependency> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-archetype-plugin</artifactId> - <version>${maven.archetype.plugin.version}</version> - </dependency> - <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>${plexus.utils.version}</version> @@ -1082,9 +1067,9 @@ <version>${commons.lang.version}</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>${geronimo-spec.jta.version}</version> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <version>1.3</version> </dependency> <dependency> <!-- Both google-java-format and Maven depend on Guava. We need to select @@ -1125,21 +1110,19 @@ <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> + <version>3.0.1</version> <configuration> <detectOfflineLinks>false</detectOfflineLinks> + <additionalOptions> + <additionalOption>${javadoc.nolint.param}</additionalOption> + </additionalOptions> + <quiet>true</quiet> </configuration> </plugin> <plugin> <artifactId>maven-release-plugin</artifactId> <configuration> <autoVersionSubmodules>true</autoVersionSubmodules> - <!-- "clean verify" fails because for OSGi bundles, there - is a mismatch between the type of the dependency (jar) - and the actual packaging (bundle) and Maven resolves - the dependency from the local repository instead of the - reactor. --> - <preparationGoals>clean install</preparationGoals> <tagNameFormat>v@{project.version}</tagNameFormat> </configuration> </plugin> @@ -1151,6 +1134,11 @@ <groupId>org.codehaus.gmavenplus</groupId> <artifactId>gmavenplus-plugin</artifactId> <version>1.5</version> + <configuration> + <!-- We don't actually want to allow System.exit, but the security manager + installed by the plugin causes problems in multithreaded builds. --> + <allowSystemExits>true</allowSystemExits> + </configuration> <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> @@ -1161,15 +1149,15 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.2</version> + <version>1.8</version> </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> + <version>3.1.0</version> </plugin> <plugin> <artifactId>maven-clean-plugin</artifactId> - <version>2.2</version> + <version>3.0.0</version> </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -1177,7 +1165,7 @@ </plugin> <plugin> <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> + <version>3.0.2</version> </plugin> <plugin> <artifactId>maven-ear-plugin</artifactId> @@ -1189,15 +1177,15 @@ </plugin> <plugin> <artifactId>maven-install-plugin</artifactId> - <version>2.2</version> + <version>2.5.2</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> + <version>3.0.2</version> </plugin> <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.6</version> + <version>3.5</version> </plugin> <plugin> <artifactId>maven-rar-plugin</artifactId> @@ -1205,38 +1193,43 @@ </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> - <version>2.4.2</version> + <version>3.0.2</version> </plugin> <plugin> <artifactId>maven-source-plugin</artifactId> - <version>2.4</version> + <version>3.0.1</version> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>2.20</version> + <version>2.22.1</version> </plugin> <plugin> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.20</version> + <version>2.22.1</version> </plugin> <plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.6</version> + <version>3.2.2</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.4</version> + <version>1.7</version> </plugin> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>3.3.0</version> + <version>4.1.0</version> </plugin> <plugin> - <groupId>net.ju-n.maven.plugins</groupId> + <groupId>net.nicoulaj.maven.plugins</groupId> <artifactId>checksum-maven-plugin</artifactId> - <version>1.2</version> + <version>1.5</version> + <configuration> + <algorithms> + <algorithm>SHA-512</algorithm> + </algorithms> + </configuration> </plugin> <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> @@ -1245,35 +1238,42 @@ <plugin> <groupId>com.github.veithen.alta</groupId> <artifactId>alta-maven-plugin</artifactId> - <version>0.6.1</version> + <version>0.6.2</version> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxb2-maven-plugin</artifactId> - <version>2.2</version> + <groupId>com.github.veithen.maven</groupId> + <artifactId>xjc-maven-plugin</artifactId> + <version>0.1</version> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxws-maven-plugin</artifactId> - <version>2.4.1</version> - <configuration> - <vmArgs> - <vmArg>-Djavax.xml.accessExternalSchema=all</vmArg> - </vmArgs> - </configuration> + <groupId>com.github.veithen.maven</groupId> + <artifactId>wsimport-maven-plugin</artifactId> + <version>0.2</version> </plugin> <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>9.3.10.v20160621</version> + <version>9.3.25.v20180904</version> + </plugin> + <plugin> + <groupId>com.github.veithen.invoker</groupId> + <artifactId>resolver-proxy-maven-plugin</artifactId> + <version>0.1</version> </plugin> <plugin> <artifactId>maven-invoker-plugin</artifactId> - <version>2.0.0</version> + <version>3.0.1</version> <configuration> <javaHome>${java.home}</javaHome> + <!-- Enable the JaCoCo agent. --> + <mavenOpts>${argLine}</mavenOpts> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-archetype-plugin</artifactId> + <version>3.0.1</version> + </plugin> <!-- Use released versions of the aar and mar plugins in order to avoid the chicken and egg problem. --> @@ -1300,7 +1300,7 @@ <plugins> <plugin> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.1</version> + <version>3.0.0-M2</version> <executions> <execution> <phase>validate</phase> @@ -1340,7 +1340,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.14</version> + <version>1.17</version> <executions> <execution> <id>check</id> @@ -1359,9 +1359,30 @@ </configuration> </plugin> <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.8.2</version> + <executions> + <execution> + <id>prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <includes> + <include>org.apache.axis2.*</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <!-- Make test execution deterministic --> + <runOrder>alphabetical</runOrder> <redirectTestOutputToFile>true</redirectTestOutputToFile> + <trimStackTrace>false</trimStackTrace> <systemProperties> <property> <name>java.io.tmpdir</name> @@ -1390,6 +1411,18 @@ </configuration> </plugin> <plugin> + <groupId>com.github.veithen.maven</groupId> + <artifactId>jacoco-report-maven-plugin</artifactId> + <version>0.1.1</version> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <!-- Always build source JARs --> <artifactId>maven-source-plugin</artifactId> <executions> Modified: axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/download.md.vm URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/download.md.vm?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/download.md.vm (original) +++ axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/download.md.vm Thu Dec 27 18:42:33 2018 @@ -26,13 +26,13 @@ release can be found [here](release-note The following distributions are available for download: | Link | Checksums and signatures ------------------------------------|-----------------------------------------------------------|------------------------------- -Binary distribution | [axis2-${release_version}-bin.zip][1] | [MD5][2] [SHA1][3] [PGP][4] -Source distribution | [axis2-${release_version}-src.zip][5] | [MD5][6] [SHA1][7] [PGP][8] -WAR distribution | [axis2-${release_version}-war.zip][9] | [MD5][10] [SHA1][11] [PGP][12] -Service Archive plugin for Eclipse | [axis2-eclipse-service-plugin-${release_version}.zip][13] | [MD5][14] [SHA1][15] [PGP][16] -Code Generator plugin for Eclipse | [axis2-eclipse-codegen-plugin-${release_version}.zip][17] | [MD5][18] [SHA1][19] [PGP][20] -Axis2 plugin for IntelliJ IDEA | [axis2-idea-plugin-${release_version}.zip][21] | [MD5][22] [SHA1][23] [PGP][24] +-----------------------------------|-----------------------------------------------------------|------------------------- +Binary distribution | [axis2-${release_version}-bin.zip][1] | [SHA512][3] [PGP][4] +Source distribution | [axis2-${release_version}-src.zip][5] | [SHA512][7] [PGP][8] +WAR distribution | [axis2-${release_version}-war.zip][9] | [SHA512][11] [PGP][12] +Service Archive plugin for Eclipse | [axis2-eclipse-service-plugin-${release_version}.zip][13] | [SHA512][15] [PGP][16] +Code Generator plugin for Eclipse | [axis2-eclipse-codegen-plugin-${release_version}.zip][17] | [SHA512][19] [PGP][20] +Axis2 plugin for IntelliJ IDEA | [axis2-idea-plugin-${release_version}.zip][21] | [SHA512][23] [PGP][24] The binary distribution contains all the Axis2 libraries and modules, except for [Apache Rampart](../rampart/) (WS-Security implementation) which must be downloaded separately. It also contains command line tools, @@ -48,28 +48,22 @@ Distributions for older releases can be All releases are also available as Maven artifacts in the [central repository][29]. [1]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip -[2]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip.md5 -[3]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip.sha1 +[3]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip.sha512 [4]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip.asc [5]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip -[6]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip.md5 -[7]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip.sha1 +[7]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip.sha512 [8]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip.asc [9]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip -[10]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip.md5 -[11]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip.sha1 +[11]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip.sha512 [12]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip.asc [13]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip -[14]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip.md5 -[15]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip.sha1 +[15]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip.sha512 [16]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip.asc [17]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip -[18]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip.md5 -[19]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip.sha1 +[19]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip.sha512 [20]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip.asc [21]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip -[22]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip.md5 -[23]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip.sha1 +[23]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip.sha512 [24]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip.asc [25]: http://www.apache.org/dev/release-signing#verifying-signature [26]: https://www.apache.org/dist/axis/axis2/java/core/KEYS Modified: axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/release-notes/1.8.0.md URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/release-notes/1.8.0.md?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/release-notes/1.8.0.md (original) +++ axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/release-notes/1.8.0.md Thu Dec 27 18:42:33 2018 @@ -9,3 +9,13 @@ Apache Axis2 1.8.0 Release Note * The HTTPClient 4.x based transport has been upgraded to use the APIs supported by the latest HTTPClient version. + +* To improve dependency management, the data binding JARs have been split to + separate the code required at build time from the code required at runtime: + * `axis2-jibx` has been split into `axis2-jibx` and `axis2-jibx-codegen`. + * `axis2-xmlbeans` has been split into `axis2-xmlbeans` and + `axis2-xmlbeans-codegen`. + * `axis2-jaxbri` has been renamed to `axis2-jaxbri` (The JAXB-RI data + binding doesn't require any additional classes at runtime). + * There are no changes for ADB because the code was already split in + previous Axis2 versions. Modified: axis/axis2/java/core/branches/hermetic-tests/src/site/xdoc/docs/axis2config.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/src/site/xdoc/docs/axis2config.xml?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/src/site/xdoc/docs/axis2config.xml (original) +++ axis/axis2/java/core/branches/hermetic-tests/src/site/xdoc/docs/axis2config.xml Thu Dec 27 18:42:33 2018 @@ -301,7 +301,7 @@ inside the servlet container. A very sim class="fully qualified name the service lifecycle class" targetNamespace="target namespace for the service"> - <Description> The description of the service </Description> + <description> The description of the service </description> <transports> <transport>HTTP</transport> Propchange: axis/axis2/java/core/branches/hermetic-tests/systests/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Dec 27 18:42:33 2018 @@ -1,2 +1,3 @@ .project +.settings target Modified: axis/axis2/java/core/branches/hermetic-tests/systests/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/systests/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/systests/pom.xml (original) +++ axis/axis2/java/core/branches/hermetic-tests/systests/pom.xml Thu Dec 27 18:42:33 2018 @@ -41,6 +41,11 @@ </build> <modules> + <module>echo</module> + <module>SOAP12TestModuleB</module> + <module>SOAP12TestModuleC</module> + <module>SOAP12TestServiceB</module> + <module>SOAP12TestServiceC</module> <module>webapp-tests</module> </modules> </project> Modified: axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/pom.xml (original) +++ axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/pom.xml Thu Dec 27 18:42:33 2018 @@ -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,19 +76,35 @@ <artifactId>alta-maven-plugin</artifactId> <executions> <execution> + <id>war-location</id> <goals> <goal>generate-properties</goal> </goals> <configuration> <name>webapp</name> <value>%file%</value> - <artifacts> - <artifact> - <groupId>${project.groupId}</groupId> - <artifactId>axis2-webapp</artifactId> - <type>war</type> - </artifact> - </artifacts> + <dependencySet> + <scope>test</scope> + <includes> + <include>*:axis2-webapp:war:*</include> + </includes> + </dependencySet> + </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> Modified: axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java (original) +++ axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java Thu Dec 27 18:42:33 2018 @@ -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; @@ -40,6 +41,7 @@ public class AxisAdminServletITCase { public void testAvailableServices() { tester.clickLinkWithText("Available Services"); tester.assertMatch("Service EPR : http://localhost:[0-9]+/axis2/services/Version";); + tester.assertTextPresent("Service Description : This service is to get the running Axis version"); } /** @@ -59,6 +61,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"); Modified: axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisServletITCase.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisServletITCase.java?rev=1849802&r1=1849801&r2=1849802&view=diff ============================================================================== --- axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisServletITCase.java (original) +++ axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisServletITCase.java Thu Dec 27 18:42:33 2018 @@ -30,6 +30,7 @@ public class AxisServletITCase { tester.beginAt("/"); tester.clickLinkWithExactText("Services"); tester.assertLinkPresentWithExactText("Version"); + tester.assertTextPresent("Service Description : This service is to get the running Axis version"); } /**
