Author: gnodet
Date: Fri Sep 21 14:51:31 2007
New Revision: 578283
URL: http://svn.apache.org/viewvc?rev=578283&view=rev
Log:
Reuse geronimo specs jars, configure log4j properly
Added:
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/log4j.xml
incubator/servicemix/branches/servicemix-4.0/bundles/log4j/
incubator/servicemix/branches/servicemix-4.0/bundles/log4j/pom.xml
- copied, changed from r578258, felix/trunk/commons/log4j/pom.xml
Removed:
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/log4j.properties
incubator/servicemix/branches/servicemix-4.0/bundles/activation/
incubator/servicemix/branches/servicemix-4.0/bundles/j2ee-management/
incubator/servicemix/branches/servicemix-4.0/bundles/jms/
incubator/servicemix/branches/servicemix-4.0/bundles/servlet/
incubator/servicemix/branches/servicemix-4.0/bundles/stax-api/
Modified:
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/inno-servicemix.iss
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/rpm-servicemix.spec
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.sh
incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml
incubator/servicemix/branches/servicemix-4.0/daemon/pom.xml
incubator/servicemix/branches/servicemix-4.0/itests/pom.xml
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml?rev=578283&r1=578282&r2=578283&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
(original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml Fri
Sep 21 14:51:31 2007
@@ -144,14 +144,34 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.servlet</artifactId>
- <version>2.5-4.0-SNAPSHOT</version>
+ <artifactId>org.apache.servicemix.bundles.log4j</artifactId>
+ <version>1.2.14-4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
<version>1.0-4.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-api</artifactId>
+ <version>2.0-4.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+ <version>2.0.3-4.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -291,6 +311,10 @@
<destinationPath>conf/config.properties</destinationPath>
</packagedFile>
<packagedFile>
+ <source>log4j.xml</source>
+ <destinationPath>conf/log4j.xml</destinationPath>
+ </packagedFile>
+ <packagedFile>
<source>servicemix.sh</source>
<destinationPath>bin/servicemix.sh</destinationPath>
</packagedFile>
@@ -416,9 +440,23 @@
</packagedFile>
<packagedFile>
<dependency>true</dependency>
-
<source>org.apache.servicemix.bundles:org.apache.servicemix.bundles.servlet</source>
+
<source>org.apache.geronimo.specs:geronimo-activation_1.1_spec</source>
<destinationPath>
-
bundle/org.apache.servicemix.bundles.servlet-2.5-${project.version}.jar
+
bundle/org.apache.geronimo.specs.activation_1.1_spec-1.0.1-SNAPSHOT.jar
+ </destinationPath>
+ </packagedFile>
+ <packagedFile>
+ <dependency>true</dependency>
+
<source>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-api</source>
+ <destinationPath>
+
bundle/org.apache.servicemix.bundles.jaxb-api-2.0-${project.version}.jar
+ </destinationPath>
+ </packagedFile>
+ <packagedFile>
+ <dependency>true</dependency>
+
<source>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl</source>
+ <destinationPath>
+
bundle/org.apache.servicemix.bundles.jaxb-impl-2.0.3-${project.version}.jar
</destinationPath>
</packagedFile>
<packagedFile>
@@ -426,6 +464,13 @@
<source>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-logging</source>
<destinationPath>
bundle/org.apache.servicemix.bundles.commons-logging-1.1-${project.version}.jar
+ </destinationPath>
+ </packagedFile>
+ <packagedFile>
+ <dependency>true</dependency>
+
<source>org.apache.servicemix.bundles:org.apache.servicemix.bundles.log4j</source>
+ <destinationPath>
+
bundle/org.apache.servicemix.bundles.log4j-1.2.14-${project.version}.jar
</destinationPath>
</packagedFile>
<packagedFile>
Modified:
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties?rev=578283&r1=578282&r2=578283&view=diff
==============================================================================
---
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties
(original)
+++
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties
Fri Sep 21 14:51:31 2007
@@ -42,8 +42,11 @@
"file:${servicemix.home}/bundle/org.apache.servicemix.core-4.0-SNAPSHOT.jar" \
"file:${servicemix.home}/bundle/org.apache.servicemix.api-4.0-SNAPSHOT.jar"
\
"file:${servicemix.home}/bundle/org.apache.camel.core-1.1-SNAPSHOT.jar" \
-
"file:${servicemix.home}/bundle/org.apache.servicemix.bundles.servlet-2.5-4.0-SNAPSHOT.jar"
\
+
"file:${servicemix.home}/bundle/org.apache.geronimo.specs.activation_1.1_spec-1.0.1-SNAPSHOT.jar"
\
+
"file:${servicemix.home}/bundle/org.apache.servicemix.bundles.jaxb-api-2.0-4.0-SNAPSHOT.jar"
\
+
"file:${servicemix.home}/bundle/org.apache.servicemix.bundles.jaxb-impl-2.0.3-4.0-SNAPSHOT.jar"
\
"file:${servicemix.home}/bundle/org.apache.servicemix.bundles.commons-logging-1.1-4.0-SNAPSHOT.jar"
\
+
"file:${servicemix.home}/bundle/org.apache.servicemix.bundles.log4j-1.2.14-4.0-SNAPSHOT.jar"
\
"file:${servicemix.home}/bundle/org.apache.servicemix.bundles.aopalliance-1.0-4.0-SNAPSHOT.jar"
felix.startlevel.framework=1
felix.startlevel.bundle=1
@@ -202,7 +205,7 @@
org.xml.sax.helpers; \
version="1.4.0"
-jre-1.5=, \
+jre-1.5= \
javax.accessibility; \
javax.activity; \
javax.crypto; \
@@ -327,7 +330,7 @@
org.xml.sax.helpers; \
version="1.5.0"
-jre-1.6=, \
+jre-1.6= \
javax.accessibility; \
javax.activation; \
javax.activity; \
Modified:
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/inno-servicemix.iss
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/inno-servicemix.iss?rev=578283&r1=578282&r2=578283&view=diff
==============================================================================
---
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/inno-servicemix.iss
(original)
+++
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/inno-servicemix.iss
Fri Sep 21 14:51:31 2007
@@ -70,7 +70,7 @@
; bundle directory targets
Source: {#SourceBase}\bundle\*; DestDir: {app}\bundle; Flags: ignoreversion
recursesubdirs createallsubdirs
; conf directory targets
-Source: {#SourceBase}\conf\log4j.properties; DestDir: {app}\conf; DestName:
log4j.properties
+Source: {#SourceBase}\conf\log4j.xml; DestDir: {app}\conf; DestName: log4j.xml
Source: {#SourceBase}\conf\bootstrapper.properties; DestDir: {app}\conf;
DestName: bootstrapper.properties
Source: {#SourceBase}\conf\config.properties; DestDir: {app}\conf; DestName:
config.properties
; top level directory targets
Added:
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/log4j.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/log4j.xml?rev=578283&view=auto
==============================================================================
---
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/log4j.xml
(added)
+++
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/log4j.xml
Fri Sep 21 14:51:31 2007
@@ -0,0 +1,102 @@
+<?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.
+
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";
debug="false">
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="threshold" value="DEBUG"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-5p - %-30c{1} - %m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="threshold" value="DEBUG"/>
+ <param name="File" value="var/log/servicemix.log"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ABSOLUTE} | %-5p | %-10t
| %-24.24c{1} | %-30.30C %4L | %m%n"/>
+ </layout>
+ </appender>
+
+ <logger name="org.apache">
+ <level value="WARN"/>
+ </logger>
+ <logger name="org.springframework">
+ <level value="WARN"/>
+ </logger>
+ <logger name="org.jencks">
+ <level value="WARN"/>
+ </logger>
+ <logger name="org.apache.activemq">
+ <level value="WARN"/>
+ </logger>
+ <logger name="org.apache.activemq.transport.discovery">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.apache.servicemix">
+ <!-- To enable debug logging, replace the INFO by DEBUG -->
+ <level value="INFO"/>
+ </logger>
+
+ <root>
+ <level value="INFO"/>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
+<!--
+
+Log4J Configuration Quick Reference:
+====================================
+
+Priority order is DEBUG < INFO < WARN < ERROR < FATAL
+
+PatternLayout conversion characters:
+
+%c Category of the logging event
+%C Fully qualified class name of the caller
+%d Date of the logging event (example: %d{HH:mm:ss,SSS} )
+%F File name where the logging request was issued (caution: extremely slow)
+%l Location information of the caller (caution: extremely slow)
+%L Line number from where the logging request was issued (caution: extremely
slow)
+%m Application-supplied message
+%M Method name from where the logging request was issued (caution: extremely
slow)
+%n Line separator
+%p Priority of the logging event
+%r Number of milliseconds since the start of the application
+%t Name of the thread that generated the logging event
+%x Nested diagnotic context associated with the thread
+%% A single percent sign
+
+Format modifiers examples:
+
+%20c Left pad with spaces if category is less than 20 characters long
+%-20c Right pad with spaces if category is less than 20 characters long
+%.30c Truncate from the beginning if category is more than 30 chars long
+%20.30c Left pad 20 chars + truncate from beginning if more than 30 chars
+%-20.30c Right pad 20 chars + truncate from beginning if more than 30 chars
+
+Examples: "%r [%t] %-5p %c %x - %m\n"
+"%-6r [%15.15t] %-5p %30.30c %x - %m\n"
+
+-->
Modified:
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/rpm-servicemix.spec
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/rpm-servicemix.spec?rev=578283&r1=578282&r2=578283&view=diff
==============================================================================
---
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/rpm-servicemix.spec
(original)
+++
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/rpm-servicemix.spec
Fri Sep 21 14:51:31 2007
@@ -60,7 +60,7 @@
install -m 644 ${image.basedir}/bin/logger.jar
$RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/logger.jar
install -m 644 ${image.basedir}/bin/daemon.jar
$RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/daemon.jar
install -m 644 ${image.basedir}/conf/bootstrapper.properties
$RPM_BUILD_ROOT/usr/local/${app}-%{version}/conf/bootstrapper.properties
-install -m 644 ${image.basedir}/conf/log4j.properties
$RPM_BUILD_ROOT/usr/local/${app}-%{version}/conf/log4j.properties
+install -m 644 ${image.basedir}/conf/log4j.xml
$RPM_BUILD_ROOT/usr/local/${app}-%{version}/conf/log4j.xml
install -m 744 ${image.basedir}/bin/${server.init}
$RPM_BUILD_ROOT/etc/init.d/${app}
install -m 744 ${image.basedir}/bin/servicemix.jar
$RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/servicemix.jar
install -m 644 ${image.basedir}/${app.license.name}
$RPM_BUILD_ROOT/usr/local/${app}-%{version}
@@ -84,7 +84,7 @@
/usr/local/${app}-%{version}/bin/logger.jar
/usr/local/${app}-%{version}/bin/daemon.jar
/usr/local/${app}-%{version}/bin/servicemix.jar
-/usr/local/${app}-%{version}/conf/log4j.properties
+/usr/local/${app}-%{version}/conf/log4j.xml
/usr/local/${app}-%{version}/conf/bootstrapper.properties
/usr/local/${app}-%{version}/conf/server.xml
/usr/local/${app}-%{version}/lib/ext
Modified:
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.sh
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.sh?rev=578283&r1=578282&r2=578283&view=diff
==============================================================================
---
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.sh
(original)
+++
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.sh
Fri Sep 21 14:51:31 2007
@@ -233,7 +233,7 @@
cd "$SERVICEMIX_HOME"
if [ "x$1" = "x" ] ; then
#exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -jar
"$JAR" "$SERVICEMIX_HOME" start
- exec $JAVA $JAVA_OPTS
-Dfelix.config.properties=file:$SERVICEMIX_HOME/conf/config.properties
-Dservicemix.home="$SERVICEMIX_HOME" -jar bin/servicemix.jar
+ exec $JAVA $JAVA_OPTS
-Dlog4j.configuration=file:$SERVICEMIX_HOME/conf/log4j.xml
-Dfelix.config.properties=file:$SERVICEMIX_HOME/conf/config.properties
-Dservicemix.home="$SERVICEMIX_HOME" -jar bin/servicemix.jar
else
exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -jar "$JAR"
"$SERVICEMIX_HOME" "$1"
fi
Copied: incubator/servicemix/branches/servicemix-4.0/bundles/log4j/pom.xml
(from r578258, felix/trunk/commons/log4j/pom.xml)
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/log4j/pom.xml?p2=incubator/servicemix/branches/servicemix-4.0/bundles/log4j/pom.xml&p1=felix/trunk/commons/log4j/pom.xml&r1=578258&r2=578283&rev=578283&view=diff
==============================================================================
--- felix/trunk/commons/log4j/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/log4j/pom.xml Fri Sep
21 14:51:31 2007
@@ -1,5 +1,5 @@
<?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
@@ -17,38 +17,30 @@
specific language governing permissions and limitations
under the License.
-->
-<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";>
+<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";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.commons</groupId>
- <artifactId>commons-build</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <relativePath>../pom</relativePath>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>bundles</artifactId>
+ <version>4.0-SNAPSHOT</version>
</parent>
<properties>
<pkgArtifactId>log4j</pkgArtifactId>
- <pkgVersion>1.2.12</pkgVersion>
- <pomVersion>0001</pomVersion>
- <osgiVersion>${pkgVersion}</osgiVersion>
+ <pkgVersion>1.2.14</pkgVersion>
+ <pomVersion>4.0-SNAPSHOT</pomVersion>
+
<servicemix.osgi.export.pkg>org.apache.log4j*</servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg></servicemix.osgi.import.pkg>
</properties>
- <groupId>org.apache.felix.commons</groupId>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
- <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
+ <version>${pkgVersion}-${pomVersion}</version>
<packaging>bundle</packaging>
- <name>${pkgArtifactId} bundle</name>
+ <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
</description>
- <organization>
- <name>Apache Felix Project</name>
- <url>http://felix.apache.org/</url>
- </organization>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/commons/log4j</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/commons/log4j</developerConnection>
- <url>http://svn.apache.org/viewcvs/felix/trunk/commons/log4j</url>
- </scm>
-
<dependencies>
<dependency>
<groupId>log4j</groupId>
@@ -56,24 +48,4 @@
<version>${pkgVersion}</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>
- ${pom.artifactId}
- </Bundle-SymbolicName>
-
<Export-Package>*;version=${pkgVersion}</Export-Package>
- <Private-Package>
- org.apache.log4j.lf5.*
- </Private-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml?rev=578283&r1=578282&r2=578283&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml Fri Sep 21
14:51:31 2007
@@ -34,16 +34,12 @@
<name>ServiceMix OSGI Common Bundles</name>
<modules>
- <module>servlet</module>
- <module>j2ee-management</module>
<module>commons-logging</module>
<module>aopalliance</module>
<module>jaxb-api</module>
<module>jaxb-impl</module>
- <module>jms</module>
- <module>stax-api</module>
- <module>activation</module>
<module>httpcore</module>
+ <module>log4j</module>
</modules>
<properties>
Modified: incubator/servicemix/branches/servicemix-4.0/daemon/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/daemon/pom.xml?rev=578283&r1=578282&r2=578283&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/daemon/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/daemon/pom.xml Fri Sep 21
14:51:31 2007
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.directory.daemon</groupId>
<artifactId>daemon-bootstrappers</artifactId>
- <version>1.0-RC2</version>
+ <version>1.1.1</version>
</dependency>
</dependencies>
</project>
Modified: incubator/servicemix/branches/servicemix-4.0/itests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/itests/pom.xml?rev=578283&r1=578282&r2=578283&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/itests/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/itests/pom.xml Fri Sep 21
14:51:31 2007
@@ -128,6 +128,31 @@
<version>1.4.3</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
<!--
<dependency>
<groupId>org.apache.felix</groupId>
Modified:
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java?rev=578283&r1=578282&r2=578283&view=diff
==============================================================================
---
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
(original)
+++
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
Fri Sep 21 14:51:31 2007
@@ -53,10 +53,10 @@
*/
protected String[] getBundles() {
return new String[] {
- localMavenArtifact("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jms", "1.1-4.0-SNAPSHOT"),
- localMavenArtifact("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.j2ee-management", "1.0-4.0-SNAPSHOT"),
- localMavenArtifact("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.stax-api", "1.0.1-4.0-SNAPSHOT"),
- localMavenArtifact("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.activation", "1.1-4.0-SNAPSHOT"),
+ localMavenArtifact("org.apache.geronimo.specs",
"geronimo-jms_1.1_spec", "1.1.1-SNAPSHOT"),
+ localMavenArtifact("org.apache.geronimo.specs",
"geronimo-j2ee-management_1.1_spec", "1.0.1-SNAPSHOT"),
+ localMavenArtifact("org.apache.geronimo.specs",
"geronimo-stax-api_1.0_spec", "1.0.1-SNAPSHOT"),
+ localMavenArtifact("org.apache.geronimo.specs",
"geronimo-activation_1.1_spec", "1.0.1-SNAPSHOT"),
localMavenArtifact("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxb-api", "2.0-4.0-SNAPSHOT"),
localMavenArtifact("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxb-impl", "2.0.3-4.0-SNAPSHOT"),
localMavenArtifact("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.httpcore", "4.0-alpha5-4.0-SNAPSHOT"),
