Author: dejanb
Date: Fri Feb 26 17:06:53 2010
New Revision: 916760
URL: http://svn.apache.org/viewvc?rev=916760&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2547 - fixing jetty.xml and
merging some visual improvs to the web apps
Added:
activemq/branches/activemq-5.3/assembly/src/release/webapps/favicon.ico
- copied unchanged from r908527,
activemq/trunk/assembly/src/release/webapps/favicon.ico
Modified:
activemq/branches/activemq-5.3/activemq-web-demo/src/main/webapp/index.html
activemq/branches/activemq-5.3/assembly/src/release/conf/jetty.xml
activemq/branches/activemq-5.3/assembly/src/release/webapps/index.html
Modified:
activemq/branches/activemq-5.3/activemq-web-demo/src/main/webapp/index.html
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-web-demo/src/main/webapp/index.html?rev=916760&r1=916759&r2=916760&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-web-demo/src/main/webapp/index.html
(original)
+++ activemq/branches/activemq-5.3/activemq-web-demo/src/main/webapp/index.html
Fri Feb 26 17:06:53 2010
@@ -1,72 +1,181 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
- 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.
+ 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.
-->
-<html>
-<head>
- <title>ActiveMQ Web Connector</title>
- <link rel="stylesheet" href="style.css" type="text/css">
-</head>
-
-<body>
-<h1>ActiveMQ Web Connector</h1>
-
-<p>
-This service allows you to send messages to the JMS network using a
-normal HTTP POST and to receive messages from a destination using a
-HTTP GET.
-</p>
-
-<h2>Market data example</h2>
-
-<p>
-<a
href="portfolioPublish?count=1&refresh=2&stocks=IBMW&stocks=BEAS&stocks=MSFT&stocks=SUNW">Market
data publisher</a> starts publishing
-some mock market data prices
-</p>
-
-<p>
-<a href="portfolio/portfolio.html">Portfolio</a> example shows how you could
make an interactive trading portfolio which
-updates in real time as the market prices change
-</p>
-
-<h2>Chat example</h2>
-
-<p>
-<a href="chat.html">Chat room</a> example shows how you can use Streamlets and
ActiveMQ to create a simple chat room
-</p>
-
-<h2>Simple Form based browser example</h2>
-
-<p>
-<a href="send.html">Send a message</a>
-</p>
-
-<p>
-<a href="message/FOO/BAR?timeout=10000&type=queue">Receive a message</a>
-</p>
-
-<h2>Queue browser example</h2>
-
-<ul>
-<li><a href="queueBrowse/FOO/BAR">Browse a queue</a></li>
-<li><a href="queueBrowse/FOO/BAR?view=xml">Browse a queue as XML</a></li>
-<li><a href="queueBrowse/FOO/BAR?view=rss&feedType=atom_1.0">Browse a queue as
Atom</a></li>
-<li><a href="queueBrowse/FOO/BAR?view=rss&feedType=rss_1.0">Browse a queue as
RSS 1.0</a></li>
-<li><a href="queueBrowse/FOO/BAR?view=rss&feedType=rss_2.0">Browse a queue as
RSS 2.0</a></li>
-</ul>
-
-</body>
-</html>
+
+
+
+
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <title>ActiveMQ Web Demos</title>
+ <style type="text/css" media="screen">
+ @import url(/admin/styles/sorttable.css);
+ @import url(/admin/styles/type-settings.css);
+ @import url(/admin/styles/site.css);
+ @import url(/admin/styles/prettify.css);
+ </style>
+
+ <script type='text/javascript' src='/js/common.js'></script>
+ <script type='text/javascript' src='/js/css.js'></script>
+ <script type='text/javascript'
src='/js/standardista-table-sorting.js'></script>
+ <script type='text/javascript' src='/js/prettify.js'></script>
+ <script>addEvent(window, 'load', prettyPrint)</script>
+
+
+
+</head>
+
+<body>
+
+
+<div class="white_box">
+ <div class="header">
+ <div class="header_l">
+ <div class="header_r">
+ </div>
+ </div>
+ </div>
+ <div class="content">
+ <div class="content_l">
+ <div class="content_r">
+
+ <div>
+
+ <!-- Banner -->
+ <div id="asf_logo">
+ <div id="activemq_logo">
+ <a style="float:left;
width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
margin-top:10px; margin-left:100px;"
+ href="http://activemq.apache.org/";
+ title="The most popular and powerful open
source Message Broker">ActiveMQ</a>
+ <a style="float:right;
width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
margin-top:15px; margin-right:10px;"
+ href="http://www.apache.org/"; title="The Apache
Software Foundation">ASF</a>
+ </div>
+ </div>
+
+
+ <div class="top_red_bar">
+ <div id="site-breadcrumbs">
+ </div>
+ <div id="site-quicklinks"><P>
+ <a href="http://activemq.apache.org/support.html";
+ title="Get help and support using Apache
ActiveMQ">Support</a></p>
+ </div>
+ </div>
+
+ <table border="0">
+ <tbody>
+ <tr>
+ <td valign="top" width="100%"
style="overflow:hidden;">
+ <div class="body-content">
+ <h1>ActiveMQ Web Demos</h1>
+
+ <p>
+ Here you can find some examples on
how you can exchange messages with ActiveMQ broker, using REST and Ajax APIs
+ </p>
+
+ <h2>Market data example</h2>
+
+ <p>
+ <a
href="portfolioPublish?count=1&refresh=2&stocks=IBMW&stocks=BEAS&stocks=MSFT&stocks=SUNW">Market
data publisher</a> starts publishing
+ some mock market data prices
+ </p>
+
+ <p>
+ <a
href="portfolio/portfolio.html">Portfolio</a> example shows how you could make
an interactive trading portfolio which
+ updates in real time as the market
prices change
+ </p>
+
+ <h2>Chat example</h2>
+
+ <p>
+ <a href="chat.html">Chat room</a>
example shows how you can use Streamlets and ActiveMQ to create a simple chat
room
+ </p>
+
+ <h2>Simple Form based browser
example</h2>
+
+ <p>
+ <a href="send.html">Send a
message</a>
+ </p>
+
+ <p>
+ <a
href="message/FOO/BAR?timeout=10000&type=queue">Receive a message</a>
+ </p>
+
+ <h2>Queue browser example</h2>
+
+ <ul>
+ <li><a
href="queueBrowse/FOO/BAR">Browse a queue</a></li>
+ <li><a
href="queueBrowse/FOO/BAR?view=xml">Browse a queue as XML</a></li>
+ <li><a
href="queueBrowse/FOO/BAR?view=rss&feedType=atom_1.0">Browse a queue as
Atom</a></li>
+ <li><a
href="queueBrowse/FOO/BAR?view=rss&feedType=rss_1.0">Browse a queue as RSS
1.0</a></li>
+ <li><a
href="queueBrowse/FOO/BAR?view=rss&feedType=rss_2.0">Browse a queue as RSS
2.0</a></li>
+ </ul>
+ </div>
+ </td>
+ <td valign="top">
+
+ <div class="navigation">
+ <div class="navigation_top">
+ <div class="navigation_bottom">
+ <H3>Useful Links</H3>
+
+ <ul class="alternate"
type="square">
+ <li><a
href="http://activemq.apache.org/";
+ title="The most
popular and powerful open source Message Broker">Documentation</a></li>
+ <li><a
href="http://activemq.apache.org/faq.html";>FAQ</a></li>
+ <li><a
href="http://activemq.apache.org/download.html";>Downloads</a>
+ </li>
+ <li><a
href="http://activemq.apache.org/discussion-forums.html";>Forums</a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+
+ <div class="bottom_red_bar"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="black_box">
+ <div class="footer">
+ <div class="footer_l">
+ <div class="footer_r">
+ <div>
+ Copyright 2005-2007 The Apache Software Foundation.
+
+ (<a href="?printable=true">printable version</a>)
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<div class="design_attribution"><a href="http://hiramchirino.com/";>Graphic
Design By Hiram</a></div>
+
+</body>
+</html>
Modified: activemq/branches/activemq-5.3/assembly/src/release/conf/jetty.xml
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/conf/jetty.xml?rev=916760&r1=916759&r2=916760&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/conf/jetty.xml
(original)
+++ activemq/branches/activemq-5.3/assembly/src/release/conf/jetty.xml Fri Feb
26 17:06:53 2010
@@ -20,17 +20,70 @@
e.g. <import resource="jetty.xml"/>
-->
-<beans>
- <jetty xmlns="http://mortbay.com/schemas/jetty/1.0";>
- <connectors>
- <nioConnector port="8161"/>
- </connectors>
+<beans
+ xmlns="http://www.springframework.org/schema/beans";
+ xmlns:jetty="http://mortbay.com/schemas/jetty/1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+
+ <bean id="Server"
+ class="org.mortbay.jetty.Server" init-method="start"
destroy-method="stop">
+ <property name="connectors">
+ <list>
+ <bean id="Connector"
class="org.mortbay.jetty.nio.SelectChannelConnector">
+ <property name="port" value="8161"/>
+ </bean>
+ </list>
+ </property>
- <handlers>
- <webAppContext contextPath="/admin"
resourceBase="${activemq.base}/webapps/admin" logUrlOnStart="true"/>
- <webAppContext contextPath="/camel"
resourceBase="${activemq.base}/webapps/camel" logUrlOnStart="true"/>
- <webAppContext contextPath="/demo"
resourceBase="${activemq.base}/webapps/demo" logUrlOnStart="true"/>
- <webAppContext contextPath="/fileserver"
resourceBase="${activemq.base}/webapps/fileserver" logUrlOnStart="true"/>
- </handlers>
- </jetty>
- </beans>
+ <property name="handler">
+ <bean id="handlers"
+ class="org.mortbay.jetty.handler.HandlerCollection">
+ <property name="handlers">
+ <list>
+ <bean id="contexts"
+ class="org.mortbay.jetty.handler.ContextHandlerCollection">
+ <property name="handlers">
+ <list>
+ <bean class="org.mortbay.jetty.webapp.WebAppContext">
+ <property name="contextPath" value="/admin"/>
+ <property name="resourceBase"
value="${activemq.base}/webapps/admin"/>
+ <property name="logUrlOnStart" value="true"/>
+ </bean>
+ <bean class="org.mortbay.jetty.webapp.WebAppContext">
+ <property name="contextPath" value="/camel"/>
+ <property name="resourceBase"
value="${activemq.base}/webapps/camel"/>
+ <property name="logUrlOnStart" value="true"/>
+ </bean>
+ <bean class="org.mortbay.jetty.webapp.WebAppContext">
+ <property name="contextPath" value="/demo"/>
+ <property name="resourceBase"
value="${activemq.base}/webapps/demo"/>
+ <property name="logUrlOnStart" value="true"/>
+ </bean>
+ <bean class="org.mortbay.jetty.webapp.WebAppContext">
+ <property name="contextPath" value="/fileserver"/>
+ <property name="resourceBase"
value="${activemq.base}/webapps/fileserver"/>
+ <property name="logUrlOnStart" value="true"/>
+ </bean>
+ <bean class="org.mortbay.jetty.handler.ContextHandler">
+ <property name="contextPath" value="/"/>
+ <property name="handler">
+ <bean
class="org.mortbay.jetty.handler.ResourceHandler">
+ <property name="welcomeFiles">
+ <list>
+ <value>index.html</value>
+ </list>
+ </property>
+ <property name="resourceBase"
value="${activemq.base}/webapps/"/>
+ </bean>
+ </property>
+ </bean>
+ </list>
+ </property>
+ </bean>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+</beans>
Modified: activemq/branches/activemq-5.3/assembly/src/release/webapps/index.html
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/webapps/index.html?rev=916760&r1=916759&r2=916760&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/webapps/index.html
(original)
+++ activemq/branches/activemq-5.3/assembly/src/release/webapps/index.html Fri
Feb 26 17:06:53 2010
@@ -14,8 +14,133 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html>
- <body>
- <h1>Welcome to Apache ActiveMQ!</h1>
- </body>
-</html>
+
+
+
+
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <title>Apache ActiveMQ</title>
+ <style type="text/css" media="screen">
+ @import url(/admin/styles/sorttable.css);
+ @import url(/admin/styles/type-settings.css);
+ @import url(/admin/styles/site.css);
+ @import url(/admin/styles/prettify.css);
+ </style>
+
+ <script type='text/javascript' src='/js/common.js'></script>
+ <script type='text/javascript' src='/js/css.js'></script>
+ <script type='text/javascript'
src='/js/standardista-table-sorting.js'></script>
+ <script type='text/javascript' src='/js/prettify.js'></script>
+ <script>addEvent(window, 'load', prettyPrint)</script>
+
+
+
+</head>
+
+<body>
+
+
+<div class="white_box">
+ <div class="header">
+ <div class="header_l">
+ <div class="header_r">
+ </div>
+ </div>
+ </div>
+ <div class="content">
+ <div class="content_l">
+ <div class="content_r">
+
+ <div>
+
+ <!-- Banner -->
+ <div id="asf_logo">
+ <div id="activemq_logo">
+ <a style="float:left;
width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
margin-top:10px; margin-left:100px;"
+ href="http://activemq.apache.org/";
+ title="The most popular and powerful open
source Message Broker">ActiveMQ</a>
+ <a style="float:right;
width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
margin-top:15px; margin-right:10px;"
+ href="http://www.apache.org/"; title="The Apache
Software Foundation">ASF</a>
+ </div>
+ </div>
+
+
+ <div class="top_red_bar">
+ <div id="site-breadcrumbs">
+ </div>
+ <div id="site-quicklinks"><P>
+ <a href="http://activemq.apache.org/support.html";
+ title="Get help and support using Apache
ActiveMQ">Support</a></p>
+ </div>
+ </div>
+
+ <table border="0">
+ <tbody>
+ <tr>
+ <td valign="top" width="100%"
style="overflow:hidden;">
+ <div class="body-content">
+ <h2>Welcome to the Apache
ActiveMQ!</h2>
+
+ <p>What do you want to do
next?</p>
+ <ul class="alternate"
type="square">
+ <li><a title="Manage
ActiveMQ broker" href="/admin/">Manage ActiveMQ broker</a></li>
+ <li><a title="Manage Camel
instance" href="/camel/">Manage Camel instance</a></li>
+ <li><a title="See some Web
demos" href="/demo/">See some Web demos</a></li>
+ </ul>
+ </div>
+ </td>
+ <td valign="top">
+
+ <div class="navigation">
+ <div class="navigation_top">
+ <div class="navigation_bottom">
+ <H3>Useful Links</H3>
+
+ <ul class="alternate"
type="square">
+ <li><a
href="http://activemq.apache.org/";
+ title="The most
popular and powerful open source Message Broker">Documentation</a></li>
+ <li><a
href="http://activemq.apache.org/faq.html";>FAQ</a></li>
+ <li><a
href="http://activemq.apache.org/download.html";>Downloads</a>
+ </li>
+ <li><a
href="http://activemq.apache.org/discussion-forums.html";>Forums</a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+
+ <div class="bottom_red_bar"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="black_box">
+ <div class="footer">
+ <div class="footer_l">
+ <div class="footer_r">
+ <div>
+ Copyright 2005-2007 The Apache Software Foundation.
+
+ (<a href="?printable=true">printable version</a>)
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<div class="design_attribution"><a href="http://hiramchirino.com/";>Graphic
Design By Hiram</a></div>
+
+</body>
+</html>
