Author: veithen
Date: Sun Jan 15 09:25:58 2017
New Revision: 1778895
URL: http://svn.apache.org/viewvc?rev=1778895&view=rev
Log:
Copy axis2.xml to the repository instead of configuring it in code.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/TestConstants.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1778895&r1=1778894&r2=1778895&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Sun Jan
15 09:25:58 2017
@@ -85,6 +85,7 @@
</goals>
<configuration>
<modules>addressing,rampart,rahas</modules>
+
<axis2xml>src/test/resources/conf/axis2.xml</axis2xml>
<outputDirectory>target/test-resources/rampart_service_repo</outputDirectory>
</configuration>
</execution>
@@ -105,6 +106,7 @@
</goals>
<configuration>
<modules>addressing,rampart,rahas</modules>
+
<axis2xml>src/test/resources/conf/axis2.xml</axis2xml>
<outputDirectory>target/test-resources/rahas_service_repo_1</outputDirectory>
</configuration>
</execution>
@@ -115,6 +117,7 @@
</goals>
<configuration>
<modules>addressing,rampart,rahas</modules>
+
<axis2xml>src/test/resources/conf/axis2.xml</axis2xml>
<outputDirectory>target/test-resources/rahas_service_repo_3</outputDirectory>
</configuration>
</execution>
@@ -126,6 +129,7 @@
<configuration>
<modules>addressing,rampart</modules>
<axis2xml>src/test/resources/conf/axis2.xml</axis2xml>
+
<configurationDirectory>conf</configurationDirectory>
<outputDirectory>target/test-resources/default_security_client_repo</outputDirectory>
</configuration>
</execution>
@@ -136,13 +140,11 @@
</goals>
<configuration>
<modules>addressing,rampart,rahas</modules>
+
<axis2xml>src/test/resources/conf/axis2.xml</axis2xml>
<outputDirectory>target/test-resources/rahas_service_repo_5</outputDirectory>
</configuration>
</execution>
</executions>
- <configuration>
- <configurationDirectory>conf</configurationDirectory>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java?rev=1778895&r1=1778894&r2=1778895&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java
Sun Jan 15 09:25:58 2017
@@ -69,7 +69,6 @@ public class JettyServer extends Externa
private static final Log log = LogFactory.getLog(JettyServer.class);
private final String repository;
- private final String axis2xml;
private final boolean secure;
private File keyStoreFile;
private File trustStoreFile;
@@ -87,12 +86,11 @@ public class JettyServer extends Externa
* @param secure
* Whether to enable HTTPS.
*/
- public JettyServer(String repository, String axis2xml, boolean secure) {
+ public JettyServer(String repository, boolean secure) {
if (repository == null || repository.trim().length() == 0) {
throw new IllegalArgumentException("Axis2 repository must not be
null or empty");
}
this.repository = repository;
- this.axis2xml = axis2xml;
this.secure = secure;
}
@@ -187,7 +185,7 @@ public class JettyServer extends Externa
context.setThrowUnavailableOnStartupException(true);
final ConfigurationContext configurationContext =
-
ConfigurationContextFactory.createConfigurationContextFromFileSystem(repository,
axis2xml);
+
ConfigurationContextFactory.createConfigurationContextFromFileSystem(repository);
@SuppressWarnings("serial")
ServletHolder servlet = new ServletHolder(new AxisServlet() {
@Override
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/TestConstants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/TestConstants.java?rev=1778895&r1=1778894&r2=1778895&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/TestConstants.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/TestConstants.java
Sun Jan 15 09:25:58 2017
@@ -20,7 +20,6 @@ package org.apache.axis2.integration;
public final class TestConstants {
public static final String TESTING_PATH = "target/test-resources/";
- public static final String AXIS2_XML = "src/test/resources/conf/axis2.xml";
private TestConstants() {}
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java?rev=1778895&r1=1778894&r2=1778895&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
Sun Jan 15 09:25:58 2017
@@ -16,7 +16,6 @@
package org.apache.rahas;
-import static org.apache.axis2.integration.TestConstants.AXIS2_XML;
import static org.apache.axis2.integration.TestConstants.TESTING_PATH;
import java.io.FileInputStream;
@@ -42,7 +41,7 @@ import org.junit.Test;
public abstract class TestClient {
@Rule
- public final JettyServer server = new JettyServer(TESTING_PATH +
getServiceRepo(), AXIS2_XML, false);
+ public final JettyServer server = new JettyServer(TESTING_PATH +
getServiceRepo(), false);
/**
*/
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?rev=1778895&r1=1778894&r2=1778895&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
Sun Jan 15 09:25:58 2017
@@ -16,7 +16,6 @@
package org.apache.rampart;
-import static org.apache.axis2.integration.TestConstants.AXIS2_XML;
import static org.apache.axis2.integration.TestConstants.TESTING_PATH;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -48,10 +47,10 @@ public class RampartTest {
private static ResourceBundle resources;
@Rule
- public final JettyServer server = new JettyServer(TESTING_PATH +
"rampart_service_repo", AXIS2_XML, false);
+ public final JettyServer server = new JettyServer(TESTING_PATH +
"rampart_service_repo", false);
@Rule
- public final JettyServer secureServer = new JettyServer(TESTING_PATH +
"rampart_service_repo", AXIS2_XML, true);
+ public final JettyServer secureServer = new JettyServer(TESTING_PATH +
"rampart_service_repo", true);
static {
try {
