Author: chirino
Date: Fri Nov 12 17:06:17 2010
New Revision: 1034470
URL: http://svn.apache.org/viewvc?rev=1034470&view=rev
Log:
- precompile the bdb store's jade template so it has a nice html rendering.
- switch to the snapshot version of scalate.. website gen should once again
work on it.
Added:
activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/
activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/
activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/
activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/
activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/
activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/
activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/
activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/bdb/
activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/
activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade
- copied, changed from r1034387,
activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/scalate/layouts/default.jade
- copied, changed from r1034387,
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
Removed:
activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
Modified:
activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
activemq/activemq-apollo/trunk/apollo-web/pom.xml
activemq/activemq-apollo/trunk/pom.xml
Modified: activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/pom.xml?rev=1034470&r1=1034469&r2=1034470&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/pom.xml Fri Nov 12 17:06:17 2010
@@ -39,7 +39,7 @@
<artifactId>apollo-store</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
@@ -58,6 +58,22 @@
<version>${slf4j-version}</version>
</dependency>
+ <!-- Since we implement a jade template to display the BDB status -->
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apollo-web</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>jar</type>
+ <classifier>slim</classifier>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api-version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Scala Support -->
<dependency>
<groupId>org.scala-lang</groupId>
@@ -128,7 +144,20 @@
</execution>
</executions>
</plugin>
-
+
+ <plugin>
+ <groupId>org.fusesource.scalate</groupId>
+ <artifactId>maven-scalate-plugin</artifactId>
+ <version>${scalate-version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>precompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
Copied:
activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade
(from r1034387,
activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade)
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade&r1=1034387&r2=1034470&rev=1034470&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade
(original)
+++
activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade
Fri Nov 12 17:06:17 2010
@@ -13,12 +13,15 @@
-# See the License for the specific language governing permissions and
-# limitations under the License.
-- import it._
- import org.apache.activemq.apollo.dto._
+- import it._
- val helper = new org.apache.activemq.apollo.web.resources.ViewHelper
- import helper._
- import java.util.concurrent.TimeUnit._
+.breadcumbs
+ a(href={strip_resolve(".")}) Back
+
p state: #{state} for #{ uptime(state_since) }
h2 Cancel Stats
Modified: activemq/activemq-apollo/trunk/apollo-web/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/pom.xml?rev=1034470&r1=1034469&r2=1034470&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/pom.xml Fri Nov 12 17:06:17 2010
@@ -57,12 +57,6 @@
<artifactId>scalate-core</artifactId>
<version>${scalate-version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.fusesource.scalate</groupId>-->
- <!--<artifactId>scalate-war</artifactId>-->
- <!--<version>${scalate-version}</version>-->
- <!--<type>war</type>-->
- <!--</dependency>-->
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
Copied:
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/scalate/layouts/default.jade
(from r1034387,
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml)
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/scalate/layouts/default.jade?p2=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/scalate/layouts/default.jade&p1=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml&r1=1034387&r2=1034470&rev=1034470&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
(original)
+++
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/scalate/layouts/default.jade
Fri Nov 12 17:06:17 2010
@@ -16,29 +16,29 @@
-@ var body: String
-@ var title : String = "ActiveMQ Appollo Web Console"
- response.setContentType("text/html")
-%html(lang="en")
- %head
- %meta(http-equiv="Content-Type" content="text/html; charset=utf-8")
- %meta(name="description" content="ActiveMQ Apollo Web Console")
- %meta(name="keywords" content="ActiveMQ,Apollo,Console")
- %meta(name="author" content="Apache Software Foundation")
+html(lang="en")
+ head
+ meta(http-equiv="Content-Type" content="text/html; charset=utf-8")
+ meta(name="description" content="ActiveMQ Apollo Web Console")
+ meta(name="keywords" content="ActiveMQ,Apollo,Console")
+ meta(name="author" content="Apache Software Foundation")
/ = include("/org/fusesource/scalate/console/console_head.scaml")
- %link(href={uri("/css/style.css")} rel="stylesheet" type="text/css")
- / %link(href={uri("/css/scalate/console.css")} rel="stylesheet"
type="text/css")
- %title
+ link(href={uri("/css/style.css")} rel="stylesheet" type="text/css")
+ / link(href={uri("/css/scalate/console.css")} rel="stylesheet"
type="text/css")
+ title
= title
- %body
+ body
#navigation
.wrapper
- %ul
- %li
+ ul
+ li
-# - if (requestURI.startsWith("/index."))
- -# %span Home
+ -# span Home
-# - else
- %a(href={uri("/index.scaml")}) Home
+ a(href={uri("/index.scaml")}) Home
#content
.wrapper
@@ -46,6 +46,3 @@
#footer
.wrapper
- %hr
- / = include("/org/fusesource/scalate/console/console.scaml")
-
\ No newline at end of file
Modified: activemq/activemq-apollo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1034470&r1=1034469&r2=1034470&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Fri Nov 12 17:06:17 2010
@@ -104,7 +104,7 @@
<bdb-version>4.1.6</bdb-version>
<jetty-version>6.1.22</jetty-version>
- <scalate-version>1.3.1</scalate-version>
+ <scalate-version>1.4-SNAPSHOT</scalate-version>
<scalamd-version>1.2</scalamd-version>
<servlet-api-version>2.5</servlet-api-version>
@@ -161,7 +161,7 @@
<module>apollo-stomp</module>
<module>apollo-web</module>
<module>apollo-cli</module>
- <!-- <module>apollo-website</module> -->
+ <module>apollo-website</module>
<module>apollo-distro</module>
</modules>
