You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/07/01 20:58:48 UTC
svn commit: r1800531 - in
/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test:
java/org/apache/axis2/maven2/aar/ resources/
Author: veithen
Date: Sat Jul 1 20:58:48 2017
New Revision: 1800531
URL: http://svn.apache.org/viewvc?rev=1800531&view=rev
Log:
Normalize whitespace.
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AarMojoTest.java
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AbstractAarTest.java
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/aar-plugin-config-2.xml
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/services.xml
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AarMojoTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AarMojoTest.java?rev=1800531&r1=1800530&r2=1800531&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AarMojoTest.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AarMojoTest.java Sat Jul 1 20:58:48 2017
@@ -23,22 +23,22 @@ import java.io.File;
public class AarMojoTest extends AbstractAarTest {
- public void testAarMojoGoal() throws Exception {
+ public void testAarMojoGoal() throws Exception {
- AarMojo mojo = (AarMojo) getAarMojoGoal("aar",
- "target/test-classes/aar-plugin-config-1.xml");
- mojo.execute();
- String aarName = "target/axis2-aar-plugin-basic-test1.aar";
- assertTrue(" Can not find " + aarName, new File(aarName).exists());
- }
-
- public void testAarMojoGoalConfiguration() throws Exception {
-
- AarMojo mojo = (AarMojo) getAarMojoGoal("aar",
- "target/test-classes/aar-plugin-config-2.xml");
- mojo.execute();
- String aarName = "target/axis2-aar-plugin-configuration-test1.aar";
- assertTrue(" Can not find " + aarName, new File(aarName).exists());
- }
+ AarMojo mojo = (AarMojo) getAarMojoGoal("aar",
+ "target/test-classes/aar-plugin-config-1.xml");
+ mojo.execute();
+ String aarName = "target/axis2-aar-plugin-basic-test1.aar";
+ assertTrue(" Can not find " + aarName, new File(aarName).exists());
+ }
+
+ public void testAarMojoGoalConfiguration() throws Exception {
+
+ AarMojo mojo = (AarMojo) getAarMojoGoal("aar",
+ "target/test-classes/aar-plugin-config-2.xml");
+ mojo.execute();
+ String aarName = "target/axis2-aar-plugin-configuration-test1.aar";
+ assertTrue(" Can not find " + aarName, new File(aarName).exists());
+ }
}
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AbstractAarTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AbstractAarTest.java?rev=1800531&r1=1800530&r2=1800531&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AbstractAarTest.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AbstractAarTest.java Sat Jul 1 20:58:48 2017
@@ -34,35 +34,35 @@ import org.codehaus.plexus.util.ReaderFa
public abstract class AbstractAarTest extends AbstractMojoTestCase {
- public Mojo getAarMojoGoal(String goal, String testPom) throws Exception {
+ public Mojo getAarMojoGoal(String goal, String testPom) throws Exception {
- File pom = new File(getBasedir(), testPom);
- MavenXpp3Reader pomReader = new MavenXpp3Reader();
- MavenProject project = new MavenProject();
- Model model = pomReader.read(ReaderFactory.newXmlReader(pom));
- // Set project properties.
- setVariableValueToObject(project, "model", model);
- setVariableValueToObject(project, "file", pom);
- Artifact artifact = new DefaultArtifact(model.getGroupId(),
- model.getArtifactId(),
- VersionRange.createFromVersionSpec("SNAPSHOT"), null, "aar",
- null, (new DefaultArtifactHandlerStub("aar", null)));
- artifact.setBaseVersion("SNAPSHOT");
- artifact.setVersion("SNAPSHOT");
- setVariableValueToObject(project, "artifact", artifact);
- // Create and set Mojo properties.
- Mojo mojo = lookupMojo(goal, pom);
- setVariableValueToObject(mojo, "aarDirectory", new File(getBasedir(),
- "target/aar"));
- setVariableValueToObject(mojo, "aarName", model.getArtifactId());
- setVariableValueToObject(mojo, "outputDirectory", "target");
- setVariableValueToObject(mojo, "project", project);
- // Use some classes only for testing.
- setVariableValueToObject(mojo, "classesDirectory", new File(
- getBasedir(), "target/classes"));
- assertNotNull(mojo);
- return mojo;
+ File pom = new File(getBasedir(), testPom);
+ MavenXpp3Reader pomReader = new MavenXpp3Reader();
+ MavenProject project = new MavenProject();
+ Model model = pomReader.read(ReaderFactory.newXmlReader(pom));
+ // Set project properties.
+ setVariableValueToObject(project, "model", model);
+ setVariableValueToObject(project, "file", pom);
+ Artifact artifact = new DefaultArtifact(model.getGroupId(),
+ model.getArtifactId(),
+ VersionRange.createFromVersionSpec("SNAPSHOT"), null, "aar",
+ null, (new DefaultArtifactHandlerStub("aar", null)));
+ artifact.setBaseVersion("SNAPSHOT");
+ artifact.setVersion("SNAPSHOT");
+ setVariableValueToObject(project, "artifact", artifact);
+ // Create and set Mojo properties.
+ Mojo mojo = lookupMojo(goal, pom);
+ setVariableValueToObject(mojo, "aarDirectory", new File(getBasedir(),
+ "target/aar"));
+ setVariableValueToObject(mojo, "aarName", model.getArtifactId());
+ setVariableValueToObject(mojo, "outputDirectory", "target");
+ setVariableValueToObject(mojo, "project", project);
+ // Use some classes only for testing.
+ setVariableValueToObject(mojo, "classesDirectory", new File(
+ getBasedir(), "target/classes"));
+ assertNotNull(mojo);
+ return mojo;
- }
+ }
}
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/aar-plugin-config-2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/aar-plugin-config-2.xml?rev=1800531&r1=1800530&r2=1800531&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/aar-plugin-config-2.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/aar-plugin-config-2.xml Sat Jul 1 20:58:48 2017
@@ -19,29 +19,29 @@
~ under the License.
-->
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-aar-plugin-configuration-test1</artifactId>
- <version>SNAPSHOT</version>
- <name>Test 1 of the axis2-wsdl2code-maven-plugin</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-aar-maven-plugin</artifactId>
- <version>SNAPSHOT</version>
- <configuration>
- <servicesXmlFile>target/test-classes/services.xml</servicesXmlFile>
- <wsdlFile>target/test-classes/simple.wsdl</wsdlFile>
- <wsdlFileName>SimpleService.wsdl</wsdlFileName>
- <fileSets>
- <fileSet>
- <directory>target/test-classes/AdditionalDir</directory>
- <outputDirectory>META-INF/docs</outputDirectory>
- </fileSet>
- </fileSets>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-aar-plugin-configuration-test1</artifactId>
+ <version>SNAPSHOT</version>
+ <name>Test 1 of the axis2-wsdl2code-maven-plugin</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-aar-maven-plugin</artifactId>
+ <version>SNAPSHOT</version>
+ <configuration>
+ <servicesXmlFile>target/test-classes/services.xml</servicesXmlFile>
+ <wsdlFile>target/test-classes/simple.wsdl</wsdlFile>
+ <wsdlFileName>SimpleService.wsdl</wsdlFileName>
+ <fileSets>
+ <fileSet>
+ <directory>target/test-classes/AdditionalDir</directory>
+ <outputDirectory>META-INF/docs</outputDirectory>
+ </fileSet>
+ </fileSets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/services.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/services.xml?rev=1800531&r1=1800530&r2=1800531&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/services.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/services.xml Sat Jul 1 20:58:48 2017
@@ -18,10 +18,10 @@
~ under the License.
-->
<serviceGroup>
- <service name="SimpleService">
- <parameter name="ServiceClass">sample.SimpleService</parameter>
- <operation name="helloService">
- <messageReceiver class="org.apache.axis2.rpc.receivers.RPCMessageReceiver" />
- </operation>
- </service>
+ <service name="SimpleService">
+ <parameter name="ServiceClass">sample.SimpleService</parameter>
+ <operation name="helloService">
+ <messageReceiver class="org.apache.axis2.rpc.receivers.RPCMessageReceiver" />
+ </operation>
+ </service>
</serviceGroup>