1.1 --- a/pom.xml	Mon Mar 19 21:57:30 2012 +0100
     1.2 +++ b/pom.xml	Tue Mar 20 10:54:48 2012 +0100
     1.3 @@ -25,6 +25,7 @@
     1.4  		<module>monetdb</module>
     1.5  		<module>generaldb</module>
     1.6  		<module>resultio</module>
     1.7 +		<module>webapp</module>
     1.8  	</modules>
     1.9  
    1.10  	<properties>
    1.11 @@ -40,7 +41,7 @@
    1.12  
    1.13  	<dependencyManagement>
    1.14  		<dependencies>
    1.15 -
    1.16 +			<!-- Sesame dependencies -->
    1.17  			<dependency>
    1.18  				<groupId>org.openrdf.sesame</groupId>
    1.19  				<artifactId>sesame-repository-sail</artifactId>
    1.20 @@ -82,7 +83,7 @@
    1.21  				<artifactId>sesame-sail-generaldb</artifactId>
    1.22  				<version>${eu.earthobservatory.version}</version>
    1.23  			</dependency>
    1.24 -			<!-- OpenRDF modules -->
    1.25 +
    1.26  			<dependency>
    1.27  				<groupId>org.openrdf.sesame</groupId>
    1.28  				<artifactId>sesame-queryalgebra</artifactId>
    1.29 @@ -137,128 +138,37 @@
    1.30  				<version>${sesame.version}</version>
    1.31  			</dependency>
    1.32  
    1.33 -			<!-- <dependency> <groupId>info.aduna.commons</groupId> <artifactId>aduna-commons-lang</artifactId> 
    1.34 -				<version>2.10.0-SNAPSHOT</version> </dependency> -->
    1.35 -
    1.36  			<!-- Aduna Commons -->
    1.37 -			<!-- Note: other Aduna Commons dependencies are imported from appbase -->
    1.38  			<dependency>
    1.39  				<groupId>info.aduna.commons</groupId>
    1.40  				<artifactId>aduna-commons-collections</artifactId>
    1.41  				<version>2.8.0</version>
    1.42  			</dependency>
    1.43 +
    1.44  			<dependency>
    1.45  				<groupId>info.aduna.commons</groupId>
    1.46  				<artifactId>aduna-commons-concurrent</artifactId>
    1.47  				<version>2.7.0</version>
    1.48  			</dependency>
    1.49 +
    1.50  			<dependency>
    1.51  				<groupId>info.aduna.commons</groupId>
    1.52  				<artifactId>aduna-commons-i18n</artifactId>
    1.53  				<version>1.4.0</version>
    1.54  			</dependency>
    1.55 +
    1.56  			<dependency>
    1.57  				<groupId>info.aduna.commons</groupId>
    1.58  				<artifactId>aduna-commons-iteration</artifactId>
    1.59  				<version>2.10.0</version>
    1.60  			</dependency>
    1.61 +
    1.62  			<dependency>
    1.63  				<groupId>info.aduna.commons</groupId>
    1.64  				<artifactId>aduna-commons-net-http-server-embedded</artifactId>
    1.65  				<version>2.5.0</version>
    1.66  			</dependency>
    1.67  
    1.68 -			<!-- Apache Commons -->
    1.69 -			<dependency>
    1.70 -				<groupId>commons-cli</groupId>
    1.71 -				<artifactId>commons-cli</artifactId>
    1.72 -				<version>1.2</version>
    1.73 -			</dependency>
    1.74 -			<dependency>
    1.75 -				<groupId>commons-dbcp</groupId>
    1.76 -				<artifactId>commons-dbcp</artifactId>
    1.77 -				<version>1.3</version>
    1.78 -			</dependency>
    1.79 -			<dependency>
    1.80 -				<groupId>commons-fileupload</groupId>
    1.81 -				<artifactId>commons-fileupload</artifactId>
    1.82 -				<version>1.2.1</version>
    1.83 -			</dependency>
    1.84 -			<dependency>
    1.85 -				<groupId>commons-io</groupId>
    1.86 -				<artifactId>commons-io</artifactId>
    1.87 -				<!-- this is the version that is specified as an optional dependency 
    1.88 -					for fileupload -->
    1.89 -				<version>1.3.2</version>
    1.90 -			</dependency>
    1.91 -			<dependency>
    1.92 -				<groupId>commons-httpclient</groupId>
    1.93 -				<artifactId>commons-httpclient</artifactId>
    1.94 -				<version>3.1</version>
    1.95 -				<exclusions>
    1.96 -					<exclusion>
    1.97 -						<groupId>commons-logging</groupId>
    1.98 -						<artifactId>commons-logging</artifactId>
    1.99 -					</exclusion>
   1.100 -					<exclusion>
   1.101 -						<!-- httpclient includes older codec -->
   1.102 -						<groupId>commons-codec</groupId>
   1.103 -						<artifactId>commons-codec</artifactId>
   1.104 -					</exclusion>
   1.105 -				</exclusions>
   1.106 -			</dependency>
   1.107 -			<dependency>
   1.108 -				<groupId>commons-codec</groupId>
   1.109 -				<artifactId>commons-codec</artifactId>
   1.110 -				<version>1.4</version>
   1.111 -				<scope>runtime</scope>
   1.112 -			</dependency>
   1.113 -
   1.114 -			<!-- Spring framework -->
   1.115 -			<dependency>
   1.116 -				<groupId>org.springframework</groupId>
   1.117 -				<artifactId>spring-aop</artifactId>
   1.118 -				<version>${spring.version}</version>
   1.119 -				<exclusions>
   1.120 -					<exclusion>
   1.121 -						<groupId>commons-logging</groupId>
   1.122 -						<artifactId>commons-logging</artifactId>
   1.123 -					</exclusion>
   1.124 -				</exclusions>
   1.125 -			</dependency>
   1.126 -
   1.127 -			<!-- Compliance tests -->
   1.128 -			<dependency>
   1.129 -				<groupId>edu.lehigh.swat.bench</groupId>
   1.130 -				<artifactId>uba</artifactId>
   1.131 -				<version>1.7</version>
   1.132 -			</dependency>
   1.133 -			<dependency>
   1.134 -				<groupId>edu.lehigh.swat.bench</groupId>
   1.135 -				<artifactId>ubt</artifactId>
   1.136 -				<version>1.1</version>
   1.137 -			</dependency>
   1.138 -
   1.139 -			<!-- JDBC Drivers -->
   1.140 -			<dependency>
   1.141 -				<groupId>postgresql</groupId>
   1.142 -				<artifactId>postgresql</artifactId>
   1.143 -				<version>9.0-801.jdbc4</version>
   1.144 -			</dependency>
   1.145 -
   1.146 -			<dependency>
   1.147 -				<groupId>mysql</groupId>
   1.148 -				<artifactId>mysql-connector-java</artifactId>
   1.149 -				<version>5.1.15</version>
   1.150 -			</dependency>
   1.151 -
   1.152 -			<!-- various -->
   1.153 -			<dependency>
   1.154 -				<groupId>cglib</groupId>
   1.155 -				<artifactId>cglib</artifactId>
   1.156 -				<version>2.2</version>
   1.157 -			</dependency>
   1.158 -
   1.159  			<!-- GeoTools -->
   1.160  			<dependency>
   1.161  				<groupId>org.geotools.xsd</groupId>
   1.162 @@ -302,20 +212,29 @@
   1.163  				<version>${geotools.version}</version>
   1.164  			</dependency>
   1.165  
   1.166 -			<!-- <dependency> -->
   1.167 -			<!-- <groupId>org.opengis</groupId> -->
   1.168 -			<!-- <artifactId>geoapi</artifactId> -->
   1.169 -			<!-- <version>3.0.0</version> -->
   1.170 -			<!-- </dependency> -->
   1.171 +			<!-- 
   1.172 +			<dependency> 
   1.173 +				<groupId>org.opengis</groupId> 
   1.174 +				<artifactId>geoapi</artifactId> 
   1.175 +				<version>3.0.0</version> 
   1.176 +			</dependency> 
   1.177 +			-->
   1.178  
   1.179 -			<!-- Testing: JUnit -->
   1.180 +			<!-- JDBC Drivers -->
   1.181  			<dependency>
   1.182 -				<groupId>junit</groupId>
   1.183 -				<artifactId>junit</artifactId>
   1.184 -				<version>4.7</version>
   1.185 -				<scope>test</scope>
   1.186 +				<groupId>postgresql</groupId>
   1.187 +				<artifactId>postgresql</artifactId>
   1.188 +				<version>9.0-801.jdbc4</version>
   1.189  			</dependency>
   1.190  
   1.191 +			<!--
   1.192 +			<dependency>
   1.193 +				<groupId>mysql</groupId>
   1.194 +				<artifactId>mysql-connector-java</artifactId>
   1.195 +				<version>5.1.15</version>
   1.196 +			</dependency>
   1.197 +			-->			
   1.198 +
   1.199  			<!-- SLF4J -->
   1.200  			<dependency>
   1.201  				<groupId>org.slf4j</groupId>
   1.202 @@ -335,7 +254,140 @@
   1.203                          	<version>1.2</version>
   1.204  	                </dependency>
   1.205  
   1.206 +			<!-- Apache Commons -->
   1.207 +			<dependency>
   1.208 +				<groupId>commons-cli</groupId>
   1.209 +				<artifactId>commons-cli</artifactId>
   1.210 +				<version>1.2</version>
   1.211 +			</dependency>
   1.212  
   1.213 +			<dependency>
   1.214 +				<groupId>commons-dbcp</groupId>
   1.215 +				<artifactId>commons-dbcp</artifactId>
   1.216 +				<version>1.3</version>
   1.217 +			</dependency>
   1.218 +
   1.219 +			<dependency>
   1.220 +				<groupId>commons-fileupload</groupId>
   1.221 +				<artifactId>commons-fileupload</artifactId>
   1.222 +				<version>1.2.1</version>
   1.223 +			</dependency>
   1.224 +
   1.225 +			<dependency>
   1.226 +				<groupId>commons-io</groupId>
   1.227 +				<artifactId>commons-io</artifactId>
   1.228 +
   1.229 +				<version>1.3.2</version>
   1.230 +			</dependency>
   1.231 +
   1.232 +			<dependency>
   1.233 +				<groupId>commons-httpclient</groupId>
   1.234 +				<artifactId>commons-httpclient</artifactId>
   1.235 +				<version>3.1</version>
   1.236 +				<exclusions>
   1.237 +					<exclusion>
   1.238 +						<groupId>commons-logging</groupId>
   1.239 +						<artifactId>commons-logging</artifactId>
   1.240 +					</exclusion>
   1.241 +					<exclusion>
   1.242 +						<!-- httpclient includes older codec -->
   1.243 +						<groupId>commons-codec</groupId>
   1.244 +						<artifactId>commons-codec</artifactId>
   1.245 +					</exclusion>
   1.246 +				</exclusions>
   1.247 +			</dependency>
   1.248 +
   1.249 +			<dependency>
   1.250 +				<groupId>commons-codec</groupId>
   1.251 +				<artifactId>commons-codec</artifactId>
   1.252 +				<version>1.4</version>
   1.253 +				<scope>runtime</scope>
   1.254 +			</dependency>
   1.255 +
   1.256 +			<dependency>
   1.257 +				<groupId>commons-validator</groupId>
   1.258 +				<artifactId>commons-validator</artifactId>
   1.259 +				<version>1.3.1</version>
   1.260 +			</dependency>
   1.261 +
   1.262 +			<!-- Spring framework -->
   1.263 +			<dependency>
   1.264 +				<groupId>org.springframework</groupId>
   1.265 +				<artifactId>spring-aop</artifactId>
   1.266 +				<version>${spring.version}</version>
   1.267 +				<exclusions>
   1.268 +					<exclusion>
   1.269 +						<groupId>commons-logging</groupId>
   1.270 +						<artifactId>commons-logging</artifactId>
   1.271 +					</exclusion>
   1.272 +				</exclusions>
   1.273 +			</dependency>
   1.274 +
   1.275 +			<dependency>
   1.276 +				<groupId>org.springframework</groupId>
   1.277 +				<artifactId>spring-webmvc</artifactId>
   1.278 +				<version>${spring.version}</version>
   1.279 +				<exclusions>
   1.280 +					<exclusion>
   1.281 +						<groupId>commons-logging</groupId>
   1.282 +						<artifactId>commons-logging</artifactId>
   1.283 +					</exclusion>
   1.284 +				</exclusions>
   1.285 +			</dependency>
   1.286 +
   1.287 +			<!-- Apache CXF framework -->
   1.288 +			<dependency>
   1.289 +				<groupId>org.apache.cxf</groupId>
   1.290 +				<artifactId>cxf-rt-frontend-jaxws</artifactId>
   1.291 +				<version>2.2.5</version>
   1.292 +			</dependency>
   1.293 +
   1.294 +			<dependency>
   1.295 +				<groupId>org.apache.cxf</groupId>
   1.296 +				<artifactId>cxf-rt-transports-http</artifactId>
   1.297 +				<version>2.2.5</version>
   1.298 +			</dependency>
   1.299 +
   1.300 +			<dependency>
   1.301 +				<groupId>org.apache.cxf</groupId>
   1.302 +				<artifactId>cxf-rt-transports-http-jetty</artifactId>
   1.303 +				<version>2.2.5</version>
   1.304 +			</dependency>
   1.305 +
   1.306 +			<!-- Compliance tests -->
   1.307 +			<dependency>
   1.308 +				<groupId>edu.lehigh.swat.bench</groupId>
   1.309 +				<artifactId>uba</artifactId>
   1.310 +				<version>1.7</version>
   1.311 +			</dependency>
   1.312 +
   1.313 +			<dependency>
   1.314 +				<groupId>edu.lehigh.swat.bench</groupId>
   1.315 +				<artifactId>ubt</artifactId>
   1.316 +				<version>1.1</version>
   1.317 +			</dependency>
   1.318 +
   1.319 +			<!-- Testing: JUnit -->
   1.320 +			<dependency>
   1.321 +				<groupId>junit</groupId>
   1.322 +				<artifactId>junit</artifactId>
   1.323 +				<version>4.7</version>
   1.324 +				<scope>test</scope>
   1.325 +			</dependency>
   1.326 +			
   1.327 +			<!-- Various -->
   1.328 +			<dependency>
   1.329 +				<groupId>cglib</groupId>
   1.330 +				<artifactId>cglib</artifactId>
   1.331 +				<version>2.2</version>
   1.332 +			</dependency>
   1.333 +
   1.334 +			<dependency>
   1.335 +				<groupId>javax</groupId>
   1.336 +				<artifactId>javaee-web-api</artifactId>
   1.337 +				<version>6.0</version>
   1.338 +				<scope>provided</scope>
   1.339 +			</dependency>
   1.340  		</dependencies>
   1.341  	</dependencyManagement>
   1.342