cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject git commit: [CXF-5947]use blueprint-cm v1.1.0 so that the changes in org.apache.cxf.osgi.cfg could be reloaded
Date Fri, 15 Aug 2014 07:18:29 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes cf1e55369 -> e9e76049a


[CXF-5947]use blueprint-cm v1.1.0 so that the changes in org.apache.cxf.osgi.cfg could be
reloaded


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e9e76049
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e9e76049
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e9e76049

Branch: refs/heads/2.7.x-fixes
Commit: e9e76049aad88c041f1900ad5a44d317f9a907a4
Parents: cf1e553
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Fri Aug 15 15:18:12 2014 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Fri Aug 15 15:18:12 2014 +0800

----------------------------------------------------------------------
 .../src/main/resources/OSGI-INF/blueprint/osgiservlet.xml   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e9e76049/rt/transports/http/src/main/resources/OSGI-INF/blueprint/osgiservlet.xml
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/resources/OSGI-INF/blueprint/osgiservlet.xml b/rt/transports/http/src/main/resources/OSGI-INF/blueprint/osgiservlet.xml
index 6d3392c..b08dbd5 100644
--- a/rt/transports/http/src/main/resources/OSGI-INF/blueprint/osgiservlet.xml
+++ b/rt/transports/http/src/main/resources/OSGI-INF/blueprint/osgiservlet.xml
@@ -18,13 +18,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
 
-           xsi:schemaLocation="
-            http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
-
-  <cm:property-placeholder persistent-id="org.apache.cxf.osgi" id="cxfOsgiProperties">
+  <cm:property-placeholder persistent-id="org.apache.cxf.osgi" id="cxfOsgiProperties"
update-strategy="reload">
 
     <cm:default-properties>
 
@@ -54,6 +50,7 @@ under the License.
 
   <service ref="osgiServlet" interface="javax.servlet.Servlet">
     <service-properties>
+      <entry key="init-prefix" value=""/>
       <entry key="alias" value="${org.apache.cxf.servlet.context}"/>
       <entry key="servlet-name" value="${org.apache.cxf.servlet.name}"/>
       <entry key="hide-service-list-page" value="${org.apache.cxf.servlet.hide-service-list-page}"/>


Mime
View raw message