Adds missing Tapestry changes

joshlong-attic · Apr 29, 2010 · 9cf2d5f · 9cf2d5f
1 parent 576ced4
commit 9cf2d5f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/projects/spring-modules-tapestry/pom.xml b/projects/spring-modules-tapestry/pom.xml
@@ -4,15 +4,29 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springmodules</groupId>
     <artifactId>spring-modules-tapestry</artifactId>
-    <version>0.9</version>
+    <version>${parent.version}</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.springmodules</groupId>
         <artifactId>spring-modules</artifactId>
-        <version>0.9</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
 
+  	<build>
+  		<plugins>
+  			<plugin>
+  				<groupId>org.apache.maven.plugins</groupId>
+  				<artifactId>maven-surefire-plugin</artifactId>
+  				<configuration>
+  					<excludes>
+  					  <exclude>org/springmodules/web/tapestry/SpringTapestryIntegrationTests.java</exclude>
+  					</excludes>
+  				</configuration>
+  			</plugin>
+  		</plugins>
+  	</build>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.hivemind</groupId>
@@ -35,5 +49,16 @@
             <version>2.4</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+        	<groupId>org.springframework</groupId>
+        	<artifactId>spring-mock</artifactId>
+        	<version>2.0.3</version>
+        	<scope>test</scope>
+        </dependency>
+        <dependency>
+        	<groupId>org.springframework</groupId>
+        	<artifactId>spring-web</artifactId>
+        	<version>2.0.3</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...tapestry/src/test/java/org/springmodules/web/tapestry/SpringTapestryIntegrationTests.java b/...tapestry/src/test/java/org/springmodules/web/tapestry/SpringTapestryIntegrationTests.java
@@ -34,4 +34,4 @@ public void testSpringIntegration() throws Exception {
         assertNotNull(name);
         assertEquals("Steven Devijver", name);
     }
-}
+}
diff --git a/projects/spring-modules-tapestry/src/test/resources/log4j.properties b/projects/spring-modules-tapestry/src/test/resources/log4j.properties
@@ -1,16 +1,12 @@
-log4j.rootCategory=WARN, stdout, logfile
+log4j.rootCategory=WARN, stdout
 
 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=${@PROJECT_NAME@.root}/@PROJECT_NAME@.log
-log4j.appender.logfile.MaxFileSize=512KB
-
 # Keep three backup files
 log4j.appender.logfile.MaxBackupIndex=3
 log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
 
 #Pattern to output : date priority [category] - <message>line_separator
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n
+log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n