Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-05-21 03:19:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

+ improved war structure

Browse source
This commit is contained in:
Costin Leau 2009-12-17 17:34:12 +00:00 committed by Mic
parent c0a9be95fb
commit 905d9824b0
11 changed files with 45 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.settings/org.eclipse.wst.common.component
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="org.springframework.samples.petclinic">
<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<property name="java-output-path" value="target/classes"/>
<property name="context-root" value="petclinic"/>
</wb-module>
</project-modules>
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="org.springframework.samples.petclinic">
<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<property name="java-output-path" value="target/classes"/>
<property name="context-root" value="petclinic"/>
</wb-module>
</project-modules>

53
pom.xml
View file

@ -26,6 +26,16 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.aspects</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.weaver</artifactId>
<version>1.6.5.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.orm</artifactId>
@ -42,18 +52,6 @@
<version>${spring.version}</version>
</dependency>
<!-- AspectJ -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.aspects</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.weaver</artifactId>
<version>1.6.5.RELEASE</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
@ -131,13 +129,6 @@
<artifactId>com.springsource.org.apache.openjpa</artifactId>
<version>1.1.0</version>
<scope>runtime</scope>
<exclusions>
<!-- Exclude Commons Logging in favor of SLF4j (see 'Logging' Dependency Config below) -->
<exclusion>
<groupId>org.apache.commons.logging</groupId>
<artifactId>com.springsource.org.apache.commons.logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Servlet -->
@ -208,22 +199,22 @@
<repositories>
<repository>
<id>com.springsource.repository.bundles.release</id>
<name>EBR Spring Releases</name>
<name>SpringSource Enterprise Bundle Repository - SpringSource Releases</name>
<url>http://repository.springsource.com/maven/bundles/release</url>
</repository>
<repository>
<id>com.springsource.repository.bundles.external</id>
<name>EBR External Releases</name>
<name>SpringSource Enterprise Bundle Repository - External Releases</name>
<url>http://repository.springsource.com/maven/bundles/external</url>
</repository>
<repository>
<id>com.springsource.repository.bundles.milestone</id>
<name>EBR Spring Milestones</name>
<name>SpringSource Enterprise Bundle Repository - SpringSource Milestones</name>
<url>http://repository.springsource.com/maven/bundles/milestone</url>
</repository>
<repository>
<id>com.springsource.repository.bundles.snapshot</id>
<name>EBR Spring Snapshots</name>
<name>SpringSource Enterprise Bundle Repository - Snapshot Releases</name>
<url>http://repository.springsource.com/maven/bundles/snapshot</url>
</repository>
</repositories>
@ -239,6 +230,22 @@
<showWarnings>true</showWarnings>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/*Tests.java</include>
</includes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>petclinic</warName>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>

0
src/main/webapp/WEB-INF/classes/META-INF/aop.xml → src/main/resources/META-INF/aop.xml
View file

0
src/main/webapp/WEB-INF/classes/META-INF/jpa-persistence.xml → src/main/resources/META-INF/jpa-persistence.xml
View file

0
src/main/webapp/WEB-INF/classes/META-INF/orm.xml → src/main/resources/META-INF/orm.xml
View file

18
src/main/webapp/WEB-INF/classes/log4j.properties
View file

@ -1,18 +0,0 @@
# For JBoss: Avoid to setup Log4J outside $JBOSS_HOME/server/default/deploy/log4j.xml!
# For all other servers: Comment out the Log4J listener in web.xml to activate Log4J.
log4j.rootLogger=INFO, stdout, logfile
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
log4j.appender.logfile=org.apache.log4j.RollingFileAppender
log4j.appender.logfile.File=${petclinic.root}/WEB-INF/petclinic.log
log4j.appender.logfile.MaxFileSize=512KB
# Keep three backup files.
log4j.appender.logfile.MaxBackupIndex=3
# Pattern to output: date priority [category] - message
log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - %m%n
log4j.logger.org.springframework.samples.petclinic.aspects=DEBUG

8
src/main/webapp/WEB-INF/classes/messages.properties
View file

@ -1,8 +0,0 @@
welcome=Welcome
required=is required
notFound=has not been found
duplicate=is already in use
nonNumeric=must be all numeric
duplicateFormSubmission=Duplicate form submission is not allowed
typeMismatch.date=invalid date
typeMismatch.birthDate=invalid date

8
src/main/webapp/WEB-INF/classes/messages_de.properties
View file

@ -1,8 +0,0 @@
welcome=Willkommen
required=muss angegeben werden
notFound=wurde nicht gefunden
duplicate=ist bereits vergeben
nonNumeric=darf nur numerisch sein
duplicateFormSubmission=Wiederholtes Absenden des Formulars ist nicht erlaubt
typeMismatch.date=ungültiges Datum
typeMismatch.birthDate=ungültiges Datum

1
src/main/webapp/WEB-INF/classes/messages_en.properties
View file

@ -1 +0,0 @@
# This file is intentionally empty. Message look-ups will fall back to the default "messages.properties" file.

6
src/main/webapp/WEB-INF/web.xml
View file

@ -45,8 +45,10 @@
<!--
To use the JPA variant above, you will need to enable Spring load-time
weaving in your server environment. See PetClinic's readme and/or
Spring's JPA documentation for information on how to do this.
weaving in your server environment. Out of the box, Spring will try to
detect the running environment and use the appropriate weaver but if that
fails, one must enable one by hand or use the VM-wide weaver.
See PetClinic's readme and/or Spring's JPA documentation for more information.
-->
</context-param>

3
src/test/java/org/springframework/samples/petclinic/jpa/AbstractJpaClinicTests.java
View file

@ -195,5 +195,4 @@ public abstract class AbstractJpaClinicTests extends AbstractJpaTests {
p7 = this.clinic.loadPet(7);
assertEquals(found + 1, p7.getVisits().size());
}
}
}