geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r712231 - in /geronimo/server/trunk/plugins/activemq5: activemq5-broker/src/main/resources/activemq.xml geronimo-activemq5/pom.xml geronimo-activemq5/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java
Date Fri, 07 Nov 2008 19:32:13 GMT
Author: djencks
Date: Fri Nov  7 11:32:12 2008
New Revision: 712231

URL: http://svn.apache.org/viewvc?rev=712231&view=rev
Log:
GERONIMO-4337 micro-amq5 server starts

Modified:
    geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/resources/activemq.xml
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/pom.xml
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java

Modified: geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/resources/activemq.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/resources/activemq.xml?rev=712231&r1=712230&r2=712231&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/resources/activemq.xml
(original)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/resources/activemq.xml
Fri Nov  7 11:32:12 2008
@@ -22,13 +22,12 @@
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
  
   http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
 
-    <!-- Allows us to use system properties as variables in this configuration file 
+    <!-- Allows us to use system properties as variables in this configuration file-->
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-         <property name="locations">
-            <value>file://${activemq.base}/conf/credentials.properties</value>
-         </property>      
+         <!--<property name="locations">-->
+            <!--<value>file://${activemq.base}/conf/credentials.properties</value>-->
+         <!--</property>      -->
     </bean>
-    -->
 
     <broker xmlns="http://activemq.apache.org/schema/core" brokerName="amq-broker">
 
@@ -94,8 +93,7 @@
             http://activemq.apache.org/persistence.html 
         -->
         <persistenceAdapter>
-            <!--<amqPersistenceAdapter syncOnWrite="false" directory="${activemq.base}/data"
maxFileLength="20 mb"/>-->
-            <amqPersistenceAdapter syncOnWrite="false" directory="var/activemq/data" maxFileLength="20
mb"/>
+            <amqPersistenceAdapter syncOnWrite="false" directory="${activemq.data}" maxFileLength="20
mb"/>
         </persistenceAdapter>
 
         <!-- 

Modified: geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/pom.xml?rev=712231&r1=712230&r2=712231&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/pom.xml Fri Nov  7 11:32:12
2008
@@ -64,7 +64,7 @@
 
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java?rev=712231&r1=712230&r2=712231&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java
(original)
+++ geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java
Fri Nov  7 11:32:12 2008
@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.net.URI;
+import java.util.Properties;
 
 import javax.jms.JMSException;
 
@@ -73,6 +74,8 @@
         try {
             BrokerFactoryBean brokerFactory = new BrokerFactoryBean(
                     new FileSystemResource(new File(amqConfigUri)));
+            System.setProperty("activemq.home", new File(baseDir).toString());
+            System.setProperty("activemq.data", new File(dataDir).toString());
             brokerFactory.afterPropertiesSet();
             brokerService = brokerFactory.getBroker();
 //            brokerService = BrokerFactory.createBroker(new URI(brokerUri));



Mime
View raw message