Author: peterjones
Date: Fri May 4 07:56:26 2007
New Revision: 535274
URL: http://svn.apache.org/viewvc?view=rev&rev=535274
Log:
Removed a dependency on sun saaj.
Minor change to not use internal sun saaj class in SAAJOutInterceptor (added
in revision 532651).
Added saaj.impl.artifactId and saaj.impl.groupId properties to parent pom.
Added missing checkstyle and pmd plugin config to ibm jdk profile.
Modified:
incubator/cxf/trunk/common/common/pom.xml
incubator/cxf/trunk/parent/pom.xml
incubator/cxf/trunk/rt/bindings/soap/pom.xml
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
incubator/cxf/trunk/rt/transports/jms/pom.xml
incubator/cxf/trunk/rt/ws/security/pom.xml
Modified: incubator/cxf/trunk/common/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/pom.xml?view=diff&rev=535274&r1=535273&r2=535274
==============================================================================
--- incubator/cxf/trunk/common/common/pom.xml (original)
+++ incubator/cxf/trunk/common/common/pom.xml Fri May 4 07:56:26 2007
@@ -123,8 +123,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
+ <groupId>${saaj.impl.groupId}</groupId>
+ <artifactId>${saaj.impl.artifactId}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -132,7 +132,6 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<scm>
Modified: incubator/cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?view=diff&rev=535274&r1=535273&r2=535274
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Fri May 4 07:56:26 2007
@@ -40,6 +40,8 @@
<surefire.usefile>false</surefire.usefile>
<compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
+ <saaj.impl.groupId>com.sun.xml.messaging.saaj</saaj.impl.groupId>
+ <saaj.impl.artifactId>saaj-impl</saaj.impl.artifactId>
<jaxb.version>2.0</jaxb.version>
<jaxb.impl.version>2.0.5</jaxb.impl.version>
@@ -47,6 +49,7 @@
<jaxws.version>2.0</jaxws.version>
<jetty.version>5.1.11</jetty.version>
<saaj.version>1.3</saaj.version>
+ <saaj.impl.version>1.3</saaj.impl.version>
<spring.version>2.0.4</spring.version>
<wsdl4j.version>1.6.1</wsdl4j.version>
<derby.version>10.1.1.0</derby.version>
@@ -413,9 +416,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>${saaj.version}</version>
+ <groupId>${saaj.impl.groupId}</groupId>
+ <artifactId>${saaj.impl.artifactId}</artifactId>
+ <version>${saaj.impl.version}</version>
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
@@ -827,6 +830,23 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+
<compilerArgument>${compile.flags}</compilerArgument>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Modified: incubator/cxf/trunk/rt/bindings/soap/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/pom.xml?view=diff&rev=535274&r1=535273&r2=535274
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/soap/pom.xml Fri May 4 07:56:26 2007
@@ -83,8 +83,8 @@
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
+ <groupId>${saaj.impl.groupId}</groupId>
+ <artifactId>${saaj.impl.artifactId}</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
Modified:
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java?view=diff&rev=535274&r1=535273&r2=535274
==============================================================================
---
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
Fri May 4 07:56:26 2007
@@ -30,7 +30,6 @@
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
import javax.xml.stream.XMLStreamWriter;
-import com.sun.xml.messaging.saaj.packaging.mime.MessagingException;
import org.apache.cxf.binding.soap.SoapFault;
@@ -105,15 +104,12 @@
} catch (SOAPException e) {
throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE),
e, message.getVersion()
.getSender());
- } catch (MessagingException e) {
- throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE),
e, message.getVersion()
- .getSender());
}
}
}
private void setMessageContent(SoapMessage message, SOAPMessage
soapMessage)
- throws MessagingException, SOAPException {
+ throws SOAPException {
if (soapMessage.getAttachments().hasNext()) {
StringBuffer sb = new StringBuffer();
Modified: incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/pom.xml?view=diff&rev=535274&r1=535273&r2=535274
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/pom.xml Fri May 4 07:56:26 2007
@@ -107,8 +107,8 @@
<version>${spring.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
+ <groupId>${saaj.impl.groupId}</groupId>
+ <artifactId>${saaj.impl.artifactId}</artifactId>
</dependency>
</dependencies>
Modified: incubator/cxf/trunk/rt/transports/jms/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/pom.xml?view=diff&rev=535274&r1=535273&r2=535274
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/jms/pom.xml Fri May 4 07:56:26 2007
@@ -72,8 +72,8 @@
</dependency>
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
+ <groupId>${saaj.impl.groupId}</groupId>
+ <artifactId>${saaj.impl.artifactId}</artifactId>
<scope>runtime</scope>
</dependency>
Modified: incubator/cxf/trunk/rt/ws/security/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/pom.xml?view=diff&rev=535274&r1=535273&r2=535274
==============================================================================
--- incubator/cxf/trunk/rt/ws/security/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/security/pom.xml Fri May 4 07:56:26 2007
@@ -12,7 +12,6 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
-
<dependencies>
<dependency>
@@ -105,8 +104,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
+ <groupId>${saaj.impl.groupId}</groupId>
+ <artifactId>${saaj.impl.artifactId}</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -169,4 +168,4 @@
<!-- </plugin>-->
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
