Author: dkulp
Date: Tue Oct 23 11:04:22 2007
New Revision: 587578
URL: http://svn.apache.org/viewvc?rev=587578&view=rev
Log:
Merged revisions 587575 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r587575 | dkulp | 2007-10-23 14:01:00 -0400 (Tue, 23 Oct 2007) | 3 lines
Refork the server
Update to latest remote-resources and jar bundle for latest NOTICE file format
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=587578&r1=587577&r2=587578&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Tue Oct 23 11:04:22 2007
@@ -251,7 +251,7 @@
<plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-5</version>
+ <version>1.0-alpha-6</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -267,13 +267,14 @@
<configuration>
<resourceBundles>
<resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
-
<resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
</resourceBundles>
<supplementalModels>
<supplementalModel>notice-supplements.xml</supplementalModel>
</supplementalModels>
<properties>
<addLicense>true</addLicense>
+ <addArtifact>true</addArtifact>
<projectName>Apache CXF</projectName>
</properties>
</configuration>
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java?rev=587578&r1=587577&r2=587578&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
Tue Oct 23 11:04:22 2007
@@ -58,7 +58,7 @@
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly",
launchServer(ServerMisc.class, true));
+ assertTrue("server did not launch correctly",
launchServer(ServerMisc.class));
}
@Test
