Revision: 20218
Author: [email protected]
Date: Thu Sep 8 05:43:48 2011
Log: Update Issue 1887
Fix eclipse classpath issues
http://code.google.com/p/mobicents/source/detail?r=20218
Deleted:
/trunk/servers/sip-servlets/sip-servlets-annotations/.settings/org.eclipse.jdt.core.prefs
/trunk/servers/sip-servlets/sip-servlets-catalina/.settings/org.eclipse.jdt.core.prefs
/trunk/servers/sip-servlets/sip-servlets-client/.settings/org.eclipse.jdt.core.prefs
/trunk/servers/sip-servlets/sip-servlets-core-api/.settings/org.eclipse.jdt.core.prefs
/trunk/servers/sip-servlets/sip-servlets-impl/.settings/org.eclipse.jdt.core.prefs
/trunk/servers/sip-servlets/sip-servlets-jboss5/.settings/org.eclipse.jdt.core.prefs
/trunk/servers/sip-servlets/sip-servlets-jboss5-deployer/.settings/org.eclipse.jdt.core.prefs
/trunk/servers/sip-servlets/sip-servlets-jboss5-ha-server-cache/.settings/org.eclipse.jdt.core.prefs
/trunk/servers/sip-servlets/sip-servlets-jboss5-metadata/.settings/org.eclipse.jdt.core.prefs
/trunk/servers/sip-servlets/sip-servlets-jruby/.settings/org.eclipse.jdt.core.prefs
/trunk/servers/sip-servlets/sip-servlets-spec/.settings/org.eclipse.jdt.core.prefs
/trunk/servers/sip-servlets/sip-servlets-test-suite/.settings/org.eclipse.jdt.core.prefs
/trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/.settings/org.eclipse.jdt.core.prefs
Modified:
/trunk/servers/sip-servlets/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/SipProtocolHandler.java
/trunk/servers/sip-servlets/sip-servlets-impl/.classpath
/trunk/servers/sip-servlets/sip-servlets-jboss5/.classpath
/trunk/servers/sip-servlets/sip-servlets-jboss5-deployer/.classpath
/trunk/servers/sip-servlets/sip-servlets-jruby/.classpath
/trunk/servers/sip-servlets/sip-servlets-management/.classpath
/trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/.classpath
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-annotations/.settings/org.eclipse.jdt.core.prefs
Fri Jan 16 07:05:31 2009
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Jul 09 21:43:56 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-catalina/.settings/org.eclipse.jdt.core.prefs
Thu Sep 8 02:10:52 2011
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Jul 09 21:43:56 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-client/.settings/org.eclipse.jdt.core.prefs
Tue Oct 27 08:19:13 2009
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Jul 09 21:43:56 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-core-api/.settings/org.eclipse.jdt.core.prefs
Thu Sep 8 02:10:52 2011
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Jul 09 21:43:56 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/.settings/org.eclipse.jdt.core.prefs
Tue Apr 15 04:19:56 2008
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Jun 13 22:24:58 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-jboss5/.settings/org.eclipse.jdt.core.prefs
Tue Dec 16 04:37:42 2008
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Jul 09 21:43:56 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-jboss5-deployer/.settings/org.eclipse.jdt.core.prefs
Thu Jan 7 05:02:56 2010
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Jul 09 21:43:56 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-jboss5-ha-server-cache/.settings/org.eclipse.jdt.core.prefs
Thu Jan 7 05:05:02 2010
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Jul 09 21:43:56 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-jboss5-metadata/.settings/org.eclipse.jdt.core.prefs
Thu Apr 2 09:23:14 2009
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Jul 09 21:43:56 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-jruby/.settings/org.eclipse.jdt.core.prefs
Thu Jan 7 05:06:47 2010
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Jul 09 21:43:56 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-spec/.settings/org.eclipse.jdt.core.prefs
Tue Apr 15 04:19:25 2008
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Jul 09 21:43:56 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-test-suite/.settings/org.eclipse.jdt.core.prefs
Tue Apr 15 06:05:00 2008
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Nov 11 21:39:33 CET 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/.settings/org.eclipse.jdt.core.prefs
Tue Dec 16 04:38:35 2008
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Jul 09 21:43:56 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/SipProtocolHandler.java
Thu Sep 8 02:10:52 2011
+++
/trunk/servers/sip-servlets/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/SipProtocolHandler.java
Thu Sep 8 05:43:48 2011
@@ -51,7 +51,6 @@
import org.mobicents.servlet.sip.JainSipUtils;
import org.mobicents.servlet.sip.SipConnector;
import org.mobicents.servlet.sip.core.ExtendedListeningPoint;
-import org.mobicents.servlet.sip.core.MobicentsExtendedListeningPoint;
import org.mobicents.servlet.sip.core.SipApplicationDispatcher;
/**
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/.classpath Thu Sep 8
02:18:19 2011
+++ /trunk/servers/sip-servlets/sip-servlets-impl/.classpath Thu Sep 8
05:43:48 2011
@@ -8,8 +8,7 @@
<classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
<classpathentry kind="var"
path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var"
path="M2_REPO/dnsjava/dnsjava/2.1.0/dnsjava-2.1.0.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/ha/javax/sip/mobicents-jain-sip-ha-core/1.2.0-SNAPSHOT/mobicents-jain-sip-ha-core-1.2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/dnsjava/dnsjava/2.1.0/dnsjava-2.1.0.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-annotations"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-spec"/>
@@ -20,5 +19,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/jain-sip"/>
<classpathentry combineaccessrules="false" kind="src"
path="/jain-sip-ext"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-core-api"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/mobicents-jain-sip-ha-core"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-jboss5/.classpath Thu Sep 8
02:18:19 2011
+++ /trunk/servers/sip-servlets/sip-servlets-jboss5/.classpath Thu Sep 8
05:43:48 2011
@@ -159,14 +159,14 @@
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-spec"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-jboss5-metadata"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-client"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/cluster/core/1.10-SNAPSHOT/core-1.10-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/cluster/cache/1.10-SNAPSHOT/cache-1.10-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/cluster/timers/1.10-SNAPSHOT/timers-1.10-SNAPSHOT.jar"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/mobicents-jain-sip-ha-core"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/mobicents-jain-sip-jboss5"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/jain-sip-ext"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/core"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/cache"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/timers"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-jboss5-ha-server-cache"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-jruby"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/ha/javax/sip/mobicents-jain-sip-ha-core/1.2.0-SNAPSHOT/mobicents-jain-sip-ha-core-1.2.0-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/ha/javax/sip/mobicents-jain-sip-jboss5/1.2.0-SNAPSHOT/mobicents-jain-sip-jboss5-1.2.0-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/javax/sip/mobicents-jain-sip-ext/1.0-SNAPSHOT/mobicents-jain-sip-ext-1.0-SNAPSHOT.jar"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-core-api"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-catalina"/>
<classpathentry kind="output" path="target/classes"/>
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-jboss5-deployer/.classpath Wed
Feb 2 08:02:48 2011
+++ /trunk/servers/sip-servlets/sip-servlets-jboss5-deployer/.classpath Thu
Sep 8 05:43:48 2011
@@ -138,9 +138,6 @@
<classpathentry kind="var"
path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxrpc/3.0.4.GA/jbossws-native-jaxrpc-3.0.4.GA.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxws/3.1.2.GA/jbossws-native-jaxws-3.1.2.GA.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.1.2.GA/jbossws-native-saaj-3.1.2.GA.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-annotations/1.6.0-SNAPSHOT/sip-servlets-annotations-1.6.0-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-impl/1.6.0-SNAPSHOT/sip-servlets-impl-1.6.0-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-spec/1.6.0-SNAPSHOT/sip-servlets-spec-1.6.0-SNAPSHOT.jar"/>
<classpathentry kind="var"
path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar"/>
<classpathentry kind="var"
path="M2_REPO/quartz/quartz/1.5.2/quartz-1.5.2.jar"/>
<classpathentry kind="var"
path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
@@ -151,6 +148,8 @@
<classpathentry kind="var"
path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-jboss5-metadata"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-spec"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-spec"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-annotations"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-impl"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-jruby/.classpath Wed Feb 2
08:02:48 2011
+++ /trunk/servers/sip-servlets/sip-servlets-jruby/.classpath Thu Sep 8
05:43:48 2011
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-annotations/1.6.0-SNAPSHOT/sip-servlets-annotations-1.6.0-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-impl/1.6.0-SNAPSHOT/sip-servlets-impl-1.6.0-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-spec/1.6.0-SNAPSHOT/sip-servlets-spec-1.6.0-SNAPSHOT.jar"/>
<classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-spec"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-annotations"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-management/.classpath Thu Apr
7 06:41:32 2011
+++ /trunk/servers/sip-servlets/sip-servlets-management/.classpath Thu Sep
8 05:43:48 2011
@@ -3,13 +3,14 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/catalina/6.0.32/catalina-6.0.32.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-spec/1.6.0-SNAPSHOT/sip-servlets-spec-1.6.0-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-impl/1.6.0-SNAPSHOT/sip-servlets-impl-1.6.0-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-application-router/1.6.0-SNAPSHOT/sip-servlets-application-router-1.6.0-SNAPSHOT.jar"/>
<classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
<classpathentry kind="var"
path="M2_REPO/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar"/>
<classpathentry kind="var"
path="M2_REPO/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar"/>
<classpathentry kind="var"
path="M2_REPO/gwt-dnd/gwt-dnd/2.0.7/gwt-dnd-2.0.7.jar"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-spec"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-core-api"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-annotations"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-impl"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-application-router"/>
<classpathentry kind="output" path="src/main/webapp/WEB-INF/classes"/>
</classpath>
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/.classpath Thu
Sep 8 02:18:19 2011
+++ /trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/.classpath Thu
Sep 8 05:43:48 2011
@@ -36,8 +36,7 @@
<classpathentry kind="var"
path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA.jar"/>
<classpathentry kind="var"
path="M2_REPO/javax/sip/jain-sip-api/1.2/jain-sip-api-1.2.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/sip/jain-sip-ri/1.2.X-SNAPSHOT/jain-sip-ri-1.2.X-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/javax/sip/mobicents-jain-sip-ext/1.0-SNAPSHOT/mobicents-jain-sip-ext-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/sip/jain-sip-ri/1.2.X-SNAPSHOT/jain-sip-ri-1.2.X-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar"/>
<classpathentry kind="var"
path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -48,5 +47,6 @@
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-jruby"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-catalina"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-core-api"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/jain-sip-ext"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
