cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1330010 - in /cxf/branches/2.5.x-fixes/services/wsn/wsn-core: pom.xml src/main/resources/META-INF/ src/main/resources/META-INF/jax-ws-catalog.xml
Date Tue, 24 Apr 2012 20:59:14 GMT
Author: dkulp
Date: Tue Apr 24 20:59:14 2012
New Revision: 1330010

URL: http://svn.apache.org/viewvc?rev=1330010&view=rev
Log:
Merged revisions 1330009 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1330009 | dkulp | 2012-04-24 16:58:00 -0400 (Tue, 24 Apr 2012) | 2 lines

  [CXF-4240] Get WSN service running if not connected to w3.org.

........

Added:
    cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/resources/META-INF/
    cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/resources/META-INF/jax-ws-catalog.xml
  (with props)
Modified:
    cxf/branches/2.5.x-fixes/services/wsn/wsn-core/pom.xml

Modified: cxf/branches/2.5.x-fixes/services/wsn/wsn-core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/wsn/wsn-core/pom.xml?rev=1330010&r1=1330009&r2=1330010&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/wsn/wsn-core/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/services/wsn/wsn-core/pom.xml Tue Apr 24 20:59:14 2012
@@ -129,7 +129,7 @@
                 <configuration>
                     <instructions>
                         <Require-Bundle>
-                            org.apache.activemq.activemq-core
+                            org.apache.activemq.activemq-core,org.apache.cxf.services.wsn.cxf-services-wsn-api
                         </Require-Bundle>
                         <Import-Package>
                             org.apache.cxf.wsn.util.*;version=${project.version},

Added: cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/resources/META-INF/jax-ws-catalog.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/resources/META-INF/jax-ws-catalog.xml?rev=1330010&view=auto
==============================================================================
--- cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/resources/META-INF/jax-ws-catalog.xml
(added)
+++ cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/resources/META-INF/jax-ws-catalog.xml
Tue Apr 24 20:59:14 2012
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
+    <rewriteSystem systemIdStartString="http://www.w3.org/2006/03/addressing" rewritePrefix="classpath:/org/apache/cxf/wsn/wsdl"/>
+    <rewriteSystem systemIdStartString="http://www.w3.org/2005/08/addressing" rewritePrefix="classpath:/org/apache/cxf/wsn/wsdl"/>
+</catalog>

Propchange: cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message