Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.rss URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.rss?rev=1418104&r1=1418103&r2=1418104&view=diff ============================================================================== --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.rss (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.rss Thu Dec 6 21:57:40 2012 @@ -8,10 +8,10 @@ <language>en-us</language> <copyright>©2005 - 2012 The Apache Software Foundation</copyright> <item> - <title>File: 21, - Errors: 59, - Warnings: 16, - Infos: 7 + <title>File: 25, + Errors: 36, + Warnings: 25, + Infos: 13 </title> <link>http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html</link> <description> @@ -29,7 +29,7 @@ <tbody> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.deploy.DeployMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.deploy.RedeployMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java</a> </td> <td> 0 @@ -57,63 +57,77 @@ </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.AbstractWarCatalinaMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/AbstractWarCatalinaMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.ExtendedTomcat.java";>org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java</a> </td> <td> 0 </td> <td> + 2 + </td> + <td> + 1 + </td> + </tr> + <tr> + <td> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.ExtraDependency.java";>org/apache/tomcat/maven/plugin/tomcat7/run/ExtraDependency.java</a> + </td> + <td> 0 </td> <td> 0 </td> + <td> + 1 + </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.ExtendedTomcat.java";>org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunWarMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunWarMojo.java</a> </td> <td> 0 </td> <td> - 2 + 0 </td> <td> - 1 + 0 </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.WarRunDependency.java";>org/apache/tomcat/maven/plugin/tomcat7/run/WarRunDependency.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.deploy.RedeployOnlyMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java</a> </td> <td> - 3 + 0 </td> <td> - 1 + 0 </td> <td> - 4 + 0 </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.AbstractTomcat7Mojo.java";>org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.AbstractExecWarMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java</a> </td> <td> - 1 + 8 </td> <td> - 1 + 9 </td> <td> - 1 + 5 </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.ExtraDependency.java";>org/apache/tomcat/maven/plugin/tomcat7/run/ExtraDependency.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.deploy.AbstractDeployWarMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java</a> </td> <td> 0 @@ -122,26 +136,40 @@ 0 </td> <td> - 1 + 0 </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.RunWarMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/RunWarMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.AbstractStandaloneWarMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.java</a> </td> <td> 0 </td> <td> + 1 + </td> + <td> + 7 + </td> + </tr> + <tr> + <td> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.RunWarOnlyMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/RunWarOnlyMojo.java</a> + </td> + <td> 0 </td> <td> 0 </td> + <td> + 1 + </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunWarMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunWarMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.StandaloneWarMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarMojo.java</a> </td> <td> 0 @@ -150,18 +178,46 @@ 0 </td> <td> + 5 + </td> + </tr> + <tr> + <td> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java</a> + </td> + <td> + 1 + </td> + <td> + 8 + </td> + <td> + 5 + </td> + </tr> + <tr> + <td> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.AbstractCatalinaMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java</a> + </td> + <td> + 0 + </td> + <td> + 1 + </td> + <td> 0 </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.Webapp.java";>org/apache/tomcat/maven/plugin/tomcat7/run/Webapp.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.deploy.DeployMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployMojo.java</a> </td> <td> 0 </td> <td> - 2 + 0 </td> <td> 0 @@ -169,7 +225,7 @@ </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.deploy.DeployOnlyMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployOnlyMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.AbstractWarCatalinaMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/AbstractWarCatalinaMojo.java</a> </td> <td> 0 @@ -183,35 +239,35 @@ </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.AbstractExecWarMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.WarRunDependency.java";>org/apache/tomcat/maven/plugin/tomcat7/run/WarRunDependency.java</a> </td> <td> - 2 + 3 </td> <td> 1 </td> <td> - 40 + 4 </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.deploy.AbstractDeployWarMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.AbstractTomcat7Mojo.java";>org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java</a> </td> <td> - 0 + 1 </td> <td> - 0 + 1 </td> <td> - 0 + 1 </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.ShutdownMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.RunWarMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/RunWarMojo.java</a> </td> <td> 0 @@ -220,26 +276,26 @@ 0 </td> <td> - 1 + 0 </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.ExecWarOnlyMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarOnlyMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.Webapp.java";>org/apache/tomcat/maven/plugin/tomcat7/run/Webapp.java</a> </td> <td> 0 </td> <td> - 0 + 2 </td> <td> - 1 + 0 </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.RunMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.deploy.DeployOnlyMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployOnlyMojo.java</a> </td> <td> 0 @@ -248,12 +304,12 @@ 0 </td> <td> - 1 + 0 </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.ExecWarMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.ShutdownMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java</a> </td> <td> 0 @@ -262,12 +318,12 @@ 0 </td> <td> - 2 + 1 </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.RunWarOnlyMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/RunWarOnlyMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.ExecWarOnlyMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarOnlyMojo.java</a> </td> <td> 0 @@ -281,7 +337,7 @@ </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.ExtraResource.java";>org/apache/tomcat/maven/plugin/tomcat7/run/ExtraResource.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.RunMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java</a> </td> <td> 0 @@ -295,30 +351,30 @@ </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.ExecWarMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarMojo.java</a> </td> <td> - 1 + 0 </td> <td> - 8 + 0 </td> <td> - 5 + 2 </td> </tr> <tr> <td> - <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.AbstractCatalinaMojo.java";>org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java</a> + <a href="http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/checkstyle.html#org.apache.tomcat.maven.plugin.tomcat7.run.ExtraResource.java";>org/apache/tomcat/maven/plugin/tomcat7/run/ExtraResource.java</a> </td> <td> 0 </td> <td> - 1 + 0 </td> <td> - 0 + 1 </td> </tr> </tbody>
Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/cpd.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/cpd.html?rev=1418104&r1=1418103&r2=1418104&view=diff ============================================================================== --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/cpd.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/cpd.html Thu Dec 6 21:57:40 2012 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Nov 21, 2012 + | Generated by Apache Maven Doxia at Dec 6, 2012 | Rendered using Apache Maven Fluido Skin 1.3.0 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20121121" /> + <meta name="Date-Revision-yyyymmdd" content="20121206" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache Tomcat Maven Plugin :: Tomcat 7.x - CPD Results</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" /> @@ -194,7 +194,7 @@ - <li id="publishDate" class="pull-right">Last Published: 21 November 2012</li> <li class="divider pull-right">|</li> + <li id="publishDate" class="pull-right">Last Published: 06 December 2012</li> <li class="divider pull-right">|</li> <li id="projectVersion" class="pull-right">Version: 2.1-SNAPSHOT</li> </ul> @@ -204,7 +204,197 @@ <div id="bodyColumn" > - <div class="section"><h2>CPD Results<a name="CPD_Results"></a></h2><p>The following document contains the results of PMD's <a class="externalLink" href="http://pmd.sourceforge.net/cpd.html";>CPD</a> 4.2.5.</p></div><div class="section"><h2>Duplications<a name="Duplications"></a></h2><p>CPD found no problems in your source code.</p></div> + <div class="section"><h2>CPD Results<a name="CPD_Results"></a></h2><p>The following document contains the results of PMD's <a class="externalLink" href="http://pmd.sourceforge.net/cpd.html";>CPD</a> 4.2.5.</p></div><div class="section"><h2>Duplications<a name="Duplications"></a></h2><table border="0" class="table table-striped"><tr class="a"><th>File</th><th>Line</th></tr><tr class="b"><td>org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java</td><td><a href="./xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html#316">316</a></td></tr><tr class="a"><td>org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.java</td><td><a href="./xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.html#142">142</a></td></tr><tr class="b"><td colspan='2'><div><pre> if ( serverXml != null && serverXml.exists() ) + { + os.putArchiveEntry( new JarArchiveEntry( "conf/server.xml" ) ); + IOUtils.copy( new FileInputStream( serverXml ), os ); + os.closeArchiveEntry(); + properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.TRUE.toString() ); + } + else + { + properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.FALSE.toString() ); + } + + os.putArchiveEntry( new JarArchiveEntry( "conf/web.xml" ) ); + IOUtils.copy( getClass().getResourceAsStream( "/conf/web.xml" ), os ); + os.closeArchiveEntry(); + + properties.store( tmpPropertiesFileOutputStream, "created by Apache Tomcat Maven plugin" ); + + tmpPropertiesFileOutputStream.flush(); + tmpPropertiesFileOutputStream.close(); + + os.putArchiveEntry( new JarArchiveEntry( Tomcat7RunnerCli.STAND_ALONE_PROPERTIES_FILENAME ) ); + IOUtils.copy( new FileInputStream( tmpPropertiesFile ), os ); + os.closeArchiveEntry(); + + // add tomcat classes + for ( Artifact pluginArtifact : pluginArtifacts ) + { + if ( StringUtils.equals( "org.apache.tomcat", pluginArtifact.getGroupId() ) || StringUtils.equals( + "org.apache.tomcat.embed", pluginArtifact.getGroupId() ) || StringUtils.equals( + "org.eclipse.jdt.core.compiler", pluginArtifact.getGroupId() ) || StringUtils.equals( "commons-cli", + pluginArtifact.getArtifactId() ) + || StringUtils.equals( "tomcat7-war-runner", pluginArtifact.getArtifactId() ) ) + { + JarFile jarFile = new JarFile( pluginArtifact.getFile() ); + extractJarToArchive( jarFile, os ); + } + } + + // add extra dependencies + if ( extraDependencies != null && !extraDependencies.isEmpty() ) + { + for ( Dependency dependency : extraDependencies ) + { + // String groupId, String artifactId, String version, String scope, String type + Artifact artifact = + artifactFactory.createArtifact( dependency.getGroupId(), dependency.getArtifactId(), + dependency.getVersion(), dependency.getScope(), + dependency.getType() ); + + artifactResolver.resolve( artifact, this.remoteRepos, this.local ); + JarFile jarFile = new JarFile( artifact.getFile() ); + extractJarToArchive( jarFile, os ); + } + } + + Manifest manifest = new Manifest(); + + Manifest.Attribute mainClassAtt = new Manifest.Attribute(); + mainClassAtt.setName( "Main-Class" ); + mainClassAtt.setValue( mainClass ); + manifest.addConfiguredAttribute( mainClassAtt ); + + manifest.write( tmpManifestWriter ); + tmpManifestWriter.flush(); + tmpManifestWriter.close(); + + os.putArchiveEntry( new JarArchiveEntry( "META-INF/MANIFEST.MF" ) ); + IOUtils.copy( new FileInputStream( tmpManifestFile ), os ); + os.closeArchiveEntry(); + + if ( attachArtifact ) + { + //MavenProject project, String artifactType, String artifactClassifier, File artifactFile + projectHelper.attachArtifact( project, attachArtifactClassifierType, attachArtifactClassifier, + execWarJar ); + } + + if ( extraResources != null ) + { + for ( ExtraResource extraResource : extraResources ) + { + + DirectoryScanner directoryScanner = new DirectoryScanner(); + directoryScanner.setBasedir( extraResource.getDirectory() ); + directoryScanner.addDefaultExcludes(); + directoryScanner.setExcludes( toStringArray( extraResource.getExcludes() ) ); + directoryScanner.setIncludes( toStringArray( extraResource.getIncludes() ) ); + directoryScanner.scan(); + for ( String includeFile : directoryScanner.getIncludedFiles() ) + { + getLog().debug( "include file:" + includeFile ); + os.putArchiveEntry( new JarArchiveEntry( includeFile ) ); + IOUtils.copy( new FileInputStream( new File( extraResource.getDirectory(), includeFile ) ), + os ); + os.closeArchiveEntry(); + } + } + } + + if ( tomcatConfigurationFilesDirectory != null && tomcatConfigurationFilesDirectory.exists() ) + { + // Because its the tomcat default dir for configs + String aConfigOutputDir = "conf/"; + copyDirectoryContentIntoArchive( tomcatConfigurationFilesDirectory, aConfigOutputDir, os ); + } + } + catch ( ManifestException e ) + { + throw new MojoExecutionException( e.getMessage(), e ); + } + catch ( IOException e ) + { + throw new MojoExecutionException( e.getMessage(), e ); + } + catch ( ArchiveException e ) + { + throw new MojoExecutionException( e.getMessage(), e ); + } + catch ( ArtifactNotFoundException e ) + { + throw new MojoExecutionException( e.getMessage(), e ); + } + catch ( ArtifactResolutionException e ) + { + throw new MojoExecutionException( e.getMessage(), e ); + } + finally + { + IOUtils.closeQuietly( os ); + IOUtils.closeQuietly( tmpManifestWriter ); + IOUtils.closeQuietly( execWarJarOutputStream ); + IOUtils.closeQuietly( tmpPropertiesFileOutputStream ); + } + + }</pre></div></td></tr></table><table border="0" class="table table-striped"><tr class="a"><th>File</th><th>Line</th></tr><tr class="b"><td>org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java</td><td><a href="./xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html#205">205</a></td></tr><tr class="a"><td>org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.java</td><td><a href="./xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.html#79">79</a></td></tr><tr class="b"><td colspan='2'><div><pre> File warExecFile = new File( buildDirectory, finalName ); + if ( warExecFile.exists() ) + { + warExecFile.delete(); + } + + File execWarJar = new File( buildDirectory, finalName ); + + FileOutputStream execWarJarOutputStream = null; + ArchiveOutputStream os = null; + File tmpPropertiesFile = null; + File tmpManifestFile = null; + FileOutputStream tmpPropertiesFileOutputStream = null; + PrintWriter tmpManifestWriter = null; + + try + { + tmpPropertiesFile = new File( buildDirectory, "war-exec.properties" ); + if ( tmpPropertiesFile.exists() ) + { + tmpPropertiesFile.delete(); + } + tmpPropertiesFile.getParentFile().mkdirs(); + + tmpManifestFile = new File( buildDirectory, "war-exec.manifest" ); + if ( tmpManifestFile.exists() ) + { + tmpManifestFile.delete(); + } + tmpPropertiesFileOutputStream = new FileOutputStream( tmpPropertiesFile ); + execWarJar.getParentFile().mkdirs(); + execWarJar.createNewFile(); + execWarJarOutputStream = new FileOutputStream( execWarJar ); + + tmpManifestWriter = new PrintWriter( tmpManifestFile ); + + // store : + //* wars in the root: foo.war + //* tomcat jars + //* file tomcat.standalone.properties with possible values : + // * useServerXml=true/false to use directly the one provided + // * enableNaming=true/false + // * wars=foo.war|contextpath;bar.war ( |contextpath is optionnal if empty use the war name ) + // * accessLogValveFormat= + // * connectorhttpProtocol: HTTP/1.1 or org.apache.coyote.http11.Http11NioProtocol + // * codeSourceContextPath=path parameter, default is project.artifactId + //* optionnal: conf/ with usual tomcat configuration files + //* MANIFEST with Main-Class + + Properties properties = new Properties(); + + properties.put( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY, + Long.toString( System.currentTimeMillis() ) ); + properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString( enableNaming ) ); + properties.put( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY, accessLogValveFormat ); + properties.put( Tomcat7Runner.HTTP_PROTOCOL_KEY, connectorHttpProtocol );</pre></div></td></tr></table></div> </div> </div> Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/cpd.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/cpd.xml?rev=1418104&r1=1418103&r2=1418104&view=diff ============================================================================== --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/cpd.xml (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/cpd.xml Thu Dec 6 21:57:40 2012 @@ -1,3 +1,211 @@ <?xml version="1.0" encoding="UTF-8"?> <pmd-cpd> +<duplication lines="136" tokens="719"> +<file line="316" path="/scratch/jenkins/workspace/tomcat-maven-plugin-site-deploy/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java"/> +<file line="142" path="/scratch/jenkins/workspace/tomcat-maven-plugin-site-deploy/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.java"/> +<codefragment> +<![CDATA[ + if ( serverXml != null && serverXml.exists() ) + { + os.putArchiveEntry( new JarArchiveEntry( "conf/server.xml" ) ); + IOUtils.copy( new FileInputStream( serverXml ), os ); + os.closeArchiveEntry(); + properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.TRUE.toString() ); + } + else + { + properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.FALSE.toString() ); + } + + os.putArchiveEntry( new JarArchiveEntry( "conf/web.xml" ) ); + IOUtils.copy( getClass().getResourceAsStream( "/conf/web.xml" ), os ); + os.closeArchiveEntry(); + + properties.store( tmpPropertiesFileOutputStream, "created by Apache Tomcat Maven plugin" ); + + tmpPropertiesFileOutputStream.flush(); + tmpPropertiesFileOutputStream.close(); + + os.putArchiveEntry( new JarArchiveEntry( Tomcat7RunnerCli.STAND_ALONE_PROPERTIES_FILENAME ) ); + IOUtils.copy( new FileInputStream( tmpPropertiesFile ), os ); + os.closeArchiveEntry(); + + // add tomcat classes + for ( Artifact pluginArtifact : pluginArtifacts ) + { + if ( StringUtils.equals( "org.apache.tomcat", pluginArtifact.getGroupId() ) || StringUtils.equals( + "org.apache.tomcat.embed", pluginArtifact.getGroupId() ) || StringUtils.equals( + "org.eclipse.jdt.core.compiler", pluginArtifact.getGroupId() ) || StringUtils.equals( "commons-cli", + pluginArtifact.getArtifactId() ) + || StringUtils.equals( "tomcat7-war-runner", pluginArtifact.getArtifactId() ) ) + { + JarFile jarFile = new JarFile( pluginArtifact.getFile() ); + extractJarToArchive( jarFile, os ); + } + } + + // add extra dependencies + if ( extraDependencies != null && !extraDependencies.isEmpty() ) + { + for ( Dependency dependency : extraDependencies ) + { + // String groupId, String artifactId, String version, String scope, String type + Artifact artifact = + artifactFactory.createArtifact( dependency.getGroupId(), dependency.getArtifactId(), + dependency.getVersion(), dependency.getScope(), + dependency.getType() ); + + artifactResolver.resolve( artifact, this.remoteRepos, this.local ); + JarFile jarFile = new JarFile( artifact.getFile() ); + extractJarToArchive( jarFile, os ); + } + } + + Manifest manifest = new Manifest(); + + Manifest.Attribute mainClassAtt = new Manifest.Attribute(); + mainClassAtt.setName( "Main-Class" ); + mainClassAtt.setValue( mainClass ); + manifest.addConfiguredAttribute( mainClassAtt ); + + manifest.write( tmpManifestWriter ); + tmpManifestWriter.flush(); + tmpManifestWriter.close(); + + os.putArchiveEntry( new JarArchiveEntry( "META-INF/MANIFEST.MF" ) ); + IOUtils.copy( new FileInputStream( tmpManifestFile ), os ); + os.closeArchiveEntry(); + + if ( attachArtifact ) + { + //MavenProject project, String artifactType, String artifactClassifier, File artifactFile + projectHelper.attachArtifact( project, attachArtifactClassifierType, attachArtifactClassifier, + execWarJar ); + } + + if ( extraResources != null ) + { + for ( ExtraResource extraResource : extraResources ) + { + + DirectoryScanner directoryScanner = new DirectoryScanner(); + directoryScanner.setBasedir( extraResource.getDirectory() ); + directoryScanner.addDefaultExcludes(); + directoryScanner.setExcludes( toStringArray( extraResource.getExcludes() ) ); + directoryScanner.setIncludes( toStringArray( extraResource.getIncludes() ) ); + directoryScanner.scan(); + for ( String includeFile : directoryScanner.getIncludedFiles() ) + { + getLog().debug( "include file:" + includeFile ); + os.putArchiveEntry( new JarArchiveEntry( includeFile ) ); + IOUtils.copy( new FileInputStream( new File( extraResource.getDirectory(), includeFile ) ), + os ); + os.closeArchiveEntry(); + } + } + } + + if ( tomcatConfigurationFilesDirectory != null && tomcatConfigurationFilesDirectory.exists() ) + { + // Because its the tomcat default dir for configs + String aConfigOutputDir = "conf/"; + copyDirectoryContentIntoArchive( tomcatConfigurationFilesDirectory, aConfigOutputDir, os ); + } + } + catch ( ManifestException e ) + { + throw new MojoExecutionException( e.getMessage(), e ); + } + catch ( IOException e ) + { + throw new MojoExecutionException( e.getMessage(), e ); + } + catch ( ArchiveException e ) + { + throw new MojoExecutionException( e.getMessage(), e ); + } + catch ( ArtifactNotFoundException e ) + { + throw new MojoExecutionException( e.getMessage(), e ); + } + catch ( ArtifactResolutionException e ) + { + throw new MojoExecutionException( e.getMessage(), e ); + } + finally + { + IOUtils.closeQuietly( os ); + IOUtils.closeQuietly( tmpManifestWriter ); + IOUtils.closeQuietly( execWarJarOutputStream ); + IOUtils.closeQuietly( tmpPropertiesFileOutputStream ); + } + + } +]]> +</codefragment> +</duplication> +<duplication lines="56" tokens="214"> +<file line="205" path="/scratch/jenkins/workspace/tomcat-maven-plugin-site-deploy/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java"/> +<file line="79" path="/scratch/jenkins/workspace/tomcat-maven-plugin-site-deploy/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.java"/> +<codefragment> +<![CDATA[ + File warExecFile = new File( buildDirectory, finalName ); + if ( warExecFile.exists() ) + { + warExecFile.delete(); + } + + File execWarJar = new File( buildDirectory, finalName ); + + FileOutputStream execWarJarOutputStream = null; + ArchiveOutputStream os = null; + File tmpPropertiesFile = null; + File tmpManifestFile = null; + FileOutputStream tmpPropertiesFileOutputStream = null; + PrintWriter tmpManifestWriter = null; + + try + { + tmpPropertiesFile = new File( buildDirectory, "war-exec.properties" ); + if ( tmpPropertiesFile.exists() ) + { + tmpPropertiesFile.delete(); + } + tmpPropertiesFile.getParentFile().mkdirs(); + + tmpManifestFile = new File( buildDirectory, "war-exec.manifest" ); + if ( tmpManifestFile.exists() ) + { + tmpManifestFile.delete(); + } + tmpPropertiesFileOutputStream = new FileOutputStream( tmpPropertiesFile ); + execWarJar.getParentFile().mkdirs(); + execWarJar.createNewFile(); + execWarJarOutputStream = new FileOutputStream( execWarJar ); + + tmpManifestWriter = new PrintWriter( tmpManifestFile ); + + // store : + //* wars in the root: foo.war + //* tomcat jars + //* file tomcat.standalone.properties with possible values : + // * useServerXml=true/false to use directly the one provided + // * enableNaming=true/false + // * wars=foo.war|contextpath;bar.war ( |contextpath is optionnal if empty use the war name ) + // * accessLogValveFormat= + // * connectorhttpProtocol: HTTP/1.1 or org.apache.coyote.http11.Http11NioProtocol + // * codeSourceContextPath=path parameter, default is project.artifactId + //* optionnal: conf/ with usual tomcat configuration files + //* MANIFEST with Main-Class + + Properties properties = new Properties(); + + properties.put( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY, + Long.toString( System.currentTimeMillis() ) ); + properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString( enableNaming ) ); + properties.put( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY, accessLogValveFormat ); + properties.put( Tomcat7Runner.HTTP_PROTOCOL_KEY, connectorHttpProtocol ); +]]> +</codefragment> +</duplication> </pmd-cpd> \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
