You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/11/07 19:10:51 UTC
svn commit: r712215 - in /geronimo/server/trunk/plugins/activemq5: ./
activemq5-broker/ activemq5-broker/src/main/history/
activemq5-broker/src/main/plan/ activemq5-broker/src/main/resources/
activemq5-server/ geronimo-activemq5/ geronimo-activemq5/src...
Author: djencks
Date: Fri Nov 7 10:10:32 2008
New Revision: 712215
URL: http://svn.apache.org/viewvc?rev=712215&view=rev
Log:
GERONIMO-4337 Get the broker closer to starting, add a test server
Added:
geronimo/server/trunk/plugins/activemq5/activemq5-server/
geronimo/server/trunk/plugins/activemq5/activemq5-server/pom.xml (with props)
Modified:
geronimo/server/trunk/plugins/activemq5/activemq5-broker/pom.xml
geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/plan/plan.xml
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
geronimo/server/trunk/plugins/activemq5/pom.xml
Modified: geronimo/server/trunk/plugins/activemq5/activemq5-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-broker/pom.xml?rev=712215&r1=712214&r2=712215&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq5-broker/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-broker/pom.xml Fri Nov 7 10:10:32 2008
@@ -93,6 +93,8 @@
<category>JMS</category>
<instance>
<plugin-artifact>
+ <copy-file relative-to="server" dest-dir="var/activemq/conf">activemq.xml</copy-file>
+ <!--
<config-xml-content>
<gbean name="ActiveMQ.tcp.default">
<attribute name="host">#{ServerHostname}</attribute>
@@ -105,6 +107,7 @@
</config-xml-content>
<config-substitution key="ActiveMQPort">61616</config-substitution>
<config-substitution key="ActiveMQStompPort">61613</config-substitution>
+ -->
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml?rev=712215&r1=712214&r2=712215&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml Fri Nov 7 10:10:32 2008
@@ -7,6 +7,16 @@
<type>car</type>
</module-id>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activeio-core</artifactId>
<type>jar</type>
@@ -22,18 +32,13 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -42,18 +47,13 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/plan/plan.xml?rev=712215&r1=712214&r2=712215&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/plan/plan.xml Fri Nov 7 10:10:32 2008
@@ -23,7 +23,7 @@
<!-- gbean name="ActiveMQManager" class="org.apache.geronimo.activemq.management.ActiveMQManagerGBean"/-->
<gbean name="ActiveMQ" class="org.apache.geronimo.activemq.BrokerServiceGBeanImpl">
- <attribute name="amqBaseDir">var/activemq</attribute>
+ <attribute name="amqBaseDir">var/activemq/</attribute>
<attribute name="amqDataDir">data</attribute>
<attribute name="amqConfigFile">conf/activemq.xml</attribute>
<attribute name="useShutdownHook">false</attribute>
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=712215&r1=712214&r2=712215&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 10:10:32 2008
@@ -94,7 +94,8 @@
http://activemq.apache.org/persistence.html
-->
<persistenceAdapter>
- <amqPersistenceAdapter syncOnWrite="false" directory="${activemq.base}/data" maxFileLength="20 mb"/>
+ <!--<amqPersistenceAdapter syncOnWrite="false" directory="${activemq.base}/data" maxFileLength="20 mb"/>-->
+ <amqPersistenceAdapter syncOnWrite="false" directory="var/activemq/data" maxFileLength="20 mb"/>
</persistenceAdapter>
<!--
@@ -192,7 +193,7 @@
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
-->
- </camelContext>
+ <!--</camelContext>-->
<!-- You can use a <package> element for each root package to search for Java routes
<package>org.foo.bar</package>
Added: geronimo/server/trunk/plugins/activemq5/activemq5-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-server/pom.xml?rev=712215&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq5-server/pom.xml (added)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-server/pom.xml Fri Nov 7 10:10:32 2008
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>activemq5</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>activemq5-server</artifactId>
+ <packaging>server-assembly</packaging>
+ <name>Geronimo ActiveMQ Micro-Server</name>
+ <description>Small server for testing activemq5 integration</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.plugingroups</groupId>
+ <artifactId>framework</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>activemq5-broker</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <servers>
+ <serverInstance>
+ <name>default</name>
+ <configFile>var/config/config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>client</name>
+ <attributeManagerFrom>default</attributeManagerFrom>
+ <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>offline</name>
+ <configFile>var/config/offline-deployer-config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>jsr88</name>
+ <configFile>var/config/jsr88-configurer-config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ </servers>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange: geronimo/server/trunk/plugins/activemq5/activemq5-server/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/activemq5/activemq5-server/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/activemq5/activemq5-server/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
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=712215&r1=712214&r2=712215&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/pom.xml Fri Nov 7 10:10:32 2008
@@ -27,18 +27,18 @@
<artifactId>activemq5</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
-
+
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activemq5</artifactId>
<name>Geronimo Plugins, ActiveMQ5 :: Core</name>
-
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activemq5-management</artifactId>
<version>${version}</version>
</dependency>
-
+
<!-- g-j2ee comes from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -50,26 +50,52 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activeio-core</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.5.5</version>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.5.5</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.5.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.5.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>3.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-naming</artifactId>
+ <version>2.2-SNAPSHOT</version>
</dependency>
</dependencies>
-
+
</project>
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=712215&r1=712214&r2=712215&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 10:10:32 2008
@@ -17,6 +17,7 @@
package org.apache.geronimo.activemq;
+import java.io.File;
import java.net.URI;
import javax.jms.JMSException;
@@ -31,14 +32,13 @@
import org.apache.geronimo.gbean.annotation.ParamReference;
import org.apache.geronimo.gbean.annotation.ParamSpecial;
import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
-
import org.apache.geronimo.management.geronimo.JMSManager;
import org.apache.geronimo.management.geronimo.NetworkConnector;
import org.apache.geronimo.system.jmx.MBeanServerReference;
import org.apache.geronimo.system.serverinfo.ServerInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
/**
* Default implementation of the ActiveMQ Message Server
@@ -72,7 +72,7 @@
Thread.currentThread().setContextClassLoader(classLoader);
try {
BrokerFactoryBean brokerFactory = new BrokerFactoryBean(
- new ClassPathResource(amqConfigUri.toString()));
+ new FileSystemResource(new File(amqConfigUri)));
brokerFactory.afterPropertiesSet();
brokerService = brokerFactory.getBroker();
// brokerService = BrokerFactory.createBroker(new URI(brokerUri));
Modified: geronimo/server/trunk/plugins/activemq5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/pom.xml?rev=712215&r1=712214&r2=712215&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/pom.xml Fri Nov 7 10:10:32 2008
@@ -47,7 +47,8 @@
<module>activemq5-console-jetty</module>
<module>activemq5-console-tomcat</module>
-->
- </modules>
+ <module>activemq5-server</module>
+ </modules>
<dependencyManagement>
<dependencies>
@@ -89,4 +90,4 @@
</dependencies>
</dependencyManagement>
-</project>
+</project>
\ No newline at end of file