geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r695540 - in /geronimo/server/trunk: plugins/cxf/cxf/src/main/history/dependencies.xml plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java pom.xml
Date Mon, 15 Sep 2008 16:38:19 GMT
Author: gawor
Date: Mon Sep 15 09:38:19 2008
New Revision: 695540

URL: http://svn.apache.org/viewvc?rev=695540&view=rev
Log:
exclude fastinfoset library and some fixes for latest cxf

Modified:
    geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=695540&r1=695539&r2=695540&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml Mon Sep 15 09:38:19
2008
@@ -101,9 +101,4 @@
         <artifactId>cxf-common-utilities</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>com.sun.xml.fastinfoset</groupId>
-        <artifactId>FastInfoset</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java?rev=695540&r1=695539&r2=695540&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java
(original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java
Mon Sep 15 09:38:19 2008
@@ -91,15 +91,15 @@
 
         final HttpServletRequest servletRequest = 
             (HttpServletRequest)request.getAttribute(WebServiceContainer.SERVLET_REQUEST);
-        message.put(MessageContext.SERVLET_REQUEST, servletRequest);
+        message.put(HTTP_REQUEST, servletRequest);
         
         HttpServletResponse servletResponse =
             (HttpServletResponse)request.getAttribute(WebServiceContainer.SERVLET_RESPONSE);
-        message.put(MessageContext.SERVLET_RESPONSE, servletResponse);
+        message.put(HTTP_RESPONSE, servletResponse);
         
         ServletContext servletContext = 
             (ServletContext)request.getAttribute(WebServiceContainer.SERVLET_CONTEXT);
-        message.put(MessageContext.SERVLET_CONTEXT, servletContext);
+        message.put(HTTP_CONTEXT, servletContext);
         
         if (this.passSecurityContext) {
             message.put(SecurityContext.class, new SecurityContext() {

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=695540&r1=695539&r2=695540&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Sep 15 09:38:19 2008
@@ -2512,6 +2512,10 @@
                         <artifactId>jaxb-impl</artifactId>
                     </exclusion>
                     <exclusion>
+                        <groupId>com.sun.xml.fastinfoset</groupId>
+                        <artifactId>FastInfoset</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
                         <artifactId>geronimo-javamail_1.4_spec</artifactId>
                     </exclusion>



Mime
View raw message