- Revision
- 343
- Author
- mauro
- Date
- 2007-11-11 04:45:54 -0600 (Sun, 11 Nov 2007)
Log Message
Moved Abstract*RegistrarTestCase classes to waffle-mock extension. jMock and JUnit are now by default test-scoped and only compile-scoped in waffle-mock.
Modified Paths
- trunk/examples/freemarker-example/src/test/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrarTest.java
- trunk/examples/paranamer-example/src/test/java/org/codehaus/waffle/example/paranamer/ParanamerRegistrarTest.java
- trunk/examples/simple-example/src/test/java/org/codehaus/waffle/example/simple/SimpleRegistrarTest.java
- trunk/extensions/mock/pom.xml
- trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractRegistrarMockery.java
- trunk/pom.xml
Added Paths
- trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractPicoRegistrarTestCase.java
- trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractRegistrarTestCase.java
Removed Paths
Diff
Deleted: trunk/core/src/main/java/org/codehaus/waffle/registrar/mock/AbstractPicoRegistrarTestCase.java (342 => 343)
--- trunk/core/src/main/java/org/codehaus/waffle/registrar/mock/AbstractPicoRegistrarTestCase.java 2007-11-06 23:53:47 UTC (rev 342) +++ trunk/core/src/main/java/org/codehaus/waffle/registrar/mock/AbstractPicoRegistrarTestCase.java 2007-11-11 10:45:54 UTC (rev 343) @@ -1,23 +0,0 @@ -package org.codehaus.waffle.registrar.mock; - -import org.picocontainer.MutablePicoContainer; - -import org.codehaus.waffle.context.ContextContainer; -import org.codehaus.waffle.context.pico.PicoContextContainer; -import org.codehaus.waffle.registrar.Registrar; -import org.codehaus.waffle.registrar.pico.PicoRegistrar; - -/** - * Abstract TestCase that uses PicoContainer as the ContextContainer - * @author Mauro Talevi - */ -public abstract class AbstractPicoRegistrarTestCase extends AbstractRegistrarTestCase { - - protected ContextContainer createContextContainer() { - return new PicoContextContainer(); - } - - protected Registrar createRegistrar(ContextContainer container) { - return new PicoRegistrar((MutablePicoContainer) container.getDelegate()); - } -}
Deleted: trunk/core/src/main/java/org/codehaus/waffle/registrar/mock/AbstractRegistrarTestCase.java (342 => 343)
--- trunk/core/src/main/java/org/codehaus/waffle/registrar/mock/AbstractRegistrarTestCase.java 2007-11-06 23:53:47 UTC (rev 342) +++ trunk/core/src/main/java/org/codehaus/waffle/registrar/mock/AbstractRegistrarTestCase.java 2007-11-11 10:45:54 UTC (rev 343) @@ -1,125 +0,0 @@ -/***************************************************************************** - * Copyright (C) 2005,2006 Michael Ward * - * All rights reserved. * - * ------------------------------------------------------------------------- * - * The software in this package is published under the terms of the BSD * - * style license a copy of which has been included with this distribution in * - * the LICENSE.txt file. * - * * - * Original code by: Michael Ward * - *****************************************************************************/ -package org.codehaus.waffle.registrar.mock; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import org.jmock.Mock; -import org.jmock.MockObjectTestCase; - -import org.codehaus.waffle.context.ContextContainer; -import org.codehaus.waffle.context.ContextLevel; -import org.codehaus.waffle.i18n.MessageResources; -import org.codehaus.waffle.registrar.Registrar; -import org.codehaus.waffle.registrar.RegistrarAssistant; - -/** - * Built-in test for asserting Registrars are defined correctly. - * Concrete subclasses need to define method to create the ContextContainer - * and the Registrar. - * - * @author Michael Ward - * @author Mauro Talevi - */ -public abstract class AbstractRegistrarTestCase extends MockObjectTestCase { - private Mock mockServletContext = mock(ServletContext.class); - private Mock mockHttpSession = mock(HttpSession.class); - private Mock mockHttpServletRequest = mock(HttpServletRequest.class); - private Mock mockHttpServletResponse = mock(HttpServletResponse.class); - private Mock mockMessageResources = mock(MessageResources.class); - - public Mock getMockServletContext() { - return mockServletContext; - } - - public Mock getMockHttpSession() { - return mockHttpSession; - } - - public Mock getMockHttpServletRequest() { - return mockHttpServletRequest; - } - - public Mock getMockHttpServletResponse() { - return mockHttpServletResponse; - } - - public void setMockHttpServletResponse(Mock mockHttpServletResponse) { - this.mockHttpServletResponse = mockHttpServletResponse; - } - - public void assertConfiguration(Class<?> registrarClass) { - assertApplicationContext(registrarClass); - assertSessionContext(registrarClass); - assertRequestContext(registrarClass); - } - - public void assertApplicationContext(Class<?> customRegistrarClass) { - ServletContext servletContext = (ServletContext) mockServletContext.proxy(); - - ContextContainer container = createContextContainer(); - container.registerComponentInstance(servletContext); - container.registerComponentInstance(mockMessageResources.proxy()); - Registrar registrar = createRegistrar(container); - - RegistrarAssistant registrarAssistant = new RegistrarAssistant(customRegistrarClass); - registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.APPLICATION); - - container.validateComponentInstances(); // ensure dependencies are satisfied - } - - public void assertSessionContext(Class<?> customRegistrarClass) { - ServletContext servletContext = (ServletContext) mockServletContext.proxy(); - HttpSession httpSession = (HttpSession) mockHttpSession.proxy(); - - ContextContainer container = createContextContainer(); - container.registerComponentInstance(servletContext); - container.registerComponentInstance(httpSession); - container.registerComponentInstance(mockMessageResources.proxy()); - Registrar registrar = createRegistrar(container); - - RegistrarAssistant registrarAssistant = new RegistrarAssistant(customRegistrarClass); - registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.APPLICATION); - registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.SESSION); - - container.validateComponentInstances(); // ensure dependencies are satisfied - } - - public void assertRequestContext(Class<?> customRegistrarClass) { - ServletContext servletContext = (ServletContext) mockServletContext.proxy(); - HttpSession httpSession = (HttpSession) mockHttpSession.proxy(); - HttpServletRequest request = (HttpServletRequest) mockHttpServletRequest.proxy(); - HttpServletResponse response = (HttpServletResponse) mockHttpServletResponse.proxy(); - - ContextContainer container = createContextContainer(); - container.registerComponentInstance(servletContext); - container.registerComponentInstance(httpSession); - container.registerComponentInstance(request); - container.registerComponentInstance(response); - container.registerComponentInstance(mockMessageResources.proxy()); - Registrar registrar = createRegistrar(container); - - RegistrarAssistant registrarAssistant = new RegistrarAssistant(customRegistrarClass); - registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.APPLICATION); - registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.SESSION); - registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.REQUEST); - - container.validateComponentInstances(); // ensure dependencies are satisfied - } - - protected abstract ContextContainer createContextContainer(); - - protected abstract Registrar createRegistrar(ContextContainer container); - -}
Modified: trunk/examples/freemarker-example/src/test/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrarTest.java (342 => 343)
--- trunk/examples/freemarker-example/src/test/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrarTest.java 2007-11-06 23:53:47 UTC (rev 342) +++ trunk/examples/freemarker-example/src/test/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrarTest.java 2007-11-11 10:45:54 UTC (rev 343) @@ -1,15 +1,12 @@ package org.codehaus.waffle.example.freemarker; import org.codehaus.waffle.mock.PicoRegistrarMockery; -import org.codehaus.waffle.registrar.mock.AbstractPicoRegistrarTestCase; +import org.junit.Test; -public class FreemarkerRegistrarTest extends AbstractPicoRegistrarTestCase { +public class FreemarkerRegistrarTest { - public void testConfiguration() { - assertConfiguration(FreemarkerRegistrar.class); - } - - public void testConfigurationWithMockery() { + @Test + public void canAssertConfiguration() { PicoRegistrarMockery mockery = new PicoRegistrarMockery(); mockery.assertConfiguration(FreemarkerRegistrar.class); }
Modified: trunk/examples/paranamer-example/src/test/java/org/codehaus/waffle/example/paranamer/ParanamerRegistrarTest.java (342 => 343)
--- trunk/examples/paranamer-example/src/test/java/org/codehaus/waffle/example/paranamer/ParanamerRegistrarTest.java 2007-11-06 23:53:47 UTC (rev 342) +++ trunk/examples/paranamer-example/src/test/java/org/codehaus/waffle/example/paranamer/ParanamerRegistrarTest.java 2007-11-11 10:45:54 UTC (rev 343) @@ -1,15 +1,12 @@ package org.codehaus.waffle.example.paranamer; import org.codehaus.waffle.mock.PicoRegistrarMockery; -import org.codehaus.waffle.registrar.mock.AbstractPicoRegistrarTestCase; +import org.junit.Test; -public class ParanamerRegistrarTest extends AbstractPicoRegistrarTestCase { +public class ParanamerRegistrarTest { - public void testConfiguration() { - assertConfiguration(ParanamerRegistrar.class); - } - - public void testConfigurationWithMockery() { + @Test + public void canAssertConfiguration() { PicoRegistrarMockery mockery = new PicoRegistrarMockery(); mockery.assertConfiguration(ParanamerRegistrar.class); }
Modified: trunk/examples/simple-example/src/test/java/org/codehaus/waffle/example/simple/SimpleRegistrarTest.java (342 => 343)
--- trunk/examples/simple-example/src/test/java/org/codehaus/waffle/example/simple/SimpleRegistrarTest.java 2007-11-06 23:53:47 UTC (rev 342) +++ trunk/examples/simple-example/src/test/java/org/codehaus/waffle/example/simple/SimpleRegistrarTest.java 2007-11-11 10:45:54 UTC (rev 343) @@ -1,15 +1,12 @@ package org.codehaus.waffle.example.simple; import org.codehaus.waffle.mock.PicoRegistrarMockery; -import org.codehaus.waffle.registrar.mock.AbstractPicoRegistrarTestCase; +import org.junit.Test; -public class SimpleRegistrarTest extends AbstractPicoRegistrarTestCase { +public class SimpleRegistrarTest { - public void testConfiguration() { - assertConfiguration(SimpleRegistrar.class); - } - - public void testConfigurationWithMockery() { + @Test + public void canAssertConfiguration() { PicoRegistrarMockery mockery = new PicoRegistrarMockery(); mockery.assertConfiguration(SimpleRegistrar.class); }
Modified: trunk/extensions/mock/pom.xml (342 => 343)
--- trunk/extensions/mock/pom.xml 2007-11-06 23:53:47 UTC (rev 342) +++ trunk/extensions/mock/pom.xml 2007-11-11 10:45:54 UTC (rev 343) @@ -1,30 +1,41 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.codehaus.waffle</groupId> - <artifactId>waffle-parent</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - <packaging>jar</packaging> - <artifactId>waffle-mock</artifactId> - <name>Waffle Mock</name> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.codehaus.waffle</groupId> + <artifactId>waffle-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + <packaging>jar</packaging> + <artifactId>waffle-mock</artifactId> + <name>Waffle Mock</name> - <dependencies> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>waffle</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>waffle</artifactId> + <version>${pom.version}</version> + </dependency> + <dependency> + <groupId>jmock</groupId> + <artifactId>jmock</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock-junit4</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + </dependencies> </project>
Copied: trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractPicoRegistrarTestCase.java (from rev 342, trunk/core/src/main/java/org/codehaus/waffle/registrar/mock/AbstractPicoRegistrarTestCase.java) (0 => 343)
--- trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractPicoRegistrarTestCase.java (rev 0) +++ trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractPicoRegistrarTestCase.java 2007-11-11 10:45:54 UTC (rev 343) @@ -0,0 +1,24 @@ +package org.codehaus.waffle.mock; + +import org.picocontainer.MutablePicoContainer; + +import org.codehaus.waffle.context.ContextContainer; +import org.codehaus.waffle.context.pico.PicoContextContainer; +import org.codehaus.waffle.registrar.Registrar; +import org.codehaus.waffle.registrar.pico.PicoRegistrar; + +/** + * Abstract TestCase that uses PicoContainer as the ContextContainer + * + * @author Mauro Talevi + */ +public abstract class AbstractPicoRegistrarTestCase extends AbstractRegistrarTestCase { + + protected ContextContainer createContextContainer() { + return new PicoContextContainer(); + } + + protected Registrar createRegistrar(ContextContainer container) { + return new PicoRegistrar((MutablePicoContainer) container.getDelegate()); + } +}
Modified: trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractRegistrarMockery.java (342 => 343)
--- trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractRegistrarMockery.java 2007-11-06 23:53:47 UTC (rev 342) +++ trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractRegistrarMockery.java 2007-11-11 10:45:54 UTC (rev 343) @@ -23,7 +23,7 @@ import org.jmock.Mockery; /** - * Abstract Mockery for asserting Registrars are defined correctly. + * Abstract jMock 2.x Mockery for asserting Registrars are defined correctly. * Concrete subclasses need to define method to create the ContextContainer * and the Registrar. *
Copied: trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractRegistrarTestCase.java (from rev 342, trunk/core/src/main/java/org/codehaus/waffle/registrar/mock/AbstractRegistrarTestCase.java) (0 => 343)
--- trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractRegistrarTestCase.java (rev 0) +++ trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractRegistrarTestCase.java 2007-11-11 10:45:54 UTC (rev 343) @@ -0,0 +1,124 @@ +/***************************************************************************** + * Copyright (C) 2005,2006 Michael Ward * + * All rights reserved. * + * ------------------------------------------------------------------------- * + * The software in this package is published under the terms of the BSD * + * style license a copy of which has been included with this distribution in * + * the LICENSE.txt file. * + * * + * Original code by: Michael Ward * + *****************************************************************************/ +package org.codehaus.waffle.mock; + +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.jmock.Mock; +import org.jmock.MockObjectTestCase; + +import org.codehaus.waffle.context.ContextContainer; +import org.codehaus.waffle.context.ContextLevel; +import org.codehaus.waffle.i18n.MessageResources; +import org.codehaus.waffle.registrar.Registrar; +import org.codehaus.waffle.registrar.RegistrarAssistant; + +/** + * Abstract jMock 1.x MockObjectTestCase used for asserting Registrars are defined correctly. + * Concrete subclasses need to define method to create the ContextContainer and the Registrar. + * + * @author Michael Ward + * @author Mauro Talevi + */ +public abstract class AbstractRegistrarTestCase extends MockObjectTestCase { + private Mock mockServletContext = mock(ServletContext.class); + private Mock mockHttpSession = mock(HttpSession.class); + private Mock mockHttpServletRequest = mock(HttpServletRequest.class); + private Mock mockHttpServletResponse = mock(HttpServletResponse.class); + private Mock mockMessageResources = mock(MessageResources.class); + + public Mock getMockServletContext() { + return mockServletContext; + } + + public Mock getMockHttpSession() { + return mockHttpSession; + } + + public Mock getMockHttpServletRequest() { + return mockHttpServletRequest; + } + + public Mock getMockHttpServletResponse() { + return mockHttpServletResponse; + } + + public void setMockHttpServletResponse(Mock mockHttpServletResponse) { + this.mockHttpServletResponse = mockHttpServletResponse; + } + + public void assertConfiguration(Class<?> registrarClass) { + assertApplicationContext(registrarClass); + assertSessionContext(registrarClass); + assertRequestContext(registrarClass); + } + + public void assertApplicationContext(Class<?> customRegistrarClass) { + ServletContext servletContext = (ServletContext) mockServletContext.proxy(); + + ContextContainer container = createContextContainer(); + container.registerComponentInstance(servletContext); + container.registerComponentInstance(mockMessageResources.proxy()); + Registrar registrar = createRegistrar(container); + + RegistrarAssistant registrarAssistant = new RegistrarAssistant(customRegistrarClass); + registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.APPLICATION); + + container.validateComponentInstances(); // ensure dependencies are satisfied + } + + public void assertSessionContext(Class<?> customRegistrarClass) { + ServletContext servletContext = (ServletContext) mockServletContext.proxy(); + HttpSession httpSession = (HttpSession) mockHttpSession.proxy(); + + ContextContainer container = createContextContainer(); + container.registerComponentInstance(servletContext); + container.registerComponentInstance(httpSession); + container.registerComponentInstance(mockMessageResources.proxy()); + Registrar registrar = createRegistrar(container); + + RegistrarAssistant registrarAssistant = new RegistrarAssistant(customRegistrarClass); + registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.APPLICATION); + registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.SESSION); + + container.validateComponentInstances(); // ensure dependencies are satisfied + } + + public void assertRequestContext(Class<?> customRegistrarClass) { + ServletContext servletContext = (ServletContext) mockServletContext.proxy(); + HttpSession httpSession = (HttpSession) mockHttpSession.proxy(); + HttpServletRequest request = (HttpServletRequest) mockHttpServletRequest.proxy(); + HttpServletResponse response = (HttpServletResponse) mockHttpServletResponse.proxy(); + + ContextContainer container = createContextContainer(); + container.registerComponentInstance(servletContext); + container.registerComponentInstance(httpSession); + container.registerComponentInstance(request); + container.registerComponentInstance(response); + container.registerComponentInstance(mockMessageResources.proxy()); + Registrar registrar = createRegistrar(container); + + RegistrarAssistant registrarAssistant = new RegistrarAssistant(customRegistrarClass); + registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.APPLICATION); + registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.SESSION); + registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.REQUEST); + + container.validateComponentInstances(); // ensure dependencies are satisfied + } + + protected abstract ContextContainer createContextContainer(); + + protected abstract Registrar createRegistrar(ContextContainer container); + +}
Modified: trunk/pom.xml (342 => 343)
--- trunk/pom.xml 2007-11-06 23:53:47 UTC (rev 342) +++ trunk/pom.xml 2007-11-11 10:45:54 UTC (rev 343) @@ -1,4 +1,6 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.codehaus.waffle</groupId> <artifactId>waffle-parent</artifactId> @@ -6,8 +8,9 @@ <version>1.0-SNAPSHOT</version> <name>Waffle Parent</name> <description> - Waffle is a Java web framework that makes the process of developing Java based web applications easier. It was built - to support enterprise level web-based business applications. + Waffle is a Java web framework that makes the process of developing + Java based web applications easier. It was built to support + enterprise level web-based business applications. </description> <url>http://waffle.codehaus.org</url> @@ -75,24 +78,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>jmock</groupId> - <artifactId>jmock</artifactId> - <version>1.2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - <version>2.2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.3.1</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1</version> @@ -118,6 +103,24 @@ <version>1.2.14</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>jmock</groupId> + <artifactId>jmock</artifactId> + <version>1.2.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock-junit4</artifactId> + <version>2.2.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.3.1</version> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement> @@ -237,7 +240,7 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>rspec-maven-plugin</artifactId> <version>1.0-beta-1</version> - </plugin> + </plugin> <plugin> <groupId>org.codehaus.xsite</groupId> <artifactId>xsite-maven-plugin</artifactId> @@ -316,7 +319,9 @@ <!-- Tomcat profile: equivalent to -Dwebapp.deploy.dir=${env.TOMCAT_HOME}/webapps --> <id>tomcat</id> <properties> - <webapp.deploy.dir>${env.TOMCAT_HOME}/webapps</webapp.deploy.dir> + <webapp.deploy.dir> + ${env.TOMCAT_HOME}/webapps + </webapp.deploy.dir> </properties> </profile> <profile> @@ -330,7 +335,9 @@ <!-- Geronimo profile: equivalent to -Dwebapp.deploy.dir=${env.GERONIMO_HOME}/deploy --> <id>geronimo</id> <properties> - <webapp.deploy.dir>${env.GERONIMO_HOME}/deploy</webapp.deploy.dir> + <webapp.deploy.dir> + ${env.GERONIMO_HOME}/deploy + </webapp.deploy.dir> </properties> </profile> <profile> @@ -421,7 +428,9 @@ </developers> <scm> - <developerConnection>scm:svn:https://svn.codehaus.org/waffle</developerConnection> + <developerConnection> + scm:svn:https://svn.codehaus.org/waffle + </developerConnection> <url>http://svn.codehaus.org/waffle</url> </scm> @@ -437,7 +446,9 @@ <snapshotRepository> <id>codehaus.org</id> <name>Codehaus Waffle Snapshot Repository</name> - <url>dav:https://dav.codehaus.org/snapshots.repository/waffle/</url> + <url> + dav:https://dav.codehaus.org/snapshots.repository/waffle/ + </url> </snapshotRepository> <site> <id>codehaus.org</id>
To unsubscribe from this list please visit:
