cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r822456 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
Date Tue, 06 Oct 2009 19:33:51 GMT
Author: sergeyb
Date: Tue Oct  6 19:33:51 2009
New Revision: 822456

URL: http://svn.apache.org/viewvc?rev=822456&view=rev
Log:
Merged revisions 822452 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r822452 | sergeyb | 2009-10-06 20:28:49 +0100 (Tue, 06 Oct 2009) | 1 line
  
  Making sure the osgi transport can be configured so that it does not impose a 'cxf' prefix
on endpoint addresses
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  6 19:33:51 2009
@@ -1 +1 @@
-/cxf/trunk:822228,822312,822353,822377
+/cxf/trunk:822228,822312,822353,822377,822452

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml?rev=822456&r1=822455&r2=822456&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
(original)
+++ cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
Tue Oct  6 19:33:51 2009
@@ -1,43 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:osgi="http://www.springframework.org/schema/osgi"
+       xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
+       xmlns:ctx="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/osgi  http://www.springframework.org/schema/osgi/spring-osgi.xsd
+http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
+http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+    
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="ignoreUnresolvablePlaceholders" value="true"/>
+        <property name="ignoreResourceNotFound" value="true" />
+        <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+        <property name="location" value="file:/${karaf.base}/etc/org.apache.cxf.osgi.cfg"/>
+    </bean>
+
+    <osgix:cm-properties id="cxfOsgiProps" persistent-id="org.apache.cxf.osgi">
+        <prop key="org.apache.cxf.servlet.context">/cxf</prop>
+        <prop key="org.apache.cxf.servlet.name">cxf-servlet-osgi-transport</prop>
+    </osgix:cm-properties>
+
+    <ctx:property-placeholder properties-ref="cxfOsgiProps"/>
+
+    <bean id="destinationRegistry" class="org.apache.cxf.transport.http_osgi.OsgiDestinationRegistry"
/>
+
+    <bean id="osgiServlet" class="org.apache.cxf.transport.http_osgi.SpringOsgiServlet">
+        <constructor-arg ref="destinationRegistry"/>
+    </bean>
+
+    <osgi:service ref="osgiServlet" interface="javax.servlet.Servlet">
+        <osgi:service-properties>
+            <entry key="alias" value="${org.apache.cxf.servlet.context}" />
+            <entry key="servlet-name" value="${org.apache.cxf.servlet.name}"/>
+        </osgi:service-properties>
+    </osgi:service>
+
+    <osgi:service ref="destinationRegistry" interface="org.apache.cxf.transport.http_osgi.OsgiDestinationRegistryIntf">
+    </osgi:service>
+
+</beans>
 
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:osgi="http://www.springframework.org/schema/osgi"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/osgi  http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-    <bean id="destinationRegistry" class="org.apache.cxf.transport.http_osgi.OsgiDestinationRegistry"
/>
-
-    <bean id="osgiServlet" class="org.apache.cxf.transport.http_osgi.SpringOsgiServlet">
-        <constructor-arg ref="destinationRegistry"/>
-    </bean>
-
-    <osgi:service ref="osgiServlet" interface="javax.servlet.Servlet">
-        <osgi:service-properties>
-            <entry key="alias" value="/cxf" />
-            <entry key="servlet-name" value="cxf-transport-osgi-servlet"/>
-        </osgi:service-properties>
-    </osgi:service>
-
-    <osgi:service ref="destinationRegistry" interface="org.apache.cxf.transport.http_osgi.OsgiDestinationRegistryIntf">
-    </osgi:service>
-
-</beans>



Mime
View raw message