You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2011/02/04 17:23:00 UTC

svn commit: r1067213 - in /servicemix/documentation/trunk: .gitignore src/main/webapp/WEB-INF/scalate/layouts/default.ssp src/main/webapp/quickstart/activemq.conf

Author: gertv
Date: Fri Feb  4 16:23:00 2011
New Revision: 1067213

URL: http://svn.apache.org/viewvc?rev=1067213&view=rev
Log:
SMX4-647: Add Google search to the generated website
SMX4-614: Simplify the getting started guide examples

Thanks to Joris for providing this patch!

Modified:
    servicemix/documentation/trunk/.gitignore
    servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
    servicemix/documentation/trunk/src/main/webapp/quickstart/activemq.conf

Modified: servicemix/documentation/trunk/.gitignore
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/.gitignore?rev=1067213&r1=1067212&r2=1067213&view=diff
==============================================================================
--- servicemix/documentation/trunk/.gitignore (original)
+++ servicemix/documentation/trunk/.gitignore Fri Feb  4 16:23:00 2011
@@ -3,4 +3,7 @@ target
 .classpath
 .project
 *.i??
-.idea
\ No newline at end of file
+.idea
+
+# Mac OSX
+.DS_Store

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=1067213&r1=1067212&r2=1067213&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 Fri Feb  4 16:23:00 2011
@@ -89,6 +89,18 @@ limitations under the License.
                   <li><a href="http://servicemix.apache.org/contrib/developers.html" title="Developers">Developer Resources</a></li>
                 </ul>
               </li>
+              <% if (sitegen(engine)) { %>
+              <li>
+                <form action="http://www.google.com/search" method="get" style="font-size: 10px;">
+                <input name="ie" type="hidden" value="UTF-8"></input>
+                <input name="oe" type="hidden" value="UTF-8"></input>
+                  <input maxlength="255" name="q" size="15" type="text" value=""></input>
+                  <input name="btnG" type="submit" value="Search"></input>
+                  <input name="domains" type="hidden" value="servicemix.apache.org/docs/4.3.0-SNAPSHOT/"></input>
+                  <input name="sitesearch" type="hidden" value="servicemix.apache.org/docs/4.3.0-SNAPSHOT/"></input>
+                </form>
+              </li>
+              <% } %>
             </ul>
           </td>
         </tr>

Modified: servicemix/documentation/trunk/src/main/webapp/quickstart/activemq.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/quickstart/activemq.conf?rev=1067213&r1=1067212&r2=1067213&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/quickstart/activemq.conf (original)
+++ servicemix/documentation/trunk/src/main/webapp/quickstart/activemq.conf Fri Feb  4 16:23:00 2011
@@ -28,14 +28,9 @@ The first Blueprint XML file we'll creat
             FileMovedEvent(file: ${file:name}, timestamp: ${date:now:hh:MM:ss.SSS})
           </simple>
         </setBody>
-        <to uri="amq://events" />
+        <to uri="activemq://events" />
       </route>
     </camelContext>
-
-    <bean id="amq" class="org.apache.activemq.camel.component.ActiveMQComponent">
-      <property name="brokerURL" value="vm://default?create=false&amp;waitForStart=10000"/>
-    </bean>
-
 </blueprint>
 {pygmentize}
 
@@ -55,15 +50,10 @@ After deploying the first XML file, you'
 
     <camelContext xmlns="http://camel.apache.org/schema/blueprint">
       <route>
-        <from uri="amq://events"/>
+        <from uri="activemq://events"/>
         <to uri="log:events"/>
       </route>
     </camelContext>
-
-    <bean id="amq" class="org.apache.activemq.camel.component.ActiveMQComponent">
-      <property name="brokerURL" value="tcp://localhost:61616"/>
-    </bean>
-
 </blueprint>
 {pygmentize}