svn commit: r511140 - in /incubator/cxf/trunk: parent/pom.xml tools/common/src/main/java/org/apache/cxf/tools/common/model/WSDLModel.java

[dkulp]

Author: dkulp
Date: Fri Feb 23 14:26:50 2007
New Revision: 511140

URL: http://svn.apache.org/viewvc?view=rev&rev=511140
Log:
Fix deprecation warning.   Fix exclusions to remove log4j and others from 
eclipse

Modified:
    incubator/cxf/trunk/parent/pom.xml
    
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/WSDLModel.java

Modified: incubator/cxf/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?view=diff&rev=511140&r1=511139&r2=511140
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Fri Feb 23 14:26:50 2007
@@ -458,11 +458,47 @@
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
                 <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>servlet-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>logkit</groupId>
+                        <artifactId>logkit</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>avalon-framework</groupId>
+                        <artifactId>avalon-framework</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
                 <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>servlet-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>logkit</groupId>
+                        <artifactId>logkit</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>avalon-framework</groupId>
+                        <artifactId>avalon-framework</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>

Modified: 
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/WSDLModel.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/WSDLModel.java?view=diff&rev=511140&r1=511139&r2=511140
==============================================================================
--- 
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/WSDLModel.java
 (original)
+++ 
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/WSDLModel.java
 Fri Feb 23 14:26:50 2007
@@ -150,7 +150,8 @@
             clzzs[i++] = (Class)typeref.type;
         }
         try {
-            jaxbContext = JAXBRIContext.newInstance(clzzs, types, 
this.getTargetNameSpace(), false);
+            jaxbContext = JAXBRIContext.newInstance(clzzs, types, null,
+                                                    this.getTargetNameSpace(), 
false, null);
 
         } catch (Exception e) {
             Message message = new Message("CREATE_JAXBRICONTEXT_EXCEPTION", 
LOG);