Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2013-03-04 11:47:10 -0500
committerChristopher Frost2013-03-04 11:47:10 -0500
commit17820f21ba5a5fcf934514c01bd0990768a21470 (patch)
tree4be749038d019ee5c99615ef05d33787d543b54d
parent0d293b040deeb74cef5234ac33a8dd01a7e69a37 (diff)
downloadorg.eclipse.virgo.samples-17820f21ba5a5fcf934514c01bd0990768a21470.tar.gz
org.eclipse.virgo.samples-17820f21ba5a5fcf934514c01bd0990768a21470.tar.xz
org.eclipse.virgo.samples-17820f21ba5a5fcf934514c01bd0990768a21470.zip
Additional fixes to get all the Greenpages tests to pass.
-rw-r--r--greenpages/greenpages.db/pom.xml5
-rw-r--r--greenpages/greenpages.jpa/pom.xml16
-rw-r--r--greenpages/greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml2
-rw-r--r--greenpages/greenpages.par/.classpath (renamed from greenpages/greenpages/.classpath)0
-rw-r--r--greenpages/greenpages.par/.project (renamed from greenpages/greenpages/.project)0
-rw-r--r--greenpages/greenpages.par/.settings/org.eclipse.jdt.core.prefs (renamed from greenpages/greenpages/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--greenpages/greenpages.par/.settings/org.eclipse.m2e.core.prefs (renamed from greenpages/greenpages/.settings/org.eclipse.m2e.core.prefs)0
-rw-r--r--greenpages/greenpages.par/.settings/org.eclipse.virgo.ide.runtime.core.par.xml (renamed from greenpages/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml)0
-rw-r--r--greenpages/greenpages.par/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from greenpages/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--greenpages/greenpages.par/.settings/org.maven.ide.eclipse.prefs (renamed from greenpages/greenpages/.settings/org.maven.ide.eclipse.prefs)0
-rw-r--r--greenpages/greenpages.par/META-INF/MANIFEST.MF (renamed from greenpages/greenpages/META-INF/MANIFEST.MF)0
-rw-r--r--greenpages/greenpages.par/com.springsource.org.h2-1.0.71.jar (renamed from greenpages/greenpages/com.springsource.org.h2-1.0.71.jar)bin1060309 -> 1060309 bytes
-rw-r--r--greenpages/greenpages.par/pom.xml (renamed from greenpages/greenpages/pom.xml)2
-rw-r--r--greenpages/greenpages.par/src/main/resources/.gitignore (renamed from greenpages/greenpages/src/main/resources/.gitignore)0
-rw-r--r--greenpages/greenpages.par/template.mf (renamed from greenpages/greenpages/template.mf)0
-rw-r--r--greenpages/greenpages.parent/pom.xml29
-rw-r--r--greenpages/greenpages.web/pom.xml20
-rw-r--r--greenpages/greenpages.web/src/main/webapp/WEB-INF/applicationContext.xml (renamed from greenpages/greenpages.web/src/main/resources/WEB-INF/applicationContext.xml)0
-rw-r--r--greenpages/greenpages.web/src/main/webapp/WEB-INF/ftl/entry.ftl (renamed from greenpages/greenpages.web/src/main/resources/WEB-INF/ftl/entry.ftl)0
-rw-r--r--greenpages/greenpages.web/src/main/webapp/WEB-INF/ftl/home.ftl (renamed from greenpages/greenpages.web/src/main/resources/WEB-INF/ftl/home.ftl)0
-rw-r--r--greenpages/greenpages.web/src/main/webapp/WEB-INF/ftl/search.ftl (renamed from greenpages/greenpages.web/src/main/resources/WEB-INF/ftl/search.ftl)0
-rw-r--r--greenpages/greenpages.web/src/main/webapp/WEB-INF/greenpages-servlet.xml (renamed from greenpages/greenpages.web/src/main/resources/WEB-INF/greenpages-servlet.xml)0
-rw-r--r--greenpages/greenpages.web/src/main/webapp/WEB-INF/web.xml (renamed from greenpages/greenpages.web/src/main/resources/WEB-INF/web.xml)0
-rwxr-xr-xgreenpages/greenpages.web/src/main/webapp/images/favicon.ico (renamed from greenpages/greenpages.web/src/main/resources/images/favicon.ico)bin1150 -> 1150 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/footer-left.png (renamed from greenpages/greenpages.web/src/main/resources/images/footer-left.png)bin2792 -> 2792 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/footer-right.png (renamed from greenpages/greenpages.web/src/main/resources/images/footer-right.png)bin2792 -> 2792 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/footer-stretch.png (renamed from greenpages/greenpages.web/src/main/resources/images/footer-stretch.png)bin2726 -> 2726 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/header-left.png (renamed from greenpages/greenpages.web/src/main/resources/images/header-left.png)bin2887 -> 2887 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/header-right.png (renamed from greenpages/greenpages.web/src/main/resources/images/header-right.png)bin2918 -> 2918 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/loader-white-large.gif (renamed from greenpages/greenpages.web/src/main/resources/images/loader-white-large.gif)bin7399 -> 7399 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/loader-white-small.gif (renamed from greenpages/greenpages.web/src/main/resources/images/loader-white-small.gif)bin2228 -> 2228 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/menu-curve-left.png (renamed from greenpages/greenpages.web/src/main/resources/images/menu-curve-left.png)bin1277 -> 1277 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/menu-curve-right.png (renamed from greenpages/greenpages.web/src/main/resources/images/menu-curve-right.png)bin1278 -> 1278 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/menu-stretch.png (renamed from greenpages/greenpages.web/src/main/resources/images/menu-stretch.png)bin2720 -> 2720 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/mini-header-left.png (renamed from greenpages/greenpages.web/src/main/resources/images/mini-header-left.png)bin236 -> 236 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/mini-header-right.png (renamed from greenpages/greenpages.web/src/main/resources/images/mini-header-right.png)bin955 -> 955 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/s2ap_soda_can.png (renamed from greenpages/greenpages.web/src/main/resources/images/s2ap_soda_can.png)bin64118 -> 64118 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/spring.png (renamed from greenpages/greenpages.web/src/main/resources/images/spring.png)bin3139 -> 3139 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/images/table-header-background.png (renamed from greenpages/greenpages.web/src/main/resources/images/table-header-background.png)bin2765 -> 2765 bytes
-rw-r--r--greenpages/greenpages.web/src/main/webapp/index.html (renamed from greenpages/greenpages.web/src/main/resources/index.html)0
-rw-r--r--greenpages/greenpages.web/src/main/webapp/styles/local.css (renamed from greenpages/greenpages.web/src/main/resources/styles/local.css)0
-rw-r--r--greenpages/greenpages.web/src/main/webapp/styles/main.css (renamed from greenpages/greenpages.web/src/main/resources/styles/main.css)0
-rw-r--r--greenpages/greenpages.web/src/main/webapp/styles/print.css (renamed from greenpages/greenpages.web/src/main/resources/styles/print.css)0
-rw-r--r--greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF12
-rw-r--r--greenpages/greenpages.web/src/test/resources/META-INF/spring/test-context.xml2
-rw-r--r--greenpages/greenpages.web/template.mf6
-rw-r--r--greenpages/pom.xml2
47 files changed, 78 insertions, 18 deletions
diff --git a/greenpages/greenpages.db/pom.xml b/greenpages/greenpages.db/pom.xml
index 8d06261..3c60b29 100644
--- a/greenpages/greenpages.db/pom.xml
+++ b/greenpages/greenpages.db/pom.xml
@@ -46,6 +46,11 @@
<groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.weaver</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.instrument</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project> \ No newline at end of file
diff --git a/greenpages/greenpages.jpa/pom.xml b/greenpages/greenpages.jpa/pom.xml
index b3dbbe6..7837984 100644
--- a/greenpages/greenpages.jpa/pom.xml
+++ b/greenpages/greenpages.jpa/pom.xml
@@ -26,6 +26,7 @@
<groupId>org.springframework</groupId>
<artifactId>org.springframework.spring-library</artifactId>
<type>libd</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
@@ -58,11 +59,26 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.instrument</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.aspects</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>com.springsource.org.h2</artifactId>
<scope>test</scope>
diff --git a/greenpages/greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml b/greenpages/greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml
index beb679a..bc0e415 100644
--- a/greenpages/greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml
+++ b/greenpages/greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml
@@ -11,7 +11,7 @@
<bean class="greenpages.jpa.TestDataPopulator" init-method="populate">
<constructor-arg ref="dataSource"/>
- <constructor-arg value="file:../../db/db.sql"/>
+ <constructor-arg value="file:../db/db.sql"/>
</bean>
</beans>
diff --git a/greenpages/greenpages/.classpath b/greenpages/greenpages.par/.classpath
index 464509f..464509f 100644
--- a/greenpages/greenpages/.classpath
+++ b/greenpages/greenpages.par/.classpath
diff --git a/greenpages/greenpages/.project b/greenpages/greenpages.par/.project
index 35c8920..35c8920 100644
--- a/greenpages/greenpages/.project
+++ b/greenpages/greenpages.par/.project
diff --git a/greenpages/greenpages/.settings/org.eclipse.jdt.core.prefs b/greenpages/greenpages.par/.settings/org.eclipse.jdt.core.prefs
index 6119722..6119722 100644
--- a/greenpages/greenpages/.settings/org.eclipse.jdt.core.prefs
+++ b/greenpages/greenpages.par/.settings/org.eclipse.jdt.core.prefs
diff --git a/greenpages/greenpages/.settings/org.eclipse.m2e.core.prefs b/greenpages/greenpages.par/.settings/org.eclipse.m2e.core.prefs
index f3d930c..f3d930c 100644
--- a/greenpages/greenpages/.settings/org.eclipse.m2e.core.prefs
+++ b/greenpages/greenpages.par/.settings/org.eclipse.m2e.core.prefs
diff --git a/greenpages/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml b/greenpages/greenpages.par/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
index 63b3898..63b3898 100644
--- a/greenpages/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
+++ b/greenpages/greenpages.par/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
diff --git a/greenpages/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml b/greenpages/greenpages.par/.settings/org.eclipse.wst.common.project.facet.core.xml
index 4dfacf4..4dfacf4 100644
--- a/greenpages/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/greenpages/greenpages.par/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/greenpages/greenpages/.settings/org.maven.ide.eclipse.prefs b/greenpages/greenpages.par/.settings/org.maven.ide.eclipse.prefs
index 97f7bba..97f7bba 100644
--- a/greenpages/greenpages/.settings/org.maven.ide.eclipse.prefs
+++ b/greenpages/greenpages.par/.settings/org.maven.ide.eclipse.prefs
diff --git a/greenpages/greenpages/META-INF/MANIFEST.MF b/greenpages/greenpages.par/META-INF/MANIFEST.MF
index db1a5d7..db1a5d7 100644
--- a/greenpages/greenpages/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.par/META-INF/MANIFEST.MF
diff --git a/greenpages/greenpages/com.springsource.org.h2-1.0.71.jar b/greenpages/greenpages.par/com.springsource.org.h2-1.0.71.jar
index 41dc982..41dc982 100644
--- a/greenpages/greenpages/com.springsource.org.h2-1.0.71.jar
+++ b/greenpages/greenpages.par/com.springsource.org.h2-1.0.71.jar
Binary files differ
diff --git a/greenpages/greenpages/pom.xml b/greenpages/greenpages.par/pom.xml
index c9dce99..86780a2 100644
--- a/greenpages/greenpages/pom.xml
+++ b/greenpages/greenpages.par/pom.xml
@@ -12,7 +12,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>greenpages</artifactId>
+ <artifactId>greenpages.par</artifactId>
<name>greenpages.par</name>
<description>GreenPages PAR</description>
<packaging>par</packaging>
diff --git a/greenpages/greenpages/src/main/resources/.gitignore b/greenpages/greenpages.par/src/main/resources/.gitignore
index e69de29..e69de29 100644
--- a/greenpages/greenpages/src/main/resources/.gitignore
+++ b/greenpages/greenpages.par/src/main/resources/.gitignore
diff --git a/greenpages/greenpages/template.mf b/greenpages/greenpages.par/template.mf
index ac59b66..ac59b66 100644
--- a/greenpages/greenpages/template.mf
+++ b/greenpages/greenpages.par/template.mf
diff --git a/greenpages/greenpages.parent/pom.xml b/greenpages/greenpages.parent/pom.xml
index 7d487f6..a4c9fb8 100644
--- a/greenpages/greenpages.parent/pom.xml
+++ b/greenpages/greenpages.parent/pom.xml
@@ -80,12 +80,30 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.test</artifactId>
<version>3.1.0.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.aspects</artifactId>
+ <version>3.1.0.RELEASE</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.instrument</artifactId>
+ <version>3.1.0.RELEASE</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet</artifactId>
<version>3.0.0.v201103241009</version>
@@ -139,7 +157,7 @@
</repositories>
<properties>
- <maven.test.failure.ignore>true</maven.test.failure.ignore>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<pluginRepositories>
@@ -174,10 +192,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.0</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
@@ -195,7 +213,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
+ <version>2.13</version>
<configuration>
<includes>
<include>**/*Tests.java</include>
@@ -204,6 +222,7 @@
<exclude>**/Abstract*.java</exclude>
</excludes>
<junitArtifactName>org.junit:com.springsource.org.junit</junitArtifactName>
+ <argLine>-javaagent:${user.home}/.m2/repository/org/springframework/org.springframework.instrument/3.1.0.RELEASE/org.springframework.instrument-3.1.0.RELEASE.jar</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/greenpages/greenpages.web/pom.xml b/greenpages/greenpages.web/pom.xml
index 2915cb8..31a6552 100644
--- a/greenpages/greenpages.web/pom.xml
+++ b/greenpages/greenpages.web/pom.xml
@@ -39,6 +39,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>com.springsource.javax.persistence</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.jpa</artifactId>
<version>${project.version}</version>
@@ -55,16 +60,31 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.aspects</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>com.springsource.org.h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.instrument</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.weaver</artifactId>
<scope>test</scope>
diff --git a/greenpages/greenpages.web/src/main/resources/WEB-INF/applicationContext.xml b/greenpages/greenpages.web/src/main/webapp/WEB-INF/applicationContext.xml
index 36b743e..36b743e 100644
--- a/greenpages/greenpages.web/src/main/resources/WEB-INF/applicationContext.xml
+++ b/greenpages/greenpages.web/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/greenpages/greenpages.web/src/main/resources/WEB-INF/ftl/entry.ftl b/greenpages/greenpages.web/src/main/webapp/WEB-INF/ftl/entry.ftl
index 504e6ec..504e6ec 100644
--- a/greenpages/greenpages.web/src/main/resources/WEB-INF/ftl/entry.ftl
+++ b/greenpages/greenpages.web/src/main/webapp/WEB-INF/ftl/entry.ftl
diff --git a/greenpages/greenpages.web/src/main/resources/WEB-INF/ftl/home.ftl b/greenpages/greenpages.web/src/main/webapp/WEB-INF/ftl/home.ftl
index bec4830..bec4830 100644
--- a/greenpages/greenpages.web/src/main/resources/WEB-INF/ftl/home.ftl
+++ b/greenpages/greenpages.web/src/main/webapp/WEB-INF/ftl/home.ftl
diff --git a/greenpages/greenpages.web/src/main/resources/WEB-INF/ftl/search.ftl b/greenpages/greenpages.web/src/main/webapp/WEB-INF/ftl/search.ftl
index f116e48..f116e48 100644
--- a/greenpages/greenpages.web/src/main/resources/WEB-INF/ftl/search.ftl
+++ b/greenpages/greenpages.web/src/main/webapp/WEB-INF/ftl/search.ftl
diff --git a/greenpages/greenpages.web/src/main/resources/WEB-INF/greenpages-servlet.xml b/greenpages/greenpages.web/src/main/webapp/WEB-INF/greenpages-servlet.xml
index 61d2256..61d2256 100644
--- a/greenpages/greenpages.web/src/main/resources/WEB-INF/greenpages-servlet.xml
+++ b/greenpages/greenpages.web/src/main/webapp/WEB-INF/greenpages-servlet.xml
diff --git a/greenpages/greenpages.web/src/main/resources/WEB-INF/web.xml b/greenpages/greenpages.web/src/main/webapp/WEB-INF/web.xml
index f5a6641..f5a6641 100644
--- a/greenpages/greenpages.web/src/main/resources/WEB-INF/web.xml
+++ b/greenpages/greenpages.web/src/main/webapp/WEB-INF/web.xml
diff --git a/greenpages/greenpages.web/src/main/resources/images/favicon.ico b/greenpages/greenpages.web/src/main/webapp/images/favicon.ico
index 9244a9c..9244a9c 100755
--- a/greenpages/greenpages.web/src/main/resources/images/favicon.ico
+++ b/greenpages/greenpages.web/src/main/webapp/images/favicon.ico
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/footer-left.png b/greenpages/greenpages.web/src/main/webapp/images/footer-left.png
index 8bfe3b1..8bfe3b1 100644
--- a/greenpages/greenpages.web/src/main/resources/images/footer-left.png
+++ b/greenpages/greenpages.web/src/main/webapp/images/footer-left.png
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/footer-right.png b/greenpages/greenpages.web/src/main/webapp/images/footer-right.png
index 51527ad..51527ad 100644
--- a/greenpages/greenpages.web/src/main/resources/images/footer-right.png
+++ b/greenpages/greenpages.web/src/main/webapp/images/footer-right.png
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/footer-stretch.png b/greenpages/greenpages.web/src/main/webapp/images/footer-stretch.png
index c58f721..c58f721 100644
--- a/greenpages/greenpages.web/src/main/resources/images/footer-stretch.png
+++ b/greenpages/greenpages.web/src/main/webapp/images/footer-stretch.png
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/header-left.png b/greenpages/greenpages.web/src/main/webapp/images/header-left.png
index 4920a0a..4920a0a 100644
--- a/greenpages/greenpages.web/src/main/resources/images/header-left.png
+++ b/greenpages/greenpages.web/src/main/webapp/images/header-left.png
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/header-right.png b/greenpages/greenpages.web/src/main/webapp/images/header-right.png
index 09b0a59..09b0a59 100644
--- a/greenpages/greenpages.web/src/main/resources/images/header-right.png
+++ b/greenpages/greenpages.web/src/main/webapp/images/header-right.png
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/loader-white-large.gif b/greenpages/greenpages.web/src/main/webapp/images/loader-white-large.gif
index aa4ec5a..aa4ec5a 100644
--- a/greenpages/greenpages.web/src/main/resources/images/loader-white-large.gif
+++ b/greenpages/greenpages.web/src/main/webapp/images/loader-white-large.gif
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/loader-white-small.gif b/greenpages/greenpages.web/src/main/webapp/images/loader-white-small.gif
index 75ad2b3..75ad2b3 100644
--- a/greenpages/greenpages.web/src/main/resources/images/loader-white-small.gif
+++ b/greenpages/greenpages.web/src/main/webapp/images/loader-white-small.gif
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/menu-curve-left.png b/greenpages/greenpages.web/src/main/webapp/images/menu-curve-left.png
index c48a2e0..c48a2e0 100644
--- a/greenpages/greenpages.web/src/main/resources/images/menu-curve-left.png
+++ b/greenpages/greenpages.web/src/main/webapp/images/menu-curve-left.png
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/menu-curve-right.png b/greenpages/greenpages.web/src/main/webapp/images/menu-curve-right.png
index 1f3b100..1f3b100 100644
--- a/greenpages/greenpages.web/src/main/resources/images/menu-curve-right.png
+++ b/greenpages/greenpages.web/src/main/webapp/images/menu-curve-right.png
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/menu-stretch.png b/greenpages/greenpages.web/src/main/webapp/images/menu-stretch.png
index 0ca66f7..0ca66f7 100644
--- a/greenpages/greenpages.web/src/main/resources/images/menu-stretch.png
+++ b/greenpages/greenpages.web/src/main/webapp/images/menu-stretch.png
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/mini-header-left.png b/greenpages/greenpages.web/src/main/webapp/images/mini-header-left.png
index 72551e7..72551e7 100644
--- a/greenpages/greenpages.web/src/main/resources/images/mini-header-left.png
+++ b/greenpages/greenpages.web/src/main/webapp/images/mini-header-left.png
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/mini-header-right.png b/greenpages/greenpages.web/src/main/webapp/images/mini-header-right.png
index 8aaf50c..8aaf50c 100644
--- a/greenpages/greenpages.web/src/main/resources/images/mini-header-right.png
+++ b/greenpages/greenpages.web/src/main/webapp/images/mini-header-right.png
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/s2ap_soda_can.png b/greenpages/greenpages.web/src/main/webapp/images/s2ap_soda_can.png
index 8eb53a8..8eb53a8 100644
--- a/greenpages/greenpages.web/src/main/resources/images/s2ap_soda_can.png
+++ b/greenpages/greenpages.web/src/main/webapp/images/s2ap_soda_can.png
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/spring.png b/greenpages/greenpages.web/src/main/webapp/images/spring.png
index 05a1940..05a1940 100644
--- a/greenpages/greenpages.web/src/main/resources/images/spring.png
+++ b/greenpages/greenpages.web/src/main/webapp/images/spring.png
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/images/table-header-background.png b/greenpages/greenpages.web/src/main/webapp/images/table-header-background.png
index 8f2ba1b..8f2ba1b 100644
--- a/greenpages/greenpages.web/src/main/resources/images/table-header-background.png
+++ b/greenpages/greenpages.web/src/main/webapp/images/table-header-background.png
Binary files differ
diff --git a/greenpages/greenpages.web/src/main/resources/index.html b/greenpages/greenpages.web/src/main/webapp/index.html
index a541368..a541368 100644
--- a/greenpages/greenpages.web/src/main/resources/index.html
+++ b/greenpages/greenpages.web/src/main/webapp/index.html
diff --git a/greenpages/greenpages.web/src/main/resources/styles/local.css b/greenpages/greenpages.web/src/main/webapp/styles/local.css
index 8302e89..8302e89 100644
--- a/greenpages/greenpages.web/src/main/resources/styles/local.css
+++ b/greenpages/greenpages.web/src/main/webapp/styles/local.css
diff --git a/greenpages/greenpages.web/src/main/resources/styles/main.css b/greenpages/greenpages.web/src/main/webapp/styles/main.css
index 8eac83a..8eac83a 100644
--- a/greenpages/greenpages.web/src/main/resources/styles/main.css
+++ b/greenpages/greenpages.web/src/main/webapp/styles/main.css
diff --git a/greenpages/greenpages.web/src/main/resources/styles/print.css b/greenpages/greenpages.web/src/main/webapp/styles/print.css
index f325cfc..f325cfc 100644
--- a/greenpages/greenpages.web/src/main/resources/styles/print.css
+++ b/greenpages/greenpages.web/src/main/webapp/styles/print.css
diff --git a/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF
index fefa2cf..ef528b9 100644
--- a/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF
@@ -4,17 +4,17 @@ Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
Bundle-ClassPath: .,WEB-INF/classes
Bundle-Version: 3.0.0
Tool: Bundlor 1.1.2.RELEASE
-Import-Library: org.springframework.spring;version="[3.0, 3.5)"
+Import-Library: org.springframework.spring;version="[3.1, 3.5)"
Bundle-Name: GreenPages Web
Bundle-ManifestVersion: 2
Import-Package: freemarker.cache;version="[2.3.18,2.3.18]",greenpages;
version="[3.0, 4.0)",javax.servlet;version="[3.0.0, 3.1.0)",javax.ser
vlet.jsp.jstl.core;version="[1.2.0, 2.0.0)",javax.sql,org.apache.comm
- ons.dbcp,org.eclipse.virgo.web.dm;version="[3.0.0, 4.0.0)",org.spring
- framework.beans.factory.annotation;version="[3.0, 3.5)",org.springfra
- mework.core.io;version="[3.0, 3.5)",org.springframework.stereotype;ve
- rsion="[3.0, 3.5)",org.springframework.web.bind.annotation;version="[
- 3.0, 3.5)"
+ ons.dbcp,org.eclipse.virgo.web.dm;version="[3.6.0, 4.0.0)",org.spring
+ framework.beans.factory.annotation;version="[3.1, 3.5)",org.springfra
+ mework.core.io;version="[3.1, 3.5)",org.springframework.stereotype;ve
+ rsion="[3.1, 3.5)",org.springframework.web.bind.annotation;version="[
+ 3.1, 3.5)"
Bundle-SymbolicName: greenpages.web
Web-ContextPath: greenpages
diff --git a/greenpages/greenpages.web/src/test/resources/META-INF/spring/test-context.xml b/greenpages/greenpages.web/src/test/resources/META-INF/spring/test-context.xml
index c1d14b4..a0d7cbf 100644
--- a/greenpages/greenpages.web/src/test/resources/META-INF/spring/test-context.xml
+++ b/greenpages/greenpages.web/src/test/resources/META-INF/spring/test-context.xml
@@ -11,7 +11,7 @@
<bean class="greenpages.web.TestDataPopulator" init-method="populate">
<constructor-arg ref="dataSource"/>
- <constructor-arg value="file:../../db/db.sql"/>
+ <constructor-arg value="file:../db/db.sql"/>
</bean>
</beans>
diff --git a/greenpages/greenpages.web/template.mf b/greenpages/greenpages.web/template.mf
index 3369ed7..a5019ea 100644
--- a/greenpages/greenpages.web/template.mf
+++ b/greenpages/greenpages.web/template.mf
@@ -6,17 +6,17 @@ Bundle-Version: 3.0.0
Bundle-ClassPath: .,WEB-INF/classes
Web-ContextPath: greenpages
Import-Template:
- org.springframework.*;version="[3.0, 3.5)",
+ org.springframework.*;version="[3.1, 3.5)",
greenpages.*;version="[3.0, 4.0)"
Import-Package:
javax.servlet.jsp.jstl.core;version="[1.2.0, 2.0.0)",
javax.servlet;version="[3.0.0, 3.1.0)",
- org.eclipse.virgo.web.dm;version="[3.0.0, 4.0.0)",
+ org.eclipse.virgo.web.dm;version="[3.6.0, 4.0.0)",
freemarker.cache;version="[2.3.18,2.3.18]"
Import-Bundle:
com.springsource.org.apache.taglibs.standard;version="[1.1.2,2.0)"
Import-Library:
- org.springframework.spring;version="[3.0, 3.5)"
+ org.springframework.spring;version="[3.1, 3.5)"
Excluded-Exports:
greenpages.tests,
greenpages.web,
diff --git a/greenpages/pom.xml b/greenpages/pom.xml
index fe1bb76..d2d5b51 100644
--- a/greenpages/pom.xml
+++ b/greenpages/pom.xml
@@ -16,6 +16,6 @@
<module>greenpages.core</module>
<module>greenpages.jpa</module>
<module>greenpages.web</module>
- <module>greenpages</module>
+ <module>greenpages.par</module>
</modules>
</project>

Back to the top