Skip to content

Commit

Permalink
Embed apollo in the web jvm for simpler dev of the Apollo hawtio plugin.
Browse files Browse the repository at this point in the history
  • Loading branch information
chirino committed Jun 24, 2013
1 parent a0bfe59 commit da9855b
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 8 deletions.
70 changes: 64 additions & 6 deletions hawtio-web/pom.xml
Expand Up @@ -213,12 +213,6 @@
<version>${activemq-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>${activemq-leveldb-artifactid}</artifactId>
<version>${activemq-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-camel</artifactId>
Expand Down Expand Up @@ -261,6 +255,70 @@
<version>${insight-log4j.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-broker</artifactId>
<version>${apollo-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-stomp</artifactId>
<version>${apollo-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-openwire</artifactId>
<version>${apollo-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-mqtt</artifactId>
<version>${apollo-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-amqp</artifactId>
<version>${apollo-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-leveldb</artifactId>
<version>${apollo-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-jmx</artifactId>
<version>${apollo-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-web</artifactId>
<classifier>classes</classifier>
<version>${apollo-version}</version>
<!-- we don't need the html rendering -->
<exclusions>
<exclusion>
<groupId>org.fusesource.scalate</groupId>
<artifactId>scalate-core_2.10</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<scope>test</scope>
<version>${scala-version}</version>
</dependency>

</dependencies>

<repositories>
Expand Down
28 changes: 28 additions & 0 deletions hawtio-web/src/main/webapp/WEB-INF/web.xml
Expand Up @@ -89,5 +89,33 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>


<!-- For Apollo -->
<filter>
<filter-name>static</filter-name>
<filter-class>org.apache.activemq.apollo.web.StaticContentFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>static</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter>
<filter-name>ApolloApplication</filter-name>
<filter-class>org.apache.activemq.apollo.web.ApolloApplication</filter-class>
</filter>
<filter-mapping>
<filter-name>ApolloApplication</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<servlet>
<servlet-name>jersey</servlet-name>
<servlet-class>org.apache.activemq.apollo.web.JerseyServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>jersey</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>

</web-app>

4 changes: 2 additions & 2 deletions hawtio-web/src/test/resources/applicationContext.xml
Expand Up @@ -28,7 +28,7 @@
</transportConnectors>

<persistenceAdapter>
<levelDB directory="target/activemq/broker1/data/leveldb" logSize="107374182"/>
<kahaDB directory="target/activemq/broker1/data/kahadb"/>
</persistenceAdapter>
<plugins>
<simpleAuthenticationPlugin>
Expand All @@ -48,7 +48,7 @@
</transportConnectors>

<persistenceAdapter>
<levelDB directory="target/activemq/broker2/data/leveldb" logSize="107374182"/>
<kahaDB directory="target/activemq/broker2/data/kahadb"/>
</persistenceAdapter>
<plugins>
<simpleAuthenticationPlugin>
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
Expand Up @@ -67,6 +67,8 @@
<activemq-version>5.9.0.${perfectus-build}</activemq-version>
<activemq-leveldb-artifactid>activemq-leveldb-store</activemq-leveldb-artifactid>
<aether-version>1.13.1</aether-version>
<apollo-version>99-trunk-SNAPSHOT</apollo-version>
<scala-version>2.10.0</scala-version>
<atmosphere-version>1.0.0.beta5</atmosphere-version>
<blueprint-web-version>1.0.0</blueprint-web-version>
<build-helper-maven-plugin-version>1.7</build-helper-maven-plugin-version>
Expand Down

0 comments on commit da9855b

Please sign in to comment.