Project

General

Profile

« Previous | Next » 

Revision c5485129

Added by Cherian Mathew almost 9 years ago

fixed classpath issues and issues from last merge

View differences:

eu.etaxonomy.taxeditor.cdmlib/.classpath
33 33
	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.8.3.jar"/>
34 34
	<classpathentry exported="true" kind="lib" path="lib/commons-codec-20041127.091804.jar"/>
35 35
	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
36
	<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar" sourcepath="lib/commons-dbcp-1.4-sources.jar"/>
36
	<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>
37 37
	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
38 38
	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
39 39
	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.2.jar"/>
......
58 58
	<classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-4.1.10.Final.jar"/>
59 59
	<classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
60 60
	<classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/>
61
<<<<<<< HEAD
62
	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar" sourcepath="/home/cmathew/.m2/repository/org/hibernate/hibernate-core/4.1.10.Final/hibernate-core-4.1.10.Final-sources.jar"/>
63
=======
64 61
	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar"/>
65
>>>>>>> 02176688eaa23a31ff5b71c317cb5ee685483aa4
66 62
	<classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-4.1.10.Final.jar"/>
67 63
	<classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.10.Final.jar"/>
68 64
	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final.jar"/>
......
126 122
	<classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>
127 123
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.2.2.RELEASE.jar"/>
128 124
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.2.2.RELEASE.jar"/>
129
<<<<<<< HEAD
130
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE.jar" sourcepath="/home/cmathew/.m2/repository/org/springframework/org.springframework.beans/3.2.2.RELEASE/org.springframework.beans-3.2.2.RELEASE-sources.jar"/>
131
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE.jar" sourcepath="/home/cmathew/.m2/repository/org/springframework/org.springframework.context/3.2.2.RELEASE/org.springframework.context-3.2.2.RELEASE-sources.jar"/>
132
=======
133 125
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE.jar"/>
134 126
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE.jar"/>
135
>>>>>>> 02176688eaa23a31ff5b71c317cb5ee685483aa4
136 127
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.2.2.RELEASE.jar"/>
137 128
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.2.2.RELEASE.jar"/>
138
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar" sourcepath="lib/org.springframework.jdbc-3.2.2.RELEASE-sources.jar"/>
139
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar" sourcepath="lib/org.springframework.orm-3.2.2.RELEASE-sources.jar"/>
129
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar"/>
130
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar"/>
140 131
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.2.2.RELEASE.jar"/>
141 132
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.test-3.2.2.RELEASE.jar"/>
142
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar" sourcepath="lib/org.springframework.transaction-3.2.2.RELEASE-sources.jar"/>
143
<<<<<<< HEAD
144
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE.jar" sourcepath="/home/cmathew/.m2/repository/org/springframework/org.springframework.web/3.2.2.RELEASE/org.springframework.web-3.2.2.RELEASE-sources.jar"/>
145
=======
133
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar"/>
146 134
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE.jar"/>
147
>>>>>>> 02176688eaa23a31ff5b71c317cb5ee685483aa4
148 135
	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.2.2.RELEASE.jar"/>
149 136
	<classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>
150 137
	<classpathentry exported="true" kind="lib" path="lib/p6spy-1.3.jar"/>
......
169 156
	<classpathentry exported="true" kind="lib" path="lib/spring-expression-3.2.2.RELEASE.jar"/>
170 157
	<classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>
171 158
	<classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.1.3.RELEASE.jar"/>
172
<<<<<<< HEAD
173
	<classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.1.3.RELEASE.jar" sourcepath="/home/cmathew/.m2/repository/org/springframework/security/spring-security-core/3.1.3.RELEASE/spring-security-core-3.1.3.RELEASE-sources.jar"/>
174
	<classpathentry exported="true" kind="lib" path="lib/stax-1.2.0.jar"/>
175
	<classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>
176
=======
177 159
	<classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.1.3.RELEASE.jar"/>
178 160
	<classpathentry exported="true" kind="lib" path="lib/stax-1.2.0.jar"/>
179 161
	<classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>
180
	<classpathentry exported="true" kind="lib" path="lib/unitils-core-3.3.jar"/>
181
	<classpathentry exported="true" kind="lib" path="lib/unitils-database-3.3.jar"/>
182
	<classpathentry exported="true" kind="lib" path="lib/unitils-dbmaintainer-3.3.jar"/>
183
	<classpathentry exported="true" kind="lib" path="lib/unitils-dbunit-3.3.jar"/>
184
	<classpathentry exported="true" kind="lib" path="lib/unitils-easymock-3.3.jar"/>
185
	<classpathentry exported="true" kind="lib" path="lib/unitils-inject-3.3.jar"/>
186
	<classpathentry exported="true" kind="lib" path="lib/unitils-mock-3.3.jar"/>
187
	<classpathentry exported="true" kind="lib" path="lib/unitils-orm-3.3.jar"/>
188
	<classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.3.jar"/>
189
>>>>>>> 02176688eaa23a31ff5b71c317cb5ee685483aa4
190 162
	<classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1.jar"/>
191 163
	<classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1.jar"/>
192 164
	<classpathentry exported="true" kind="lib" path="lib/validation-api-1.0.0.GA.jar"/>
......
211 183
	<classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
212 184
	<classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
213 185
	<classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
214
<<<<<<< HEAD
215
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.5.2-SNAPSHOT-sources.jar"/>
216
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.5.2-SNAPSHOT.jar"/>
217
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.5.2-SNAPSHOT-sources.jar"/>
218
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.5.2-SNAPSHOT.jar"/>
219
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.5.2-SNAPSHOT-sources.jar"/>
220
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.5.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-io-3.5.2-SNAPSHOT-sources.jar"/>
221
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.5.2-SNAPSHOT-sources.jar"/>
222
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.5.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.5.2-SNAPSHOT-sources.jar"/>
223
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.5.2-SNAPSHOT-sources.jar"/>
224
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.5.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.5.2-SNAPSHOT-sources.jar"/>
225
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.5.2-SNAPSHOT-sources.jar"/>
226
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.5.2-SNAPSHOT.jar"/>
227
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.5.2-SNAPSHOT-sources.jar"/>
228
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.5.2-SNAPSHOT.jar"/>
229
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.5.2-SNAPSHOT-sources.jar"/>
230
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.5.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.5.2-SNAPSHOT-sources.jar"/>
231
=======
232
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1-SNAPSHOT-sources.jar"/>
233 186
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1-SNAPSHOT.jar"/>
234
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1-SNAPSHOT-sources.jar"/>
235 187
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1-SNAPSHOT.jar"/>
236
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1-SNAPSHOT-sources.jar"/>
237
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-io-3.6.1-SNAPSHOT-sources.jar"/>
238
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1-SNAPSHOT-sources.jar"/>
239
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.6.1-SNAPSHOT-sources.jar"/>
240
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1-SNAPSHOT-sources.jar"/>
241
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.6.1-SNAPSHOT-sources.jar"/>
242
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1-SNAPSHOT-sources.jar"/>
188
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1-SNAPSHOT.jar"/>
189
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1-SNAPSHOT.jar"/>
190
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1-SNAPSHOT.jar"/>
243 191
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1-SNAPSHOT.jar"/>
244
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1-SNAPSHOT-sources.jar"/>
245 192
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1-SNAPSHOT.jar"/>
246
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1-SNAPSHOT-sources.jar"/>
247
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.6.1-SNAPSHOT-sources.jar"/>
248
>>>>>>> 02176688eaa23a31ff5b71c317cb5ee685483aa4
193
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1-SNAPSHOT.jar"/>
249 194
	<classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
250 195
	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
251 196
	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
252 197
	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>
253 198
	<classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>
254
<<<<<<< HEAD
255 199
	<classpathentry exported="true" kind="lib" path="lib/cdm-server-3.5.2-SNAPSHOT.jar"/>
256
=======
257
>>>>>>> 02176688eaa23a31ff5b71c317cb5ee685483aa4
258 200
	<classpathentry kind="output" path="target/classes"/>
259 201
</classpath>

Also available in: Unified diff