Skip to content

Commit a99a072

Browse files
author
[email protected]
committed
Update Issue 1887
Fix eclipse classpath issues git-svn-id: https://mobicents.googlecode.com/svn/trunk/servers/sip-servlets@20218 bf0df8d0-2c1f-0410-b170-bd30377b63dc
1 parent 17b8e28 commit a99a072

File tree

20 files changed

+18
-86
lines changed

20 files changed

+18
-86
lines changed

‎sip-servlets-annotations/.settings/org.eclipse.jdt.core.prefs

-5
This file was deleted.

‎sip-servlets-catalina/.settings/org.eclipse.jdt.core.prefs

-5
This file was deleted.

‎sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/SipProtocolHandler.java

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import org.mobicents.servlet.sip.JainSipUtils;
5252
import org.mobicents.servlet.sip.SipConnector;
5353
import org.mobicents.servlet.sip.core.ExtendedListeningPoint;
54-
import org.mobicents.servlet.sip.core.MobicentsExtendedListeningPoint;
5554
import org.mobicents.servlet.sip.core.SipApplicationDispatcher;
5655

5756
/**

‎sip-servlets-client/.settings/org.eclipse.jdt.core.prefs

-5
This file was deleted.

‎sip-servlets-core-api/.settings/org.eclipse.jdt.core.prefs

-5
This file was deleted.

‎sip-servlets-impl/.classpath

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
99
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
1010
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
11-
<classpathentry kind="var" path="M2_REPO/dnsjava/dnsjava/2.1.0/dnsjava-2.1.0.jar"/>
12-
<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"/>
11+
<classpathentry kind="var" path="M2_REPO/dnsjava/dnsjava/2.1.0/dnsjava-2.1.0.jar"/>
1312
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
1413
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-annotations"/>
1514
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-spec"/>
@@ -20,5 +19,6 @@
2019
<classpathentry combineaccessrules="false" kind="src" path="/jain-sip"/>
2120
<classpathentry combineaccessrules="false" kind="src" path="/jain-sip-ext"/>
2221
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-core-api"/>
22+
<classpathentry combineaccessrules="false" kind="src" path="/mobicents-jain-sip-ha-core"/>
2323
<classpathentry kind="output" path="target/classes"/>
2424
</classpath>

‎sip-servlets-impl/.settings/org.eclipse.jdt.core.prefs

-5
This file was deleted.

‎sip-servlets-jboss5-deployer/.classpath

+3-4
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,6 @@
138138
<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"/>
139139
<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"/>
140140
<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"/>
141-
<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"/>
142-
<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"/>
143-
<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"/>
144141
<classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar"/>
145142
<classpathentry kind="var" path="M2_REPO/quartz/quartz/1.5.2/quartz-1.5.2.jar"/>
146143
<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
@@ -151,6 +148,8 @@
151148
<classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
152149
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
153150
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-jboss5-metadata"/>
154-
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-spec"/>
151+
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-spec"/>
152+
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-annotations"/>
153+
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-impl"/>
155154
<classpathentry kind="output" path="target/classes"/>
156155
</classpath>

‎sip-servlets-jboss5-deployer/.settings/org.eclipse.jdt.core.prefs

-5
This file was deleted.

‎sip-servlets-jboss5-ha-server-cache/.settings/org.eclipse.jdt.core.prefs

-5
This file was deleted.

‎sip-servlets-jboss5-metadata/.settings/org.eclipse.jdt.core.prefs

-5
This file was deleted.

‎sip-servlets-jboss5/.classpath

+6-6
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,14 @@
159159
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-spec"/>
160160
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-jboss5-metadata"/>
161161
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-client"/>
162-
<classpathentry kind="var" path="M2_REPO/org/mobicents/cluster/core/1.10-SNAPSHOT/core-1.10-SNAPSHOT.jar"/>
163-
<classpathentry kind="var" path="M2_REPO/org/mobicents/cluster/cache/1.10-SNAPSHOT/cache-1.10-SNAPSHOT.jar"/>
164-
<classpathentry kind="var" path="M2_REPO/org/mobicents/cluster/timers/1.10-SNAPSHOT/timers-1.10-SNAPSHOT.jar"/>
162+
<classpathentry combineaccessrules="false" kind="src" path="/mobicents-jain-sip-ha-core"/>
163+
<classpathentry combineaccessrules="false" kind="src" path="/mobicents-jain-sip-jboss5"/>
164+
<classpathentry combineaccessrules="false" kind="src" path="/jain-sip-ext"/>
165+
<classpathentry combineaccessrules="false" kind="src" path="/core"/>
166+
<classpathentry combineaccessrules="false" kind="src" path="/cache"/>
167+
<classpathentry combineaccessrules="false" kind="src" path="/timers"/>
165168
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-jboss5-ha-server-cache"/>
166169
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-jruby"/>
167-
<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"/>
168-
<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"/>
169-
<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"/>
170170
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-core-api"/>
171171
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-catalina"/>
172172
<classpathentry kind="output" path="target/classes"/>

‎sip-servlets-jboss5/.settings/org.eclipse.jdt.core.prefs

-5
This file was deleted.

‎sip-servlets-jruby/.classpath

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src/main/java"/>
4-
<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"/>
5-
<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"/>
6-
<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"/>
74
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
85
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
96
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-spec"/>
7+
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-annotations"/>
108
<classpathentry kind="output" path="target/classes"/>
119
</classpath>

‎sip-servlets-jruby/.settings/org.eclipse.jdt.core.prefs

-5
This file was deleted.

‎sip-servlets-management/.classpath

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
<classpathentry kind="src" path="src/main/java"/>
44
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
55
<classpathentry kind="var" path="M2_REPO/org/apache/tomcat/catalina/6.0.32/catalina-6.0.32.jar"/>
6-
<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"/>
7-
<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"/>
8-
<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"/>
96
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
107
<classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar"/>
118
<classpathentry kind="var" path="M2_REPO/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar"/>
129
<classpathentry kind="var" path="M2_REPO/gwt-dnd/gwt-dnd/2.0.7/gwt-dnd-2.0.7.jar"/>
10+
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-spec"/>
11+
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-core-api"/>
1312
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-annotations"/>
13+
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-impl"/>
14+
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-application-router"/>
1415
<classpathentry kind="output" path="src/main/webapp/WEB-INF/classes"/>
1516
</classpath>

‎sip-servlets-spec/.settings/org.eclipse.jdt.core.prefs

-5
This file was deleted.

‎sip-servlets-test-suite/.settings/org.eclipse.jdt.core.prefs

-5
This file was deleted.

‎sip-servlets-tomcat-jboss4/.classpath

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/>
3737
<classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA.jar"/>
3838
<classpathentry kind="var" path="M2_REPO/javax/sip/jain-sip-api/1.2/jain-sip-api-1.2.jar"/>
39-
<classpathentry kind="var" path="M2_REPO/javax/sip/jain-sip-ri/1.2.X-SNAPSHOT/jain-sip-ri-1.2.X-SNAPSHOT.jar"/>
40-
<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"/>
39+
<classpathentry kind="var" path="M2_REPO/javax/sip/jain-sip-ri/1.2.X-SNAPSHOT/jain-sip-ri-1.2.X-SNAPSHOT.jar"/>
4140
<classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar"/>
4241
<classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
4342
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -48,5 +47,6 @@
4847
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-jruby"/>
4948
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-catalina"/>
5049
<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-core-api"/>
50+
<classpathentry combineaccessrules="false" kind="src" path="/jain-sip-ext"/>
5151
<classpathentry kind="output" path="target/classes"/>
5252
</classpath>

‎sip-servlets-tomcat-jboss4/.settings/org.eclipse.jdt.core.prefs

-5
This file was deleted.

0 commit comments

Comments
 (0)