You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/06/20 23:13:07 UTC
svn commit: r1137787 - in
/maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project: pom.xml
src/main/java/org/apache/maven/jxr/it/App.java
src/main/java/org/apache/maven/jxr/it/App2.java verify.groovy
Author: hboutemy
Date: Mon Jun 20 21:13:06 2011
New Revision: 1137787
URL: http://svn.apache.org/viewvc?rev=1137787&view=rev
Log:
[JXR-71] JXR doesn't link classes with non letters in their names
added IT
Added:
maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/src/main/java/org/apache/maven/jxr/it/App2.java (with props)
Modified:
maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/pom.xml
maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/src/main/java/org/apache/maven/jxr/it/App.java
maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/verify.groovy
Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/pom.xml?rev=1137787&r1=1137786&r2=1137787&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/pom.xml (original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/pom.xml Mon Jun 20 21:13:06 2011
@@ -19,14 +19,17 @@ specific language governing permissions
under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.maven.jxr.it</groupId>
<artifactId>simple-project</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
<name>simple-project</name>
<url>http://maven.apache.org</url>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -35,6 +38,7 @@ under the License.
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -49,6 +53,7 @@ under the License.
</plugin>
</plugins>
</build>
+
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>
@@ -57,7 +62,6 @@ under the License.
<artifactId>maven-jxr-plugin</artifactId>
<version>@pom.version@</version>
</plugin>
-
</plugins>
</reporting>
</project>
Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/src/main/java/org/apache/maven/jxr/it/App.java
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/src/main/java/org/apache/maven/jxr/it/App.java?rev=1137787&r1=1137786&r2=1137787&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/src/main/java/org/apache/maven/jxr/it/App.java (original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/src/main/java/org/apache/maven/jxr/it/App.java Mon Jun 20 21:13:06 2011
@@ -23,7 +23,8 @@ package org.apache.maven.jxr.it;
* Hello world!
*
*/
-public class App
+public class App
+ extends App2
{
public static void main( String[] args )
{
Added: maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/src/main/java/org/apache/maven/jxr/it/App2.java
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/src/main/java/org/apache/maven/jxr/it/App2.java?rev=1137787&view=auto
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/src/main/java/org/apache/maven/jxr/it/App2.java (added)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/src/main/java/org/apache/maven/jxr/it/App2.java Mon Jun 20 21:13:06 2011
@@ -0,0 +1,32 @@
+package org.apache.maven.jxr.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App2
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/src/main/java/org/apache/maven/jxr/it/App2.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/src/main/java/org/apache/maven/jxr/it/App2.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/src/main/java/org/apache/maven/jxr/it/App2.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/verify.groovy
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/verify.groovy?rev=1137787&r1=1137786&r2=1137787&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/verify.groovy (original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/verify.groovy Mon Jun 20 21:13:06 2011
@@ -17,18 +17,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-assert new File(basedir, 'target/site').exists();
+assert new File( basedir, 'target/site' ).exists();
-content = new File(basedir, 'target/site/project-reports.html').text;
+content = new File( basedir, 'target/site/project-reports.html' ).text;
assert content.contains( 'xref/index.html' );
assert content.contains( 'xref-test/index.html' );
-assert new File(basedir, 'target/site/xref').exists();
-assert new File(basedir, 'target/site/xref/index.html').exists();
-assert new File(basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html').exists();
-
-assert new File(basedir, 'target/site/xref-test').exists();
-assert new File(basedir, 'target/site/xref-test/index.html').exists();
-assert new File(basedir, 'target/site/xref-test/org/apache/maven/jxr/it/AppTest.html').exists();
+assert new File( basedir, 'target/site/xref' ).exists();
+assert new File( basedir, 'target/site/xref/index.html' ).exists();
+assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).exists();
+
+assert new File( basedir, 'target/site/xref-test' ).exists();
+assert new File( basedir, 'target/site/xref-test/index.html' ).exists();
+assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it/AppTest.html' ).exists();
+
+content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).text;
+assert content.contains( 'App2.html' );
+
return true;
\ No newline at end of file