Diff
Modified: trunk/servicemix-common/project.xml (960 => 961)
--- trunk/servicemix-common/project.xml 2005-11-28 21:29:46 UTC (rev 960)
+++ trunk/servicemix-common/project.xml 2005-11-28 23:47:44 UTC (rev 961)
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project>
-<project>
- <pomVersion>3</pomVersion>
- <extend>${basedir}/../etc/project.xml</extend>
-
- <name>ServiceMix :: Common</name>
- <id>servicemix-common</id>
- <shortDescription>Common components library</shortDescription>
- <description>Common library for binding component and service engines</description>
-
- <package>org.servicemix.common</package>
- <packageGroups>
- <packageGroup>
- <title>Common components library</title>
- <packages>org.servicemix.common</packages>
- </packageGroup>
- </packageGroups>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
- <dependencies>
-
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>servicemix-jbi</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <eclipse.dependency>true</eclipse.dependency>
- </properties>
- </dependency>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project>
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/../etc/project.xml</extend>
+
+ <name>ServiceMix :: Common</name>
+ <id>servicemix-common</id>
+ <shortDescription>Common components library</shortDescription>
+ <description>Common library for binding component and service engines</description>
+
+ <package>org.servicemix.common</package>
+ <packageGroups>
+ <packageGroup>
+ <title>Common components library</title>
+ <packages>org.servicemix.common</packages>
+ </packageGroup>
+ </packageGroups>
+
+ <!-- ============ -->
+ <!-- Dependencies -->
+ <!-- ============ -->
+ <dependencies>
+
<dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>servicemix-jbi</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
+ </dependency>
+ <dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-connector</artifactId>
<version>${geronimo_spec_j2ee_connector_version}</version>
@@ -40,18 +40,28 @@
<artifactId>geronimo-spec-jta</artifactId>
<version>${geronimo_spec_jta_version}</version>
</dependency>
-
+
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons_logging_version}</version>
- </dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons_logging_version}</version>
+ </dependency>
+ <dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>${backport_util_concurrent_version}</version>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ <version>${mx4j_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxp</artifactId>
+ <version>${jaxp_version}</version>
+ </dependency>
<!-- WSDL deployment -->
<dependency>
@@ -82,7 +92,7 @@
<version>${spring_version}</version>
</dependency>
-
- </dependencies>
-
-</project>
+
+ </dependencies>
+
+</project>
Modified: trunk/servicemix-jms/project.xml (960 => 961)
--- trunk/servicemix-jms/project.xml 2005-11-28 21:29:46 UTC (rev 960)
+++ trunk/servicemix-jms/project.xml 2005-11-28 23:47:44 UTC (rev 961)
@@ -148,6 +148,11 @@
<artifactId>commons-collections</artifactId>
<version>${commons_collections_version}</version>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ <version>${mx4j_version}</version>
+ </dependency>
</dependencies>
Modified: trunk/servicemix-jms/src/test/java/org/servicemix/jms/CopyOfJMSComponentTest.java (960 => 961)
--- trunk/servicemix-jms/src/test/java/org/servicemix/jms/CopyOfJMSComponentTest.java 2005-11-28 21:29:46 UTC (rev 960)
+++ trunk/servicemix-jms/src/test/java/org/servicemix/jms/CopyOfJMSComponentTest.java 2005-11-28 23:47:44 UTC (rev 961)
@@ -32,6 +32,7 @@
import javax.xml.transform.Source;
import java.io.File;
+import java.net.URI;
import java.net.URL;
import junit.framework.TestCase;
@@ -65,7 +66,7 @@
container.activateComponent(component, "JMSComponent");
URL url = ""
- File path = new File(url.toURI());
+ File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("provider", path.getAbsolutePath());
component.getServiceUnitManager().start("provider");
@@ -76,7 +77,7 @@
container.activateComponent(component, "JMSComponent");
URL url = ""
- File path = new File(url.toURI());
+ File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("jms_soap", path.getAbsolutePath());
component.getServiceUnitManager().start("jms_soap");
Modified: trunk/servicemix-jms/src/test/java/org/servicemix/jms/JMSComponentTest.java (960 => 961)
--- trunk/servicemix-jms/src/test/java/org/servicemix/jms/JMSComponentTest.java 2005-11-28 21:29:46 UTC (rev 960)
+++ trunk/servicemix-jms/src/test/java/org/servicemix/jms/JMSComponentTest.java 2005-11-28 23:47:44 UTC (rev 961)
@@ -44,6 +44,7 @@
import javax.xml.transform.Source;
import java.io.File;
+import java.net.URI;
import java.net.URL;
import junit.framework.TestCase;
@@ -106,7 +107,7 @@
// Deploy SU
URL url = ""
- File path = new File(url.toURI());
+ File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("provider", path.getAbsolutePath());
component.getServiceUnitManager().start("provider");
@@ -148,7 +149,7 @@
// Deploy SU
URL url = ""
- File path = new File(url.toURI());
+ File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("provider", path.getAbsolutePath());
component.getServiceUnitManager().start("provider");
@@ -181,7 +182,7 @@
// Deploy SU
URL url = ""
- File path = new File(url.toURI());
+ File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("consumer", path.getAbsolutePath());
component.getServiceUnitManager().start("consumer");
@@ -217,7 +218,7 @@
// Deploy Provider SU
{
URL url = ""
- File path = new File(url.toURI());
+ File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("provider", path.getAbsolutePath());
component.getServiceUnitManager().start("provider");
@@ -226,7 +227,7 @@
// Deploy Consumer SU
{
URL url = ""
- File path = new File(url.toURI());
+ File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("consumer", path.getAbsolutePath());
component.getServiceUnitManager().start("consumer");
Modified: trunk/servicemix-wsrm/project.xml (960 => 961)
--- trunk/servicemix-wsrm/project.xml 2005-11-28 21:29:46 UTC (rev 960)
+++ trunk/servicemix-wsrm/project.xml 2005-11-28 23:47:44 UTC (rev 961)
@@ -32,12 +32,21 @@
</properties>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons_logging_version}</version>
+ </dependency>
+ <dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>${backport_util_concurrent_version}</version>
</dependency>
-
<dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${concurrent_version}</version>
+ </dependency>
+ <dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
<version>${mx4j_version}</version>
