You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/03/31 16:34:24 UTC
svn commit: r760461 - in /cxf/branches/2.1.x-fixes: ./
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
rt/frontend/simple/pom.xml
Author: dkulp
Date: Tue Mar 31 14:34:12 2009
New Revision: 760461
URL: http://svn.apache.org/viewvc?rev=760461&view=rev
Log:
Merged revisions 760456 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r760456 | dkulp | 2009-03-31 10:01:59 -0400 (Tue, 31 Mar 2009) | 2 lines
Remove dependency on jaxws from aegis
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
cxf/branches/2.1.x-fixes/rt/frontend/simple/pom.xml
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 31 14:34:12 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,759890,759961,759963-759964,759966,760029,760073,760150,760178
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,759890,759961,759963-759964,759966,760029,760073,760150,760178,760456
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java?rev=760461&r1=760460&r2=760461&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java Tue Mar 31 14:34:12 2009
@@ -25,7 +25,6 @@
import java.util.Map;
import javax.xml.namespace.QName;
-import javax.xml.ws.Holder;
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.type.basic.ArrayType;
@@ -135,7 +134,7 @@
protected boolean isHolder(Class javaType) {
- return javaType.equals(Holder.class);
+ return "javax.xml.ws.Holder".equals(javaType.getName());
}
protected Type createHolderType(TypeClassInfo info) {
Modified: cxf/branches/2.1.x-fixes/rt/frontend/simple/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/simple/pom.xml?rev=760461&r1=760460&r2=760461&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/simple/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/simple/pom.xml Tue Mar 31 14:34:12 2009
@@ -58,8 +58,9 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -83,10 +84,7 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </dependency>
+
</dependencies>