Author: gnodet
Date: Sun Feb 24 15:19:39 2008
New Revision: 630701
URL: http://svn.apache.org/viewvc?rev=630701&view=rev
Log:
Update mina, geronimo-servlet version, use felix preferences service instead of
servicemix one
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/filtered-resources/etc/startup.properties
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=630701&r1=630700&r2=630701&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Sun Feb 24 15:19:39 2008
@@ -287,6 +287,11 @@
<artifactId>pax-web-service</artifactId>
<version>${pax.web.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.prefs</artifactId>
+ <version>${felix.prefs.version}</version>
+ </dependency>
</dependencies>
<build>
<resources>
@@ -371,6 +376,7 @@
</descriptors>
<finalName>${pom.artifactId}-${pom.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
<execution>
@@ -397,6 +403,7 @@
<descriptors>
<descriptor>src/main/descriptors/unix-src.xml</descriptor>
</descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
<execution>
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=630701&r1=630700&r2=630701&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
Sun Feb 24 15:19:39 2008
@@ -107,7 +107,7 @@
<!-- 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.servicemix.nmr:org.apache.servicemix.preferences</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>
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=630701&r1=630700&r2=630701&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
Sun Feb 24 15:19:39 2008
@@ -53,7 +53,7 @@
org.apache.servicemix.kernel.gshell.osgi-${servicemix.kernel.version}.jar=50
org.apache.servicemix.kernel.gshell.features-${servicemix.kernel.version}.jar=50
-org.apache.servicemix.preferences-${servicemix.nmr.version}.jar=50
+org.apache.felix.prefs-${felix.prefs.version}.jar=30
org.apache.servicemix.nmr.api-${servicemix.nmr.version}.jar=50
org.apache.servicemix.nmr.commands-${servicemix.nmr.version}.jar=50
org.apache.servicemix.nmr.core-${servicemix.nmr.version}.jar=50
@@ -107,7 +107,6 @@
openejb-server-${openejb.version}.jar=50
openejb-webservices-${openejb.version}.jar=50
-org.apache.servicemix.bundles.asm-2.2.3-${servicemix.kernel.version}.jar=50
org.apache.servicemix.bundles.cxf-2.0.4-${version}.jar=50
org.apache.servicemix.bundles.commons-cli-1.1-${version}.jar=50
org.apache.servicemix.bundles.jaxb-api-2.0-${servicemix.nmr.version}.jar=50
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=630701&r1=630700&r2=630701&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Sun Feb 24 15:19:39 2008
@@ -74,6 +74,7 @@
<felix.core.version>1.1.0-r605854</felix.core.version>
<felix.osgi.version>1.0.0</felix.osgi.version>
<felix.plugin.version>1.1.0-r605854</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>
<geronimo.ejb3.version>1.0.1</geronimo.ejb3.version>
@@ -87,7 +88,7 @@
<geronimo.jta.version>1.1.1</geronimo.jta.version>
<geronimo.jpa.version>1.1.1</geronimo.jpa.version>
<geronimo.saaj.version>1.0.0</geronimo.saaj.version>
- <geronimo.servlet.version>1.1.1</geronimo.servlet.version>
+ <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<geronimo.stax.version>1.0.1</geronimo.stax.version>
<geronimo.wsmetadata.version>1.1.2</geronimo.wsmetadata.version>
<geronimo.transaction.version>2.2-SNAPSHOT</geronimo.transaction.version>
@@ -101,7 +102,7 @@
<jline.version>0.9.93</jline.version>
<junit.version>4.4</junit.version>
<log4j.version>1.2.14</log4j.version>
- <mina.version>1.1.6-r602102</mina.version>
+ <mina.version>1.1.6</mina.version>
<openejb.version>3.0-beta-2</openejb.version>
<openjpa.version>1.0.1</openjpa.version>
<pax.logging.version>1.0.0</pax.logging.version>
