Changeset 805
- Timestamp:
- 10/19/10 18:10:19 (14 years ago)
- Location:
- VirtualCollectionRegistry/trunk/VirtualCollectionRegistry
- Files:
-
- 32 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/pom.xml
r778 r805 137 137 138 138 <dependency> 139 <groupId>org.slf4j</groupId> 140 <artifactId>slf4j-jdk14</artifactId> 141 <version>${slf4j.version}</version> 142 <scope>runtime</scope> 143 </dependency> 144 145 <dependency> 146 <groupId>org.slf4j</groupId> 147 <artifactId>slf4j-api</artifactId> 148 <version>${slf4j.version}</version> 149 </dependency> 150 151 <dependency> 139 152 <groupId>javax.servlet</groupId> 140 153 <artifactId>servlet-api</artifactId> … … 147 160 <groupId>javax.xml.bind</groupId> 148 161 <artifactId>jaxb-api</artifactId> 149 <version>2.2 </version>162 <version>2.2.1</version> 150 163 <exclusions> 151 164 <exclusion> … … 231 244 </dependency> 232 245 246 247 <dependency> 248 <groupId>org.codehaus.woodstox</groupId> 249 <artifactId>woodstox-core-asl</artifactId> 250 <version>4.0.8</version> 251 <type>jar</type> 252 <scope>compile</scope> 253 </dependency> 254 255 <dependency> 256 <groupId>net.java.dev.msv</groupId> 257 <artifactId>msv-core</artifactId> 258 <version>2009.1</version> 259 <type>jar</type> 260 <scope>compile</scope> 261 </dependency> 262 263 <dependency> 264 <groupId>org.codehaus.jettison</groupId> 265 <artifactId>jettison</artifactId> 266 <version>1.2</version> 267 <exclusions> 268 <exclusion> 269 <groupId>stax</groupId> 270 <artifactId>stax-api</artifactId> 271 </exclusion> 272 </exclusions> 273 </dependency> 274 233 275 <dependency> 234 276 <groupId>commons-lang</groupId> … … 239 281 240 282 <dependency> 241 <groupId>org.codehaus.jettison</groupId>242 <artifactId>jettison</artifactId>243 <version>1.2</version>244 <exclusions>245 <exclusion>246 <groupId>stax</groupId>247 <artifactId>stax-api</artifactId>248 </exclusion>249 </exclusions>250 </dependency>251 252 <dependency>253 <groupId>org.slf4j</groupId>254 <artifactId>slf4j-jdk14</artifactId>255 <version>${slf4j.version}</version>256 <scope>runtime</scope>257 </dependency>258 259 <dependency>260 <groupId>org.slf4j</groupId>261 <artifactId>slf4j-api</artifactId>262 <version>${slf4j.version}</version>263 </dependency>264 265 <dependency>266 283 <groupId>org.apache.httpcomponents</groupId> 267 284 <artifactId>httpclient</artifactId> … … 272 289 273 290 <dependency> 291 <groupId>org.apache.wicket</groupId> 292 <artifactId>wicket</artifactId> 293 <version>${wicket.version}</version> 294 </dependency> 295 296 <dependency> 297 <groupId>org.apache.wicket</groupId> 298 <artifactId>wicket-auth-roles</artifactId> 299 <version>${wicket.version}</version> 300 </dependency> 301 302 <dependency> 303 <groupId>org.apache.wicket</groupId> 304 <artifactId>wicket-extensions</artifactId> 305 <version>${wicket.version}</version> 306 </dependency> 307 308 <dependency> 274 309 <groupId>net.java.dev.javacc</groupId> 275 310 <artifactId>javacc</artifactId> … … 278 313 <scope>provided</scope> 279 314 </dependency> 315 280 316 <dependency> 281 317 <groupId>junit</groupId> … … 285 321 <scope>test</scope> 286 322 </dependency> 323 287 324 <dependency> 288 325 <groupId>org.hsqldb</groupId> … … 292 329 <scope>test</scope> 293 330 </dependency> 331 294 332 <dependency> 295 333 <groupId>mysql</groupId> … … 298 336 <type>jar</type> 299 337 <scope>test</scope> 300 </dependency>301 <dependency>302 <groupId>org.codehaus.woodstox</groupId>303 <artifactId>woodstox-core-asl</artifactId>304 <version>4.0.8</version>305 <type>jar</type>306 <scope>compile</scope>307 </dependency>308 <dependency>309 <groupId>net.java.dev.msv</groupId>310 <artifactId>msv-core</artifactId>311 <version>2009.1</version>312 <type>jar</type>313 <scope>compile</scope>314 338 </dependency> 315 339 </dependencies> … … 330 354 <jersey.version>1.4</jersey.version> 331 355 <slf4j.version>1.6.0</slf4j.version> 356 <wicket.version>1.4.12</wicket.version> 332 357 </properties> 333 358 </project> -
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/WEB-INF/web.xml
r602 r805 5 5 id="WebApp_ID" version="2.5"> 6 6 <display-name>CLARIN Virtual Collection Registry</display-name> 7 8 <listener> 9 <listener-class>eu.clarin.cmdi.virtualcollectionregistry.rest.ContextListener</listener-class> 10 </listener> 7 11 8 12 <filter> … … 16 20 </filter-mapping> 17 21 18 <listener> 19 <listener-class>eu.clarin.cmdi.virtualcollectionregistry.rest.ContextListener</listener-class> 20 </listener> 22 <filter> 23 <filter-name>VirtualCollectionRegistryApplication</filter-name> 24 <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class> 25 <init-param> 26 <param-name>applicationClassName</param-name> 27 <param-value>eu.clarin.cmdi.virtualcollectionregistry.gui.Application</param-value> 28 </init-param> 29 <init-param> 30 <param-name>configuration</param-name> 31 <!-- 32 <param-value>deployment</param-value> 33 --> 34 <param-value>development</param-value> 35 </init-param> 36 </filter> 21 37 38 <filter-mapping> 39 <filter-name>VirtualCollectionRegistryApplication</filter-name> 40 <url-pattern>/app/*</url-pattern> 41 </filter-mapping> 22 42 23 43 <servlet> … … 32 52 </servlet> 33 53 54 <servlet-mapping> 55 <servlet-name>REST-Web-Service</servlet-name> 56 <url-pattern>/service/*</url-pattern> 57 </servlet-mapping> 58 34 59 <servlet> 35 60 <display-name>Virtual Collection Registry OAI-PMH Provider</display-name> … … 38 63 <load-on-startup>2</load-on-startup> 39 64 </servlet> 40 41 <servlet-mapping>42 <servlet-name>REST-Web-Service</servlet-name>43 <url-pattern>/service/*</url-pattern>44 </servlet-mapping>45 65 46 66 <servlet-mapping> … … 70 90 <url-pattern>/service/my-virtualcollections</url-pattern> 71 91 <http-method>GET</http-method> 92 </web-resource-collection> 93 <web-resource-collection> 94 <web-resource-name>VirtualCollectionRegistryApplication</web-resource-name> 95 <description></description> 96 <url-pattern>/app/login</url-pattern> 97 <http-method>GET</http-method> 98 <http-method>POST</http-method> 72 99 </web-resource-collection> 73 100 <auth-constraint> -
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/index.html
r146 r805 1 <?xml version="1.0" encoding="UTF-8" ?> 2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 1 <?xml version="1.0" encoding="UTF-8"?> 2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 3 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 3 4 <html xmlns="http://www.w3.org/1999/xhtml"> 4 5 <head> … … 8 9 <body> 9 10 <h1>CLARIN Virtual Collection Registry</h1> 10 <p> OHAI! I can has virtual colleckshun?</p>11 <p><a href="app/">Go to Web-Interface</a></p> 11 12 </body> 12 13 </html>
Note: See TracChangeset
for help on using the changeset viewer.