activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject git commit: AMQ-4787: The welcome page of the web console should not be constrained.
Date Sat, 05 Oct 2013 13:55:26 GMT
Updated Branches:
  refs/heads/trunk abaaf25d3 -> 75c659f12


AMQ-4787: The welcome page of the web console should not be constrained.


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

Branch: refs/heads/trunk
Commit: 75c659f122bc60a4e21da1f3bf3eadd227c49cbe
Parents: abaaf25
Author: Claus Ibsen <claus.ibsen@gmail.com>
Authored: Sat Oct 5 15:46:23 2013 +0200
Committer: Claus Ibsen <claus.ibsen@gmail.com>
Committed: Sat Oct 5 15:52:05 2013 +0200

----------------------------------------------------------------------
 assembly/src/main/descriptors/common-bin.xml    |  14 ++
 assembly/src/release/conf/jetty.xml             |   4 +-
 assembly/src/release/webapps/index.html         |  19 +-
 assembly/src/release/webapps/styles/site.css    | 206 -------------------
 .../release/webapps/styles/type-settings.css    | 177 ----------------
 5 files changed, 20 insertions(+), 400 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/75c659f1/assembly/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 3f20fc2..ceab036 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -44,6 +44,20 @@
 
     <!-- lets copy the portions of the admin web app we need - as we can't exclude stuff
from the WAR -->
     <fileSet>
+      <directory>../activemq-web-console/src/main/webapp/images</directory>
+      <outputDirectory>/webapps/images</outputDirectory>
+      <includes>
+        <include>*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../activemq-web-console/src/main/webapp/styles</directory>
+      <outputDirectory>/webapps/styles</outputDirectory>
+      <includes>
+        <include>*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
       <directory>../activemq-web-console/src/main/webapp</directory>
       <outputDirectory>/webapps/admin</outputDirectory>
       <excludes>

http://git-wip-us.apache.org/repos/asf/activemq/blob/75c659f1/assembly/src/release/conf/jetty.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/conf/jetty.xml b/assembly/src/release/conf/jetty.xml
index f55b0c6..17ba466 100644
--- a/assembly/src/release/conf/jetty.xml
+++ b/assembly/src/release/conf/jetty.xml
@@ -37,7 +37,7 @@
     </bean>
     <bean id="securityConstraintMapping" class="org.eclipse.jetty.security.ConstraintMapping">
         <property name="constraint" ref="securityConstraint" />
-        <property name="pathSpec" value="/,*.jsp" />
+        <property name="pathSpec" value="/admin/*,/hawtio/*,*.jsp" />
     </bean>
     <bean id="adminSecurityConstraintMapping" class="org.eclipse.jetty.security.ConstraintMapping">
         <property name="constraint" ref="adminSecurityConstraint" />
@@ -152,4 +152,4 @@
 
     </bean>
 
-</beans>
+</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq/blob/75c659f1/assembly/src/release/webapps/index.html
----------------------------------------------------------------------
diff --git a/assembly/src/release/webapps/index.html b/assembly/src/release/webapps/index.html
index d96262d..8094416 100644
--- a/assembly/src/release/webapps/index.html
+++ b/assembly/src/release/webapps/index.html
@@ -28,20 +28,11 @@
     <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);
+        @import url(/styles/sorttable.css);
+        @import url(/styles/type-settings.css);
+        @import url(/styles/site.css);
+        @import url(/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> 
@@ -132,8 +123,6 @@
                 <div class="footer_r"> 
                     <div> 
                         Copyright 2005-2013 The Apache Software Foundation.
- 
-                        (<a href="?printable=true">printable version</a>)
                     </div> 
                 </div> 
             </div> 

http://git-wip-us.apache.org/repos/asf/activemq/blob/75c659f1/assembly/src/release/webapps/styles/site.css
----------------------------------------------------------------------
diff --git a/assembly/src/release/webapps/styles/site.css b/assembly/src/release/webapps/styles/site.css
deleted file mode 100644
index 13cfc54..0000000
--- a/assembly/src/release/webapps/styles/site.css
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * 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.
- */
-
-body {
-    padding: 20px;
-}
-
-/* ====================================================== */
-/*  Rounded Box Styles */
-/* ====================================================== */
-div.white_box div.header   {background: transparent url("../images/white-header-top.png")
repeat-x 0pt;}
-div.white_box div.header_l {background: transparent url("../images/white-header-left.png")
no-repeat 0pt;}
-div.white_box div.header_r {background: transparent url("../images/white-header-right.png")
no-repeat 100% 0pt;}
-div.white_box div.header_r {height: 18px;}
-
-div.white_box div.content   {background: #ffffff; } 
-div.white_box div.content_l {background: transparent url("../images/content-left.png") repeat-y
0pt;}
-div.white_box div.content_r {background: transparent url("../images/content-right.png") repeat-y
100% 0pt;}
-div.white_box div.content_r {padding-left: 6px; padding-right: 9px;}
-
-div.white_box div.footer {background: transparent url("../images/white-footer-bottom.png")
repeat-x 0pt;}
-div.white_box div.footer_l {background: transparent url("../images/white-footer-left.png")
no-repeat 0pt;}
-div.white_box div.footer_r {background: transparent url("../images/white-footer-right.png")
no-repeat 100% 0pt;}
-div.white_box div.footer_r {color: #ffffff; height:37px; padding:0px;}
-div.white_box div.footer_r {padding-left: 6px;padding-right: 9px;}
-
-div.black_box div.footer {background: transparent url("../images/black-footer-bottom.png")
repeat-x 0pt;}
-div.black_box div.footer_l {background: transparent url("../images/black-footer-left.png")
no-repeat 0pt;}
-div.black_box div.footer_r {background: transparent url("../images/black-footer-right.png")
no-repeat right bottom;}
-div.black_box div.footer_r {color: #ffffff; height:37; padding:0px;}
-div.black_box div.footer_r {padding-left: 6px;padding-right: 9px;}
-
-/* ====================================================== */
-/*  Logo Positioning */
-/* ====================================================== */
-div#activemq_logo{background: transparent url("../images/activemq-logo.png") no-repeat left
top; height: 100px; }
-div#activemq_logo{margin-left: 20px; overflow: hidden;}
-div#asf_logo {background: transparent url("../images/asf-logo.png") no-repeat right center;
height: 100px; }
-
-/* ====================================================== */
-/*  Top and Bottom Bar Styling */
-/* ====================================================== */
-div.top_red_bar {
-  background: transparent url("../images/top-red-bar.png") repeat 0pt; 
-  overflow: hidden;
-}
-div.bottom_red_bar {
-  background: transparent url("../images/bottom-red-bar.png") repeat 0pt; height: 11px;
-  overflow: hidden;
-}
-
-div#site-breadcrumbs {
-  margin: 0px;
-  padding: 0px;
-  float:left;
-  padding: 2px;
-  padding-left: 20px;
-}
-div#site-quicklinks {
-  margin: 0px;
-  padding: 2px;
-  padding-right: 20px;
-}
-div#site-quicklinks p {
-  text-align: right;
-  padding: 0px; 
-  margin: 0px;
-}
-
-div#site-quicklinks, div#site-breadcrumbs, div#site-quicklinks p, div#site-breadcrumbs p,
-div#site-quicklinks a:link, div#site-quicklinks a:visited,
-div#site-breadcrumbs a:link, div#site-breadcrumbs a:visited {
-  font-family: Verdana, arial, sans-serif;
-  font-size: 11px;
-  font-weight: bold;	
-  line-height: 16px;
-  color: #ffffff;
-  text-decoration: none;
-}
-div#site-quicklinks a:active, div#site-quicklinks a:hover,
-div#site-breadcrumbs a:active, div#site-breadcrumbs a:hover {
-  font-family: Verdana, arial, sans-serif;
-  font-size: 11px;
-  font-weight: bold;	
-  line-height: 13px;
-  color: #c0c0c0;
-  text-decoration: underline;
-}
-div#site-quicklinks sup img {
-  height: 0px;
-  width: 0px;
-}
-
-/* ====================================================== */
-/*  Navigation Styling */
-/* ====================================================== */
-div.navigation {background: #ffffff url("../images/right-box-left.png") repeat-y left 0pt;
width:200px;}
-div.navigation_top {background: transparent url("../images/right-box-top.png") no-repeat
left top;} 
-div.navigation_bottom {background: transparent url("../images/right-box-bottom.png") no-repeat
left bottom;}
-div.navigation_bottom {padding-left: 5px;padding-right:11px; padding-top:17px; padding-bottom:17px;}
-
-/* div.navigation {float:right;} */
-div.navigation_bottom ol, 
-div.navigation_bottom ul, 
-div.navigation_bottom {
-  font-family: Verdana, arial, sans-serif;
-  font-size: 11px;
-  font-weight: bold;	
-  line-height: 13px;
-  text-align: left;
-  padding-left: 11px;
-}
-
-div.navigation {
-  text-align: left;
-  clear: left;
-}
-
-
-div.navigation h3, 
-div.navigation h3 a:link, div.navigation h3 a:visited, div.navigation h3 a:active, div.navigation
h3 a:hover { 
-  font-family: Verdana, arial, sans-serif;
-  font-size: 11px;
-  font-weight: bold;	
-  line-height: 120%;
-
-  border: none;
-  font-size: 15px; 
-  text-decoration: none;
-  color: #660033;
-  margin:5px;
-}
-
-div.navigation h3 {
-  background: url("../images/big-bullet.png") no-repeat 0pt;
-  background-position:left center;
-  margin-left:15px;
-  padding-left: 20px;
-}
-
-div.navigation a:link, div.navigation a:visited, div.navigation a:active, div.navigation
a:hover {
-  text-decoration: none;
-  color: #000000;
-}
-div.navigation a:active, div.navigation a:hover {
-  text-decoration: underline;
-  color: #880055;
-}
-
-div.navigation ul {
-  padding-left: 25px;
-  list-style: none; 
-  padding-bottom: 10px;
-  border-bottom:1px solid #CACACA;
-  margin: 0px;
-  margin-left: 10px;
-  margin-bottom: 10px;
-}
-
-div.navigation_bottom div { 
-  margin-left:10px;
-  padding-left:25px;
-  padding-bottom: 10px;
-  margin-bottom: 10px;
-  border-bottom:1px solid #CACACA;
-}
-
-div.navigation img {
-  margin-left:15px;
-  padding-left: 20px;
-}
-
-div.navigation sup img { height: 0px; width: 0px; }
-
-/* ====================================================== */
-/*  Footer Styling */
-/* ====================================================== */
-div.black_box div.footer_r div {
-  font-family: Verdana, arial, sans-serif;
-  font-size: 10px;
-  font-weight: normal;	
-  line-height: normal;
-  padding:5px;
-  padding-left:20px;
-}
-
-div.design_attribution, div.design_attribution a {
-  font-family: Verdana, arial, sans-serif;
-  font-size: 10px;
-  text-align:center;
-  color: #a0a0a0;
-}

http://git-wip-us.apache.org/repos/asf/activemq/blob/75c659f1/assembly/src/release/webapps/styles/type-settings.css
----------------------------------------------------------------------
diff --git a/assembly/src/release/webapps/styles/type-settings.css b/assembly/src/release/webapps/styles/type-settings.css
deleted file mode 100644
index e1ba15b..0000000
--- a/assembly/src/release/webapps/styles/type-settings.css
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * 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.
- */
-body, p, ul, ol {
-    font-family: verdana,arial,helvetica,sans-serif;
-    font-size: 14px;
-    font-size-adjust: none;
-    font-style: normal;
-    font-font-variant: normal;
-    font-weight: normal;
-    line-height: 140%;
-    color: #000000;
-}
-
-div.body-content {
-    padding-left: 25px;
-}
-
-td, table, tr {
-    font-family: verdana,arial,helvetica,sans-serif;
-    font-size: 10px;
-    font-size-adjust: none;
-    font-style: normal;
-    font-font-variant: normal;
-    font-weight: normal;
-    line-height: normal; 
-    color: #000000;
-}
-
-a:link, a:visited, a:active, a:hover {
-   color: #880055;
-   text-decoration: none;
-}
-
-a:active, a:hover {
-   text-decoration: underline;
-   color: #202020;
-}
-
-ul, ol {
-    margin-left: 15px;
-    margin-top: 5px;
-    margin-bottom: 5px;
-    padding: 0px;
-    font-size: 12px;
-}
-
-ul li {
-    list-style-image: url("../images/small-bullet-red.png");
-}
-ul li ul li{
-    list-style-image: url("../images/small-bullet-gray.png");
-}
-
-pre {
-    padding: 0px;
-    margin-top: 5px;
-    margin-left: 15px;
-    margin-bottom: 5px;
-    margin-right: 5px;
-    text-align: left;
-}
-
-hr {
-    color: #3c78b5;
-    height: 1;
-}
-
-input {
-    font-family: verdana, geneva, arial, sans-serif;
-    font-size: 11px;
-    color: #000000;
-}
-
-textarea {
-    font-family: verdana, geneva, arial, sans-serif;
-    font-size: 11px;
-    color: #333333;
-}
-
-h1, h2, h3, h4, h5, h6  {
-  font-family: Georgia,'Times New Roman',serif;
-  line-height: normal;
-  font-weight: bold;
-}
-
-h1 {
-  border-bottom: 1px solid #808080;
-  padding: 2px;
-  margin: 36px 0px 4px -25px;
-  font-size: 20px;
-}
-h1 a:link, h1 a:visited, h1 a:active {
-    text-decoration: none;
-}
-
-h1 a:hover {
-    border-bottom: 1px dotted #660033;
-}
-
-h2 {
-  border-bottom: 1px solid #a0a0a0;
-  padding: 2px;
-  margin: 27px 0px 4px -20px;
-  font-size: 18px;
-}
-
-h3 {
-  border-bottom: 1px solid #c0c0c0;
-  padding: 2px;
-  margin: 21px 0px 4px -15px;
-  font-size: 16px;
-}
-
-h4 {
-  border-bottom: 1px solid #c0c0c0;
-  padding: 2px;
-  margin: 18px 0px 4px -10px;
-  font-size: 15px;
-}
-
-h5 {
-  padding: 2px;
-  margin: 14px 0px 4px -5px;
-  font-size: 14px;
-}
-
-h6 {
-  padding: 2px;
-  margin: 14px 0px 4px -5px;
-  font-size: 13px;
-}
-
-blockquote {
-    padding-left: 10px;
-    padding-right: 10px;
-    margin-left: 5px;
-    margin-right: 0px;
-    border-left: 1px solid #3c78b5;
-}
-
-.tooltip {  position: relative;
-    text-decoration: none;
-}
-
-.tooltip span {
-    display: none;
-}
-
-.tooltip:hover span {
-    position: absolute;
-    top: 10px;
-    left: 25px;
-    display: block;
-    background: #ccc;
-    color: #880055;
-    border: 1px solid #880055;
-}
-
-div.message {
-    width: 1000px;
-    height: 750px;
-    overflow : scroll;
-}
\ No newline at end of file


Mime
View raw message