Changeset 5459
- Timestamp:
- 07/08/14 12:22:48 (10 years ago)
- Location:
- VirtualCollectionRegistry/trunk/VirtualCollectionRegistry
- Files:
-
- 3 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/README.txt
r5433 r5459 59 59 1. Use the shibboleth version of web.xml called 'web-shib.xml' instead of 60 60 the default one by renaming it to and overwriting web.xml (you can make a 61 backup of the original web.xml) 61 backup of the original web.xml). If the package was built for a production 62 environment, it should already have the right web.xml in place. 62 63 63 64 2. Add the following to the relevant Apache configuration: -
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/pom.xml
r5455 r5459 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <project xmlns="http://maven.apache.org/POM/4.0.0" 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 5 <modelVersion>4.0.0</modelVersion> 6 <groupId>eu.clarin.cmdi</groupId> 7 <artifactId>VirtualCollectionRegistry</artifactId> 8 <packaging>war</packaging> 9 <name>CLARIN Virtual Collection Registry</name> 10 <version>0.4.0-SNAPSHOT</version> 11 12 <organization> 13 <name>Institut fÃŒr Deutsche Sprache</name> 14 <url>http://www.ids-mannheim.de/</url> 15 </organization> 16 17 18 <properties> 19 <!-- project settings --> 20 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 21 <!-- plug-in settings --> 22 <maven.compiler.source>1.7</maven.compiler.source> 23 <maven.compiler.target>1.7</maven.compiler.target> 24 <!-- dependency versions --> 25 <slf4j.version>1.7.7</slf4j.version> 26 <hibernate.version>3.6.10.Final</hibernate.version> 27 <hibernate.jpaVersion>1.0.0.Final</hibernate.jpaVersion> 28 <jersey.version>1.18.1</jersey.version> 29 <jackson.version>1.6.1</jackson.version> 30 <wicket.version>1.4.23</wicket.version> 31 <spring.version>4.0.5.RELEASE</spring.version> 32 <log4j.appender>Console</log4j.appender> <!-- TODO: default to File --> 33 </properties> 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 5 <modelVersion>4.0.0</modelVersion> 6 <groupId>eu.clarin.cmdi</groupId> 7 <artifactId>VirtualCollectionRegistry</artifactId> 8 <packaging>war</packaging> 9 <name>CLARIN Virtual Collection Registry</name> 10 <version>0.4.0-SNAPSHOT</version> 11 12 <organization> 13 <name>Institut fÃŒr Deutsche Sprache</name> 14 <url>http://www.ids-mannheim.de/</url> 15 </organization> 16 17 18 <properties> 19 <!-- project settings --> 20 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 21 <!-- plug-in settings --> 22 <maven.compiler.source>1.7</maven.compiler.source> 23 <maven.compiler.target>1.7</maven.compiler.target> 24 <!-- dependency versions --> 25 <slf4j.version>1.7.7</slf4j.version> 26 <hibernate.version>3.6.10.Final</hibernate.version> 27 <hibernate.jpaVersion>1.0.0.Final</hibernate.jpaVersion> 28 <jersey.version>1.18.1</jersey.version> 29 <jackson.version>1.6.1</jackson.version> 30 <wicket.version>1.4.23</wicket.version> 31 <spring.version>4.0.5.RELEASE</spring.version> 32 33 <!-- Production settings below --> 34 <log4j.appender>File</log4j.appender> 35 <war.webxml>src/main/webapp/WEB-INF/web-shib.xml</war.webxml> 36 </properties> 37 38 <profiles> 39 <profile> 40 <!-- Development profile --> 41 <id>development</id> 42 <properties> 43 <!-- Log to console --> 44 <log4j.appender>Console</log4j.appender> 45 <!-- Use the user database realm version of web.xml --> 46 <war.webxml>src/main/webapp/WEB-INF/web-dev.xml</war.webxml> 47 </properties> 48 </profile> 49 </profiles> 34 50 35 51 <dependencies> … … 148 164 149 165 <!-- Libraries required for de.uni_leipzig.* EPIC library (todo: replace 150 166 with dependency on detached library) --> 151 167 <dependency> 152 168 <groupId>com.sun.jersey.contribs</groupId> … … 216 232 </dependency> 217 233 218 <!--219 <dependency>220 <groupId>net.java.dev.javacc</groupId>221 <artifactId>javacc</artifactId>222 <version>5.0</version>223 <type>jar</type>224 <scope>provided</scope>225 </dependency>226 -->234 <!-- 235 <dependency> 236 <groupId>net.java.dev.javacc</groupId> 237 <artifactId>javacc</artifactId> 238 <version>5.0</version> 239 <type>jar</type> 240 <scope>provided</scope> 241 </dependency> 242 --> 227 243 228 244 <dependency> … … 377 393 </dependencyManagement> 378 394 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 395 <build> 396 <resources> 397 <resource> 398 <filtering>true</filtering> 399 <directory>src/main/resources</directory> 400 </resource> 401 <resource> 402 <filtering>true</filtering> 403 <directory>src/main/java</directory> 404 <includes> 405 <include>**/BasePage.html</include> 406 </includes> 407 </resource> 408 <resource> 409 <filtering>false</filtering> 410 <directory>src/main/java</directory> 411 <includes> 412 <include>**/*.html</include> 413 <include>**/*.css</include> 414 <include>**/*.js</include> 415 <include>**/*.properties</include> 416 </includes> 417 </resource> 418 </resources> 419 420 <testResources> 421 <testResource> 422 <directory>src/test/resources</directory> 423 </testResource> 424 </testResources> 425 426 <plugins> 427 <plugin> 428 <groupId>org.codehaus.mojo</groupId> 429 <artifactId>javacc-maven-plugin</artifactId> 430 <version>2.6</version> 431 <executions> 432 <execution> 433 <id>javacc</id> 434 <goals> 435 <goal>jjtree-javacc</goal> 436 </goals> 437 <phase>generate-sources</phase> 438 </execution> 439 </executions> 440 </plugin> 441 442 <plugin> 443 <groupId>org.bsc.maven</groupId> 444 <artifactId>maven-processor-plugin</artifactId> 445 <version>2.0.0</version> 446 <executions> 447 <execution> 448 <id>process</id> 449 <goals> 450 <goal>process</goal> 451 </goals> 452 <phase>generate-sources</phase> 453 <configuration> 454 <processors> 455 <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor> 456 </processors> 457 <sourceDirectory>${basedir}/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model</sourceDirectory> 458 <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory> 459 </configuration> 460 </execution> 461 </executions> 446 462 <dependencies> 447 463 <dependency> 448 464 <groupId>org.hibernate</groupId> 449 465 <artifactId>hibernate-jpamodelgen</artifactId> … … 452 468 </dependency> 453 469 </dependencies> 454 470 </plugin> 455 471 456 472 <plugin> … … 471 487 </plugin> 472 488 473 <plugin> 474 <groupId>org.codehaus.mojo</groupId> 475 <artifactId>build-helper-maven-plugin</artifactId> 476 <version>1.3</version> 477 <executions> 478 <execution> 479 <id>add-source</id> 480 <goals> 481 <goal>add-source</goal> 482 </goals> 483 <phase>generate-sources</phase> 484 <configuration> 485 <sources> 486 <source>${project.build.directory}/generated-sources/metamodel</source> 487 <source>${project.build.directory}/generated-sources/javacc</source> 488 <source>${project.build.directory}/generated-sources/jjtree</source> 489 <source>${project.build.directory}/generated-sources/jaxb</source> 490 </sources> 491 </configuration> 492 </execution> 493 </executions> 494 </plugin> 495 496 <plugin> 497 <groupId>org.apache.maven.plugins</groupId> 498 <artifactId>maven-compiler-plugin</artifactId> 499 <version>2.3.2</version> 500 <configuration> 501 <source>${maven.compiler.source}</source> 502 <target>${maven.compiler.target}</target> 503 <compilerArgument>-proc:none</compilerArgument> 504 </configuration> 505 </plugin> 506 507 <plugin> 508 <groupId>org.apache.maven.plugins</groupId> 509 <artifactId>maven-war-plugin</artifactId> 510 <version>2.1.1</version> 511 <configuration> 512 <webResources> 513 <!-- additional web resources: also copy schemas to web-app --> 514 <resource> 515 <directory>src/main/resources/META-INF</directory> 516 <targetPath>schema</targetPath> 517 <includes> 518 <include>*.xsd</include> 519 </includes> 520 </resource> 521 </webResources> 522 </configuration> 523 </plugin> 524 </plugins> 525 526 <pluginManagement> 527 <plugins> 528 <!-- This plugin's configuration is used to store Eclipse m2e settings 529 only. It has no influence on the Maven build itself. --> 530 <plugin> 531 <groupId>org.eclipse.m2e</groupId> 532 <artifactId>lifecycle-mapping</artifactId> 533 <version>1.0.0</version> 534 <configuration> 535 <lifecycleMappingMetadata> 536 <pluginExecutions> 537 <pluginExecution> 538 <pluginExecutionFilter> 539 <groupId>org.codehaus.mojo</groupId> 540 <artifactId>javacc-maven-plugin</artifactId> 541 <versionRange>[2.6,)</versionRange> 542 <goals> 543 <goal>jjtree-javacc</goal> 544 </goals> 545 </pluginExecutionFilter> 546 <action> 547 <execute /> 548 </action> 549 </pluginExecution> 550 <pluginExecution> 551 <pluginExecutionFilter> 552 <groupId>org.bsc.maven</groupId> 553 <artifactId>maven-processor-plugin</artifactId> 554 <versionRange>[2.0.0,)</versionRange> 555 <goals> 556 <goal>process</goal> 557 </goals> 558 </pluginExecutionFilter> 559 <action> 560 <execute /> 561 </action> 562 </pluginExecution> 563 <pluginExecution> 564 <pluginExecutionFilter> 565 <groupId>org.codehaus.mojo</groupId> 566 <artifactId>jaxb2-maven-plugin</artifactId> 567 <versionRange>[1.6,)</versionRange> 568 <goals> 569 <goal>xjc</goal> 570 </goals> 571 </pluginExecutionFilter> 572 <action> 573 <execute /> 574 </action> 575 </pluginExecution> 576 </pluginExecutions> 577 </lifecycleMappingMetadata> 578 </configuration> 579 </plugin> 580 <!-- JAX-B If we e.g. execute on JDK 1.7, we should compile for 581 Java 7 to get the same (or higher) JAXB API version as 582 used during the xjc execution. --> 583 <plugin> 584 <groupId>org.apache.maven.plugins</groupId> 585 <artifactId>maven-compiler-plugin</artifactId> 586 <configuration> 587 <source>${maven.compiler.source}</source> 588 <target>${maven.compiler.source}</target> 589 </configuration> 590 </plugin> 591 </plugins> 592 </pluginManagement> 593 </build> 489 <plugin> 490 <groupId>org.codehaus.mojo</groupId> 491 <artifactId>build-helper-maven-plugin</artifactId> 492 <version>1.3</version> 493 <executions> 494 <execution> 495 <id>add-source</id> 496 <goals> 497 <goal>add-source</goal> 498 </goals> 499 <phase>generate-sources</phase> 500 <configuration> 501 <sources> 502 <source>${project.build.directory}/generated-sources/metamodel</source> 503 <source>${project.build.directory}/generated-sources/javacc</source> 504 <source>${project.build.directory}/generated-sources/jjtree</source> 505 <source>${project.build.directory}/generated-sources/jaxb</source> 506 </sources> 507 </configuration> 508 </execution> 509 </executions> 510 </plugin> 511 512 <plugin> 513 <groupId>org.apache.maven.plugins</groupId> 514 <artifactId>maven-compiler-plugin</artifactId> 515 <version>2.3.2</version> 516 <configuration> 517 <source>${maven.compiler.source}</source> 518 <target>${maven.compiler.target}</target> 519 <compilerArgument>-proc:none</compilerArgument> 520 </configuration> 521 </plugin> 522 523 <plugin> 524 <groupId>org.apache.maven.plugins</groupId> 525 <artifactId>maven-war-plugin</artifactId> 526 <version>2.1.1</version> 527 <configuration> 528 <failOnMissingWebXml>true</failOnMissingWebXml> 529 <webXml>${war.webxml}</webXml> 530 <webResources> 531 <!-- additional web resources: also copy schemas to web-app --> 532 <resource> 533 <directory>src/main/resources/META-INF</directory> 534 <targetPath>schema</targetPath> 535 <includes> 536 <include>*.xsd</include> 537 </includes> 538 </resource> 539 </webResources> 540 </configuration> 541 </plugin> 542 </plugins> 543 544 <pluginManagement> 545 <plugins> 546 <!-- This plugin's configuration is used to store Eclipse m2e settings 547 only. It has no influence on the Maven build itself. --> 548 <plugin> 549 <groupId>org.eclipse.m2e</groupId> 550 <artifactId>lifecycle-mapping</artifactId> 551 <version>1.0.0</version> 552 <configuration> 553 <lifecycleMappingMetadata> 554 <pluginExecutions> 555 <pluginExecution> 556 <pluginExecutionFilter> 557 <groupId>org.codehaus.mojo</groupId> 558 <artifactId>javacc-maven-plugin</artifactId> 559 <versionRange>[2.6,)</versionRange> 560 <goals> 561 <goal>jjtree-javacc</goal> 562 </goals> 563 </pluginExecutionFilter> 564 <action> 565 <execute /> 566 </action> 567 </pluginExecution> 568 <pluginExecution> 569 <pluginExecutionFilter> 570 <groupId>org.bsc.maven</groupId> 571 <artifactId>maven-processor-plugin</artifactId> 572 <versionRange>[2.0.0,)</versionRange> 573 <goals> 574 <goal>process</goal> 575 </goals> 576 </pluginExecutionFilter> 577 <action> 578 <execute /> 579 </action> 580 </pluginExecution> 581 <pluginExecution> 582 <pluginExecutionFilter> 583 <groupId>org.codehaus.mojo</groupId> 584 <artifactId>jaxb2-maven-plugin</artifactId> 585 <versionRange>[1.6,)</versionRange> 586 <goals> 587 <goal>xjc</goal> 588 </goals> 589 </pluginExecutionFilter> 590 <action> 591 <execute /> 592 </action> 593 </pluginExecution> 594 </pluginExecutions> 595 </lifecycleMappingMetadata> 596 </configuration> 597 </plugin> 598 <!-- JAX-B If we e.g. execute on JDK 1.7, we should compile for 599 Java 7 to get the same (or higher) JAXB API version as 600 used during the xjc execution. --> 601 <plugin> 602 <groupId>org.apache.maven.plugins</groupId> 603 <artifactId>maven-compiler-plugin</artifactId> 604 <configuration> 605 <source>${maven.compiler.source}</source> 606 <target>${maven.compiler.source}</target> 607 </configuration> 608 </plugin> 609 </plugins> 610 </pluginManagement> 611 </build> 594 612 595 613 <repositories> -
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/resources/log4j.properties
r5434 r5459 10 10 log4j.rootLogger=INFO,${log4j.appender} 11 11 12 #log4j.logger.eu.clarin.cmdi.virtualcollectionregistry=INFO13 log4j.logger.eu.clarin.cmdi.virtualcollectionregistry=DEBUG12 log4j.logger.eu.clarin.cmdi.virtualcollectionregistry=INFO 13 #log4j.logger.eu.clarin.cmdi.virtualcollectionregistry=DEBUG 14 14 log4j.logger.org.springframework=INFO 15 15 log4j.logger.org.hibernate=INFO
Note: See TracChangeset
for help on using the changeset viewer.