You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@tomee.apache.org by bu...@apache.org on 2014/10/26 10:44:17 UTC
svn commit: r926875 - in /websites/staging/tomee/trunk: cgi-bin/ content/
content/activemq.xml content/javaagent.html
content/jms-resources-and-mdb-container.html
Author: buildbot
Date: Sun Oct 26 09:44:17 2014
New Revision: 926875
Log:
Staging update by buildbot for tomee
Added:
websites/staging/tomee/trunk/content/activemq.xml
Modified:
websites/staging/tomee/trunk/cgi-bin/ (props changed)
websites/staging/tomee/trunk/content/ (props changed)
websites/staging/tomee/trunk/content/javaagent.html
websites/staging/tomee/trunk/content/jms-resources-and-mdb-container.html
Propchange: websites/staging/tomee/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Oct 26 09:44:17 2014
@@ -1 +1 @@
-1633661
+1634292
Propchange: websites/staging/tomee/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Oct 26 09:44:17 2014
@@ -1 +1 @@
-1633661
+1634292
Added: websites/staging/tomee/trunk/content/activemq.xml
==============================================================================
--- websites/staging/tomee/trunk/content/activemq.xml (added)
+++ websites/staging/tomee/trunk/content/activemq.xml Sun Oct 26 09:44:17 2014
@@ -0,0 +1,62 @@
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.apache.org/schema/core"
+ 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-2.0.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.8.0.xsd">
+
+ <!-- Allows us to use external properties as variables in this configuration file -->
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location">
+ <value>file:conf/your.activemq.properties</value>
+ </property>
+ <property name="properties">
+ <props>
+ <prop key="conf.db.host">database-host:database-port</prop>
+ <prop key="conf.db.un">database-username</prop>
+ <prop key="conf.db.pw">database-password</prop>
+ <prop key="data.dir">data</prop>
+ </props>
+ </property>
+ </bean>
+
+ <broker xmlns="http://activemq.apache.org/schema/core"
+ useJmx="true"
+ brokerName="spectrum"
+ useShutdownHook="false"
+ persistent="true"
+ start="false"
+ schedulerSupport="false"
+ enableStatistics="false"
+ offlineDurableSubscriberTimeout="259200000"
+ offlineDurableSubscriberTaskSchedule="3600000">
+
+ <!--persistenceAdapter>
+ <jdbcPersistenceAdapter createTablesOnStartup="false" dataSource="#postgresql-activemq-ds">
+ <adapter>
+ <postgresql-jdbc-adapter/>
+ </adapter>
+ </jdbcPersistenceAdapter>
+ </persistenceAdapter-->
+
+ <persistenceAdapter>
+ <kahaDB directory="${data.dir}/activemq-data/kaha" indexCacheSize="20000" ignoreMissingJournalfiles="true" checkForCorruptJournalFiles="true" checksumJournalFiles="true"/>
+ </persistenceAdapter>
+
+ <!-- The transport connectors ActiveMQ will listen to -->
+ <transportConnectors>
+ <transportConnector name="vm" uri="vm://spectrum?waitForStart=30000&async=true"/>
+ <transportConnector name="nio" enableStatusMonitor="true" uri="nio://0.0.0.0:54545?soTimeout=60000&daemon=true&keepAlive=true&connectionTimeout=120000&wireFormat.tcpNoDelayEnabled=true&wireFormat.maxInactivityDuration=240000&wireFormat.maxInactivityDurationInitalDelay=120000"/>
+ </transportConnectors>
+
+ </broker>
+
+ <!--bean id="postgresql-activemq-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName" value="org.postgresql.Driver"/>
+ <property name="url" value="jdbc:postgresql://${conf.db.host}/openejb_activemq"/>
+ <property name="username" value="${conf.db.un}"/>
+ <property name="password" value="${conf.db.pw}"/>
+ <property name="poolPreparedStatements" value="true"/>
+ </bean-->
+
+</beans>
\ No newline at end of file
Modified: websites/staging/tomee/trunk/content/javaagent.html
==============================================================================
--- websites/staging/tomee/trunk/content/javaagent.html (original)
+++ websites/staging/tomee/trunk/content/javaagent.html Sun Oct 26 09:44:17 2014
@@ -147,15 +147,15 @@
<h1>Adding a JavaAgent</h1>
+<p>NOTE: The java agent is only required if using OpenJPA as your persistence
+provider or if using CMP.</p>
+
<p>Adding a java agent is done via a vm parameter as follows:</p>
<pre><code>java -javaagent:openejb-javaagent-4.6.0.jar _\[other params...](other-params....html)
</code></pre>
-<p><div class="note">:title=Need the JavaAgent?}
-The java agent is only required if using OpenJPA as your persistence
-provider or if using CMP.<div class="note">}
-<a name="JavaAgent-Maven2"></a></p>
+<p><a name="JavaAgent-Maven2"></a></p>
<h2>Maven2</h2>
@@ -174,7 +174,6 @@ your pom.xml file:</p>
<workingDirectory>${project.basedir}/target</workingDirectory>
</configuration>
</plugin>
-
<!-- this tells maven to copy the openejb-javaagent jar into your target/ directory -->
<!-- where surefire can see it -->
<plugin>
@@ -200,7 +199,6 @@ your pom.xml file:</p>
</execution>
</executions>
</plugin>
-
</plugins>
</build>
</code></pre>
Modified: websites/staging/tomee/trunk/content/jms-resources-and-mdb-container.html
==============================================================================
--- websites/staging/tomee/trunk/content/jms-resources-and-mdb-container.html (original)
+++ websites/staging/tomee/trunk/content/jms-resources-and-mdb-container.html Sun Oct 26 09:44:17 2014
@@ -215,21 +215,23 @@ work, such as 'failover:'.</p>
<h2>Internal ActiveMQ Broker with activemq.xml</h2>
-<p>The <code>activemq.xml</code> file format has a significant number of extra dependencies, such as Spring, and is therefore not included in the distribution by default.</p>
+<p>The <a href="http://activemq.apache.org/xml-configuration.html">activemq.xml</a> file format requires a number of Spring dependencies, and is therefore not included in the distribution by default. This is purley due to the fact that this ActiveMQ file format is parsed using Spring libraries and this is beyond our control. However, the advantage is opening up the door to the huge number of configuration options available found here: <a href="http://activemq.apache.org/xml-configuration.html">http://activemq.apache.org/xml-configuration.html</a>.</p>
<p>This support can be enabled by adding the right libraries and creating an <code>conf/activemq.xml</code> file.</p>
-<p>Add the following jars to the <code>tomee.home/lib/</code> directory:</p>
+<p>Add the following jars to the <code>tomee/lib/</code> directory:</p>
<ul>
-<li><a href="http://repo1.maven.org/maven2/org/springframework/spring-beans/2.5.6/spring-beans-2.5.6.jar">spring-beans-2.5.6.jar</a></li>
-<li><a href="http://repo1.maven.org/maven2/org/springframework/spring-context/2.5.6/spring-context-2.5.6.jar">spring-context-2.5.6.jar</a></li>
-<li><a href="http://repo1.maven.org/maven2/org/springframework/spring-core/2.5.6/spring-core-2.5.6.jar">spring-core-2.5.6.jar</a></li>
-<li><a href="http://repo1.maven.org/maven2/org/springframework/spring-web/2.5.6/spring-web-2.5.6.jar">spring-web-2.5.6.jar</a></li>
-<li><a href="http://repo1.maven.org/maven2/org/apache/xbean/xbean-spring/3.9/xbean-spring-3.9.jar">xbean-spring-3.9.jar</a></li>
+<li><a href="http://repo1.maven.org/maven2/org/springframework/spring-beans/3.2.9.RELEASE/spring-beans-3.2.9.RELEASE.jar">spring-beans-3.2.9.RELEASE.jar</a></li>
+<li><a href="http://repo1.maven.org/maven2/org/springframework/spring-context/3.2.9.RELEASE/spring-context-3.2.9.RELEASE.jar">spring-context-3.2.9.RELEASE.jar</a></li>
+<li><a href="http://repo1.maven.org/maven2/org/springframework/spring-core/3.2.9.RELEASE/spring-core-3.2.9.RELEASE.jar">spring-core-3.2.9.RELEASE.jar</a></li>
+<li><a href="http://repo1.maven.org/maven2/org/springframework/spring-web/3.2.9.RELEASE/spring-web-3.2.9.RELEASE.jar">spring-web-3.2.9.RELEASE.jar</a></li>
+<li><a href="http://repo1.maven.org/maven2/org/apache/xbean/xbean-spring/3.2.9.RELEASE/xbean-spring-3.9.jar">xbean-spring-3.9.jar</a></li>
</ul>
-<p>Create an <a href="http://activemq.apache.org/xml-configuration.html">activemq.xml file</a> a in <code>tomee.home/conf/activemq.xml</code>.</p>
+<p>Later versions should work, but have not been tested.</p>
+
+<p>Create an <a href="activemq.xml">activemq.xml file</a> a in <code>tomee.home/conf/activemq.xml</code>.</p>
<p>Then use the <code>xbean:file:</code> url prefix in the <code>BrokerXmlConfig</code> as shown belog.</p>