Author: buildbot
Date: Tue Mar 11 13:48:18 2014
New Revision: 901112

Log:
Production update by buildbot for cxf

Modified:
    websites/production/cxf/content/cache/docs.pageCache
    websites/production/cxf/content/docs/embedding-cxf-inside-spring.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==============================================================================
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/embedding-cxf-inside-spring.html
==============================================================================
--- websites/production/cxf/content/docs/embedding-cxf-inside-spring.html 
(original)
+++ websites/production/cxf/content/docs/embedding-cxf-inside-spring.html Tue 
Mar 11 13:48:18 2014
@@ -32,7 +32,6 @@
 <link type="text/css" rel="stylesheet" 
href="/resources/highlighter/styles/shThemeCXF.css">
 
 <script src='/resources/highlighter/scripts/shCore.js'></script>
-<script src='/resources/highlighter/scripts/shBrushJava.js'></script>
 <script src='/resources/highlighter/scripts/shBrushXml.js'></script>
 <script>
   SyntaxHighlighter.defaults['toolbar'] = false;
@@ -117,12 +116,15 @@ Apache CXF -- Embedding CXF inside Sprin
          <td height="100%">
            <!-- Content -->
            <div class="wiki-content">
-<div id="ConfluenceContent"><p>You can embed CXF within an existing Spring 
application. Since all XML configuration files are Spring xml files, the two 
approaches should be equivalent. </p>
-
-<p>CXF includes Spring configuration files which configure the various CXF 
modules. You will want to import these into your application. Here is an 
example that imports the core CXF components, the SOAP binding, and the servlet 
transport:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" 
type="syntaxhighlighter"><![CDATA[
-&lt;beans xmlns=&quot;http://www.springframework.org/schema/beans&quot;
+<div id="ConfluenceContent">    <div class="aui-message warning shadowed 
information-macro">
+                    <p class="title">Changes in CXF 2.4.x</p>
+                            <span class="aui-icon icon-warning">Icon</span>
+                <div class="message-content">
+                            <p><strong>The below is applicable for CXF 
versions 2.3.x and older.</strong> Starting in CXF 2.4.0, the extensions are 
loaded internally by CXF automatically and you do not need to import all the 
cxf-extension-*.xml file. You only need to import 
classpath:META-INF/cxf/cxf.xml.</p>
+                    </div>
+    </div>
+<p>You can embed CXF within an existing Spring application. Since all XML 
configuration files are Spring xml files, the two approaches should be 
equivalent.</p><p>CXF includes Spring configuration files which configure the 
various CXF modules. You will want to import these into your application. Here 
is an example that imports the core CXF components, the SOAP binding, and the 
servlet transport:</p><div class="code panel pdl" style="border-width: 
1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" 
type="syntaxhighlighter"><![CDATA[&lt;beans 
xmlns=&quot;http://www.springframework.org/schema/beans&quot;
        xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
        xmlns:jaxws=&quot;http://cxf.apache.org/jaxws&quot;
        xsi:schemaLocation=&quot;
@@ -135,13 +137,8 @@ http://cxf.apache.org/jaxws http://cxf.a
   ...
 &lt;/beans&gt;
 ]]></script>
-</div></div>
-
-<p>To include all the CXF modules you can use cxf-all or a wildcard 
expression:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" 
type="syntaxhighlighter"><![CDATA[
-&lt;beans xmlns=&quot;http://www.springframework.org/schema/beans&quot;
+</div></div><p>To include all the CXF modules you can use cxf-all or a 
wildcard expression:</p><div class="code panel pdl" style="border-width: 
1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" 
type="syntaxhighlighter"><![CDATA[&lt;beans 
xmlns=&quot;http://www.springframework.org/schema/beans&quot;
        xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
        xmlns:jaxws=&quot;http://cxf.apache.org/jaxws&quot;
        xsi:schemaLocation=&quot;
@@ -153,22 +150,7 @@ http://cxf.apache.org/jaxws http://cxf.a
   ...
 &lt;/beans&gt;
 ]]></script>
-</div></div>
-
-<p>The only module cxf-all won't include is the servlet transport. If you want 
to include the servlet transport you must specify it specifically. This is 
because it will tell CXF to no longer use the standalone HTTP transport which 
is specified in the "classpath:META-INF/cxf/cxf-extension-http-jetty.xml" xml 
file, and you may not always want to do this.</p>
-
-<p>This <a shape="rect" class="external-link" 
href="http://cxf.547215.n5.nabble.com/Need-clarification-on-cxf-servlet-xml-config-file-td559570.html";
 rel="nofollow">mailing list thread</a> provides more information on CXF Spring 
files that may need to be imported in your web.xml.</p>
-
-
-    <div class="aui-message warning shadowed information-macro">
-                    <p class="title">Changes in CXF 2.4.x</p>
-                            <span class="aui-icon icon-warning">Icon</span>
-                <div class="message-content">
-                            
-<p>The above is applicable for CXF versions 2.3.x and older.  Starting in CXF 
2.4.0, the extensions are loaded internally by CXF automatically and you do not 
need to import all the cxf-extension-*.xml file.   You only need to import 
classpath:META-INF/cxf/cxf.xml.</p>
-
-                    </div>
-    </div></div>
+</div></div><p>The only module cxf-all won't include is the servlet transport. 
If you want to include the servlet transport you must specify it specifically. 
This is because it will tell CXF to no longer use the standalone HTTP transport 
which is specified in the "classpath:META-INF/cxf/cxf-extension-http-jetty.xml" 
xml file, and you may not always want to do this.</p><p>This <a shape="rect" 
class="external-link" 
href="http://cxf.547215.n5.nabble.com/Need-clarification-on-cxf-servlet-xml-config-file-td559570.html";
 rel="nofollow">mailing list thread</a> provides more information on CXF Spring 
files that may need to be imported in your web.xml.</p><p>&#160;</p></div>
            </div>
            <!-- Content -->
          </td>


Reply via email to