Author: veithen
Date: Fri Dec 30 20:03:24 2011
New Revision: 1225907
URL: http://svn.apache.org/viewvc?rev=1225907&view=rev
Log:
Mavenized a couple of unit tests and fixed some packaging issues.
Added:
axis/axis1/java/trunk/axis/src/main/resources/
axis/axis1/java/trunk/axis/src/main/resources/org/
axis/axis1/java/trunk/axis/src/main/resources/org/apache/
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/client/
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/client/client-config.wsdd
- copied unchanged from r1225899,
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/client/client-config.wsdd
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/i18n/
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/i18n/resource.properties
- copied, changed from r1225886,
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/resource.properties
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/i18n/resource_ja.properties
- copied, changed from r1225886,
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/resource_ja.properties
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/server/
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/server/server-config.wsdd
- copied unchanged from r1225899,
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/server/server-config.wsdd
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/utils/
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/utils/tcpmon.properties
- copied unchanged from r1225886,
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/utils/tcpmon.properties
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/utils/tcpmon_ja.properties
- copied unchanged from r1225886,
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/utils/tcpmon_ja.properties
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/utils/tcpmon_ko.properties
- copied unchanged from r1225886,
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/utils/tcpmon_ko.properties
axis/axis1/java/trunk/axis/src/test/
axis/axis1/java/trunk/axis/src/test/java/
axis/axis1/java/trunk/axis/src/test/java/test/
axis/axis1/java/trunk/axis/src/test/java/test/GenericLocalTest.java
- copied, changed from r1225899,
axis/axis1/java/trunk/test/GenericLocalTest.java
axis/axis1/java/trunk/axis/src/test/java/test/chains/
axis/axis1/java/trunk/axis/src/test/java/test/chains/TestChainFault.java
- copied unchanged from r1225886,
axis/axis1/java/trunk/test/chains/TestChainFault.java
axis/axis1/java/trunk/axis/src/test/java/test/chains/TestSimpleChain.java
- copied unchanged from r1225886,
axis/axis1/java/trunk/test/chains/TestSimpleChain.java
axis/axis1/java/trunk/axis/src/test/java/test/components/
axis/axis1/java/trunk/axis/src/test/java/test/components/TestUUID.java
- copied unchanged from r1225899,
axis/axis1/java/trunk/test/components/TestUUID.java
axis/axis1/java/trunk/axis/src/test/java/test/concurrency/
axis/axis1/java/trunk/axis/src/test/java/test/concurrency/TestApplicationScope.java
- copied unchanged from r1225899,
axis/axis1/java/trunk/test/concurrency/TestApplicationScope.java
axis/axis1/java/trunk/axis/src/test/java/test/concurrency/TestService.java
- copied unchanged from r1225899,
axis/axis1/java/trunk/test/concurrency/TestService.java
axis/axis1/java/trunk/axis/src/test/java/test/holders/
axis/axis1/java/trunk/axis/src/test/java/test/holders/ArrayOfBook.java
- copied unchanged from r1225899,
axis/axis1/java/trunk/test/holders/ArrayOfBook.java
axis/axis1/java/trunk/axis/src/test/java/test/holders/Book.java
- copied unchanged from r1225899,
axis/axis1/java/trunk/test/holders/Book.java
axis/axis1/java/trunk/axis/src/test/java/test/holders/TestBook.java
- copied unchanged from r1225899,
axis/axis1/java/trunk/test/holders/TestBook.java
axis/axis1/java/trunk/axis/src/test/java/test/holders/holders/
- copied from r1225899, axis/axis1/java/trunk/test/holders/holders/
axis/axis1/java/trunk/axis/src/test/java/test/inheritance/
axis/axis1/java/trunk/axis/src/test/java/test/inheritance/Child.java
- copied unchanged from r1225899,
axis/axis1/java/trunk/test/inheritance/Child.java
axis/axis1/java/trunk/axis/src/test/java/test/inheritance/Parent.java
- copied unchanged from r1225899,
axis/axis1/java/trunk/test/inheritance/Parent.java
axis/axis1/java/trunk/axis/src/test/java/test/inheritance/TestInheritance.java
- copied unchanged from r1225899,
axis/axis1/java/trunk/test/inheritance/TestInheritance.java
Removed:
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/client/client-config.wsdd
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/resource.properties
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/resource_ja.properties
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/server/server-config.wsdd
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/utils/tcpmon.properties
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/utils/tcpmon_ja.properties
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/utils/tcpmon_ko.properties
axis/axis1/java/trunk/test/chains/
axis/axis1/java/trunk/test/components/
axis/axis1/java/trunk/test/concurrency/
axis/axis1/java/trunk/test/holders/
axis/axis1/java/trunk/test/inheritance/
Modified:
axis/axis1/java/trunk/axis/pom.xml
Modified: axis/axis1/java/trunk/axis/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/pom.xml?rev=1225907&r1=1225906&r2=1225907&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis/pom.xml (original)
+++ axis/axis1/java/trunk/axis/pom.xml Fri Dec 30 20:03:24 2011
@@ -100,8 +100,35 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>generate-timestamp</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ import java.util.Date
+ import java.text.MessageFormat
+ project.properties['today'] =
MessageFormat.format("{0,date,MMM dd, yyyy (hh:mm:ss z)}", new Date())
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -145,6 +172,15 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- This is actually not a unit test -->
+ <exclude>test/concurrency/TestService.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
Copied:
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/i18n/resource.properties
(from r1225886,
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/resource.properties)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/i18n/resource.properties?p2=axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/i18n/resource.properties&p1=axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/resource.properties&r1=1225886&r2=1225907&rev=1225907&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/resource.properties
(original)
+++
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/i18n/resource.properties
Fri Dec 30 20:03:24 2011
@@ -598,11 +598,11 @@ invalidNotif00={0} is a notification sty
#############################################################################
# DO NOT TOUCH THESE PROPERTIES - THEY ARE AUTOMATICALLY UPDATED BY THE BUILD
# PROCESS.
-axisVersion=Apache Axis version: #axisVersion#
-axisVersionRaw=#axisVersion#
-axisBuiltOnRaw=#today#
-axisUserAgent=Axis/#axisVersion#
-builtOn=Built on #today#
+axisVersion=Apache Axis version: ${project.version}
+axisVersionRaw=${project.version}
+axisBuiltOnRaw=${today}
+axisUserAgent=Axis/${project.version}
+builtOn=Built on ${today}
#############################################################################
badProp00=Bad property. The value for {0} should be of type {1}, but it is of
type {2}.
Copied:
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/i18n/resource_ja.properties
(from r1225886,
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/resource_ja.properties)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/i18n/resource_ja.properties?p2=axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/i18n/resource_ja.properties&p1=axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/resource_ja.properties&r1=1225886&r2=1225907&rev=1225907&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/resource_ja.properties
(original)
+++
axis/axis1/java/trunk/axis/src/main/resources/org/apache/axis/i18n/resource_ja.properties
Fri Dec 30 20:03:24 2011
@@ -583,11 +583,11 @@ invalidNotif00={0}\u306fnotification\u30
#############################################################################
# DO NOT TOUCH THESE PROPERTIES - THEY ARE AUTOMATICALLY UPDATED BY THE BUILD
# PROCESS.
-axisVersion=Apache Axis version: #axisVersion#
-axisVersionRaw=#axisVersion#
-axisBuiltOnRaw=#today#
-axisUserAgent=Axis/#axisVersion#
-builtOn=Built on #today#
+axisVersion=Apache Axis version: ${project.version}
+axisVersionRaw=${project.version}
+axisBuiltOnRaw=${today}
+axisUserAgent=Axis/${project.version}
+builtOn=Built on ${today}
#############################################################################
badProp00=\u4e0d\u6b63\u306a\u30d7\u30ed\u30d1\u30c6\u30a3\u3002
{0}\u306e\u5024\u306f\u578b{1}\u3067\u3042\u308b\u3079\u304d\u3067\u3059\u304c\u3001\u578b{2}\u3067\u3082\u3042\u308a\u307e\u3059\u3002
/ [en]-(Bad property. The value for {0} should be of type {1}, but it is of
type {2}.)
Copied: axis/axis1/java/trunk/axis/src/test/java/test/GenericLocalTest.java
(from r1225899, axis/axis1/java/trunk/test/GenericLocalTest.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/src/test/java/test/GenericLocalTest.java?p2=axis/axis1/java/trunk/axis/src/test/java/test/GenericLocalTest.java&p1=axis/axis1/java/trunk/test/GenericLocalTest.java&r1=1225899&r2=1225907&rev=1225907&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/GenericLocalTest.java (original)
+++ axis/axis1/java/trunk/axis/src/test/java/test/GenericLocalTest.java Fri Dec
30 20:03:24 2011
@@ -44,7 +44,7 @@ import org.apache.axis.Handler;
*
* @author Glen Daniels ([email protected])
*/
-public class GenericLocalTest extends TestCase {
+public abstract class GenericLocalTest extends TestCase {
protected AxisServer server;
protected SimpleProvider config;
protected LocalTransport transport;
