Diff
Deleted: trunk/ws/jaxws/wsnotification/.classpath (820 => 821)
--- trunk/ws/jaxws/wsnotification/.classpath 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wsnotification/.classpath 2005-11-13 23:01:23 UTC (rev 821)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<classpath>
- <classpathentry excluding="" kind="src" path="src/main/java">
- </classpathentry>
- <classpathentry kind="src" path="src/test/resources">
- </classpathentry>
- <classpathentry output="target/test-classes" kind="src" path="src/test/java">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar">
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/servicemix-1.1-SNAPSHOT.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/mx4j/jars/mx4j-jmx-2.1.1.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/activemq/jars/activemq-3.1.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/geronimo-spec/jars/geronimo-spec-servlet-2.4-rc4.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/geronimo-spec/jars/geronimo-spec-activation-1.0.2-rc4.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/spring-1.2.2-dev-2.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/servicemix-wspojo-1.1-SNAPSHOT.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/servicemix-jaxws-1.1-SNAPSHOT.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jsr181-api-20050915.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxws-api-20050915.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxws-rt-dev-1.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxb-api-20050915.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxb-impl-20050915.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/saaj-api-20050915.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/saaj-impl-20050915.jar">
- </classpathentry>
- <classpathentry kind="lib" path="D:\javadev\servicemix\ws\jaxws\wsnotification\lib\sun\jsr250-api.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/sjsxp-20050915.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/stax/jars/stax-api-1.0.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/jencks/jars/jencks-all-1.0-M1.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/activesoap/jars/activesoap-1.0-SNAPSHOT.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/concurrent/jars/concurrent-1.3.4.jar">
- </classpathentry>
- <classpathentry kind="output" path="target/classes">
- </classpathentry>
-</classpath>
\ No newline at end of file
Deleted: trunk/ws/jaxws/wsnotification/.cvsignore (820 => 821)
--- trunk/ws/jaxws/wsnotification/.cvsignore 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wsnotification/.cvsignore 2005-11-13 23:01:23 UTC (rev 821)
@@ -1,6 +0,0 @@
-target
-.settings
-bin
-rootDir
-ActiveMQ
-junit*.properties
Deleted: trunk/ws/jaxws/wsnotification/.project (820 => 821)
--- trunk/ws/jaxws/wsnotification/.project 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wsnotification/.project 2005-11-13 23:01:23 UTC (rev 821)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<projectDescription>
- <name>servicemix-wsn</name>
- <comment>ServiceMix implementation of WS Notification</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
Modified: trunk/ws/jaxws/wsnotification/project.xml (820 => 821)
--- trunk/ws/jaxws/wsnotification/project.xml 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wsnotification/project.xml 2005-11-13 23:01:23 UTC (rev 821)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<pomVersion>3</pomVersion>
- <extend>${basedir}/../../../project.xml</extend>
+ <extend>${basedir}/../../../etc/project.xml</extend>
<name>ServiceMix :: WS-Notification</name>
<id>servicemix-wsn</id>
@@ -25,36 +25,70 @@
<dependency>
<groupId>servicemix</groupId>
- <artifactId>servicemix</artifactId>
+ <artifactId>servicemix-jbi</artifactId>
<version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
</dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>servicemix-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>servicemix-jaxws</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </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>2.1.1</version>
+ <version>${mx4j_version}</version>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>activemq</artifactId>
- <version>3.1</version>
+ <version>${activemq_version}</version>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-servlet</artifactId>
- <version>2.4-rc4</version>
+ <version>${geronimo_spec_servlet_version}</version>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-activation</artifactId>
- <version>1.0.2-rc4</version>
+ <version>${geronimo_spec_activation_version}</version>
</dependency>
<dependency>
- <groupId>servicemix</groupId>
+ <groupId>springframework</groupId>
<artifactId>spring</artifactId>
- <version>1.2.2-dev-2</version>
+ <version>${spring_version}</version>
</dependency>
<!-- WS POJOs -->
@@ -67,75 +101,70 @@
<!-- For JAX-WS: only required for Java 5, will be part of Java 6 -->
<dependency>
<groupId>servicemix</groupId>
- <artifactId>servicemix-jaxws</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
<artifactId>jsr181-api</artifactId>
- <version>20050915</version>
+ <version>${jaxws_rt_version}</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxws-api</artifactId>
- <version>20050915</version>
+ <version>${jaxws_rt_version}</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>dev-1</version>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxws_rt_version}</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>20050915</version>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxws_rt_version}</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>20050915</version>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxws_rt_version}</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>saaj-api</artifactId>
- <version>20050915</version>
+ <version>${jaxws_rt_version}</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>saaj-impl</artifactId>
- <version>20050915</version>
+ <version>${jaxws_rt_version}</version>
</dependency>
<dependency>
- <id>jsr250</id>
- <jar>jsr250-api.jar</jar>
+ <groupId>servicemix</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>${jaxws_rt_version}</version>
</dependency>
-
- <!-- Sun's StAX implementation -->
<dependency>
<groupId>servicemix</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
<artifactId>sjsxp</artifactId>
- <version>20050915</version>
+ <version>${jaxws_rt_version}</version>
</dependency>
<dependency>
<id>stax+api</id>
<version>1.0</version>
- <properties>
- <lib>true</lib>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<!-- for testing -->
<dependency>
<id>jencks+all</id>
- <version>1.0-M1</version>
+ <version>${jencks_version}</version>
</dependency>
<!-- optional ActiveSOAP component -->
<dependency>
<id>activesoap</id>
- <version>1.0-SNAPSHOT</version>
+ <version>${activesoap_version}</version>
</dependency>
</dependencies>
Modified: trunk/ws/jaxws/wsnotification/src/main/java/org/servicemix/ws/notification/ActiveMQPublisherRegistrationManager.java (820 => 821)
--- trunk/ws/jaxws/wsnotification/src/main/java/org/servicemix/ws/notification/ActiveMQPublisherRegistrationManager.java 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wsnotification/src/main/java/org/servicemix/ws/notification/ActiveMQPublisherRegistrationManager.java 2005-11-13 23:01:23 UTC (rev 821)
@@ -18,7 +18,7 @@
package org.servicemix.ws.notification;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import org.servicemix.wspojo.notification.PublisherRegistrationManager;
import org.servicemix.wspojo.notification.ResourceNotDestroyedFault;
Modified: trunk/ws/jaxws/wsnotification/src/main/java/org/servicemix/ws/notification/ActiveMQSubscriptionManager.java (820 => 821)
--- trunk/ws/jaxws/wsnotification/src/main/java/org/servicemix/ws/notification/ActiveMQSubscriptionManager.java 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wsnotification/src/main/java/org/servicemix/ws/notification/ActiveMQSubscriptionManager.java 2005-11-13 23:01:23 UTC (rev 821)
@@ -18,7 +18,7 @@
package org.servicemix.ws.notification;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import org.oasis_open.docs.wsrf._2004._06.wsrf_ws_resourceproperties_1_2_draft_01.GetResourcePropertyResponse;
import org.servicemix.wspojo.notification.InvalidResourcePropertyQNameFault;
Modified: trunk/ws/jaxws/wsnotification/src/test/java/org/servicemix/SpringTestSupport.java (820 => 821)
--- trunk/ws/jaxws/wsnotification/src/test/java/org/servicemix/SpringTestSupport.java 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wsnotification/src/test/java/org/servicemix/SpringTestSupport.java 2005-11-13 23:01:23 UTC (rev 821)
@@ -45,7 +45,6 @@
transformer = new SourceTransformer();
context = createBeanFactory();
- context.setXmlValidating(false);
jbi = (SpringJBIContainer) context.getBean("jbi");
}
Modified: trunk/ws/jaxws/wsnotification/src/test/java/org/servicemix/ws/notification/JbiNotificationTest.java (820 => 821)
--- trunk/ws/jaxws/wsnotification/src/test/java/org/servicemix/ws/notification/JbiNotificationTest.java 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wsnotification/src/test/java/org/servicemix/ws/notification/JbiNotificationTest.java 2005-11-13 23:01:23 UTC (rev 821)
@@ -40,7 +40,7 @@
return new ClassPathXmlApplicationContext("org/servicemix/ws/notification/jbi-wsn.xml");
}
- protected void assertMessagesReceived(MessageList messageList, int messageCount) throws MessagingException, TransformerException {
+ protected void assertMessagesReceived(MessageList messageList, int messageCount) throws Exception {
messageList.assertMessagesReceived(messageCount);
List list = messageList.getMessages();
int counter = 0;
Deleted: trunk/ws/jaxws/wspojo/.classpath (820 => 821)
--- trunk/ws/jaxws/wspojo/.classpath 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wspojo/.classpath 2005-11-13 23:01:23 UTC (rev 821)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="target/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/concurrent/jars/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/>
- <classpathentry kind="lib" path="lib/sjsxp.jar"/>
- <classpathentry kind="lib" path="lib/saaj-impl.jar"/>
- <classpathentry kind="lib" path="lib/saaj-api.jar"/>
- <classpathentry kind="lib" path="lib/jsr181-api.jar"/>
- <classpathentry kind="lib" path="lib/jsr173_api.jar"/>
- <classpathentry kind="lib" path="lib/jaxws-tools.jar"/>
- <classpathentry kind="lib" path="lib/jaxws-rt.jar"/>
- <classpathentry kind="lib" path="lib/jaxws-api.jar"/>
- <classpathentry kind="lib" path="lib/jaxb-xjc.jar"/>
- <classpathentry kind="lib" path="lib/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="lib/jaxb-api.jar"/>
- <classpathentry kind="lib" path="lib/FastInfoset.jar"/>
- <classpathentry kind="lib" path="lib/activation.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
Deleted: trunk/ws/jaxws/wspojo/.cvsignore (820 => 821)
--- trunk/ws/jaxws/wspojo/.cvsignore 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wspojo/.cvsignore 2005-11-13 23:01:23 UTC (rev 821)
@@ -1,4 +0,0 @@
-build
-velocity.log
-target
-.settings
Deleted: trunk/ws/jaxws/wspojo/.project (820 => 821)
--- trunk/ws/jaxws/wspojo/.project 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wspojo/.project 2005-11-13 23:01:23 UTC (rev 821)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<projectDescription>
- <name>servicemix-wspojo</name>
- <comment>WS-* Specification POJOs generated using JAX-WS / JAXB 2.0</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
Modified: trunk/ws/jaxws/wspojo/maven.xml (820 => 821)
--- trunk/ws/jaxws/wspojo/maven.xml 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wspojo/maven.xml 2005-11-13 23:01:23 UTC (rev 821)
@@ -54,20 +54,17 @@
</goal>
<goal name="setclasspath">
- <path id="jaxws.classpath">
- <fileset dir="${lib.home}" includes="**/*.jar"/>
- </path>
-
+
<taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
- <classpath refid="jaxws.classpath"/>
+ <classpath refid="maven.dependency.classpath"/>
</taskdef>
<taskdef name="wsgen" classname="com.sun.tools.ws.ant.WsGen">
- <classpath refid="jaxws.classpath"/>
+ <classpath refid="maven.dependency.classpath"/>
</taskdef>
<taskdef name="apt" classname="com.sun.tools.ws.ant.Apt">
- <classpath refid="jaxws.classpath"/>
+ <classpath refid="maven.dependency.classpath"/>
</taskdef>
</goal>
Modified: trunk/ws/jaxws/wspojo/project.xml (820 => 821)
--- trunk/ws/jaxws/wspojo/project.xml 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wspojo/project.xml 2005-11-13 23:01:23 UTC (rev 821)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<pomVersion>3</pomVersion>
- <extend>${basedir}/../../../project.xml</extend>
+ <extend>${basedir}/../../../etc/project.xml</extend>
<name>ServiceMix :: WSPOJOs</name>
<id>servicemix-wspojo</id>
@@ -39,7 +39,92 @@
<dependencies>
+ <!-- For JAX-WS: only required for Java 5, will be part of Java 6 -->
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxws-tools</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+
+ <!-- jstrachan patch from CVS HEAD -->
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+
+
+ <!-- Sun's http server -->
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>http</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+
+ <!-- Sun's StAX implementation -->
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>sjsxp</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <!-- Sun's StAX implementation -->
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-activation</artifactId>
+ <version>${geronimo_spec_activation_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax_api_version}</version>
+ </dependency>
+
</dependencies>
<build>
@@ -47,13 +132,6 @@
<resources>
<resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
<directory>${jaxws.compiled.classes.dir}</directory>
<includes>
<include>**/*.xsb</include>
@@ -64,25 +142,4 @@
</resource>
</resources>
</build>
- <reports>
-
- <!-- re-enable when we can get the warnings down to less than a few Mb!
- <report>maven-checkstyle-plugin</report>
- <report>maven-simian-plugin</report>
- <report>maven-faq-plugin</report>
- <report>maven-changes-plugin</report>
- <report>maven-clover-plugin</report>
- <report>maven-changelog-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-developer-activity-plugin</report>
- -->
- <report>maven-javadoc-plugin</report>
- <!--
- <report>maven-jxr-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-tasklist-plugin</report>
- <report>maven-pmd-plugin</report>
- -->
-
- </reports>
</project>
Deleted: trunk/ws/jaxws/wsrm/.classpath (820 => 821)
--- trunk/ws/jaxws/wsrm/.classpath 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wsrm/.classpath 2005-11-13 23:01:23 UTC (rev 821)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/resources"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/servicemix-1.0.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/mx4j/jars/mx4j-jmx-2.1.1.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/activemq/jars/activemq-3.1-M6.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/geronimo-spec/jars/geronimo-spec-j2ee-1.4-rc4.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/servicemix-wspojo-1.1-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jsr181-api-20050818.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxws-api-20050818.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxws-rt-20050818.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxb-api-20050818.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxb-impl-20050818.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/stax/jars/stax-api-1.0.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/activesoap/jars/activesoap-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/concurrent/jars/concurrent-1.3.4.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
Deleted: trunk/ws/jaxws/wsrm/.cvsignore (820 => 821)
--- trunk/ws/jaxws/wsrm/.cvsignore 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wsrm/.cvsignore 2005-11-13 23:01:23 UTC (rev 821)
@@ -1,3 +0,0 @@
-target
-.settings
-bin
Deleted: trunk/ws/jaxws/wsrm/.project (820 => 821)
--- trunk/ws/jaxws/wsrm/.project 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wsrm/.project 2005-11-13 23:01:23 UTC (rev 821)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<projectDescription>
- <name>servicemix-wsrm</name>
- <comment>ServiceMix implementation of WS ReliableMessaging</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
Modified: trunk/ws/jaxws/wsrm/project.xml (820 => 821)
--- trunk/ws/jaxws/wsrm/project.xml 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wsrm/project.xml 2005-11-13 23:01:23 UTC (rev 821)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<pomVersion>3</pomVersion>
- <extend>${basedir}/../../../project.xml</extend>
+ <extend>${basedir}/../../../etc/project.xml</extend>
<name>ServiceMix :: WS-ReliableMessaging</name>
<id>servicemix-wsrm</id>
@@ -25,25 +25,33 @@
<dependency>
<groupId>servicemix</groupId>
- <artifactId>servicemix</artifactId>
- <version>1.0</version>
+ <artifactId>servicemix-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
</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-jmx</artifactId>
- <version>2.1.1</version>
+ <version>${mx4j_version}</version>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>activemq</artifactId>
- <version>3.1-M6</version>
+ <version>${activemq_version}</version>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
- <version>1.4-rc4</version>
+ <version>${geronimo_spec_j2ee_version}</version>
</dependency>
@@ -58,37 +66,57 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>jsr181-api</artifactId>
- <version>20050818</version>
+ <version>${jaxws_rt_version}</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxws-api</artifactId>
- <version>20050818</version>
+ <version>${jaxws_rt_version}</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>20050818</version>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxws_rt_version}</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>20050818</version>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxws_rt_version}</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>20050818</version>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxws_rt_version}</version>
</dependency>
<dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
<id>stax+api</id>
- <version>1.0</version>
+ <version>${stax_api_version}</version>
</dependency>
<!-- optional ActiveSOAP component -->
<dependency>
<id>activesoap</id>
- <version>1.0-SNAPSHOT</version>
+ <version>${activesoap_version}</version>
</dependency>
</dependencies>
Modified: trunk/ws/jaxws/wsrm/src/main/java/org/servicemix/ws/rm/NonPersistentSequenceStore.java (820 => 821)
--- trunk/ws/jaxws/wsrm/src/main/java/org/servicemix/ws/rm/NonPersistentSequenceStore.java 2005-11-13 23:00:23 UTC (rev 820)
+++ trunk/ws/jaxws/wsrm/src/main/java/org/servicemix/ws/rm/NonPersistentSequenceStore.java 2005-11-13 23:01:23 UTC (rev 821)
@@ -17,7 +17,7 @@
**/
package org.servicemix.ws.rm;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import org.activemq.util.IdGenerator;
import org.xmlsoap.schemas.ws._2005._02.rm.Identifier;
