servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1344761 - in /servicemix/documentation/trunk/src: main/scala/org/apache/servicemix/documentation/ main/webapp/WEB-INF/scalate/layouts/ main/webapp/users-guide/getting-started/ test/scala/org/apache/servicemix/documentation/
Date Thu, 31 May 2012 15:08:36 GMT
Author: gertv
Date: Thu May 31 15:08:35 2012
New Revision: 1344761

URL: http://svn.apache.org/viewvc?rev=1344761&view=rev
Log:
Add a deprecation warning to the JBI guide pages

Modified:
    servicemix/documentation/trunk/src/main/scala/org/apache/servicemix/documentation/Helper.scala
    servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
    servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/technology-selection.conf
    servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala

Modified: servicemix/documentation/trunk/src/main/scala/org/apache/servicemix/documentation/Helper.scala
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/scala/org/apache/servicemix/documentation/Helper.scala?rev=1344761&r1=1344760&r2=1344761&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/scala/org/apache/servicemix/documentation/Helper.scala
(original)
+++ servicemix/documentation/trunk/src/main/scala/org/apache/servicemix/documentation/Helper.scala
Thu May 31 15:08:35 2012
@@ -51,4 +51,9 @@ object Helper {
    */
   def sitegen(engine: TemplateEngine) = (engine.getClass.getName == SITEGEN_ENGINE)
 
+  /**
+   * Determine if this is a page from the JBI guide
+   */
+  def jbi(uri: String) = uri.startsWith("/jbi")
+
 }

Modified: servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp?rev=1344761&r1=1344760&r2=1344761&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp (original)
+++ servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp Thu
May 31 15:08:35 2012
@@ -139,9 +139,17 @@ limitations under the License.
             ${include(toc(requestUri))}
         </div>
         <div id="body">
+          <% if (jbi(requestUri)) { %>
+          <div class="note">
+            <h1>JBI Support deprecated in Apache ServiceMix 4</h1>
+            <p>JBI 1.0 support is available in Apache ServiceMix 4 to allow existing
users to migrate more easily to this latest version - if you're a new user, you should consider
JBI deprecated and not use it for your project.
+            Take a look at our <a href="${uri("/users-guide/getting-started/technology-selection.html")}"</a>technology
selection guidelines</a> for more information.</p>
+          </div>
+          <% } %>
           <%= body %>
         </div>
       <% } %>
+
       <% if (!navigation) { %>
         <%= body %>
       <% } %>

Modified: servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/technology-selection.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/technology-selection.conf?rev=1344761&r1=1344760&r2=1344761&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/technology-selection.conf
(original)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/technology-selection.conf
Thu May 31 15:08:35 2012
@@ -29,6 +29,6 @@ h3. When to use NMR?
 The NMR provides the basic ESB features for ServiceMix 4.  You can use it to connect multiple
camel routes in a lightweight way.  It can also be used as a common transport on which you
can add container-level auditing by registering your own ExchangeListener implementation.
 
 h3. When to use JBI?
-If you want to build a full-blown SOA solution using BPEL, ServiceMix includes a version
of Apache ODE that integrates well with JBI messaging.  Because we still support JBI 1.0 on
ServiceMix, you can also move your existing JBI artifacts from ServiceMix 3 to the new container
with no/minimal changes.
+We still support JBI 1.0 in ServiceMix 4 so you can leverage your previous investments and
move your existing JBI artifacts from ServiceMix 3 to the new container with no/minimal changes
before migrating them to use Camel and/or CXF directly.  For new projects, you should consider
JBI deprecated and always use Camel and/or CXF inside ServiceMix instead.
 
 

Modified: servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala?rev=1344761&r1=1344760&r2=1344761&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala
(original)
+++ servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala
Thu May 31 15:08:35 2012
@@ -46,6 +46,13 @@ class HelperTest {
 
   }
 
+  @Test
+  def testJbi = {
+    assertTrue(jbi("/jbi/index.html"))
+    assertTrue(jbi("/jbi/components/servicemix-http.html"))
+    assertFalse(jbi("/nmr/index.html"))
+  }
+
   def assertValidToc(expected: String, location: String): Unit = {
     assertEquals("Should return valid TOC for " + location,
                  expected, toc(location))



Mime
View raw message