You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/03/05 15:49:35 UTC
svn commit: r633864 - in /servicemix/smx4/features/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/distribution/text/etc/
assembly/src/main/filtered-resources/etc/ management/ management/acegi/
management/core/ management/core/src/...
Author: gnodet
Date: Wed Mar 5 06:49:32 2008
New Revision: 633864
URL: http://svn.apache.org/viewvc?rev=633864&view=rev
Log:
Update the windows distro, fix the management stuff
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/features/trunk/management/acegi/pom.xml
servicemix/smx4/features/trunk/management/core/pom.xml
servicemix/smx4/features/trunk/management/core/src/main/resources/META-INF/spring/servicemix-management.xml
servicemix/smx4/features/trunk/management/pom.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=633864&r1=633863&r2=633864&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Wed Mar 5 06:49:32 2008
@@ -288,6 +288,21 @@
<version>${pax.web.version}</version>
</dependency>
<dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-jsp</artifactId>
+ <version>${pax.web.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web-extender</groupId>
+ <artifactId>pax-web-ex-war</artifactId>
+ <version>${pax.web.extender.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-war</artifactId>
+ <version>${pax.url.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.prefs</artifactId>
<version>${felix.prefs.version}</version>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=633864&r1=633863&r2=633864&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Mar 5 06:49:32 2008
@@ -137,8 +137,11 @@
<include>org.apache.xbean:xbean-spring</include>
<include>org.apache.servicemix.activemq:org.apache.servicemix.activemq</include>
- <!-- WEB -->
+ <!-- WEB / WAR -->
<include>org.ops4j.pax.web:pax-web-service</include>
+ <include>org.ops4j.pax.web:pax-web-jsp</include>
+ <include>org.ops4j.pax.web-extender:pax-web-ex-war</include>
+ <include>org.ops4j.pax.url:pax-url-war</include>
<!-- EJB3 / CXF -->
<include>org.apache.xbean:xbean-finder</include>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=633864&r1=633863&r2=633864&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Mar 5 06:49:32 2008
@@ -95,8 +95,10 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-${woodstox.version}</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.preferences</include>
+ <!-- NMR / JBI -->
+ <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
+ <include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
@@ -107,6 +109,69 @@
<include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
<include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.deployer</include>
<include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.commands</include>
+
+ <!-- Transaction -->
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+ <include>org.springframework:spring-tx</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.howl-1.0.1-1</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jencks-2.1</include>
+ <include>org.apache.geronimo.components:geronimo-connector</include>
+ <include>org.apache.geronimo.components:geronimo-transaction</include>
+ <include>org.apache.servicemix.transaction:org.apache.servicemix.transaction</include>
+
+ <!-- ActiveMQ -->
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
+ <include>org.springframework:spring-web</include>
+ <include>org.apache.activemq:activemq-core</include>
+ <include>org.apache.xbean:xbean-spring</include>
+ <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq</include>
+
+ <!-- WEB / WAR -->
+ <include>org.ops4j.pax.web:pax-web-service</include>
+ <include>org.ops4j.pax.web:pax-web-jsp</include>
+ <include>org.ops4j.pax.web-extender:pax-web-ex-war</include>
+ <include>org.ops4j.pax.url:pax-url-war</include>
+
+ <!-- EJB3 / CXF -->
+ <include>org.apache.xbean:xbean-finder</include>
+ <include>org.apache.xbean:xbean-naming</include>
+ <include>org.apache.xbean:xbean-reflect</include>
+ <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jacc_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-saaj_1.3_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
+ <include>org.apache.openejb:openejb-core</include>
+ <include>org.apache.openejb:openejb-cxf</include>
+ <include>org.apache.openejb:openejb-ejbd</include>
+ <include>org.apache.openejb:openejb-http</include>
+ <include>org.apache.openejb:openejb-javaagent</include>
+ <include>org.apache.openejb:openejb-jee</include>
+ <include>org.apache.openejb:openejb-loader</include>
+ <include>org.apache.openejb:openejb-server</include>
+ <include>org.apache.openejb:openejb-webservices</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm-2.2.3</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-cli-1.1</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cxf-2.0.4</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-api-2.0</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl-2.0.3</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxws-api-2.0</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openjpa-1.0.1</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl-1.3</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.swizzle-stream-1.0.1</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j-1.6.1</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlschema-1.3.2</include>
+ <include>org.apache.servicemix.ejb3:org.apache.servicemix.cxf.transport.nmr</include>
+ <include>org.apache.servicemix.ejb3:org.apache.servicemix.cxf.binding.nmr</include>
+ <include>org.apache.servicemix.ejb3:org.apache.servicemix.ejb3.deployer</include>
+
</includes>
</dependencySet>
Modified: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq.xml?rev=633864&r1=633863&r2=633864&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq.xml Wed Mar 5 06:49:32 2008
@@ -17,22 +17,43 @@
limitations under the License.
-->
-<beans
- xmlns="http://www.springframework.org/schema/beans"
- 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">
+<beans xmlns:amq="http://activemq.org/config/1.0">
+
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
+
+ <!-- ActiveMQ JMS Broker configuration -->
+ <bean id="broker" class="org.apache.activemq.xbean.XBeanBrokerService">
+ <property name="useShutdownHook" value="false" />
+
+ <!-- Disable creation of the jmx connector
+ which is created in the jmx.xml configuration file -->
+ <property name="managementContext">
+ <bean class="org.apache.activemq.broker.jmx.ManagementContext">
+ <property name="createConnector" value="false" />
+ </bean>
+ </property>
+
+ <!-- Use journaled Kaha persistence -->
+ <property name="persistenceAdapter">
+ <bean class="org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter">
+ <property name="directory" value="${servicemix.base}/data/amq" />
+ <property name="maxDataFileLength" value="33554432" />
+ </bean>
+ </property>
+
+ <property name="transportConnectors">
+ <!-- Activate a TCP connector -->
+ <bean class="org.apache.activemq.broker.TransportConnector">
+ <property name="uri" value="tcp://localhost:61616" />
+ </bean>
+ </property>
+
+ <!--
+ <property name="networkConnectors">
+ <amq:networkConnector uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
+ </property>
+ -->
+
+ </bean>
- <bean id="broker" class="org.apache.activemq.xbean.XBeanBrokerService">
- <property name="transportConnectorURIs">
- <list>
- <value>tcp://localhost:61616</value>
- </list>
- </property>
- <property name="useJmx">
- <value>false</value>
- </property>
- <property name="persistent">
- <value>false</value>
- </property>
- </bean>
</beans>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=633864&r1=633863&r2=633864&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties Wed Mar 5 06:49:32 2008
@@ -48,7 +48,7 @@
spring-osgi-extender-${spring.osgi.version}.jar=50
spring-osgi-io-${spring.osgi.version}.jar=50
org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=50
-pax-runner-handler-mvn-${pax.runner.version}.jar=50
+pax-url-mvn-${pax.url.version}.jar=50
org.apache.servicemix.kernel.gshell.obr-${servicemix.kernel.version}.jar=50
org.apache.servicemix.kernel.gshell.osgi-${servicemix.kernel.version}.jar=50
org.apache.servicemix.kernel.gshell.features-${servicemix.kernel.version}.jar=50
@@ -82,6 +82,9 @@
org.apache.servicemix.activemq-${version}.jar=50
pax-web-service-${pax.web.version}.jar=50
+pax-web-jsp-${pax.web.version}.jar=50
+pax-web-ex-war-${pax.web.extender.version}.jar=50
+pax-url-war-${pax.url.version}.jar=50
org.apache.servicemix.bundles.asm-2.2.3-${servicemix.kernel.version}.jar=50
xbean-finder-${xbean.version}.jar=50
Modified: servicemix/smx4/features/trunk/management/acegi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/management/acegi/pom.xml?rev=633864&r1=633863&r2=633864&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/management/acegi/pom.xml (original)
+++ servicemix/smx4/features/trunk/management/acegi/pom.xml Wed Mar 5 06:49:32 2008
@@ -23,22 +23,22 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.management</groupId>
+ <artifactId>management</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.management</groupId>
<artifactId>org.apache.servicemix.management.acegi</artifactId>
<packaging>bundle</packaging>
- <version>4.0-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<name>ServiceMix Management Acegi</name>
<dependencies>
<dependency>
<groupId>org.acegisecurity</groupId>
<artifactId>acegi-security</artifactId>
- <version>1.0.0</version>
+ <version>${acegi.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -48,13 +48,13 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${felix.version}</version>
+ <version>${felix.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${felix.compendium.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: servicemix/smx4/features/trunk/management/core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/management/core/pom.xml?rev=633864&r1=633863&r2=633864&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/management/core/pom.xml (original)
+++ servicemix/smx4/features/trunk/management/core/pom.xml Wed Mar 5 06:49:32 2008
@@ -23,45 +23,50 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.management</groupId>
+ <artifactId>management</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.management</groupId>
<artifactId>org.apache.servicemix.management.core</artifactId>
<packaging>bundle</packaging>
- <version>4.0-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<name>ServiceMix Management Core</name>
<dependencies>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${felix.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${felix.compendium.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: servicemix/smx4/features/trunk/management/core/src/main/resources/META-INF/spring/servicemix-management.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/management/core/src/main/resources/META-INF/spring/servicemix-management.xml?rev=633864&r1=633863&r2=633864&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/management/core/src/main/resources/META-INF/spring/servicemix-management.xml (original)
+++ servicemix/smx4/features/trunk/management/core/src/main/resources/META-INF/spring/servicemix-management.xml Wed Mar 5 06:49:32 2008
@@ -30,7 +30,7 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd
http://www.springframework.org/schema/osgi-compendium
- http://www.springframework.org/schema/osgi/spring-osgi-compendium.xsd">
+ http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
<!-- MBeanServer bean -->
<bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean">
Modified: servicemix/smx4/features/trunk/management/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/management/pom.xml?rev=633864&r1=633863&r2=633864&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/management/pom.xml (original)
+++ servicemix/smx4/features/trunk/management/pom.xml Wed Mar 5 06:49:32 2008
@@ -23,16 +23,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>features</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.management</groupId>
<artifactId>management</artifactId>
<packaging>pom</packaging>
- <version>4.0-SNAPSHOT</version>
- <name>ServiceMix Management</name>
+ <version>1.0-SNAPSHOT</version>
+ <name>ServiceMix Features :: Management</name>
<modules>
<module>core</module>
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=633864&r1=633863&r2=633864&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Mar 5 06:49:32 2008
@@ -35,6 +35,7 @@
<modules>
<module>transaction</module>
+ <module>management</module>
<module>activemq</module>
<module>camel</module>
<module>war</module>
@@ -59,6 +60,7 @@
<properties>
<activemq.version>5.0.0</activemq.version>
+ <acegi.version>1.0.0</acegi.version>
<ant.version>1.7.0</ant.version>
<aopalliance.version>1.0</aopalliance.version>
<asm.version>2.2.3</asm.version>
@@ -68,12 +70,12 @@
<commons.io.version>1.3.1</commons.io.version>
<commons.logging.version>1.1</commons.logging.version>
<cxf.version>2.0.4-incubator</cxf.version>
- <felix.bundlerepository.version>1.1.0-r605854</felix.bundlerepository.version>
+ <felix.bundlerepository.version>1.0.2</felix.bundlerepository.version>
<felix.compendium.version>1.0.0</felix.compendium.version>
- <felix.configadmin.version>0.9.0-r605854</felix.configadmin.version>
- <felix.core.version>1.1.0-r605854</felix.core.version>
+ <felix.configadmin.version>1.0.0</felix.configadmin.version>
+ <felix.core.version>1.0.0</felix.core.version>
<felix.osgi.version>1.0.0</felix.osgi.version>
- <felix.plugin.version>1.1.0-r605854</felix.plugin.version>
+ <felix.plugin.version>1.4.0</felix.plugin.version>
<felix.prefs.version>1.0.2</felix.prefs.version>
<geronimo.activation.version>1.0.2</geronimo.activation.version>
<geronimo.annotation.version>1.1.1</geronimo.annotation.version>
@@ -106,14 +108,15 @@
<openejb.version>3.0-beta-2</openejb.version>
<openjpa.version>1.0.1</openjpa.version>
<pax.logging.version>1.0.0</pax.logging.version>
- <pax.runner.version>0.5.5</pax.runner.version>
- <pax.web.version>0.3.1</pax.web.version>
+ <pax.url.version>0.3.0</pax.url.version>
+ <pax.web.version>0.4.0-SNAPSHOT</pax.web.version>
+ <pax.web.extender.version>0.3.1-SNAPSHOT</pax.web.extender.version>
<servicemix.kernel.version>1.0-m2-SNAPSHOT</servicemix.kernel.version>
<servicemix.nmr.version>1.0-SNAPSHOT</servicemix.nmr.version>
<spring.version>2.5.1</spring.version>
<spring.osgi.version>1.0</spring.osgi.version>
<xstream.version>1.2.2</xstream.version>
- <xbean.version>3.4-SNAPSHOT</xbean.version>
+ <xbean.version>3.3.1-r631610</xbean.version>
</properties>
<repositories>