Revision 53:ea0221651efe

View differences:

.hgignore
12 12
syntax: regexp
13 13
^logs$
14 14
syntax: regexp
15
^C:$
15
^C:$
16
syntax: regexp
17
^gfembed.*
18
syntax: regexp
19
^\.externalToolBuilders$
pom.xml
47 47
					<artifactId>maven-jetty-plugin</artifactId>
48 48
					<version>6.1.16</version>
49 49
					<configuration>
50
						<!-- <stopPort>8005</stopPort> -->
51 50
						<connectors>
52 51
							<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
53 52
								<port>9090</port>
......
60 59
						<jettyConfig>target/classes/jetty.xml</jettyConfig>
61 60
					</configuration>
62 61
				</plugin>
62
				<plugin>
63
					<groupId>org.glassfish</groupId>
64
					<artifactId>maven-embedded-glassfish-plugin</artifactId>
65
					<version>3.0</version>
66
					<configuration>
67
						<goalPrefix>embedded-glassfish</goalPrefix>
68
						<autoDelete>true</autoDelete>
69
						<port>9090</port>
70
					</configuration>
71
				</plugin>
63 72
			</plugins>
64 73
		</pluginManagement>
65 74
		<sourceDirectory>src</sourceDirectory>
......
110 119
								<copy file="resources/log4j${config.postfix}.xml" tofile="${project.build.outputDirectory}/log4j.xml" />
111 120

  
112 121
								<delete>
113
									<fileset dir="${project.build.outputDirectory}"
114
										includes="log4j.*.xml" />
122
									<fileset dir="${project.build.outputDirectory}" includes="log4j.*.xml" />
115 123
								</delete>
116 124
							</target>
117 125
						</configuration>
......
171 179
			</properties>
172 180
			<build>
173 181
				<plugins>
174
					<plugin>
182
<!--
183
 					<plugin>
175 184
						<groupId>org.mortbay.jetty</groupId>
176 185
						<artifactId>maven-jetty-plugin</artifactId>
177 186
						<configuration>
178 187
							<webAppSourceDirectory>${basedir}/WebContent</webAppSourceDirectory>
179 188
							<classesDirectory>${project.build.directory}/generated-classes/cobertura</classesDirectory>
180
							<!-- <webApp>${project.build.directory}/${project.artifactId}-instrument.${project.packaging}</webApp> -->
181 189
						</configuration>
182 190
						<executions>
183 191
							<execution>
......
204 212
								<groupId>net.sourceforge.cobertura</groupId>
205 213
								<artifactId>cobertura-runtime</artifactId>
206 214
								<version>${cobertura.version}</version>
215
								<scope>compile</scope>
216
								<type>pom</type>
217
							</dependency>
218
						</dependencies>
219
					</plugin>
220
 -->
221
					<plugin>
222
						<groupId>org.glassfish</groupId>
223
						<artifactId>maven-embedded-glassfish-plugin</artifactId>
224
						<configuration>
225
							<app>${project.build.directory}/${project.artifactId}-${project.version}-${m2u-upass-classifier}.war</app>
226
							<contextRoot>${project.artifactId}</contextRoot>
227
						</configuration>
228
						<executions>
229
							<execution>
230
								<id>start-glassfish</id>
231
								<phase>pre-integration-test</phase>
232
								<goals>
233
									<goal>start</goal>
234
								</goals>
235
							</execution>
236
							<execution>
237
								<id>glassfish-deploy</id>
238
								<phase>pre-integration-test</phase>
239
								<goals>
240
									<goal>deploy</goal>
241
								</goals>
242
							</execution>
243
							<execution>
244
								<id>glassfish-undeploy</id>
245
								<phase>post-integration-test</phase>
246
								<goals>
247
									<goal>undeploy</goal>
248
								</goals>
249
							</execution>
250
							<execution>
251
								<id>stop-glassfish</id>
252
								<phase>post-integration-test</phase>
253
								<goals>
254
									<goal>stop</goal>
255
								</goals>
256
							</execution>
257
						</executions>
258
						<dependencies>
259
							<dependency>
260
								<groupId>net.sourceforge.cobertura</groupId>
261
								<artifactId>cobertura-runtime</artifactId>
262
								<version>${cobertura.version}</version>
207 263
								<!-- <scope>provided</scope> -->
208 264
								<scope>compile</scope>
209 265
								<type>pom</type>
......
462 518
									<target>
463 519
										<!-- <echo>Shutting down the Tomcat</echo> <exec dir="${tomcat.home}/bin" 
464 520
											executable="${tomcat.home}/bin/shutdown.sh" /> -->
465
										<copy
466
											file="${basedir}/target/${project.artifactId}-${project.version}.war"
467
											tofile="${tomcat.home}/webapps/${project.artifactId}.war"
521
										<copy file="${basedir}/target/${project.artifactId}-${project.version}.war" tofile="${tomcat.home}/webapps/${project.artifactId}.war"
468 522
											overwrite="true" />
469 523
										<!-- <echo>Starting up the Tomcat</echo> <exec dir="${tomcat.home}/bin" 
470 524
											executable="${tomcat.home}/bin/startup.sh" /> -->

Also available in: Unified diff