Author: coheigea
Date: Mon Dec 6 12:54:42 2010
New Revision: 1042611
URL: http://svn.apache.org/viewvc?rev=1042611&view=rev
Log:
[WSS-250] - Started on refactoring tests
- Moved source/tests around to the standard maven project structure.
Added:
webservices/wss4j/trunk/src/main/
webservices/wss4j/trunk/src/main/java/
webservices/wss4j/trunk/src/main/java/org/
- copied from r1041921, webservices/wss4j/trunk/src/org/
webservices/wss4j/trunk/src/test/
webservices/wss4j/trunk/src/test/java/
webservices/wss4j/trunk/src/test/java/components/
- copied from r1041921, webservices/wss4j/trunk/test/components/
webservices/wss4j/trunk/src/test/java/wssec/
- copied from r1041921, webservices/wss4j/trunk/test/wssec/
webservices/wss4j/trunk/src/test/resources/
webservices/wss4j/trunk/src/test/resources/crypto.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/crypto.properties
webservices/wss4j/trunk/src/test/resources/log4j.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/log4j.properties
webservices/wss4j/trunk/src/test/resources/nofile.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/nofile.properties
webservices/wss4j/trunk/src/test/resources/saml.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/saml.properties
webservices/wss4j/trunk/src/test/resources/saml3.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/saml3.properties
webservices/wss4j/trunk/src/test/resources/saml4.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/saml4.properties
webservices/wss4j/trunk/src/test/resources/saml4sendKeyValue.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/saml4sendKeyValue.properties
webservices/wss4j/trunk/src/test/resources/wss40.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/wss40.properties
webservices/wss4j/trunk/src/test/resources/wss40CA.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/wss40CA.properties
webservices/wss4j/trunk/src/test/resources/wss40_client.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/wss40_client.properties
webservices/wss4j/trunk/src/test/resources/wss40_server.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/wss40_server.properties
webservices/wss4j/trunk/src/test/resources/wss40badca.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/wss40badca.properties
webservices/wss4j/trunk/src/test/resources/wss40badcatrust.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/wss40badcatrust.properties
webservices/wss4j/trunk/src/test/resources/wss86.properties
- copied unchanged from r1041921,
webservices/wss4j/trunk/test/wss86.properties
Removed:
webservices/wss4j/trunk/src/org/
webservices/wss4j/trunk/test/components/
webservices/wss4j/trunk/test/crypto.properties
webservices/wss4j/trunk/test/log4j.properties
webservices/wss4j/trunk/test/nofile.properties
webservices/wss4j/trunk/test/saml.properties
webservices/wss4j/trunk/test/saml3.properties
webservices/wss4j/trunk/test/saml4.properties
webservices/wss4j/trunk/test/saml4sendKeyValue.properties
webservices/wss4j/trunk/test/wss40.properties
webservices/wss4j/trunk/test/wss40CA.properties
webservices/wss4j/trunk/test/wss40_client.properties
webservices/wss4j/trunk/test/wss40_server.properties
webservices/wss4j/trunk/test/wss40badca.properties
webservices/wss4j/trunk/test/wss40badcatrust.properties
webservices/wss4j/trunk/test/wss86.properties
webservices/wss4j/trunk/test/wssec/
Modified:
webservices/wss4j/trunk/pom.xml
Modified: webservices/wss4j/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1042611&r1=1042610&r2=1042611&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Mon Dec 6 12:54:42 2010
@@ -78,24 +78,29 @@
</organization>
<build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
+ <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+ <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
<resources>
<resource>
- <directory>src</directory>
- <includes>
- <include>org/**/errors.properties</include>
- </includes>
- <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</resource>
</resources>
<testResources>
<testResource>
- <directory>test</directory>
+ <directory>src/test/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </testResource>
</testResources>
<plugins>
@@ -107,7 +112,6 @@
<linkXRef>false</linkXRef>
<failOnViolation>true</failOnViolation>
<verbose>true</verbose>
- <includeTests>false</includeTests>
<targetJdk>1.5</targetJdk>
<excludes>
<exclude>**/Merlin.java, **/CryptoBase.java,
**/SAMLIssuerImpl.java, **/DOM2Writer.java
@@ -170,7 +174,7 @@
<properties>
<projectName>Apache WebServices -
WSS4J</projectName>
</properties>
- <appendedResourcesDirectory>
${basedir}/appended-resources</appendedResourcesDirectory>
+
<appendedResourcesDirectory>${basedir}/appended-resources</appendedResourcesDirectory>
</configuration>
</execution>
</executions>
@@ -190,7 +194,7 @@
<forkMode>once</forkMode>
<childDelegation>false</childDelegation>
<includes>
- <include>**/PackageTests.java</include>
+ <include>**/*Test.java</include>
</includes>
</configuration>
</plugin>
@@ -211,9 +215,6 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
- <testExcludes>
- <exclude>interop/**/*</exclude>
- </testExcludes>
</configuration>
</plugin>
<plugin>
