svn commit: r1143543 - /maven/pom/trunk/maven/src/site/site.xml
Author: rfscholte Date: Wed Jul 6 20:18:03 2011 New Revision: 1143543 URL: http://svn.apache.org/viewvc?rev=1143543view=rev Log: Change link text in menu to 'Maven 2 3' when referring to http://maven.apache.org Modified: maven/pom/trunk/maven/src/site/site.xml Modified: maven/pom/trunk/maven/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/src/site/site.xml?rev=1143543r1=1143542r2=1143543view=diff == --- maven/pom/trunk/maven/src/site/site.xml (original) +++ maven/pom/trunk/maven/src/site/site.xml Wed Jul 6 20:18:03 2011 @@ -67,7 +67,7 @@ under the License. item name=Doxia href=http://maven.apache.org/doxia/index.html; / item name=JXR href=http://maven.apache.org/jxr/index.html; / item name=Maven 1.x href=http://maven.apache.org/maven-1.x/index.html; / - item name=Maven 2 href=http://maven.apache.org/index.html; / + item name=Maven 2 amp; 3 href=http://maven.apache.org/index.html; / item name=Plugins href=http://maven.apache.org/plugins/index.html; / item name=SCM href=http://maven.apache.org/scm/index.html; / item name=Shared Components href=http://maven.apache.org/shared/index.html; /
svn commit: r1143976 - /maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
Author: rfscholte
Date: Thu Jul 7 18:59:08 2011
New Revision: 1143976
URL: http://svn.apache.org/viewvc?rev=1143976view=rev
Log:
Update 'Building Maven' page. Maven 3 is not the unstable development branch
anymore, but the preferred one.
Modified:
maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
Modified: maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt?rev=1143976r1=1143975r2=1143976view=diff
==
--- maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
(original)
+++ maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt Thu
Jul 7 18:59:08 2011
@@ -46,17 +46,18 @@ Building Maven
All of the source code for Maven and its related libraries is in
{{{http://subversion.tigris.org/} Subversion}}.
You can {{{http://svn.apache.org/viewvc/maven/} browse the repository}}, or
checkout specific modules directly.
- To build Maven 2.2 (the current stable branch), you need the
maven-2.2.x branch of the maven-2 module. To check that out, run
the command:
+ To build Maven 3 (the current stable branch), you need the trunk of
the maven-3 module.
+ To check that out, run the command:
---
-svn co https://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x
maven-2.2.x
+svn co https://svn.apache.org/repos/asf/maven/maven-3/trunk/ maven-3
---
- To build Maven 3.0 (unstable development branch), you need the trunk
of the maven-3 module. To
- check that out, run the command:
+ To build Maven 2, you need the maven-2.2.x branch of the maven-2
module.
+ To check that out, run the command:
---
-svn co https://svn.apache.org/repos/asf/maven/maven-3/trunk/ maven-3
+svn co https://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x
maven-2.2.x
---
Alternatively, you can check out all Maven projects in one directory using:
svn commit: r1143999 - /maven/site/trunk/src/site/apt/guides/getting-started/maven-in-five-minutes.apt
Author: rfscholte Date: Thu Jul 7 19:40:00 2011 New Revision: 1143999 URL: http://svn.apache.org/viewvc?rev=1143999view=rev Log: Use more recent versions and timestamps for the 'Maven in 5 minutes'-page Modified: maven/site/trunk/src/site/apt/guides/getting-started/maven-in-five-minutes.apt Modified: maven/site/trunk/src/site/apt/guides/getting-started/maven-in-five-minutes.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/getting-started/maven-in-five-minutes.apt?rev=1143999r1=1143998r2=1143999view=diff == --- maven/site/trunk/src/site/apt/guides/getting-started/maven-in-five-minutes.apt (original) +++ maven/site/trunk/src/site/apt/guides/getting-started/maven-in-five-minutes.apt Thu Jul 7 19:40:00 2011 @@ -22,9 +22,12 @@ mvn --version It should print out your installed version of Maven, for example: -- -Maven version: 2.0.8 -Java version: 1.5.0_12 -OS name: windows 2003 version: 5.2 arch: x86 Family: windows +Apache Maven 3.0.3 (r1075438; 2011-02-28 18:31:09+0100) +Maven home: D:\apache-maven-3.0.3\bin\.. +Java version: 1.6.0_25, vendor: Sun Microsystems Inc. +Java home: E:\Program Files\Java\jdk1.6.0_25\jre +Default locale: nl_NL, platform encoding: Cp1252 +OS name: windows 7, version: 6.1, arch: amd64, family: windows -- Depending upon your network setup, you may require extra configuration. Check out the @@ -95,7 +98,7 @@ my-app dependency groupIdjunit/groupId artifactIdjunit/artifactId - version3.8.1/version + version4.8.2/version scopetest/scope /dependency /dependencies @@ -126,7 +129,7 @@ mvn package [INFO] BUILD SUCCESSFUL [INFO] [INFO] Total time: 2 seconds -[INFO] Finished at: Thu Oct 05 21:16:04 CDT 2006 +[INFO] Finished at: Thu Jul 07 21:34:52 CEST 2011 [INFO] Final Memory: 3M/6M [INFO] ---
svn commit: r1144946 - /maven/pom/trunk/maven/pom.xml
Author: rfscholte Date: Sun Jul 10 19:56:30 2011 New Revision: 1144946 URL: http://svn.apache.org/viewvc?rev=1144946view=rev Log: Add rfscholte as committer (never thought I'd ever see Amsterdam behind my name) Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1144946r1=1144945r2=1144946view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Sun Jul 10 19:56:30 2011 @@ -397,6 +397,15 @@ under the License. /roles timezone+1/timezone /developer +developer + idrfscholte/id + nameRobert Scholte/name + emailrfscho...@apache.org/email + roles +roleCommitter/role + /roles + timezoneEurope/Amsterdam/timezone +/developer !--End Committers-- developer idaramirez/id
svn commit: r1145244 - /maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
Author: rfscholte
Date: Mon Jul 11 17:09:16 2011
New Revision: 1145244
URL: http://svn.apache.org/viewvc?rev=1145244view=rev
Log:
Fix MRESOURCES-140: remove debug logging from contextualize method of mojo due
to noise
Modified:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
Modified:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java?rev=1145244r1=1145243r2=1145244view=diff
==
---
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
Mon Jul 11 17:09:16 2011
@@ -239,7 +239,6 @@ public class ResourcesMojo
public void contextualize( Context context )
throws ContextException
{
-getLog().debug( execute contextualize );
plexusContainer = (PlexusContainer) context.get(
PlexusConstants.PLEXUS_KEY );
}
svn commit: r1146487 - in /maven/plugins/trunk/maven-javadoc-plugin/src/main/resources: javadoc-report_nl.properties test-javadoc-report_nl.properties
Author: rfscholte Date: Wed Jul 13 21:20:02 2011 New Revision: 1146487 URL: http://svn.apache.org/viewvc?rev=1146487view=rev Log: Fix MJAVADOC-321: add dutch resource bundles Added: maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_nl.properties maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/test-javadoc-report_nl.properties Added: maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_nl.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_nl.properties?rev=1146487view=auto == --- maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_nl.properties (added) +++ maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_nl.properties Wed Jul 13 21:20:02 2011 @@ -0,0 +1,19 @@ +# 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. + +report.javadoc.name=JavaDocs +report.javadoc.description=JavaDoc API documentatie. Added: maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/test-javadoc-report_nl.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/test-javadoc-report_nl.properties?rev=1146487view=auto == --- maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/test-javadoc-report_nl.properties (added) +++ maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/test-javadoc-report_nl.properties Wed Jul 13 21:20:02 2011 @@ -0,0 +1,19 @@ +# 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. + +report.test-javadoc.name=Test JavaDocs +report.test-javadoc.description=Test JavaDoc API documentatie.
svn commit: r1146869 - /maven/site/trunk/src/site/apt/pom.apt
Author: rfscholte
Date: Thu Jul 14 19:35:39 2011
New Revision: 1146869
URL: http://svn.apache.org/viewvc?rev=1146869view=rev
Log:
Update Maven references when it covers both Maven 23
Modified:
maven/site/trunk/src/site/apt/pom.apt
Modified: maven/site/trunk/src/site/apt/pom.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/pom.apt?rev=1146869r1=1146868r2=1146869view=diff
==
--- maven/site/trunk/src/site/apt/pom.apt (original)
+++ maven/site/trunk/src/site/apt/pom.apt Thu Jul 14 19:35:39 2011
@@ -118,7 +118,7 @@ POM Reference
* {Quick Overview}
This is a listing of the elements directly under the POM's project element.
Notice that modelVersion
- contains 4.0.0. That is currently the only supported POM version for Maven
2, and is always required.
+ contains 4.0.0. That is currently the only supported POM version for both
Maven 2 3, and is always required.
+--+
project xmlns=http://maven.apache.org/POM/4.0.0;
@@ -192,7 +192,7 @@ POM Reference
* {Maven Coordinates}
- The POM defined above is the minimum that Maven 2 will allow.
groupId:artifactId:version are all
+ The POM defined above is the minimum that both Maven 2 3 will allow.
groupId:artifactId:version are all
required fields (although, groupId and version need not be explicitly
defined if they are inherited
from a parent - more on inheritance later). The three fields act much like
an address and timestamp
in one. This marks a specific place in a repository, acting like a
coordinate system for Maven projects.
@@ -494,7 +494,7 @@ mvn install:install-file -Dfile=non-mave
Similar to the inheritance of objects in object oriented programming, POMs
that extend
a parent POM inherit certain values from that parent. Moreover, just as Java
objects
ultimately inherit from java.lang.Object, all Project Object Models
inherit from
- a base Super POM. The snippet below is the Super POM for Maven 2.0.x.
+ a base Super POM. The snippet below is the Super POM for Maven 2.2.0.
%{snippet|id=superpom|url=http://svn.apache.org/repos/asf/maven/maven-2/tags/maven-2.2.0/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml}
@@ -1514,7 +1514,7 @@ scm:cvs:pserver:127.0.0.1:/cvs/root:my-p
http://maven.apache.org/xsd/maven-4.0.0.xsd;
...
prerequisites
-maven2.0.4/maven
+maven2.0.6/maven
/prerequisites
...
/project
@@ -1530,7 +1530,7 @@ scm:cvs:pserver:127.0.0.1:/cvs/root:my-p
* {Repositories}
Repositories are collections of artifacts which adhere to the Maven
repository directory
- layout. In order to be a Maven 2 repository artifact, a POM file must live
within the structure
+ layout. In order to be a Maven repository artifact, a POM file must live
within the structure
$BASE_REPO/groupId/artifactId/version/artifactId-version.pom.
$BASE_REPO can be
local (file structure) or remote (base URL); the remaining layout will be
the same. Repositories
exist as a place to collect and store artifacts. Whenever a project has a
dependency upon an
@@ -1593,7 +1593,7 @@ scm:cvs:pserver:127.0.0.1:/cvs/root:my-p
* layout:
In the above description of repositories, it was mentioned that they all
follow a common layout. This
- is mostly correct. Maven 2 has a default layout for its repositories;
however, Maven 1.x had a different
+ is mostly correct. The layout introduced with Maven 2 is the default layout
for repositories used by Maven both 2 3; however, Maven 1.x had a different
layout. Use this element to specify which if it is default or
legacy.
* {Plugin Repositories}
@@ -1614,7 +1614,7 @@ scm:cvs:pserver:127.0.0.1:/cvs/root:my-p
+-+
project xmlns=http://maven.apache.org/POM/4.0.0;
- xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xmlns:xsi=http://www.w3.org/001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
...
@@ -1647,7 +1647,7 @@ scm:cvs:pserver:127.0.0.1:/cvs/root:my-p
This could just as easily have been called synched. This means that this
artifact has been synched with a partner repository.
* deployed:
-By far the most common status, meaning that this artifact was deployed
from a Maven 2 instance. This is what you get when you manually deploy using
the command-line deploy phase.
+By far the most common status, meaning that this artifact was deployed
from a Maven 2 or 3 instance. This is what you get when you manually deploy
using the command-line deploy phase.
* verified:
This project has been verified, and should be considered finalized.
@@ -1817,7 +1817,7 @@ scm:cvs:pserver:127.0.0.1:/cvs/root:my-p
/os
property
namemavenVersion/name
- value2.0.3/value
+ value2.0.6/value
svn commit: r1147437 - in /maven/plugins/trunk/maven-javadoc-plugin: ./ src/it/MJAVADOC-250/ src/it/MJAVADOC-250/src/ src/it/MJAVADOC-250/src/main/ src/it/MJAVADOC-250/src/main/java/ src/it/MJAVADOC-2
Author: rfscholte
Date: Sat Jul 16 15:30:31 2011
New Revision: 1147437
URL: http://svn.apache.org/viewvc?rev=1147437view=rev
Log:
Fix MJAVADOC-250: Resolve names in {@link} to fully qualified names.
Includes:
- upgrade QDox from 1.9.2 to 1.12
- add mockito-1.8.5 for strong mocking support in junit tests
- add new junit tests for AbstractFixJavadocMojo.replaceLinkTags()
- add IT (src/it/MJAVADOC-250)
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/invoker.properties
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/src/main/java/foo/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/src/main/java/foo/bar/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/src/main/java/foo/bar/ALotOfLinkTags.java
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/verify.bsh
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojoTest.java
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1147437r1=1147436r2=1147437view=diff
==
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sat Jul 16 15:30:31 2011
@@ -170,7 +170,7 @@ under the License.
dependency
groupIdcom.thoughtworks.qdox/groupId
artifactIdqdox/artifactId
- version1.9.2/version
+ version1.12/version
/dependency
!-- Plexus --
@@ -243,6 +243,11 @@ under the License.
version6.1.19/version
scopetest/scope
/dependency
+dependency
+ groupIdorg.mockito/groupId
+ artifactIdmockito-core/artifactId
+ version1.8.5/version
+/dependency
/dependencies
build
@@ -381,6 +386,7 @@ under the License.
pomIncludeMJAVADOC-226/pom.xml/pomInclude
pomIncludeMJAVADOC-97/pom.xml/pomInclude
!-- pomInclude**/MJAVADOC-181/pom.xml/pomInclude--!--
seems to be wrong, see comment in Jira issue --
+pomIncludeMJAVADOC-250/pom.xml/pomInclude
pomIncludeMJAVADOC-257/pom.xml/pomInclude
pomIncludeMJAVADOC-259/pom.xml/pomInclude
pomIncludeMJAVADOC-262/pom.xml/pomInclude
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/invoker.properties?rev=1147437view=auto
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/invoker.properties
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/invoker.properties
Sat Jul 16 15:30:31 2011
@@ -0,0 +1 @@
+invoker.goals=clean javadoc:fix
\ No newline at end of file
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/pom.xml?rev=1147437view=auto
==
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-250/pom.xml Sat
Jul 16 15:30:31 2011
@@ -0,0 +1,48 @@
+?xml version=1.0 encoding=UTF-8?
+
+!--
+ 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.
+--
+
+project xmlns=http
svn commit: r1151283 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/WorkspaceConfiguration.java test/java/org/apache/maven/plugin/eclipse/WorkspaceConfig
Author: rfscholte
Date: Tue Jul 26 22:46:08 2011
New Revision: 1151283
URL: http://svn.apache.org/viewvc?rev=1151283view=rev
Log:
Fix MECLIPSE-691: Add Websphere 7 runtime support
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/WorkspaceConfigurationTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceConfiguration.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceConfiguration.java?rev=1151283r1=1151282r2=1151283view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceConfiguration.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceConfiguration.java
Tue Jul 26 22:46:08 2011
@@ -1,5 +1,24 @@
package org.apache.maven.plugin.eclipse;
+/*
+ * 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.
+ */
+
import java.io.File;
import java.net.URL;
@@ -111,6 +130,10 @@ public class WorkspaceConfiguration
{
if ( getDefaultDeployServerId() != null
getDefaultDeployServerId().startsWith( was. ) )
{
+if ( getDefaultDeployServerId().indexOf( v7 ) = 0 )
+{
+return 7.0;
+}
if ( getDefaultDeployServerId().indexOf( v61 ) = 0 )
{
return 6.1;
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/WorkspaceConfigurationTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/WorkspaceConfigurationTest.java?rev=1151283view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/WorkspaceConfigurationTest.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/WorkspaceConfigurationTest.java
Tue Jul 26 22:46:08 2011
@@ -0,0 +1,57 @@
+package org.apache.maven.plugin.eclipse;
+
+/*
+ * 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.
+ */
+
+import junit.framework.TestCase;
+
+public class WorkspaceConfigurationTest
+extends TestCase
+{
+
+public void testGetWebsphereVersion()
+{
+WorkspaceConfiguration wc = new WorkspaceConfiguration();
+// Websphere Application Servers
+final String was_express_v51 = was.express.v51;
+wc.setDefaultDeployServerId( was_express_v51 );
+assertEquals( 5.1, wc.getWebsphereVersion() );
+
+final String was_base_v51 = was.base.v51;
+wc.setDefaultDeployServerId( was_base_v51 );
+assertEquals( 5.1, wc.getWebsphereVersion() );
+
+final String was_base_v6 = was.base.v6;
+wc.setDefaultDeployServerId( was_base_v6 );
+assertEquals( 6.0, wc.getWebsphereVersion() );
+
+final String was_base_v61 = was.base.v61;
+wc.setDefaultDeployServerId( was_base_v61 );
+assertEquals( 6.1, wc.getWebsphereVersion() );
+
+final String was_base_v7
svn commit: r1151585 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: rfscholte
Date: Wed Jul 27 18:30:13 2011
New Revision: 1151585
URL: http://svn.apache.org/viewvc?rev=1151585view=rev
Log:
update pom.xml:
- use latest parent
- use m-failsafe-p instead of the m-surefire-p bound to the integration-test
phase
- replace deprecated configuration for m-surefire-p (systemProperties) and
m-antrun-p (tasks)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=1151585r1=1151584r2=1151585view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Wed Jul 27 18:30:13 2011
@@ -25,7 +25,7 @@ under the License.
parent
artifactIdmaven-plugins/artifactId
groupIdorg.apache.maven.plugins/groupId
-version19/version
+version21/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
@@ -237,10 +237,10 @@ under the License.
idverify-integration-tests-checks/id
phasepost-integration-test/phase
configuration
- tasks
+ target
property name=script
location=verify-integration-tests-checks.bsh /
script language=beanshell src=${script} /
- /tasks
+ /target
/configuration
goals
goalrun/goal
@@ -294,12 +294,9 @@ under the License.
exclude**/project/**/exclude
exclude**/Abstract*.java/exclude
/excludes
- systemProperties
-property
- namemaven.home/name
- value${maven.home}/value
-/property
- /systemProperties
+ systemPropertyVariables
+maven.home${maven.home}/maven.home
+ /systemPropertyVariables
argLine${maven.test.jvmargs}/argLine
/configuration
/plugin
@@ -319,12 +316,9 @@ under the License.
plugin
artifactIdmaven-surefire-plugin/artifactId
configuration
- systemProperties combine.children=append
-property
- namemaven.repo.local/name
- value${maven.repo.local}/value
-/property
- /systemProperties
+ systemPropertyVariables
+maven.repo.local${maven.repo.local}/maven.repo.local
+ /systemPropertyVariables
/configuration
/plugin
/plugins
@@ -335,21 +329,14 @@ under the License.
build
plugins
plugin
-artifactIdmaven-surefire-plugin/artifactId
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-failsafe-plugin/artifactId
+version2.9/version
executions
execution
-phaseintegration-test/phase
goals
- goaltest/goal
+ goalintegration-test/goal
/goals
-configuration
- includes
-include**/*IT.java/include
- /includes
- excludes
-excludespecified only to override configuration from
default execution/exclude
- /excludes
-/configuration
/execution
/executions
/plugin
svn commit: r1151629 - in /maven/plugins/trunk/maven-eclipse-plugin: ./ src/it/ src/it/MECLIPSE-692/ src/it/MECLIPSE-692/jar-module/ src/it/MECLIPSE-692/pom-module/ src/it/MECLIPSE-692/war-module/ src
Author: rfscholte
Date: Wed Jul 27 21:12:19 2011
New Revision: 1151629
URL: http://svn.apache.org/viewvc?rev=1151629view=rev
Log:
Fix MECLIPSE-692: .project contains projects which were skipped during reactor
build
Introducing maven-invoker-plugin
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/it/
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/jar-module/
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/jar-module/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom-module/
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom-module/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/verify.bsh
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/war-module/
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/war-module/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/it/settings.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=1151629r1=1151628r2=1151629view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Wed Jul 27 21:12:19 2011
@@ -330,6 +330,26 @@ under the License.
plugins
plugin
groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-invoker-plugin/artifactId
+version1.5/version
+executions
+ execution
+idintegration-test/id
+goals
+ goalinstall/goal
+ goalrun/goal
+/goals
+ /execution
+/executions
+configuration
+ cloneProjectsTo${project.build.directory}/it/cloneProjectsTo
+ postBuildHookScriptverify/postBuildHookScript
+
localRepositoryPath${project.build.directory}/local-repo/localRepositoryPath
+ settingsFilesrc/it/settings.xml/settingsFile
+/configuration
+ /plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-failsafe-plugin/artifactId
version2.9/version
executions
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties?rev=1151629view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties
Wed Jul 27 21:12:19 2011
@@ -0,0 +1 @@
+invoker.goals = clean eclipse:eclipse
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/jar-module/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/jar-module/pom.xml?rev=1151629view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/jar-module/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/jar-module/pom.xml
Wed Jul 27 21:12:19 2011
@@ -0,0 +1,12 @@
+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/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ parent
+ groupIdorg.apache.maven.plugins.it/groupId
+ artifactIdparent-meclipse-692/artifactId
+ version0.0.1-SNAPSHOT/version
+ /parent
+
+ artifactIdjardep-meclipse-692/artifactId
+
+/project
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom-module/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom-module/pom.xml?rev=1151629view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom-module/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom-module/pom.xml
Wed Jul 27 21:12:19 2011
@@ -0,0 +1,21 @@
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance
svn commit: r1151935 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Author: rfscholte Date: Thu Jul 28 17:15:28 2011 New Revision: 1151935 URL: http://svn.apache.org/viewvc?rev=1151935view=rev Log: Fix MECLIPSE-627: Wrong classname used in documentation at additionalBuildcommands Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=1151935r1=1151934r2=1151935view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Thu Jul 28 17:15:28 2011 @@ -242,7 +242,7 @@ public class EclipsePlugin * pre * lt;additionalBuildcommandsgt; *lt;buildCommandgt; - * lt;namegt;org.ui.externaltools.ExternalToolBuilderlt;/namegt; + * lt;namegt;org.eclipse.ui.externaltools.ExternalToolBuilderlt;/namegt; * lt;triggersgt;auto,full,incremental,lt;/triggersgt; * lt;argumentsgt; * lt;LaunchConfigHandlegt;amp;lt;projectamp;gt;./externalToolBuilders/MavenBuilder.launchlt;/LaunchConfighandlegt;
svn commit: r1151994 - in /maven/plugins/trunk/maven-eclipse-plugin/src/site/apt: examples/multi-module-projects.apt.vm usage.apt
Author: rfscholte
Date: Thu Jul 28 20:42:45 2011
New Revision: 1151994
URL: http://svn.apache.org/viewvc?rev=1151994view=rev
Log:
Fix MECLIPSE-599: Restore broken link to j2ee-simple.tar.gz on
multi-module-projects.html
Fixed some other anchor links too
Use _ #set( $varline = '') ${varline} _ -construction to work around
VELOCITY-743 related issue
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/multi-module-projects.apt.vm
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/usage.apt
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/multi-module-projects.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/multi-module-projects.apt.vm?rev=1151994r1=1151993r2=1151994view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/multi-module-projects.apt.vm
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/multi-module-projects.apt.vm
Thu Jul 28 20:42:45 2011
@@ -52,7 +52,7 @@ Using maven-eclipse-plugin in multi-modu
* The Example project
This project is an example of a multi-module projects, containing some JAR-, a
- WAR- and an EAR-project. You can download it from
{{{j2ee-simple.tar.gz}here}}.
+ WAR- and an EAR-project. You can download it from
{{{./j2ee-simple.tar.gz}here}}.
The project is based on the j2ee-simple archetype.
** Step by step
@@ -67,7 +67,7 @@ Using maven-eclipse-plugin in multi-modu
* start 'mvn eclipse:eclipse install' from the command-line in the
root project (j2ee-simple)
- * use the {{Multi Project Import/Export Plugin}} to import all the modules
into Eclipse
+ * use the {{{Multi_Project_Import_Export_Plugin}Multi Project Import/Export
Plugin}} to import all the modules into Eclipse
* define your favorite application server in the WTP Server view
@@ -109,7 +109,7 @@ target
also be included in the SCM system, so that any updates (be it a new version
or
a configuration.change) are received by all developers.
-* {Multi Project Import/Export Plugin}
+* Multi Project Import/Export Plugin
There is an Eclipe plugin available that can help a lot when using
multi-module
projects. This plugin can import several projects at once, and it can do so
from
@@ -175,7 +175,7 @@ target
* Location:
+---
-${env_var:JAVA_HOME}/bin/java
+#set($varline = '${env_var:JAVA_HOME}/bin/java') ${varline}
+---
If you're on Windows, you should add the '.exe' extension to the above
command.
@@ -186,7 +186,7 @@ target
be changed into
+---
-${env_var:JAVA_HOME}/bin/${JAVA_EXECUTABLE}
+#set($varline = '${env_var:JAVA_HOME}/bin/${JAVA_EXECUTABLE}') ${varline}
+---
* Working Directory:
@@ -194,7 +194,7 @@ target
Select the root pom project here.
+---
-${workspace_loc:/j2ee-simple}
+#set($varline = '${workspace_loc:/j2ee-simple}') ${varline}
+---
* Arguments:
@@ -203,13 +203,13 @@ target
the Maven distribution. The project is called 'organization'.
+---
- -Dclassworlds.conf=${resource_loc:organization/maven-2.0/bin/m2.conf}
- -Dmaven.home=${resource_loc:organization/maven-2.0}
- -classpath
${resource_loc:organization/maven-2.0/core/boot/classworlds-1.1.jar}
+#set($varline =
'-Dclassworlds.conf=${resource_loc:organization/maven-2.0/bin/m2.conf}')
${varline}
+#set($varline = '-Dmaven.home=${resource_loc:organization/maven-2.0}')
${varline}
+#set($varline = '-classpath
${resource_loc:organization/maven-2.0/core/boot/classworlds-1.1.jar}')
${varline}
org.codehaus.classworlds.Launcher
-DdownloadSources=true
- -Dmaven.test.skip=${string_prompt:maven.test.skip:false}
+#set($varline = '-Dmaven.test.skip=${string_prompt:maven.test.skip:false}')
${varline}
clean eclipse:clean eclipse:eclipse install
+---
@@ -282,16 +282,16 @@ target
The configuration of the maven-eclipse-plugin used in this description is:
+-
- plugin
- groupIdorg.apache.maven.plugins/groupId
- artifactIdmaven-eclipse-plugin/artifactId
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-eclipse-plugin/artifactId
version${project.version}/version
- configuration
-
projectNameTemplate[artifactId]-[version]/projectNameTemplate
- wtpmanifesttrue/wtpmanifest
- wtpapplicationxmltrue/wtpapplicationxml
- wtpversion2.0/wtpversion
-
manifest${basedir}/src/main/resources/META-INF/MANIFEST.MF/manifest
- /configuration
- /plugin
+configuration
+ projectNameTemplate[artifactId]-[version]/projectNameTemplate
+ wtpmanifesttrue/wtpmanifest
+ wtpapplicationxmltrue/wtpapplicationxml
+ wtpversion2.0/wtpversion
+ manifest${basedir
svn commit: r1152334 - /maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties
Author: rfscholte Date: Fri Jul 29 18:33:35 2011 New Revision: 1152334 URL: http://svn.apache.org/viewvc?rev=1152334view=rev Log: use eclipse:clean in IT to remove previous generated files Modified: maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties Modified: maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties?rev=1152334r1=1152333r2=1152334view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties Fri Jul 29 18:33:35 2011 @@ -1 +1 @@ -invoker.goals = clean eclipse:eclipse \ No newline at end of file +invoker.goals = eclipse:clean eclipse:eclipse \ No newline at end of file
svn commit: r1152335 - in /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers: ./ wtp/
Author: rfscholte Date: Fri Jul 29 18:40:03 2011 New Revision: 1152335 URL: http://svn.apache.org/viewvc?rev=1152335view=rev Log: Fix MECLIPSE-693: Some generated xml files are missing their xml-header Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseLaunchConfigurationWriter.java maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?rev=1152335r1=1152334r2=1152335view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java Fri Jul 29 18:40:03 2011 @@ -172,7 +172,7 @@ public class EclipseClasspathWriter throw new MojoExecutionException( Messages.getString( EclipsePlugin.erroropeningfile ), ex ); //$NON-NLS-1$ } -XMLWriter writer = new PrettyPrintXMLWriter( w ); +XMLWriter writer = new PrettyPrintXMLWriter( w, UTF-8, null ); writer.startElement( ELT_CLASSPATH ); Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseLaunchConfigurationWriter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseLaunchConfigurationWriter.java?rev=1152335r1=1152334r2=1152335view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseLaunchConfigurationWriter.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseLaunchConfigurationWriter.java Fri Jul 29 18:40:03 2011 @@ -85,7 +85,7 @@ public abstract class EclipseLaunchConfi throw new MojoExecutionException( Messages.getString( EclipsePlugin.erroropeningfile ), ex ); //$NON-NLS-1$ } -XMLWriter writer = new PrettyPrintXMLWriter( w ); +XMLWriter writer = new PrettyPrintXMLWriter( w, UTF-8, null ); writer.startElement( launchConfiguration ); writer.addAttribute( type, getLaunchConfigurationType() ); Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java?rev=1152335r1=1152334r2=1152335view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java Fri Jul 29 18:40:03 2011 @@ -199,7 +199,7 @@ public class EclipseProjectWriter throw new MojoExecutionException( Messages.getString( EclipsePlugin.erroropeningfile ), ex ); //$NON-NLS-1$ } -XMLWriter writer = new PrettyPrintXMLWriter( w ); +XMLWriter writer = new PrettyPrintXMLWriter( w, UTF-8, null ); writer.startElement( projectDescription ); //$NON-NLS-1$ Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java?rev=1152335r1=1152334r2=1152335view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main
svn commit: r1152339 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Author: rfscholte
Date: Fri Jul 29 18:53:58 2011
New Revision: 1152339
URL: http://svn.apache.org/viewvc?rev=1152339view=rev
Log:
Fix MECLIPSE-597: Workspace dependencies not resolved for SNAPSHOT dependencies
(artifact has a different version from that in dependency management)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=1152339r1=1152338r2=1152339view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Fri Jul 29 18:53:58 2011
@@ -1876,7 +1876,7 @@ public class EclipsePlugin
workspaceArtefact.getGroupId().equals(
artifact.getGroupId() )
workspaceArtefact.getArtifactId().equals(
artifact.getArtifactId() ) )
{
-if ( workspaceArtefact.getVersion().equals(
artifact.getVersion() ) )
+if ( workspaceArtefact.getVersion().equals(
artifact.getBaseVersion() ) )
{
return workspaceArtefact.getEclipseProjectName();
}
@@ -2008,7 +2008,7 @@ public class EclipsePlugin
if ( workspaceArtefact.getGroupId().equals( artifact.getGroupId() )
workspaceArtefact.getArtifactId().equals(
artifact.getArtifactId() ) )
{
-if ( workspaceArtefact.getVersion().equals(
artifact.getVersion() ) )
+if ( workspaceArtefact.getVersion().equals(
artifact.getBaseVersion() ) )
{
workspaceArtefact.setAddedToClasspath( true );
getLog().debug( Using workspace project: +
workspaceArtefact.getEclipseProjectName() );
@@ -2020,7 +2020,7 @@ public class EclipsePlugin
Artifact
+ artifact.getId()
+ already available as a workspace
project, but with different version. Expected:
- + artifact.getVersion() + , found: +
workspaceArtefact.getVersion() );
+ + artifact.getBaseVersion() + , found:
+ workspaceArtefact.getVersion() );
}
}
}
svn commit: r1152391 - /maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
Author: rfscholte
Date: Fri Jul 29 22:43:40 2011
New Revision: 1152391
URL: http://svn.apache.org/viewvc?rev=1152391view=rev
Log:
Replace m-surefire-p bound to integration-test phase with m-failsafe-p
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=1152391r1=1152390r2=1152391view=diff
==
--- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Fri Jul 29
22:43:40 2011
@@ -344,37 +344,27 @@ under the License.
/testResource
/testResources
-pluginManagement
- plugins
-plugin
- artifactIdmaven-surefire-plugin/artifactId
- executions
-execution
- idintegration-tests/id
- phaseintegration-test/phase
- goals
-goaltest/goal
- /goals
- configuration
-includes
- include**/IT*.java/include
-/includes
-systemProperties
- property
-!-- Pass this through to the tests (if set!) to have
them pick the right repository --
-namemaven.repo.local/name
-value${project.build.directory}/it-repo/value
- /property
-/systemProperties
- /configuration
-/execution
- /executions
-/plugin
- /plugins
-/pluginManagement
plugins
plugin
+artifactIdmaven-failsafe-plugin/artifactId
+version2.9/version
+executions
+ execution
+idintegration-tests/id
+goals
+ goalintegration-test/goal
+/goals
+configuration
+ systemPropertyVariables
+!-- Pass this through to the tests (if set!) to have them
pick the right repository --
+
maven.repo.local${project.build.directory}/it-repo/maven.repo.local
+ /systemPropertyVariables
+/configuration
+ /execution
+/executions
+ /plugin
+ plugin
artifactIdmaven-invoker-plugin/artifactId
executions
execution
svn commit: r1152393 - /maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
Author: rfscholte Date: Fri Jul 29 23:02:29 2011 New Revision: 1152393 URL: http://svn.apache.org/viewvc?rev=1152393view=rev Log: add verify goal for m-failsafe-p Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=1152393r1=1152392r2=1152393view=diff == --- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Fri Jul 29 23:02:29 2011 @@ -354,6 +354,7 @@ under the License. idintegration-tests/id goals goalintegration-test/goal + goalverify/goal /goals configuration systemPropertyVariables
svn commit: r1152813 [4/4] - in /maven/plugins/trunk/maven-eclipse-plugin: ./ src/test/java/org/apache/maven/plugin/eclipse/it/ src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/expected
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-09/expected/.project URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-09/expected/.project?rev=1152813r1=1152812r2=1152813view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-09/expected/.project (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-09/expected/.project Mon Aug 1 15:00:54 2011 @@ -1,3 +1,4 @@ +?xml version=1.0 encoding=UTF-8? projectDescription namemaven-eclipse-plugin-test-project-ajdt9/name commentNO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse./comment Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-10-MECLIPSE-538/expected/.classpath URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-10-MECLIPSE-538/expected/.classpath?rev=1152813r1=1152812r2=1152813view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-10-MECLIPSE-538/expected/.classpath (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-10-MECLIPSE-538/expected/.classpath Mon Aug 1 15:00:54 2011 @@ -1,3 +1,4 @@ +?xml version=1.0 encoding=UTF-8? classpath classpathentry kind=src path=src/test/java output=target/test-classes including=**/*.java|**/*.aj/ classpathentry kind=src path=src/test/resources output=target/test-classes excluding=**/*.java/ Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-10-MECLIPSE-538/expected/.project URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-10-MECLIPSE-538/expected/.project?rev=1152813r1=1152812r2=1152813view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-10-MECLIPSE-538/expected/.project (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-10-MECLIPSE-538/expected/.project Mon Aug 1 15:00:54 2011 @@ -1,3 +1,4 @@ +?xml version=1.0 encoding=UTF-8? projectDescription namemaven-eclipse-plugin-test-project-ajdt10/name commentNO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse./comment Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-11-MECLIPSE-104/expected/.classpath URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-11-MECLIPSE-104/expected/.classpath?rev=1152813r1=1152812r2=1152813view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-11-MECLIPSE-104/expected/.classpath (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-11-MECLIPSE-104/expected/.classpath Mon Aug 1 15:00:54 2011 @@ -1,3 +1,4 @@ +?xml version=1.0 encoding=UTF-8? classpath classpathentry kind=src path=src/test/java output=target/test-classes including=**/*.tst|**/*.java|**/*.aj excluding=**/.svn/**/ classpathentry kind=src path=src/test/resources output=target/test-classes excluding=**/*.java/ Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-11-MECLIPSE-104/expected/.project URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-11-MECLIPSE-104/expected/.project?rev=1152813r1=1152812r2=1152813view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-11-MECLIPSE-104/expected/.project (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-11-MECLIPSE-104/expected/.project Mon Aug 1 15:00:54 2011 @@ -1,3 +1,4 @@ +?xml version=1.0 encoding=UTF-8? projectDescription namemaven-eclipse-plugin-test-project-ajdt11/name commentNO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse./comment Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/expected/.classpath URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/expected/.classpath?rev=1152813r1=1152812r2=1152813view=diff
svn commit: r1154335 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Author: rfscholte Date: Fri Aug 5 18:22:49 2011 New Revision: 1154335 URL: http://svn.apache.org/viewvc?rev=1154335view=rev Log: Make xml inside javadoc easier to read Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=1154335r1=1154334r2=1154335view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Fri Aug 5 18:22:49 2011 @@ -536,15 +536,32 @@ public class EclipsePlugin private List sourceIncludes; /** - * A list of links to local files in the system. A configuration like this one in the pom : lt;plugingt; - * lt;groupIdgt;org.apache.maven.pluginslt;/groupIdgt; lt;artifactIdgt;maven-eclipse-pluginlt;/artifactIdgt; - * lt;configurationgt; lt;linkedResourcesgt; lt;linkedResourcegt; - * lt;namegt;src/test/resources/oracle-ds.xmllt;/namegt; lt;typegt;1lt;/typegt; - * lt;locationgt;C://jboss/server/default/deploy/oracle-ds.xmllt;/locationgt; lt;/linkedResourcegt; - * lt;/linkedResourcesgt; lt;/configurationgt; lt;/plugingt; will produce in the .project : - * lt;linkedResourcesgt; lt;linkgt; lt;namegt;src/test/resources/oracle-ds.xmllt;/namegt; - * lt;typegt;1lt;/typegt; lt;locationgt;C://jboss/server/default/deploy/oracle-ds.xmllt;/locationgt; - * lt;/linkgt; lt;/linkedResourcesgt; + * A list of links to local files in the system. A configuration like this one in the pom : + * pre + * lt;plugingt; + * lt;groupIdgt;org.apache.maven.pluginslt;/groupIdgt; + * lt;artifactIdgt;maven-eclipse-pluginlt;/artifactIdgt; + * lt;configurationgt; + * lt;linkedResourcesgt; + * lt;linkedResourcegt; + * lt;namegt;src/test/resources/oracle-ds.xmllt;/namegt; + * lt;typegt;1lt;/typegt; + * lt;locationgt;C://jboss/server/default/deploy/oracle-ds.xmllt;/locationgt; + * lt;/linkedResourcegt; + * lt;/linkedResourcesgt; + * lt;/configurationgt; + * lt;/plugingt; + * /pre + * will produce in the .project : + * pre + * lt;linkedResourcesgt; + * lt;linkgt; + * lt;namegt;src/test/resources/oracle-ds.xmllt;/namegt; + * lt;typegt;1lt;/typegt; + * lt;locationgt;C://jboss/server/default/deploy/oracle-ds.xmllt;/locationgt; + * lt;/linkgt; + * lt;/linkedResourcesgt; + * /pre * * @since 2.8 * @parameter
svn commit: r1154367 - in /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide: JeeDescriptor.java JeeUtils.java
Author: rfscholte
Date: Fri Aug 5 20:10:44 2011
New Revision: 1154367
URL: http://svn.apache.org/viewvc?rev=1154367view=rev
Log:
Fix MECLIPSE-694: Add JEE6 support
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeDescriptor.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeDescriptor.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeDescriptor.java?rev=1154367r1=1154366r2=1154367view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeDescriptor.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeDescriptor.java
Fri Aug 5 20:10:44 2011
@@ -36,6 +36,8 @@ public class JeeDescriptor
public static final String JEE_5_0 = 5.0;
+public static final String JEE_6_0 = 6.0;
+
public static final String EJB_1_1 = 1.1;
public static final String EJB_2_0 = 2.0;
@@ -44,6 +46,8 @@ public class JeeDescriptor
public static final String EJB_3_0 = 3.0;
+public static final String EJB_3_1 = 3.1;
+
public static final String SERVLET_2_2 = 2.2;
public static final String SERVLET_2_3 = 2.3;
@@ -52,6 +56,8 @@ public class JeeDescriptor
public static final String SERVLET_2_5 = 2.5;
+public static final String SERVLET_3_0 = 3.0;
+
public static final String JSP_1_1 = 1.1;
public static final String JSP_1_2 = 1.2;
@@ -60,6 +66,8 @@ public class JeeDescriptor
public static final String JSP_2_1 = 2.1;
+public static final String JSP_2_2 = 2.2;
+
/**
* @param jeeVersion
* @param ejbVersion
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java?rev=1154367r1=1154366r2=1154367view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
Fri Aug 5 20:10:44 2011
@@ -43,6 +43,7 @@ public class JeeUtils
// //$NON-NLS-1$
static
{
+ addJEE( JeeDescriptor.JEE_6_0, JeeDescriptor.EJB_3_1,
JeeDescriptor.SERVLET_3_0, JeeDescriptor.JSP_2_2 );
addJEE( JeeDescriptor.JEE_5_0, JeeDescriptor.EJB_3_0,
JeeDescriptor.SERVLET_2_5, JeeDescriptor.JSP_2_1 );
addJEE( JeeDescriptor.JEE_1_4, JeeDescriptor.EJB_2_1,
JeeDescriptor.SERVLET_2_4, JeeDescriptor.JSP_2_0 );
addJEE( JeeDescriptor.JEE_1_3, JeeDescriptor.EJB_2_0,
JeeDescriptor.SERVLET_2_3, JeeDescriptor.JSP_1_2 );
svn commit: r1154368 - in /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse: EclipseSourceDir.java EclipseToMavenMojo.java writers/AbstractEclipseManifestWriter.j
Author: rfscholte
Date: Fri Aug 5 20:13:42 2011
New Revision: 1154368
URL: http://svn.apache.org/viewvc?rev=1154368view=rev
Log:
Small String/char and StringBuffer improvements
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java?rev=1154368r1=1154367r2=1154368view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
Fri Aug 5 20:13:42 2011
@@ -269,7 +269,7 @@ public class EclipseSourceDir
public String toString()
{
StringBuffer buffer = new StringBuffer();
-buffer.append( ( isResource ? re : ) + source );
+buffer.append( isResource ? resource : source );
buffer.append( path );
buffer.append( : );
buffer.append( output= ).append( output ).append( , );
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java?rev=1154368r1=1154367r2=1154368view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
Fri Aug 5 20:13:42 2011
@@ -527,11 +527,11 @@ public class EclipseToMavenMojo
{
if ( stripQualifier StringUtils.countMatches( version, . ) 2 )
//$NON-NLS-1$
{
-version = StringUtils.substring( version, 0, version.lastIndexOf(
. ) ); //$NON-NLS-1$
+version = StringUtils.substring( version, 0, version.lastIndexOf(
'.' ) ); //$NON-NLS-1$
}
else if ( StringUtils.countMatches( version, . ) 2 ) //$NON-NLS-1$
{
-int lastDot = version.lastIndexOf( . ); //$NON-NLS-1$
+int lastDot = version.lastIndexOf( '.' ); //$NON-NLS-1$
if ( StringUtils.isNotEmpty( forcedQualifier ) )
{
version = StringUtils.substring( version, 0, lastDot ) + - +
forcedQualifier; //$NON-NLS-1$
@@ -606,7 +606,7 @@ public class EclipseToMavenMojo
*/
protected String createGroupId( String bundleName )
{
-int i = bundleName.lastIndexOf( . ); //$NON-NLS-1$
+int i = bundleName.lastIndexOf( '.' ); //$NON-NLS-1$
if ( i 0 )
{
return bundleName.substring( 0, i );
@@ -623,7 +623,7 @@ public class EclipseToMavenMojo
*/
protected String createArtifactId( String bundleName )
{
-int i = bundleName.lastIndexOf( . ); //$NON-NLS-1$
+int i = bundleName.lastIndexOf( '.' ); //$NON-NLS-1$
if ( i 0 )
{
return bundleName.substring( i + 1 );
@@ -708,7 +708,7 @@ public class EclipseToMavenMojo
if ( StringUtils.countMatches( group, . ) 2 ) //$NON-NLS-1$
{
// build number found, fix it
-int lastDot = group.lastIndexOf( . ); //$NON-NLS-1$
+int lastDot = group.lastIndexOf( '.' ); //$NON-NLS-1$
group = StringUtils.substring( group, 0, lastDot ) + -
//$NON-NLS-1$
+ StringUtils.substring( group, lastDot + 1,
group.length() );
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java?rev=1154368r1=1154367r2=1154368view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java
Fri Aug 5 20:13:42 2011
@@ -134,7 +134,7 @@ public abstract class
svn commit: r1154560 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/ide/IdeUtils.java test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java
Author: rfscholte
Date: Sat Aug 6 17:46:34 2011
New Revision: 1154560
URL: http://svn.apache.org/viewvc?rev=1154560view=rev
Log:
Fix MECLIPSE-587: maven-eclipse-plugin creates wrong
org.eclipse.wst.common.project.facet.core.xml for ear-projects when
javaee:javaee-api is used
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java?rev=1154560r1=1154559r2=1154560view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
Sat Aug 6 17:46:34 2011
@@ -30,6 +30,8 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
@@ -38,7 +40,6 @@ import org.apache.maven.plugin.eclipse.M
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.PropertyUtils;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -234,7 +235,14 @@ public class IdeUtils
/**
* Extracts the version of the first matching artifact in the given list.
- *
+ * p
+ * The {@code len} parameter indicated what to to return:
+ * ul
+ * listrong1/strong indicated codemajor/code version/li
+ * listrong3/strong indicated codemajor dot minor/code
version/li
+ * listrong5 and above/strong indicates codemajor dot minor dot
incremental/code version
+ * /ul
+ *
* @param artifactIds artifact names to compare against for extracting
version
* @param artifacts Set of artifacts for our project
* @param len expected length of the version sub-string
@@ -242,6 +250,44 @@ public class IdeUtils
*/
public static String getArtifactVersion( String[] artifactIds, List
dependencies, int len )
{
+String version = null;
+ArtifactVersion artifactVersion = getArtifactVersion( artifactIds,
dependencies );
+if ( artifactVersion != null )
+{
+StringBuffer versionBuffer = new StringBuffer();
+if( len = 1 )
+{
+versionBuffer.append( artifactVersion.getMajorVersion() );
+}
+if( len = 2 )
+{
+versionBuffer.append( '.' );
+}
+if( len = 3 )
+{
+versionBuffer.append( artifactVersion.getMinorVersion() );
+}
+if( len = 4 )
+{
+versionBuffer.append( '.' );
+}
+if( len = 5 )
+{
+versionBuffer.append( artifactVersion.getIncrementalVersion()
);
+}
+version = versionBuffer.toString();
+}
+return version;
+}
+
+/**
+ *
+ * @param artifactIds an array of artifactIds, should not be
codenull/code
+ * @param dependencies a list of {@link Dependency}-objects, should not be
codenull/code
+ * @return the resolved ArtifactVersion, otherwise codenull/code
+ */
+public static ArtifactVersion getArtifactVersion( String[] artifactIds,
List /*Dependency*/ dependencies )
+{
for ( int j = 0; j artifactIds.length; j++ )
{
String id = artifactIds[j];
@@ -251,7 +297,7 @@ public class IdeUtils
Dependency dep = (Dependency) depIter.next();
if ( id.equals( dep.getArtifactId() ) )
{
-return StringUtils.substring( dep.getVersion(), 0, len );
+return VersionRange.createFromVersion( dep.getVersion()
).getRecommendedVersion();
}
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java?rev=1154560r1=1154559r2=1154560view=diff
svn commit: r1154686 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java
Author: rfscholte Date: Sun Aug 7 10:33:48 2011 New Revision: 1154686 URL: http://svn.apache.org/viewvc?rev=1154686view=rev Log: Use canonicalPath for localRepo in test to please Jenkins on ubuntu Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java?rev=1154686r1=1154685r2=1154686view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java Sun Aug 7 10:33:48 2011 @@ -92,7 +92,7 @@ public class EclipseWorkspaceIT assertNotNull( Test M2_REPO has a value, M2_REPO ); -String localRepo = PlexusTestCase.getBasedir() + /target/test-classes/m2repo; +String localRepo = new File( PlexusTestCase.getBasedir(), target/test-classes/m2repo ).getCanonicalPath(); // comparing repo's all in lower case because windows is case insensitive and settings.xml may have // a repository specified with different case
svn commit: r1154754 - in /maven/plugins/trunk/maven-eclipse-plugin/src: it/MECLIPSE-676/ it/MECLIPSE-676/invoker.properties it/MECLIPSE-676/pom.xml it/MECLIPSE-676/verify.bsh main/java/org/apache/mav
Author: rfscholte
Date: Sun Aug 7 19:49:56 2011
New Revision: 1154754
URL: http://svn.apache.org/viewvc?rev=1154754view=rev
Log:
Fix MECLIPSE-676: linkedResources: location vs locationURI
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/invoker.properties
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/verify.bsh
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/LinkedResource.java
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/invoker.properties?rev=1154754view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/invoker.properties
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/invoker.properties
Sun Aug 7 19:49:56 2011
@@ -0,0 +1 @@
+invoker.goals = eclipse:clean eclipse:eclipse
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/pom.xml?rev=1154754view=auto
==
--- maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/pom.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/pom.xml Sun
Aug 7 19:49:56 2011
@@ -0,0 +1,29 @@
+?xml version=1.0 encoding=UTF-8?
+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;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.plugins.it/groupId
+ artifactIdmeclipse-676/artifactId
+ version0.1-SNAPSHOT/version
+ namemeclipse676/name
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-eclipse-plugin/artifactId
+version@project.version@/version
+configuration
+ linkedResources
+linkedResource
+ namesrc/main/webapp/docroot/myfolder/name
+ type2/type
+ locationURIFOLDER_VAR/otherfolder/myfolder/locationURI
+/linkedResource
+ /linkedResources
+/configuration
+ /plugin
+/plugins
+ /build
+/project
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/verify.bsh?rev=1154754view=auto
==
--- maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/verify.bsh
(added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-676/verify.bsh Sun
Aug 7 19:49:56 2011
@@ -0,0 +1,56 @@
+
+/*
+ * 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.
+ */
+
+import java.io.*;
+import java.util.*;
+import java.util.jar.*;
+import org.codehaus.plexus.util.*;
+
+boolean result = true;
+
+try
+{
+ File dotProject = new File( basedir, .project);
+ if( !dotProject.exists() )
+ {
+System.err.println( Expected .project, but file doesn't exist );
+return false;
+ }
+
+ String dotProjectContent = FileUtils.fileRead( dotProject, UTF-8 );
+ if ( dotProjectContent.indexOf(
locationURIFOLDER_VAR/otherfolder/myfolder/locationURI ) 0 )
+ {
+System.err.println( Expected .project to contain
'locationURIFOLDER_VAR/otherfolder/myfolder/locationURI', but it didn't );
+return false;
+ }
+
+ if ( dotProjectContent.indexOf( location ) = 0 )
+ {
+System.err.println( Expected .project to not contain 'location', but it
did );
+return false;
+ }
+
+}
+catch ( Exception e)
+{
+e.printStackTrace();
+result = false;
+}
+return result;
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main
svn commit: r1154761 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Author: rfscholte Date: Sun Aug 7 20:36:41 2011 New Revision: 1154761 URL: http://svn.apache.org/viewvc?rev=1154761view=rev Log: Fix MECLIPSE-499: Improve eclipse:eclipse excludes option documentation Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=1154761r1=1154760r2=1154761view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Sun Aug 7 20:36:41 2011 @@ -174,9 +174,10 @@ public class EclipsePlugin private List projectnatures; /** - * List of artifact to exclude from eclipse classpath, beeing provided by some eclipse classPathContainer - * [MECLIPSE-79] - * + * List of artifacts, represented as codegroupId:artifactId/code, to exclude from the eclipse classpath, + * being provided by some eclipse classPathContainer. + * + * @see http://jira.codehaus.org/browse/MECLIPSE-79 * @since 2.5 * @parameter */
svn commit: r1155111 - /maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
Author: rfscholte
Date: Mon Aug 8 21:28:42 2011
New Revision: 1155111
URL: http://svn.apache.org/viewvc?rev=1155111view=rev
Log:
Small adjustments trying to fix unstable results:
- use only one System.currentTimeInMillis()
- compare lastModified() of both files instead on the intended times. According
to API it depends on the OS how this value will be set.
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java?rev=1155111r1=1155110r2=1155111view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
Mon Aug 8 21:28:42 2011
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import org.apache.commons.lang.time.DateFormatUtils;
@@ -496,22 +497,23 @@ public class TestUnpackMojo
public void testUnpackOverWriteIfNewer()
throws IOException, MojoExecutionException, InterruptedException
{
+final long now = System.currentTimeMillis();
+
mojo.silent = false;
stubFactory.setCreateFiles( true );
Artifact artifact = stubFactory.getSnapshotArtifact();
-assertTrue( artifact.getFile().setLastModified(
System.currentTimeMillis() - 2 ) );
+assertTrue( artifact.getFile().setLastModified( now - 2 ) );
ArtifactItem item = new ArtifactItem( artifact );
-ListArtifactItem list = new ArrayListArtifactItem( 1 );
-list.add( item );
+ListArtifactItem list = Collections.singletonList( item );
mojo.setArtifactItems( list );
mojo.setOverWriteIfNewer( true );
mojo.execute();
File unpackedFile = getUnpackedFile( item );
// round down to the last second
-long time = System.currentTimeMillis();
+long time = now;
time = time - ( time % 1000 );
// go back 10 more seconds for linux
time -= 1;
@@ -532,11 +534,10 @@ public class TestUnpackMojo
displayFile( unpackedFile, unpackedFile );
displayFile( artifact, artifact.getFile() );
displayFile( marker , marker );
-System.out.println( marker.lastModified() = + time );
-long unpackedFileTime = unpackedFile.lastModified();
-System.out.println( unpackedFile.lastModified() = +
unpackedFileTime );
-assertTrue( unpackedFile ' + unpackedFile + ' lastModified() == +
time + : should be different,
-time != unpackedFile.lastModified() );
+System.out.println( marker.lastModified() = + marker.lastModified()
);
+System.out.println( unpackedFile.lastModified() = +
unpackedFile.lastModified() );
+assertTrue( unpackedFile ' + unpackedFile + ' lastModified() == +
marker.lastModified() + : should be different,
+marker.lastModified() != unpackedFile.lastModified() );
}
private void displayFile( String description, File file )
svn commit: r1158862 - /maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt.vm
Author: rfscholte
Date: Wed Aug 17 18:39:16 2011
New Revision: 1158862
URL: http://svn.apache.org/viewvc?rev=1158862view=rev
Log:
Documenting both ways of creating jars with test-classes
Modified:
maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt.vm?rev=1158862r1=1158861r2=1158862view=diff
==
--- maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt.vm Wed Aug 17
18:39:16 2011
@@ -131,6 +131,17 @@ mvn package
+-+
* How to create a jar containing test classes
+
+ When you want to create a jar containing test-classes, you would probably
want to reuse those classes.
+ There are two ways to solve this:
+
+ * Create an attached jar with the test-classes from the current project and
loose its transitive test-scoped dependencies.
+
+ * Create a separate project with the test-classes.
+
+ []
+
+** The easy way
You can produce a jar which will include your test classes and resources.
@@ -177,7 +188,44 @@ mvn package
/project
+-+
+ Note: The downside of this solution is that you don't get the transitive
test-scoped dependencies automatically.
+ Maven only resolves the compile-time dependencies, so you'll have to
add all the other required test-scoped dependencies by hand.
+** The preferred way
+ In order to let Maven resolve all test-scoped transitive dependencies
you should create a separate project.
+
++-+
+project
+ groupIdgroupId/groupId
+artifactIdartifactId-tests/artifactId
+versionversion/version
+ ...
+/project
++-+
+
+ * Move the sources files from src/test/java you want to share from
the original project to the src/main/java of this project.
+ The same type of movement counts for the resources as well of course.
+
+ * Move the required test-scoped dependencies and from the original
project to this project and remove the scope (i.e. changing it to the
compile-scope).
+ And yes, that means that the junit dependency (or any other testing
framework dependency) gets the default scope too.
+ You'll probably need to add some project specific dependencies as well to
let it all compile again.
+
+ Now you have your reusable test-classes and you can refer to it as you're
used to:
+
++-+
+project
+ ...
+ dependencies
+dependency
+ groupIdgroupId/groupId
+ artifactIdartifactId-tests/artifactId
+ versionversion/version
+ scopetest/scope
+/dependency
+ /dependencies
+ ...
+/project
++-+
- For full documentation, click {{{plugin-info.html}here}}.
+ For full documentation, click {{{./plugin-info.html}here}}.
svn commit: r1158941 - in /maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar: AbstractJarMojo.java JarMojo.java TestJarMojo.java
Author: rfscholte
Date: Wed Aug 17 22:22:17 2011
New Revision: 1158941
URL: http://svn.apache.org/viewvc?rev=1158941view=rev
Log:
replace expression with default-value when the latter should be used.
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java?rev=1158941r1=1158940r2=1158941view=diff
==
---
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
Wed Aug 17 22:22:17 2011
@@ -62,7 +62,7 @@ public abstract class AbstractJarMojo
/**
* Directory containing the generated JAR.
*
- * @parameter expression=${project.build.directory}
+ * @parameter default-value=${project.build.directory}
* @required
*/
private File outputDirectory;
@@ -85,7 +85,7 @@ public abstract class AbstractJarMojo
/**
* The Maven project.
*
- * @parameter expression=${project}
+ * @parameter default-value=${project}
* @required
* @readonly
*/
@@ -103,7 +103,7 @@ public abstract class AbstractJarMojo
* Path to the default MANIFEST file to use. It will be used if
* codeuseDefaultManifestFile/code is set to codetrue/code.
*
- * @parameter
expression=${project.build.outputDirectory}/META-INF/MANIFEST.MF
+ * @parameter
default-value=${project.build.outputDirectory}/META-INF/MANIFEST.MF
* @required
* @readonly
* @since 2.2
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java?rev=1158941r1=1158940r2=1158941view=diff
==
---
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
Wed Aug 17 22:22:17 2011
@@ -38,7 +38,7 @@ public class JarMojo
/**
* Directory containing the classes and resource files that should be
packaged into the JAR.
*
- * @parameter expression=${project.build.outputDirectory}
+ * @parameter default-value=${project.build.outputDirectory}
* @required
*/
private File classesDirectory;
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java?rev=1158941r1=1158940r2=1158941view=diff
==
---
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
Wed Aug 17 22:22:17 2011
@@ -48,7 +48,7 @@ public class TestJarMojo
/**
* Directory containing the test classes and resource files that should be
packaged into the JAR.
*
- * @parameter expression=${project.build.testOutputDirectory}
+ * @parameter default-value=${project.build.testOutputDirectory}
* @required
*/
private File testClassesDirectory;
svn commit: r1162398 - in /maven/plugins/trunk/maven-compiler-plugin/src: main/java/org/apache/maven/plugin/CompilerMojo.java test/java/org/apache/maven/plugin/CompilerMojoTestCase.java
Author: rfscholte
Date: Sat Aug 27 16:39:22 2011
New Revision: 1162398
URL: http://svn.apache.org/viewvc?rev=1162398view=rev
Log:
Fix MCOMPILER-94: compiler sets artifact file to target/classes, even if
nothing is compiled
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
maven/plugins/trunk/maven-compiler-plugin/src/test/java/org/apache/maven/plugin/CompilerMojoTestCase.java
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java?rev=1162398r1=1162397r2=1162398view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
Sat Aug 27 16:39:22 2011
@@ -127,7 +127,10 @@ public class CompilerMojo
{
super.execute();
-projectArtifact.setFile( outputDirectory );
+if ( outputDirectory.isDirectory() )
+{
+projectArtifact.setFile( outputDirectory );
+}
}
protected SourceInclusionScanner getSourceInclusionScanner( int
staleMillis )
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/test/java/org/apache/maven/plugin/CompilerMojoTestCase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/test/java/org/apache/maven/plugin/CompilerMojoTestCase.java?rev=1162398r1=1162397r2=1162398view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/test/java/org/apache/maven/plugin/CompilerMojoTestCase.java
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/test/java/org/apache/maven/plugin/CompilerMojoTestCase.java
Sat Aug 27 16:39:22 2011
@@ -19,11 +19,6 @@ package org.apache.maven.plugin;
* under the License.
*/
-import org.apache.maven.plugin.stubs.CompilerManagerStub;
-import org.apache.maven.plugin.stubs.DebugEnabledLog;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
@@ -31,6 +26,12 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.stubs.CompilerManagerStub;
+import org.apache.maven.plugin.stubs.DebugEnabledLog;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.plugin.testing.stubs.ArtifactStub;
+
public class CompilerMojoTestCase
extends AbstractMojoTestCase
{
@@ -54,6 +55,9 @@ public class CompilerMojoTestCase
getTestCompilerMojo( compileMojo,
target/test-classes/unit/compiler-basic-test/plugin-config.xml );
testCompileMojo.execute();
+
+Artifact projectArtifact = (Artifact) getVariableValueFromObject(
compileMojo, projectArtifact );
+assertNotNull( MCOMPILER-94: artifact file should only be null if
there is nothing to compile, projectArtifact.getFile() );
testClass = new File( testCompileMojo.getOutputDirectory(),
TestCompile0Test.class );
@@ -75,6 +79,9 @@ public class CompilerMojoTestCase
assertFalse( compileMojo.getOutputDirectory().exists() );
+Artifact projectArtifact = (Artifact) getVariableValueFromObject(
compileMojo, projectArtifact );
+assertNull( MCOMPILER-94: artifact file should be null if there is
nothing to compile, projectArtifact.getFile() );
+
TestCompilerMojo testCompileMojo =
getTestCompilerMojo( compileMojo,
target/test-classes/unit/compiler-empty-source-test/plugin-config.xml );
svn commit: r1162594 - in /maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106: ./ invoker.properties pom.xml src/ src/main/ src/main/java/ src/main/java/MyClass.java
Author: rfscholte
Date: Sun Aug 28 21:16:42 2011
New Revision: 1162594
URL: http://svn.apache.org/viewvc?rev=1162594view=rev
Log:
Add IT for MCOMPILER-106 and verify Maven doesn't check namespaces
Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/invoker.properties
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/pom.xml
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/src/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/src/main/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/src/main/java/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/src/main/java/MyClass.java
Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/invoker.properties?rev=1162594view=auto
==
---
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/invoker.properties
(added)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/invoker.properties
Sun Aug 28 21:16:42 2011
@@ -0,0 +1 @@
+invoker.goals = clean compile
\ No newline at end of file
Added: maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/pom.xml?rev=1162594view=auto
==
--- maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/pom.xml
(added)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/pom.xml Sun
Aug 28 21:16:42 2011
@@ -0,0 +1,27 @@
+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;
+ modelVersion4.0.0/modelVersion
+ groupIdorg.apache.maven.plugins.compiler.it/groupId
+ artifactIdmcompiler-106/artifactId
+ version1.0-SNAPSHOT/version
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-compiler-plugin/artifactId
+version@project.version@/version
+configuration
+ forktrue/fork
+ source1.5/source
+ target1.5/target
+ compilerArguments
+ Xlint/
+ Xlint:-path/
+ /compilerArguments
+/configuration
+ /plugin
+/plugins
+
+ /build
+/project
Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/src/main/java/MyClass.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/src/main/java/MyClass.java?rev=1162594view=auto
==
---
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/src/main/java/MyClass.java
(added)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-106/src/main/java/MyClass.java
Sun Aug 28 21:16:42 2011
@@ -0,0 +1,4 @@
+public class MyClass
+{
+
+}
svn commit: r1162597 - /maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Author: rfscholte
Date: Sun Aug 28 21:36:04 2011
New Revision: 1162597
URL: http://svn.apache.org/viewvc?rev=1162597view=rev
Log:
Fix MCOMPILER-130: compilerArgument option doesn't work with maxerrs option,
compilerArguments does.
Improve javadocs
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=1162597r1=1162596r2=1162597view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Sun Aug 28 21:36:04 2011
@@ -64,7 +64,7 @@ public abstract class AbstractCompilerMo
// --
/**
- * Indicates whether the build will continue even if there are compilation
errors; defaults to true.
+ * Indicates whether the build will continue even if there are compilation
errors.
*
* @parameter expression=${maven.compiler.failOnError}
default-value=true
* @since 2.0.2
@@ -72,14 +72,14 @@ public abstract class AbstractCompilerMo
private boolean failOnError = true;
/**
- * Set to true to include debugging information in the compiled class
files.
+ * Set to codetrue/code to include debugging information in the
compiled class files.
*
* @parameter expression=${maven.compiler.debug} default-value=true
*/
private boolean debug = true;
/**
- * Set to true to show messages about what the compiler is doing.
+ * Set to codetrue/code to show messages about what the compiler is
doing.
*
* @parameter expression=${maven.compiler.verbose} default-value=false
*/
@@ -93,14 +93,14 @@ public abstract class AbstractCompilerMo
private boolean showDeprecation;
/**
- * Set to true to optimize the compiled code using the compiler's
optimization methods.
+ * Set to codetrue/code to optimize the compiled code using the
compiler's optimization methods.
*
* @parameter expression=${maven.compiler.optimize} default-value=false
*/
private boolean optimize;
/**
- * Set to true to show compilation warnings.
+ * Set to codetrue/code to show compilation warnings.
*
* @parameter expression=${maven.compiler.showWarnings}
default-value=false
*/
@@ -144,7 +144,7 @@ public abstract class AbstractCompilerMo
private String compilerId;
/**
- * Version of the compiler to use, ex. 1.3, 1.5, if fork is set to
true.
+ * Version of the compiler to use, ex. 1.3, 1.5, if {@link #fork} is
set to codetrue/code.
*
* @parameter expression=${maven.compiler.compilerVersion}
*/
@@ -152,7 +152,7 @@ public abstract class AbstractCompilerMo
/**
* Allows running the compiler in a separate process.
- * If false it uses the built in compiler, while if true it will use
an executable.
+ * If codefalse/code it uses the built in compiler, while if
codetrue/code it will use an executable.
*
* @parameter expression=${maven.compiler.fork} default-value=false
*/
@@ -160,7 +160,7 @@ public abstract class AbstractCompilerMo
/**
* Initial size, in megabytes, of the memory allocation pool, ex. 64,
64m
- * if fork is set to true.
+ * if {@link #fork} is set to codetrue/code.
*
* @parameter expression=${maven.compiler.meminitial}
* @since 2.0.1
@@ -169,7 +169,7 @@ public abstract class AbstractCompilerMo
/**
* Sets the maximum size, in megabytes, of the memory allocation pool, ex.
128, 128m
- * if fork is set to true.
+ * if {@link #fork} is set to codetrue/code.
*
* @parameter expression=${maven.compiler.maxmem}
* @since 2.0.1
@@ -177,7 +177,7 @@ public abstract class AbstractCompilerMo
private String maxmem;
/**
- * Sets the executable of the compiler to use when fork is true.
+ * Sets the executable of the compiler to use when {@link #fork} is
codetrue/code.
*
* @parameter expression=${maven.compiler.executable}
*/
@@ -212,13 +212,22 @@ public abstract class AbstractCompilerMo
/**
* p
- * Sets the arguments to be passed to the compiler (prepending a dash) if
fork is set to true.
+ * Sets the arguments to be passed to the compiler (prepending a dash) if
{@link #fork} is set to codetrue/code.
* /p
* p
* This is because the list of valid arguments passed to a Java compiler
* varies based on the compiler version
svn commit: r1162905 - in /maven/plugins/trunk/maven-compiler-plugin/src: it/mcompiler-135/ it/mcompiler-135/src/ it/mcompiler-135/src/main/ it/mcompiler-135/src/main/java/ main/java/org/apache/maven/
Author: rfscholte
Date: Mon Aug 29 17:19:50 2011
New Revision: 1162905
URL: http://svn.apache.org/viewvc?rev=1162905view=rev
Log:
Fix MCOMPILER-135: Passing multiple parameters to Java 6 annotation processors
with javac does not work
Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/invoker.properties
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/pom.xml
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/java/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/java/MyClass.java
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/invoker.properties?rev=1162905view=auto
==
---
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/invoker.properties
(added)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/invoker.properties
Mon Aug 29 17:19:50 2011
@@ -0,0 +1,2 @@
+invoker.goals = clean compile
+invoker.java.version = 1.6+
\ No newline at end of file
Added: maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/pom.xml?rev=1162905view=auto
==
--- maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/pom.xml
(added)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/pom.xml Mon
Aug 29 17:19:50 2011
@@ -0,0 +1,27 @@
+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;
+ modelVersion4.0.0/modelVersion
+ groupIdorg.apache.maven.plugins.compiler.it/groupId
+ artifactIdmcompiler-135/artifactId
+ version1.0-SNAPSHOT/version
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-compiler-plugin/artifactId
+version@project.version@/version
+configuration
+ forktrue/fork
+ source1.6/source
+ target1.6/target
+compilerArguments
+ Averbosetrue/Averbose
+ AaddResDirsrc/main/webapp/AaddResDir
+/compilerArguments
+/configuration
+ /plugin
+/plugins
+
+ /build
+/project
Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/java/MyClass.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/java/MyClass.java?rev=1162905view=auto
==
---
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/java/MyClass.java
(added)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/java/MyClass.java
Mon Aug 29 17:19:50 2011
@@ -0,0 +1,4 @@
+public class MyClass
+{
+
+}
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=1162905r1=1162904r2=1162905view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Mon Aug 29 17:19:50 2011
@@ -452,7 +452,15 @@ public abstract class AbstractCompilerMo
{
key = - + key;
}
-cplrArgsCopy.put( key, value );
+
+if( key.startsWith( -A ) StringUtils.isNotEmpty(
value ) )
+{
+cplrArgsCopy.put( key + = + value, null );
+}
+else
+{
+cplrArgsCopy.put( key, value );
+}
}
}
if ( !StringUtils.isEmpty( effectiveCompilerArgument ) )
svn commit: r1162918 - /maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Author: rfscholte Date: Mon Aug 29 17:50:52 2011 New Revision: 1162918 URL: http://svn.apache.org/viewvc?rev=1162918view=rev Log: MCOMPILER-135: add example to javadoc for annotation processor parameter Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=1162918r1=1162917r2=1162918view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java Mon Aug 29 17:50:52 2011 @@ -219,13 +219,14 @@ public abstract class AbstractCompilerMo * varies based on the compiler version. * /p * p - * To pass code-Xmaxerrs 1000 -Xlint -Xlint:-path/code you should include the following: + * To pass code-Xmaxerrs 1000 -Xlint -Xlint:-path -Averbose=true/code you should include the following: * /p * pre * lt;compilerArgumentsgt; * lt;Xmaxerrsgt;1000lt;/Xmaxerrsgt; * lt;Xlint/gt; * lt;Xlint:-path/gt; + * lt;Averbosegt;truelt;/Averbosegt; * lt;/compilerArgumentsgt; * /pre * @parameter
svn commit: r1162949 - /maven/plugins/trunk/maven-compiler-plugin/src/site/apt/usage.apt.vm
Author: rfscholte
Date: Mon Aug 29 19:19:31 2011
New Revision: 1162949
URL: http://svn.apache.org/viewvc?rev=1162949view=rev
Log:
Fix MCOMPILER-147: The usage page should use pluginManagement for configuring
the plugin
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-compiler-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/usage.apt.vm?rev=1162949r1=1162948r2=1162949view=diff
==
--- maven/plugins/trunk/maven-compiler-plugin/src/site/apt/usage.apt.vm
(original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/site/apt/usage.apt.vm Mon Aug
29 19:19:31 2011
@@ -44,29 +44,35 @@ mvn test-compile
+-
The above command will execute both compiler:compile and
- compiler:test-compile since the compile phase happens a few phases
- before the test-compile phase.
+ compiler:testCompile since the compile phase happens a few phases
+ before the test-compile phase.
* Configuring Your Compiler Plugin
Since the Compiler Plugin executes automatically during their phases, you
- don't have to put executions unlike the other plugins.
+ don't have to put executions unlike many other plugins. However, you
+ should specify the version of the Compiler Plugin.
+-
project
...
build
-plugins
- plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-compiler-plugin/artifactId
-version${project.version}/version
-configuration
- !-- put your configurations here --
-/configuration
- /plugin
-/plugins
+pluginManagement
+ plugins
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-compiler-plugin/artifactId
+ version${project.version}/version
+ configuration
+!-- put your configurations here --
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
/build
...
/project
+-
+
+ Note: Maven 3.0 will issue warnings if you do not specify the version of
a
+ plugin.
svn commit: r1162951 - /maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Author: rfscholte
Date: Mon Aug 29 19:25:33 2011
New Revision: 1162951
URL: http://svn.apache.org/viewvc?rev=1162951view=rev
Log:
Fix MCOMPILER-148: Misleading documentation on configurationencoding
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=1162951r1=1162950r2=1162951view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Mon Aug 29 19:25:33 2011
@@ -124,6 +124,7 @@ public abstract class AbstractCompilerMo
* The -encoding argument for the Java compiler.
*
* @parameter expression=${encoding}
default-value=${project.build.sourceEncoding}
+ * @since 2.1
*/
private String encoding;
svn commit: r1165052 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: rfscholte
Date: Sun Sep 4 15:49:33 2011
New Revision: 1165052
URL: http://svn.apache.org/viewvc?rev=1165052view=rev
Log:
update maven-scm-plugin
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=1165052r1=1165051r2=1165052view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Sun Sep 4 15:49:33 2011
@@ -162,7 +162,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-repository-plugin/} repository}} | B |
2.3.1| 2010-07-21 | Plugin to help with repository-based tasks. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-repository-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MREPOSITORY}JIRA}}
*--++--++--+++
-| {{{/scm/maven-scm-plugin/} scm}} | B |
1.4 | 2010-08-08 | Generate a SCM for the current project. |
{{{http://svn.apache.org/repos/asf/maven/scm/trunk/maven-scm-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/SCM}JIRA}}
+| {{{/scm/maven-scm-plugin/} scm}} | B |
1.5 | 2011-31-03 | Generate a SCM for the current project. |
{{{http://svn.apache.org/repos/asf/maven/scm/trunk/maven-scm-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/SCM}JIRA}}
*--++--++--+++
| {{{/plugins/maven-source-plugin/} source}} | B |
2.1.2| 2010-05-21 | Build a JAR of sources for use in IDEs and
distribution to the repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-source-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MSOURCES}JIRA}}
*--++--++--+++
svn commit: r1165423 - in /maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote: BundleRemoteResourcesMojo.java ProcessRemoteResourcesMojo.java
Author: rfscholte
Date: Mon Sep 5 21:38:28 2011
New Revision: 1165423
URL: http://svn.apache.org/viewvc?rev=1165423view=rev
Log:
Fix MRRESOURCES-57: Incorrect documentation of outputDirectory?
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java?rev=1165423r1=1165422r2=1165423view=diff
==
---
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
Mon Sep 5 21:38:28 2011
@@ -54,14 +54,14 @@ public class BundleRemoteResourcesMojo
/**
* The directory which contains the resources you want packaged up in this
resource bundle.
*
- * @parameter expression=${basedir}/src/main/resources
+ * @parameter default-value=${basedir}/src/main/resources
*/
private File resourcesDirectory;
/**
* The directory where you want the resource bundle manifest written to.
*
- * @parameter expression=${project.build.outputDirectory}
+ * @parameter default-value=${project.build.outputDirectory}
*/
private File outputDirectory;
@@ -88,7 +88,7 @@ public class BundleRemoteResourcesMojo
*
* @since 1.1
* @optional
- * @parameter expression=${project.build.sourceEncoding}
+ * @parameter default-value=${project.build.sourceEncoding}
*/
private String sourceEncoding;
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java?rev=1165423r1=1165422r2=1165423view=diff
==
---
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
Mon Sep 5 21:38:28 2011
@@ -189,7 +189,7 @@ public class ProcessRemoteResourcesMojo
/**
* The local repository taken from Maven's runtime. Typically
$HOME/.m2/repository.
*
- * @parameter expression=${localRepository}
+ * @parameter default-value=${localRepository}
* @readonly
* @required
*/
@@ -198,7 +198,7 @@ public class ProcessRemoteResourcesMojo
/**
* List of Remote Repositories used by the resolver
*
- * @parameter expression=${project.remoteArtifactRepositories}
+ * @parameter default-value=${project.remoteArtifactRepositories}
* @readonly
* @required
*/
@@ -207,7 +207,7 @@ public class ProcessRemoteResourcesMojo
/**
* The current Maven project.
*
- * @parameter expression=${project}
+ * @parameter default-value=${project}
* @readonly
* @required
*/
@@ -216,14 +216,14 @@ public class ProcessRemoteResourcesMojo
/**
* The directory where processed resources will be placed for packaging.
*
- * @parameter
expression=${project.build.directory}/maven-shared-archive-resources
+ * @parameter
default-value=${project.build.directory}/maven-shared-archive-resources
*/
private File outputDirectory;
/**
* The directory containing extra information appended to the generated
resources.
*
- * @parameter expression=${basedir}/src/main/appended-resources
+ * @parameter default-value=${basedir}/src/main/appended-resources
*/
private File appendedResourcesDirectory;
@@ -313,7 +313,7 @@ public class ProcessRemoteResourcesMojo
/**
* The list of resources defined for the project.
*
- * @parameter expression=${project.resources}
+ * @parameter default-value=${project.build.resources}
* @readonly
* @required
*/
@@ -356,7 +356,7 @@ public class ProcessRemoteResourcesMojo
/**
* The Maven session.
*
- * @parameter expression=${session}
+ * @parameter default-value=${session}
* @readonly
* @required
*/
svn commit: r1165843 - in /maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader: DefaultDownloader.java Downloader.java
Author: rfscholte
Date: Tue Sep 6 21:05:25 2011
New Revision: 1165843
URL: http://svn.apache.org/viewvc?rev=1165843view=rev
Log:
Fix to support MRRESOURCES-55: Support groupId:artifactId:version:type and
groupId:artifactId:version:type:classifier as resource bundle references
Patch contributed by Andrew Phillips, reviewed and adjusted by Robert Scholte
Modified:
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java
Modified:
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java?rev=1165843r1=1165842r2=1165843view=diff
==
---
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
(original)
+++
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
Tue Sep 6 21:05:25 2011
@@ -6,6 +6,7 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.versioning.VersionRange;
import java.io.File;
import java.util.List;
@@ -47,9 +48,31 @@ public class DefaultDownloader
throws DownloadException, DownloadNotFoundException
{
+return download( groupId, artifactId, version, jar, null,
localRepository, remoteRepositories );
+}
+
+public File download( String groupId,
+ String artifactId,
+ String version,
+ String type,
+ String classifier,
+ ArtifactRepository localRepository,
+ List/*ArtifactRepository*/ remoteRepositories )
+throws DownloadException, DownloadNotFoundException
+
+{
Artifact artifact =
-artifactFactory.createArtifact( groupId, artifactId, version,
Artifact.SCOPE_RUNTIME, jar );
+artifactFactory.createDependencyArtifact( groupId, artifactId,
VersionRange.createFromVersion( version ), type, classifier,
Artifact.SCOPE_RUNTIME );
+return download( artifact, localRepository, remoteRepositories );
+}
+
+private File download( Artifact artifact,
+ArtifactRepository localRepository,
+List/*ArtifactRepository*/ remoteRepositories )
+throws DownloadException, DownloadNotFoundException
+
+{
try
{
artifactResolver.resolve( artifact, remoteRepositories,
localRepository );
@@ -63,6 +86,6 @@ public class DefaultDownloader
throw new DownloadNotFoundException( Requested download does not
exist., e );
}
-return artifact.getFile();
+return artifact.getFile();
}
}
Modified:
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java?rev=1165843r1=1165842r2=1165843view=diff
==
---
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java
(original)
+++
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java
Tue Sep 6 21:05:25 2011
@@ -25,4 +25,13 @@ public interface Downloader
ArtifactRepository localRepository,
List remoteRepositories )
throws DownloadException, DownloadNotFoundException;
+
+public File download( String groupId,
+ String artifactId,
+ String version,
+ String type,
+ String classifier,
+ ArtifactRepository localRepository,
+ List remoteRepositories )
+throws DownloadException, DownloadNotFoundException;
}
svn commit: r1167633 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: rfscholte
Date: Sat Sep 10 22:47:42 2011
New Revision: 1167633
URL: http://svn.apache.org/viewvc?rev=1167633view=rev
Log:
update m-dependency-p and m-scm-p
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=1167633r1=1167632r2=1167633view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Sat Sep 10 22:47:42 2011
@@ -134,7 +134,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-assembly-plugin/} assembly}} | B |
2.2.1| 2011-02-27 | Build an assembly (distribution) of sources and/or
binaries. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MASSEMBLY}JIRA}}
*--++--++--+++
-| {{{/plugins/maven-dependency-plugin/} dependency}} | B+R|
2.2 | 2011-02-22 | Dependency manipulation (copy, unpack) and
analysis. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MDEP}JIRA}}
+| {{{/plugins/maven-dependency-plugin/} dependency}} | B+R|
2.3 | 2011-07-10 | Dependency manipulation (copy, unpack) and
analysis. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MDEP}JIRA}}
*--++--++--+++
| {{{/plugins/maven-enforcer-plugin/} enforcer}} | B |
1.0.1| 2011-06-22 | Environmental constraint checking (Maven Version,
JDK etc), User Custom Rule Execution. |
{{{http://svn.apache.org/repos/asf/maven/enforcer/trunk/maven-enforcer-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MENFORCER}JIRA}}
*--++--++--+++
@@ -162,7 +162,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-repository-plugin/} repository}} | B |
2.3.1| 2010-07-21 | Plugin to help with repository-based tasks. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-repository-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MREPOSITORY}JIRA}}
*--++--++--+++
-| {{{/scm/maven-scm-plugin/} scm}} | B |
1.5 | 2011-31-03 | Generate a SCM for the current project. |
{{{http://svn.apache.org/repos/asf/maven/scm/trunk/maven-scm-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/SCM}JIRA}}
+| {{{/scm/maven-scm-plugin/} scm}} | B |
1.5 | 2011-03-31 | Generate a SCM for the current project. |
{{{http://svn.apache.org/repos/asf/maven/scm/trunk/maven-scm-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/SCM}JIRA}}
*--++--++--+++
| {{{/plugins/maven-source-plugin/} source}} | B |
2.1.2| 2010-05-21 | Build a JAR of sources for use in IDEs and
distribution to the repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-source-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MSOURCES}JIRA}}
*--++--++--+++
svn commit: r1167645 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: rfscholte
Date: Sat Sep 10 22:51:43 2011
New Revision: 1167645
URL: http://svn.apache.org/viewvc?rev=1167645view=rev
Log:
update m-jxr-p
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=1167645r1=1167644r2=1167645view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Sat Sep 10 22:51:43 2011
@@ -114,7 +114,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-javadoc-plugin/} javadoc}} | B+R|
2.8 | 2011-05-06 | Generate Javadoc for the project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-javadoc-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MJAVADOC}JIRA}}
*--++--++--+++
-| {{{/plugins/maven-jxr-plugin/} jxr}} | R |
2.2 | 2010-06-05 | Generate a source cross reference. |
{{{http://svn.apache.org/repos/asf/maven/jxr/trunk/maven-jxr-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/JXR}JIRA}}
+| {{{/plugins/maven-jxr-plugin/} jxr}} | R |
2.3 | 2011-07-17 | Generate a source cross reference. |
{{{http://svn.apache.org/repos/asf/maven/jxr/trunk/maven-jxr-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/JXR}JIRA}}
*--++--++--+++
| {{{/plugins/maven-linkcheck-plugin/} linkcheck}} | R |
1.1 | 2010-11-13 | Generate a Linkcheck report of your project's
documentation. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-linkcheck-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MLINKCHECK}JIRA}}
*--++--++--+++
svn commit: r1176059 - in /maven/plugins/trunk/maven-javadoc-plugin/src: it/MJAVADOC-325/ it/MJAVADOC-325/src/ it/MJAVADOC-325/src/main/ it/MJAVADOC-325/src/main/java/ it/MJAVADOC-325/src/main/java/fo
Author: rfscholte
Date: Mon Sep 26 21:09:46 2011
New Revision: 1176059
URL: http://svn.apache.org/viewvc?rev=1176059view=rev
Log:
Fix for MJAVADOC-325: Incorrect -link is generated when its URL contains a comma
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/invoker.properties
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/foo/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/foo/Bar.java
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/verify.bsh
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/invoker.properties?rev=1176059view=auto
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/invoker.properties
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/invoker.properties
Mon Sep 26 21:09:46 2011
@@ -0,0 +1 @@
+invoker.goals=clean javadoc:javadoc
\ No newline at end of file
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml?rev=1176059view=auto
==
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml Mon
Sep 26 21:09:46 2011
@@ -0,0 +1,56 @@
+?xml version=1.0 encoding=UTF-8?
+
+!--
+ 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.
+--
+
+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/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.plugins.maven-javadoc-plugin.it/groupId
+ artifactIdmjavadoc-325/artifactId
+ version1.0-SNAPSHOT/version
+
+ properties
+project.build.sourceEncodingUTF-8/project.build.sourceEncoding
+ /properties
+
+ build
+pluginManagement
+ plugins
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-compiler-plugin/artifactId
+ version2.3.2/version
+/plugin
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-javadoc-plugin/artifactId
+ version2.8.1-SNAPSHOT/version
+ configuration
+debugtrue/debug
+links
+ linkhttp://download.oracle.com/javase/1,5,0/docs/api//link
+/links
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+ /build
+
+/project
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/foo/Bar.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/foo/Bar.java?rev=1176059view=auto
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/foo/Bar.java
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/foo/Bar.java
Mon Sep 26 21:09:46 2011
@@ -0,0 +1,3 @@
+package foo;
+
+public class Bar {}
\ No newline at end of file
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/verify.bsh?rev=1176059view=auto
svn commit: r1177071 - /maven/plugins/trunk/maven-javadoc-plugin/pom.xml
Author: rfscholte Date: Wed Sep 28 21:37:12 2011 New Revision: 1177071 URL: http://svn.apache.org/viewvc?rev=1177071view=rev Log: Add 'nl' (dutch) to l10n-maven-plugin Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1177071r1=1177070r2=1177071view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Wed Sep 28 21:37:12 2011 @@ -403,6 +403,7 @@ under the License. locales localede/locale localefr/locale +localenl/locale localesv/locale /locales /configuration
svn commit: r1181119 - /maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java
Author: rfscholte Date: Mon Oct 10 18:32:28 2011 New Revision: 1181119 URL: http://svn.apache.org/viewvc?rev=1181119view=rev Log: Fix SCM-635: No space between number and text in scm:add result Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java?rev=1181119r1=1181118r2=1181119view=diff == --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java Mon Oct 10 18:32:28 2011 @@ -51,7 +51,7 @@ public class AddMojo checkResult( result ); -getLog().info( + result.getAddedFiles().size() + files successfully added. ); +getLog().info( + result.getAddedFiles().size() + files successfully added. ); } catch ( IOException e )
svn commit: r1183617 - /maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Author: rfscholte Date: Sat Oct 15 10:22:30 2011 New Revision: 1183617 URL: http://svn.apache.org/viewvc?rev=1183617view=rev Log: Hide External Links in nav when it is empty Modified: maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Modified: maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1183617r1=1183616r2=1183617view=diff == --- maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm (original) +++ maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Sat Oct 15 10:22:30 2011 @@ -581,15 +581,16 @@ lih4a href=$relativePath/index.html$project.name/a/h4/li #topMenu( $decoration.body.menus ) /ul - - ul class=nav secondary-nav -li class=menu - a href=# class=menuExternal Links/a - ul class=menu-dropdown -#topLinks( $decoration.body.links ) - /ul -/li - /ul + #if( $decoration.body.links.size() 0 ) +ul class=nav secondary-nav + li class=menu +a href=# class=menuExternal Links/a +ul class=menu-dropdown + #topLinks( $decoration.body.links ) +/ul + /li +/ul + #end /div /div /div
svn commit: r1183734 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
Author: rfscholte Date: Sat Oct 15 21:36:41 2011 New Revision: 1183734 URL: http://svn.apache.org/viewvc?rev=1183734view=rev Log: Fix test Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java?rev=1183734r1=1183733r2=1183734view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java Sat Oct 15 21:36:41 2011 @@ -86,7 +86,7 @@ public class EntitiesVerifier author = (HtmlMeta) page.getElementsByName( author ).get( 7 ); assertNotNull( author ); assertTrue( author.toString().indexOf( test#169;email.com ) 0 ); -assertEquals( test©email.com, author.getContentAttribute() ); +assertEquals( test©email.com, author.getContentAttribute() ); HtmlElement element = page.getHtmlElementById( contentBox ); assertNotNull( element );
svn commit: r1183755 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
Author: rfscholte Date: Sat Oct 15 22:50:05 2011 New Revision: 1183755 URL: http://svn.apache.org/viewvc?rev=1183755view=rev Log: Another attempt to fix test Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java?rev=1183755r1=1183754r2=1183755view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java Sat Oct 15 22:50:05 2011 @@ -86,7 +86,7 @@ public class EntitiesVerifier author = (HtmlMeta) page.getElementsByName( author ).get( 7 ); assertNotNull( author ); assertTrue( author.toString().indexOf( test#169;email.com ) 0 ); -assertEquals( test©email.com, author.getContentAttribute() ); +assertEquals( test\u00A9email.com, author.getContentAttribute() ); HtmlElement element = page.getHtmlElementById( contentBox ); assertNotNull( element );
svn commit: r1184908 - /maven/site/trunk/src/site/apt/guides/index.apt
Author: rfscholte
Date: Sun Oct 16 19:39:12 2011
New Revision: 1184908
URL: http://svn.apache.org/viewvc?rev=1184908view=rev
Log:
Change reference to Maven Reporting apidocs
Modified:
maven/site/trunk/src/site/apt/guides/index.apt
Modified: maven/site/trunk/src/site/apt/guides/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/index.apt?rev=1184908r1=1184907r2=1184908view=diff
==
--- maven/site/trunk/src/site/apt/guides/index.apt (original)
+++ maven/site/trunk/src/site/apt/guides/index.apt Sun Oct 16 19:39:12 2011
@@ -226,7 +226,7 @@ Documentation
* {{{http://maven.apache.org/ref/current/maven-artifact/apidocs/}Maven
Artifact}}
- *
{{{http://maven.apache.org/ref/current/maven-reporting/maven-reporting-api/apidocs/}Maven
Reporting}}
+ * {{{http://maven.apache.org/shared/maven-reporting-api/apidocs/}Maven
Reporting}}
* {{{http://maven.apache.org/ref/current/maven-plugin-api/apidocs/}Maven
Plugin API}}
svn commit: r1187041 - in /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer: ./ src/main/java/org/apache/maven/doxia/siterenderer/ src/test/java/org/apache/maven/doxia/siterenderer/ src/test/reso
Author: rfscholte
Date: Thu Oct 20 20:41:56 2011
New Revision: 1187041
URL: http://svn.apache.org/viewvc?rev=1187041view=rev
Log:
Fix DOXIA-450: Add Velocity Toolmanager support
Added:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.expected.txt
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.vm
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml?rev=1187041r1=1187040r2=1187041view=diff
==
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml Thu Oct 20
20:41:56 2011
@@ -136,6 +136,11 @@ under the License.
version1.5/version
/dependency
dependency
+ groupIdorg.apache.velocity/groupId
+ artifactIdvelocity-tools/artifactId
+ version2.0/version
+/dependency
+dependency
groupIdcommons-collections/groupId
artifactIdcommons-collections/artifactId
version3.2.1/version
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1187041r1=1187040r2=1187041view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Thu Oct 20 20:41:56 2011
@@ -69,8 +69,8 @@ import org.apache.maven.doxia.siterender
import org.apache.maven.doxia.util.XmlValidator;
import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
import org.apache.velocity.context.Context;
+import org.apache.velocity.tools.ToolManager;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -427,7 +427,8 @@ public class DefaultSiteRenderer
private Context createContext( SiteRendererSink sink, SiteRenderingContext
siteRenderingContext )
{
-VelocityContext context = new VelocityContext();
+ ToolManager toolManager = new ToolManager( true );
+Context context = toolManager.createContext();
//
--
// Data objects
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java?rev=1187041r1=1187040r2=1187041view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Thu Oct 20 20:41:56 2011
@@ -19,6 +19,7 @@ package org.apache.maven.doxia.siterende
* under the License.
*/
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
@@ -26,22 +27,24 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
+import java.io.StringWriter;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import org.apache.commons.io.IOUtils;
+import
svn commit: r1187046 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/site-renderer_nl.properties
Author: rfscholte Date: Thu Oct 20 20:54:20 2011 New Revision: 1187046 URL: http://svn.apache.org/viewvc?rev=1187046view=rev Log: complete dutch resource bundle Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/site-renderer_nl.properties Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/site-renderer_nl.properties URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/site-renderer_nl.properties?rev=1187046r1=1187045r2=1187046view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/site-renderer_nl.properties (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/site-renderer_nl.properties Thu Oct 20 20:54:20 2011 @@ -16,4 +16,5 @@ # under the License. template.lastpublished=Meest recente publicatie +template.version=Versie template.builtby=Gemaakt door
svn commit: r1189910 - /maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
Author: rfscholte
Date: Thu Oct 27 18:13:37 2011
New Revision: 1189910
URL: http://svn.apache.org/viewvc?rev=1189910view=rev
Log:
Fix MNGSITE-143: typos on Introduction to the Dependency Mechanism-page
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt?rev=1189910r1=1189909r2=1189910view=diff
==
---
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
Thu Oct 27 18:13:37 2011
@@ -84,7 +84,7 @@ Introduction to the Dependency Mechanism
* {Dependency Scope}
- Dependency scope is used to limit the transitivity of a depedency, and also
to affect the classpath used for
+ Dependency scope is used to limit the transitivity of a dependency, and also
to affect the classpath used for
various build tasks.
There are 6 scopes available:
@@ -415,7 +415,7 @@ Introduction to the Dependency Mechanism
The examples in the previous section describe how to specify managed
dependencies through inheritence. However,
in larger projects it may be impossible to accomplish this since a project
can only inherit from a single parent.
- To accomodate this, projects can import managed dependencies from other
projects. This is accomplished by declaring a
+ To accommodate this, projects can import managed dependencies from other
projects. This is accomplished by declaring a
pom artifact as a dependency with a scope of import.
Project B:
@@ -558,7 +558,7 @@ Introduction to the Dependency Mechanism
++
- In the example above Z imports the managed dependencies from both X and Y.
However, both X and Y contain depedency a. Here,
+ In the example above Z imports the managed dependencies from both X and Y.
However, both X and Y contain dependency a. Here,
version 1.1 of a would be used since X is declared first and a is not
declared in Z's dependencyManagement.
This process is recursive. For example, if X imports another pom, Q, when Z
is processed it will simply appear that all
@@ -739,7 +739,7 @@ Introduction to the Dependency Mechanism
Attempting to do that will result in the build failing since it won't be
able to locate the pom.
* Never declare the pom importing a pom as the parent (or grandparent, etc)
of the target pom.
- There is no way to resolve the cicularity and an exception will be thrown.
+ There is no way to resolve the circularity and an exception will be thrown.
* When referring to artifacts whose poms have transitive dependencies the
project will need to specify versions
of those artifacts as managed dependencies. Not doing so will result in a
build failure since the
svn commit: r1199495 - /maven/shared/trunk/maven-script-interpreter/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java
Author: rfscholte Date: Tue Nov 8 22:25:51 2011 New Revision: 1199495 URL: http://svn.apache.org/viewvc?rev=1199495view=rev Log: Make tests windows-proof Modified: maven/shared/trunk/maven-script-interpreter/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java Modified: maven/shared/trunk/maven-script-interpreter/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java?rev=1199495r1=1199494r2=1199495view=diff == --- maven/shared/trunk/maven-script-interpreter/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java (original) +++ maven/shared/trunk/maven-script-interpreter/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java Tue Nov 8 22:25:51 2011 @@ -47,7 +47,7 @@ public class ScriptRunnerTest new FileLogger( logFile ), foo, true ); String logContent = FileUtils.fileRead( logFile ); -assertTrue( logContent.contains( src/test/resources/bsh-test/verify.bsh ) ); +assertTrue( logContent.contains( new File( src/test/resources/bsh-test/verify.bsh ).getPath() ) ); assertTrue( logContent.contains( foo=bar ) ); } @@ -67,7 +67,7 @@ public class ScriptRunnerTest new FileLogger( logFile ), foo, true ); String logContent = FileUtils.fileRead( logFile ); -assertTrue( logContent.contains( src/test/resources/groovy-test/verify.groovy ) ); +assertTrue( logContent.contains( new File( src/test/resources/groovy-test/verify.groovy ).getPath() ) ); assertTrue( logContent.contains( foo=bar ) ); }
svn commit: r1200490 - /maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
Author: rfscholte
Date: Thu Nov 10 19:31:18 2011
New Revision: 1200490
URL: http://svn.apache.org/viewvc?rev=1200490view=rev
Log:
Improve explanation usage of stage-parameter
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java?rev=1200490r1=1200489r2=1200490view=diff
==
---
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
(original)
+++
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
Thu Nov 10 19:31:18 2011
@@ -147,7 +147,7 @@ public class ScriptRunner
* to skip the script execution.
* @param contextThe key-value storage used to share
information between hook scripts, may be codenull/code.
* @param logger The logger to redirect the script output to,
may be codenull/code to use stdout/stderr.
- * @param stage The stage of the build job the script is
invoked in, must not be codenull/code.
+ * @param stage The stage of the build job the script is
invoked in, must not be codenull/code. This is for logging purpose only.
* @param failOnExceptionIf codetrue/code and the script throws an
exception, then a {@link RunFailureException}
* will be thrown, otherwise a {@link
RunErrorException} will be thrown on script exception.
* @throws org.apache.maven.plugin.MojoExecutionException
svn commit: r1200517 - /maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ExecutionLogger.java
Author: rfscholte
Date: Thu Nov 10 20:11:06 2011
New Revision: 1200517
URL: http://svn.apache.org/viewvc?rev=1200517view=rev
Log:
Add javadoc to ExecutionLogger
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ExecutionLogger.java
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ExecutionLogger.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ExecutionLogger.java?rev=1200517r1=1200516r2=1200517view=diff
==
---
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ExecutionLogger.java
(original)
+++
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ExecutionLogger.java
Thu Nov 10 20:11:06 2011
@@ -26,7 +26,17 @@ import java.io.PrintStream;
*/
public interface ExecutionLogger
{
+/**
+ * The stream which will catch the output of the {@link ScriptRunner}.
+ *
+ * @return the output stream
+ */
PrintStream getPrintStream();
+/**
+ * Consume logging from this component.
+ *
+ * @param line the line to consume
+ */
void consumeLine( String line );
}
svn commit: r1205641 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Author: rfscholte
Date: Wed Nov 23 22:42:21 2011
New Revision: 1205641
URL: http://svn.apache.org/viewvc?rev=1205641view=rev
Log:
DOXIA-456: Add tests for skin and custom template with Velocity ToolManager ,
succeed without touching classloaders.
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java?rev=1205641r1=1205640r2=1205641view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Wed Nov 23 22:42:21 2011
@@ -27,11 +27,14 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.StringWriter;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
import org.apache.commons.io.IOUtils;
import org.apache.maven.doxia.sink.render.RenderingContext;
@@ -69,6 +72,8 @@ public class DefaultSiteRendererTest
*/
private Locale oldLocale;
+private File skinJar = new File( getBasedir(),
target/test-classes/skin.jar );
+
/**
* @throws java.lang.Exception if something goes wrong.
* @see org.codehaus.plexus.PlexusTestCase#setUp()
@@ -96,6 +101,20 @@ public class DefaultSiteRendererTest
IOUtil.close( os );
}
+InputStream skinIS = this.getResourceAsStream(
velocity-toolmanager.vm );
+JarOutputStream jarOS = new JarOutputStream( new FileOutputStream(
skinJar ) );
+try
+{
+jarOS.putNextEntry( new ZipEntry( META-INF/maven/site.vm ) );
+IOUtil.copy( skinIS, jarOS );
+jarOS.closeEntry();
+}
+finally
+{
+IOUtil.close( skinIS );
+IOUtil.close( jarOS );
+}
+
// Safety
FileUtils.deleteDirectory( getTestFile( OUTPUT ) );
@@ -173,7 +192,40 @@ public class DefaultSiteRendererTest
String expectedResult = IOUtils.toString(
getClass().getResourceAsStream( velocity-toolmanager.expected.txt ) );
assertEquals( expectedResult, renderResult );
}
+
+public void testVelocityToolManagerForTemplate() throws Exception
+{
+StringWriter writer = new StringWriter();
+File templateFile = new File( getBasedir(),
target/test-classes/org/apache/maven/doxia/siterenderer/velocity-toolmanager.vm
);
+MapString, ? attributes = Collections.emptyMap();
+
+SiteRenderingContext siteRenderingContext =
renderer.createContextForTemplate( templateFile, null, attributes, new
DecorationModel(), defaultWindowTitle, Locale.ENGLISH );
+RenderingContext context = new RenderingContext( new File( ),
document.html );
+SiteRendererSink sink = new SiteRendererSink( context );
+renderer.generateDocument( writer, sink, siteRenderingContext );
+
+String renderResult = writer.toString();
+String expectedResult = IOUtils.toString(
getClass().getResourceAsStream( velocity-toolmanager.expected.txt ) );
+assertEquals( expectedResult, renderResult );
+}
+
+public void testVelocityToolManagerForSkin() throws Exception
+{
+StringWriter writer = new StringWriter();
+
+File skinFile = skinJar;
+MapString, ? attributes = Collections.emptyMap();
+SiteRenderingContext siteRenderingContext =
renderer.createContextForSkin( skinFile, attributes, new DecorationModel(),
defaultWindowTitle, Locale.ENGLISH );
+RenderingContext context = new RenderingContext( new File( ),
document.html );
+SiteRendererSink sink = new SiteRendererSink( context );
+renderer.generateDocument( writer, sink, siteRenderingContext );
+
+String renderResult = writer.toString();
+String expectedResult = IOUtils.toString(
getClass().getResourceAsStream( velocity-toolmanager.expected.txt ) );
+assertEquals( expectedResult, renderResult );
+}
+
private SiteRenderingContext getSiteRenderingContext( DecorationModel
decoration, String siteDir, boolean validate )
{
SiteRenderingContext ctxt = new SiteRenderingContext();
svn commit: r1206276 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
Author: rfscholte Date: Fri Nov 25 18:19:56 2011 New Revision: 1206276 URL: http://svn.apache.org/viewvc?rev=1206276view=rev Log: MSITE-620: Fix documentation of attach-descriptor according to Maven3 Compatibility Notes Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java?rev=1206276r1=1206275r2=1206276view=diff == --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java Fri Nov 25 18:19:56 2011 @@ -31,9 +31,11 @@ import org.apache.maven.project.MavenPro import org.codehaus.plexus.util.FileUtils; /** - * Adds the site descriptor (codesite.xml/code) to the list of files to be installed/deployed. - * By default, this is enabled only when the project has pom packaging since it will be used by modules inheriting, - * but this can be enabled for other projects packaging if needed. + * Adds the site descriptor (codesite.xml/code) to the list of files to be installed/deployed.br/ + * For Maven-2.x this is enabled by default only when the project has codepom/code packaging since it will be used by modules inheriting, + * but this can be enabled for other projects packaging if needed.br/ + * This default execution has been removed from the built-in lifecycle of Maven 3.x for codepom/code-projects. + * Users that actually use those projects to provide a common site descriptor for sub modules will need to explicitly define this goal execution to restore the intended behavior. * * @author a href=mailto:br...@apache.org;Brett Porter/a * @version $Id$
svn commit: r1210609 - /maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Author: rfscholte Date: Mon Dec 5 20:24:47 2011 New Revision: 1210609 URL: http://svn.apache.org/viewvc?rev=1210609view=rev Log: MSKINS-16: width, height and border not picked up for banner Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1210609r1=1210608r2=1210609view=diff == --- maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm (original) +++ maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Mon Dec 5 20:24:47 2011 @@ -127,7 +127,22 @@ #else #set ( $alt = $banner.name ) #end -img src=$src alt=$alt/ +#if( $banner.border ) + #set ( $imgBorder = ' border=' + $border + '' ) +#else + #set ( $imgBorder = ) +#end +#if( $banner.width ) +#set ( $imgWidth = ' width=' + $banner.width + '' ) +#else +#set ( $imgWidth = ) +#end +#if( $banner.height ) + #set ( $imgHeight = ' height=' + $banner.height + '' ) +#else + #set ( $imgHeight = ) +#end +img src=$src alt=$alt$imgBorder$imgWidth$imgHeight/ #else h2$banner.name/h2 #end
svn commit: r1211230 - in /maven/skins/trunk/maven-fluido-skin/src: it/mskins-16/ it/mskins-16/pom.xml it/mskins-16/src/ it/mskins-16/src/site/ it/mskins-16/src/site/site.xml main/resources/META-INF/m
Author: rfscholte Date: Tue Dec 6 23:42:37 2011 New Revision: 1211230 URL: http://svn.apache.org/viewvc?rev=1211230view=rev Log: MSKINS-16: add IT and fix alt + border Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/ maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/pom.xml maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/ maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/site/ maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/site/site.xml Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/pom.xml?rev=1211230view=auto == --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/pom.xml (added) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/pom.xml Tue Dec 6 23:42:37 2011 @@ -0,0 +1,75 @@ +?xml version=1.0 encoding=UTF-8? +!-- + 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. +-- +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/xsd/maven-4.0.0.xsd; + modelVersion4.0.0/modelVersion + + groupIdorg.apache.maven.skins.its/groupId + artifactIdmskins-16/artifactId + version1.0-SNAPSHOT/version + + properties +skinName@project.name@/skinName +skinDescription@project.description@/skinDescription +skinGroupId@project.groupId@/skinGroupId +skinArtifactId@project.artifactId@/skinArtifactId +skinVersion@project.version@/skinVersion + /properties + + build +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-site-plugin/artifactId +version3.0/version + /plugin +/plugins + /build + + reporting +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-project-info-reports-plugin/artifactId +version2.4/version +configuration + dependencyDetailsEnabledfalse/dependencyDetailsEnabled + dependencyLocationsEnabledfalse/dependencyLocationsEnabled +/configuration +reportSets + reportSet +reports + reportindex/report + reportsummary/report + reportlicense/report + reportproject-team/report + reportscm/report + reportissue-tracking/report + reportmailing-list/report + reportdependencies/report + reportcim/report + reportplugin-management/report + reportplugins/report +/reports + /reportSet +/reportSets + /plugin +/plugins + /reporting + +/project \ No newline at end of file Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/site/site.xml?rev=1211230view=auto == --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/site/site.xml (added) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/site/site.xml Tue Dec 6 23:42:37 2011 @@ -0,0 +1,51 @@ +?xml version=1.0 encoding=UTF-8? + +!-- +/* + * 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
svn commit: r1211638 - in /maven/skins/trunk/maven-fluido-skin/src/it/mskins-15: ./ pom.xml src/ src/site/ src/site/site.xml
Author: rfscholte Date: Wed Dec 7 21:16:15 2011 New Revision: 1211638 URL: http://svn.apache.org/viewvc?rev=1211638view=rev Log: IT for MSKINS-15 Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/ maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/pom.xml maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/ maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/site/ maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/site/site.xml Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/pom.xml?rev=1211638view=auto == --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/pom.xml (added) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/pom.xml Wed Dec 7 21:16:15 2011 @@ -0,0 +1,76 @@ +?xml version=1.0 encoding=UTF-8? +!-- + 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. +-- +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/xsd/maven-4.0.0.xsd; + modelVersion4.0.0/modelVersion + + groupIdorg.apache.maven.skins.its/groupId + artifactIdmskins-15/artifactId + version1.0-SNAPSHOT/version + + properties +skinNameApache Maven Fluido Skin/skinName +skinDescriptionThe Apache Maven Fluido Skin is an Apache Maven site skin +built on top of Twitter's bootstrap./skinDescription +skinGroupIdorg.apache.maven.skins/skinGroupId +skinArtifactIdmaven-fluido-skin/skinArtifactId +skinVersion1.1-SNAPSHOT/skinVersion + /properties + + build +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-site-plugin/artifactId +version3.0/version + /plugin +/plugins + /build + + reporting +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-project-info-reports-plugin/artifactId +version2.4/version +configuration + dependencyDetailsEnabledfalse/dependencyDetailsEnabled + dependencyLocationsEnabledfalse/dependencyLocationsEnabled +/configuration +reportSets + reportSet +reports + reportindex/report + reportsummary/report + reportlicense/report + reportproject-team/report + reportscm/report + reportissue-tracking/report + reportmailing-list/report + reportdependencies/report + reportcim/report + reportplugin-management/report + reportplugins/report +/reports + /reportSet +/reportSets + /plugin +/plugins + /reporting + +/project \ No newline at end of file Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/site/site.xml?rev=1211638view=auto == --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/site/site.xml (added) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/site/site.xml Wed Dec 7 21:16:15 2011 @@ -0,0 +1,47 @@ +?xml version=1.0 encoding=UTF-8? + +!-- +/* + * 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
svn commit: r1211671 - /maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm
Author: rfscholte
Date: Wed Dec 7 22:12:49 2011
New Revision: 1211671
URL: http://svn.apache.org/viewvc?rev=1211671view=rev
Log:
Add header per custom option
Describe visibility external links
Modified:
maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm
Modified: maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm?rev=1211671r1=1211670r2=1211671view=diff
==
--- maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm (original)
+++ maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm Wed Dec 7
22:12:49 2011
@@ -51,6 +51,8 @@ ${project.name}
/project
+-+
+** TopBar and/or sideBar
+
The skin supports different layouts, enabling/disabling the left sidebar menu
and the topbar menu.
Users have just play with flags in the custom/fluidoSkin element in
site.xml:
@@ -81,6 +83,8 @@ ${project.name}
Default skin setting is the option 1.
+** TopBarIcon
+
When users decide to enable the topbar, they can plug a small icon/logo there
(typically 108*20 px) just configuring
the custom/fluidoSkin/topBarIcon element in site.xml:
@@ -102,6 +106,8 @@ ${project.name}
/project
+-+
+** GoogleSearch
+
Users can optionally enable the Google Search for the generated site,
requirements are:
* the project/url property in pom.xml, unless the
custom/fluidoSkin/googleSearch/sitesearch property is set in the
site.xml:
@@ -140,6 +146,11 @@ ${project.name}
[]
+ External links are either rendered in the sidebar or the topbar. When both
sidebar and topbar are enabled,
+ they are rendered as dropdown in the topbar only.
+
+** SourceLineNumbers
+
Source code sections are enhanced by
{{{http://code.google.com/p/google-code-prettify/}Google Code Prettify}}, users
can
optionally enable line numbers rendering (disabled by default):
@@ -155,7 +166,7 @@ ${project.name}
/project
+-+
-Footers placeholders
+** Footers placeholders
Since #eval Velocity macro is not supported yet, the only placeholder
available in additional footers is @project.name@.
svn commit: r1213032 - /maven/scm/trunk/src/site/apt/scms-overview.apt
Author: rfscholte
Date: Sun Dec 11 17:51:44 2011
New Revision: 1213032
URL: http://svn.apache.org/viewvc?rev=1213032view=rev
Log:
Move Git to fully implemented SCM-list
Modified:
maven/scm/trunk/src/site/apt/scms-overview.apt
Modified: maven/scm/trunk/src/site/apt/scms-overview.apt
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/src/site/apt/scms-overview.apt?rev=1213032r1=1213031r2=1213032view=diff
==
--- maven/scm/trunk/src/site/apt/scms-overview.apt (original)
+++ maven/scm/trunk/src/site/apt/scms-overview.apt Sun Dec 11 17:51:44 2011
@@ -36,6 +36,8 @@ Overview of SCM's
* {{{./cvs.html}CVS}}
+ * {{{./git.html}Git}}
+
* {{{./mercurial.html}Mercurial}}
* {{{./perforce.html}Perforce}}
@@ -52,8 +54,6 @@ Overview of SCM's
* {{{./clearcase.html}ClearCase}}
- * {{{./git.html}Git}}
-
* {{{./local.html}File system}}
* {{{./vss.html}Visual Source Safe}}
svn commit: r1214470 - in /maven/shared/trunk/maven-doxia-tools/src: main/java/org/apache/maven/doxia/tools/ test/java/org/apache/maven/doxia/tools/ test/resources/unit/interpolation-child-test/ test/
Author: rfscholte
Date: Wed Dec 14 21:13:54 2011
New Revision: 1214470
URL: http://svn.apache.org/viewvc?rev=1214470view=rev
Log:
Fix MSHARED-217: Separate inheritance and interpolation
Added:
maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/interpolation-child-test/
maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/interpolation-child-test/pom.xml
maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/interpolation-child-test/src/
maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/interpolation-child-test/src/site/
maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/interpolation-child-test/src/site/site.xml
maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/interpolation-parent-test/
maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/interpolation-parent-test/pom.xml
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1214470r1=1214469r2=1214470view=diff
==
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Wed Dec 14 21:13:54 2011
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
+import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URL;
@@ -54,6 +55,7 @@ import org.apache.maven.doxia.site.decor
import org.apache.maven.doxia.site.decoration.Skin;
import
org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler;
import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
+import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Writer;
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Model;
import org.apache.maven.model.Site;
@@ -459,10 +461,9 @@ public class DefaultSiteTool
getDecorationModel( project, parentProject, reactorProjects,
localRepository, repositories, siteDirectory,
llocale, props, inputEncoding, outputEncoding
);
+String siteDescriptorContent;
if ( decorationModel == null )
{
-String siteDescriptorContent;
-
try
{
// Note the default is not a super class - it is used when
nothing else is found
@@ -473,12 +474,24 @@ public class DefaultSiteTool
{
throw new SiteToolException( Error reading default site
descriptor: + e.getMessage(), e );
}
-
-siteDescriptorContent = getInterpolatedSiteDescriptorContent(
props, project, siteDescriptorContent,
-
inputEncoding, outputEncoding );
-
-decorationModel = readDecorationModel( siteDescriptorContent );
}
+else
+{
+try
+{
+StringWriter writer = new StringWriter();
+new DecorationXpp3Writer().write( writer, decorationModel );
+siteDescriptorContent = writer.toString();
+}
+catch ( IOException e )
+{
+throw new SiteToolException( The site descriptor cannot be
parsed!, e );
+}
+}
+
+siteDescriptorContent = getInterpolatedSiteDescriptorContent( props,
project, siteDescriptorContent,
+
inputEncoding, outputEncoding );
+decorationModel = readDecorationModel( siteDescriptorContent );
if ( parentProject != null )
{
@@ -1160,16 +1173,15 @@ public class DefaultSiteTool
siteDescriptor = getSiteDescriptorFromBasedir( siteDirectory,
project.getBasedir(), locale );
}
-String siteDescriptorContent = null;
-long siteDescriptorLastModified = 0L;
+DecorationModel decoration = null;
try
{
if ( siteDescriptor != null siteDescriptor.exists() )
{
getLogger().debug( Reading site descriptor from +
siteDescriptor );
Reader siteDescriptorReader = ReaderFactory.newXmlReader(
siteDescriptor );
-siteDescriptorContent = IOUtil.toString( siteDescriptorReader
);
-siteDescriptorLastModified
svn commit: r1214494 - /maven/shared/trunk/maven-doxia-tools/pom.xml
Author: rfscholte Date: Wed Dec 14 21:46:18 2011 New Revision: 1214494 URL: http://svn.apache.org/viewvc?rev=1214494view=rev Log: Fix MSHARED-200: Migration from obsolete plexus-maven-plugin to plexus-containers-component-metadata Modified: maven/shared/trunk/maven-doxia-tools/pom.xml Modified: maven/shared/trunk/maven-doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/pom.xml?rev=1214494r1=1214493r2=1214494view=diff == --- maven/shared/trunk/maven-doxia-tools/pom.xml (original) +++ maven/shared/trunk/maven-doxia-tools/pom.xml Wed Dec 14 21:46:18 2011 @@ -156,12 +156,12 @@ plugins plugin groupIdorg.codehaus.plexus/groupId -artifactIdplexus-maven-plugin/artifactId +artifactIdplexus-component-metadata/artifactId executions execution idcreate-component-descriptor/id goals - goaldescriptor/goal + goalgenerate-metadata/goal /goals /execution /executions
svn commit: r1214960 - in /maven/shared/trunk/maven-doxia-tools/src: main/java/org/apache/maven/doxia/tools/ test/java/org/apache/maven/doxia/tools/ test/resources/unit/interpolation-child-test/ test/
Author: rfscholte
Date: Thu Dec 15 21:22:49 2011
New Revision: 1214960
URL: http://svn.apache.org/viewvc?rev=1214960view=rev
Log:
revert changes of rev 1214470, some parts of site.xml inheritence must be
interpolated immediately, other parts at the end. Requires another approach.
Removed:
maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/interpolation-child-test/
maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/interpolation-parent-test/
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1214960r1=1214959r2=1214960view=diff
==
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Thu Dec 15 21:22:49 2011
@@ -23,7 +23,6 @@ import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
-import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URL;
@@ -55,7 +54,6 @@ import org.apache.maven.doxia.site.decor
import org.apache.maven.doxia.site.decoration.Skin;
import
org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler;
import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
-import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Writer;
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Model;
import org.apache.maven.model.Site;
@@ -461,9 +459,10 @@ public class DefaultSiteTool
getDecorationModel( project, parentProject, reactorProjects,
localRepository, repositories, siteDirectory,
llocale, props, inputEncoding, outputEncoding
);
-String siteDescriptorContent;
if ( decorationModel == null )
{
+String siteDescriptorContent;
+
try
{
// Note the default is not a super class - it is used when
nothing else is found
@@ -474,24 +473,12 @@ public class DefaultSiteTool
{
throw new SiteToolException( Error reading default site
descriptor: + e.getMessage(), e );
}
+
+siteDescriptorContent = getInterpolatedSiteDescriptorContent(
props, project, siteDescriptorContent,
+
inputEncoding, outputEncoding );
+
+decorationModel = readDecorationModel( siteDescriptorContent );
}
-else
-{
-try
-{
-StringWriter writer = new StringWriter();
-new DecorationXpp3Writer().write( writer, decorationModel );
-siteDescriptorContent = writer.toString();
-}
-catch ( IOException e )
-{
-throw new SiteToolException( The site descriptor cannot be
parsed!, e );
-}
-}
-
-siteDescriptorContent = getInterpolatedSiteDescriptorContent( props,
project, siteDescriptorContent,
-
inputEncoding, outputEncoding );
-decorationModel = readDecorationModel( siteDescriptorContent );
if ( parentProject != null )
{
@@ -1173,15 +1160,16 @@ public class DefaultSiteTool
siteDescriptor = getSiteDescriptorFromBasedir( siteDirectory,
project.getBasedir(), locale );
}
-DecorationModel decoration = null;
+String siteDescriptorContent = null;
+long siteDescriptorLastModified = 0L;
try
{
if ( siteDescriptor != null siteDescriptor.exists() )
{
getLogger().debug( Reading site descriptor from +
siteDescriptor );
Reader siteDescriptorReader = ReaderFactory.newXmlReader(
siteDescriptor );
-decoration = readDecorationModel( siteDescriptorReader );
-decoration.setLastModified( siteDescriptor.lastModified() );
+siteDescriptorContent = IOUtil.toString( siteDescriptorReader
);
+siteDescriptorLastModified = siteDescriptor.lastModified();
}
}
catch ( IOException e )
@@ -1189,6 +1177,16 @@ public class DefaultSiteTool
throw new SiteToolException( The site descriptor cannot be
read!, e );
}
+DecorationModel decoration
svn commit: r1220517 - /maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Author: rfscholte Date: Sun Dec 18 18:52:15 2011 New Revision: 1220517 URL: http://svn.apache.org/viewvc?rev=1220517view=rev Log: push publishDate one level up as it shouldn't be a skin-specific custom property Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1220517r1=1220516r2=1220517view=diff == --- maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm (original) +++ maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Sun Dec 18 18:52:15 2011 @@ -363,9 +363,8 @@ ## #if ( $publishDate ) #set ( $dateValue = $dateFormat.format( $publishDate ) ) - #elseif ( $decoration.custom.getChild( 'fluidoSkin' ) - $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'publishDate' ) ) -#set ( $dateValue = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'publishDate' ) ) + #elseif ( $decoration.custom.getChild( 'publishDate' ) ) +#set ( $dateValue = $decoration.custom.getChild( 'publishDate' ) ) #else #set ( $dateValue = $dateFormat.format( $currentDate ) ) #end
svn commit: r1220546 - /maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm
Author: rfscholte
Date: Sun Dec 18 21:22:50 2011
New Revision: 1220546
URL: http://svn.apache.org/viewvc?rev=1220546view=rev
Log:
Fix MSKINS-20: Add custom property publishDate
Modified:
maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm
Modified:
maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm?rev=1220546r1=1220545r2=1220546view=diff
==
---
maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm
Sun Dec 18 21:22:50 2011
@@ -289,19 +289,25 @@
#end
#end
##
-#macro ( publishDate $position $publishDate $version )
- #if ( $publishDate $publishDate.format )
-#set ( $format = $publishDate.format )
+#macro ( publishDate $position $decorationPublishDate $version )
+ #if ( $decorationPublishDate $decorationPublishDate.format )
+#set ( $format = $decorationPublishDate.format )
#else
#set ( $format = -MM-dd )
#end
##
$dateFormat.applyPattern( $format )
##
- #set ( $dateToday = $dateFormat.format( $currentDate ) )
+ #if ( $publishDate )
+#set ( $dateValue = $dateFormat.format( $publishDate ) )
+ #elseif ( $decoration.custom.getChild( 'publishDate' ) )
+#set ( $dateValue = $decoration.custom.getChild( 'publishDate' ) )
+ #else
+#set ( $dateValue = $dateFormat.format( $currentDate ) )
+ #end
##
- #if ( $publishDate $publishDate.position )
-#set ( $datePosition = $publishDate.position )
+ #if ( $decorationPublishDate $decorationPublishDate.position )
+#set ( $datePosition = $decorationPublishDate.position )
#else
#set ( $datePosition = left )
#end
@@ -325,20 +331,20 @@
##
#if ( $datePosition.equalsIgnoreCase( $position ) )
#if ( ( $datePosition.equalsIgnoreCase( right ) ) || (
$datePosition.equalsIgnoreCase( bottom ) ) )
- $prefix $i18n.getString( site-renderer, $locale,
template.lastpublished ): $dateToday
+ $prefix $i18n.getString( site-renderer, $locale,
template.lastpublished ): $dateValue
#if ( $versionPosition.equalsIgnoreCase( $position ) )
nbsp;| $i18n.getString( site-renderer, $locale, template.version
): ${project.version}
#end
#elseif ( ( $datePosition.equalsIgnoreCase( navigation-bottom ) ) || (
$datePosition.equalsIgnoreCase( navigation-top ) ) )
div id=lastPublished
-$i18n.getString( site-renderer, $locale, template.lastpublished ):
$dateToday
+$i18n.getString( site-renderer, $locale, template.lastpublished ):
$dateValue
#if ( $versionPosition.equalsIgnoreCase( $position ) )
nbsp;| $i18n.getString( site-renderer, $locale,
template.version ): ${project.version}
#end
/div
#elseif ( $datePosition.equalsIgnoreCase(left) )
div class=xleft
-$i18n.getString( site-renderer, $locale, template.lastpublished ):
$dateToday
+$i18n.getString( site-renderer, $locale, template.lastpublished ):
$dateValue
#if ( $versionPosition.equalsIgnoreCase( $position ) )
nbsp;| $i18n.getString( site-renderer, $locale,
template.version ): ${project.version}
#end
svn commit: r1222390 - in /maven/skins/trunk/maven-fluido-skin/src: it/mskins-17/src/site/site.xml it/mskins-17/verify.groovy main/resources/META-INF/maven/site.vm
Author: rfscholte Date: Thu Dec 22 18:34:47 2011 New Revision: 1222390 URL: http://svn.apache.org/viewvc?rev=1222390view=rev Log: Fix IT of MSKINS-17 + verification script. Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/verify.groovy Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/src/site/site.xml maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/src/site/site.xml?rev=1222390r1=1222389r2=1222390view=diff == --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/src/site/site.xml (original) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/src/site/site.xml Thu Dec 22 18:34:47 2011 @@ -33,9 +33,7 @@ !-- START SNIPPET: skin-custom-config -- custom -fluidoSkin - publishDate1970-01-01/publishDate -/fluidoSkin +publishDate1970-01-01/publishDate /custom !-- END SNIPPET: skin-custom-config -- Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/verify.groovy URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/verify.groovy?rev=1222390view=auto == --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/verify.groovy (added) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/verify.groovy Thu Dec 22 18:34:47 2011 @@ -0,0 +1,3 @@ +File index = new File( basedir, target/site/index.html ) +assert index.exists() +assert 1 == index.getText().count( 'li id=publishDate class=pull-rightLast Published: 1970-01-01/li' ) \ No newline at end of file Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1222390r1=1222389r2=1222390view=diff == --- maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm (original) +++ maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Thu Dec 22 18:34:47 2011 @@ -359,7 +359,7 @@ #if ( $publishDate ) #set ( $dateValue = $dateFormat.format( $publishDate ) ) #elseif ( $decoration.custom.getChild( 'publishDate' ) ) -#set ( $dateValue = $decoration.custom.getChild( 'publishDate' ) ) +#set ( $dateValue = $decoration.custom.getChild( 'publishDate' ).getValue() ) #else #set ( $dateValue = $dateFormat.format( $currentDate ) ) #end
svn commit: r1222956 - /maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-base.css
Author: rfscholte
Date: Sat Dec 24 10:44:23 2011
New Revision: 1222956
URL: http://svn.apache.org/viewvc?rev=1222956view=rev
Log:
Fix MSKINS-12: Internet Explorer 9 shows scrollbar on div id=navcolumn
Modified:
maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-base.css
Modified:
maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-base.css
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-base.css?rev=1222956r1=1222955r2=1222956view=diff
==
--- maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-base.css
(original)
+++ maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-base.css
Sat Dec 24 10:44:23 2011
@@ -52,6 +52,7 @@ div.clear hr{
width: 170px;
float:left;
overflow: auto;
+ padding-bottom: 2px; /* IE-9 scrollbar-fix */
}
#bodyColumn {
margin-right: 1.5em;
svn commit: r1222957 - /maven/skins/trunk/maven-default-skin/src/main/resources/css/maven-theme.css
Author: rfscholte
Date: Sat Dec 24 10:55:34 2011
New Revision: 1222957
URL: http://svn.apache.org/viewvc?rev=1222957view=rev
Log:
Fix MSKINS-12: Internet Explorer 9 shows scrollbar on div id=navcolumn
Modified:
maven/skins/trunk/maven-default-skin/src/main/resources/css/maven-theme.css
Modified:
maven/skins/trunk/maven-default-skin/src/main/resources/css/maven-theme.css
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-default-skin/src/main/resources/css/maven-theme.css?rev=1222957r1=1222956r2=1222957view=diff
==
--- maven/skins/trunk/maven-default-skin/src/main/resources/css/maven-theme.css
(original)
+++ maven/skins/trunk/maven-default-skin/src/main/resources/css/maven-theme.css
Sat Dec 24 10:55:34 2011
@@ -98,6 +98,7 @@ p {
margin: 10px 0 0 5px;
border: 1px solid #999;
background-color: #eee;
+ padding-bottom: 3px; /* IE-9 scrollbar-fix */
}
#navcolumn h5 {
font-size: smaller;
svn commit: r1222959 - /maven/skins/trunk/maven-classic-skin/src/main/resources/css/maven-theme.css
Author: rfscholte
Date: Sat Dec 24 11:08:21 2011
New Revision: 1222959
URL: http://svn.apache.org/viewvc?rev=1222959view=rev
Log:
Fix MSKINS-12: Internet Explorer 9 shows scrollbar on div id=navcolumn
Modified:
maven/skins/trunk/maven-classic-skin/src/main/resources/css/maven-theme.css
Modified:
maven/skins/trunk/maven-classic-skin/src/main/resources/css/maven-theme.css
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-classic-skin/src/main/resources/css/maven-theme.css?rev=1222959r1=1222958r2=1222959view=diff
==
--- maven/skins/trunk/maven-classic-skin/src/main/resources/css/maven-theme.css
(original)
+++ maven/skins/trunk/maven-classic-skin/src/main/resources/css/maven-theme.css
Sat Dec 24 11:08:21 2011
@@ -65,6 +65,7 @@ div#banner {
border-right: 1px solid #aaa;
border-bottom: 1px solid #aaa;
border-top: 1px solid #fff;
+ padding-bottom: 2px; /* IE-9 scrollbar-fix */
}
#navcolumn {
svn commit: r1222966 - in /maven/skins/trunk/maven-stylus-skin/src: it/mskins-10/ it/mskins-10/pom.xml it/mskins-10/src/ it/mskins-10/src/site/ it/mskins-10/src/site/site.xml main/resources/css/maven-
Author: rfscholte
Date: Sat Dec 24 13:01:19 2011
New Revision: 1222966
URL: http://svn.apache.org/viewvc?rev=1222966view=rev
Log:
Fix MSKINS-10: Suppress line wrapping in navigation caused by spaces or
hyphens.
Resolution: use text-indent
Added:
maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/
maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/pom.xml
maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/src/
maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/src/site/
maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/src/site/site.xml
Modified:
maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-base.css
Added: maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/pom.xml?rev=1222966view=auto
==
--- maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/pom.xml (added)
+++ maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/pom.xml Sat Dec 24
13:01:19 2011
@@ -0,0 +1,58 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+ 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.
+--
+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/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.skins.its/groupId
+ artifactIdmskins-10/artifactId
+ version1.0-SNAPSHOT/version
+
+ properties
+skinName@project.name@/skinName
+skinDescription@project.description@/skinDescription
+skinGroupId@project.groupId@/skinGroupId
+skinArtifactId@project.artifactId@/skinArtifactId
+skinVersion@project.version@/skinVersion
+ /properties
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-site-plugin/artifactId
+version3.0/version
+ /plugin
+/plugins
+ /build
+
+ reporting
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-project-info-reports-plugin/artifactId
+version2.4/version
+configuration
+ dependencyDetailsEnabledfalse/dependencyDetailsEnabled
+ dependencyLocationsEnabledfalse/dependencyLocationsEnabled
+/configuration
+ /plugin
+/plugins
+ /reporting
+
+/project
\ No newline at end of file
Added: maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/src/site/site.xml?rev=1222966view=auto
==
--- maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/src/site/site.xml
(added)
+++ maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/src/site/site.xml Sat
Dec 24 13:01:19 2011
@@ -0,0 +1,41 @@
+?xml version=1.0 encoding=UTF-8?
+
+!--
+/*
+ * 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.
+ */
+ --
+
+project xmlns=http://maven.apache.org/DECORATION/1.1.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/DECORATION/1.1.0
http://maven.apache.org/xsd/decoration-1.1.0.xsd;
+ name=${skinName}
+
+ skin
+groupId${skinGroupId}/groupId
+artifactId${skinArtifactId}/artifactId
+version${skinVersion}/version
+ /skin
+
+ body
+menu
+ item
svn commit: r1222981 - in /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main: java/org/apache/maven/doxia/siterenderer/ resources/org/apache/maven/doxia/siterenderer/resources/
Author: rfscholte
Date: Sat Dec 24 14:30:00 2011
New Revision: 1222981
URL: http://svn.apache.org/viewvc?rev=1222981view=rev
Log:
DOXIA-458: Make publish date configurable
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1222981r1=1222980r2=1222981view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Sat Dec 24 14:30:00 2011
@@ -465,6 +465,9 @@ public class DefaultSiteRenderer
context.put( dateRevision, sdf.format( new Date() ) );
context.put( currentDate, new Date() );
+
+context.put( publishDate, siteRenderingContext.getPublishDate() );
+
Locale locale = siteRenderingContext.getLocale();
context.put( dateFormat, DateFormat.getDateInstance(
DateFormat.DEFAULT, locale ) );
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java?rev=1222981r1=1222980r2=1222981view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
Sat Dec 24 14:30:00 2011
@@ -22,6 +22,7 @@ package org.apache.maven.doxia.siterende
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -68,6 +69,8 @@ public class SiteRenderingContext
private boolean validate;
+private Date publishDate;
+
/**
* If input documents should be validated before parsing.
* By default no validation is performed.
@@ -372,4 +375,25 @@ public class SiteRenderingContext
{
this.outputEncoding = outputEncoding;
}
+
+/**
+ * pIf you want to specify a specific publish date instead of the
current date./p
+ *
+ * @return the publish date, can be {@code null}
+ */
+public Date getPublishDate()
+{
+return publishDate;
+}
+
+/**
+ * pSpecify a specific publish date instead of the current date./p
+ *
+ * @param publishDate the publish date
+ */
+public void setPublishDate( Date publishDate )
+{
+this.publishDate = publishDate;
+}
+
}
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm?rev=1222981r1=1222980r2=1222981view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
Sat Dec 24 14:30:00 2011
@@ -289,19 +289,25 @@
#end
#end
##
-#macro ( publishDate $position $publishDate $version )
- #if ( $publishDate $publishDate.format )
-#set ( $format = $publishDate.format )
+#macro ( publishDate $position $decorationPublishDate $version )
+ #if ( $decorationPublishDate $decorationPublishDate.format )
+#set ( $format = $decorationPublishDate.format )
#else
#set ( $format = -MM-dd )
#end
##
$dateFormat.applyPattern( $format )
##
- #set ( $dateToday = $dateFormat.format( $currentDate ) )
+ #if ( $publishDate )
+#set ( $dateValue = $dateFormat.format( $publishDate ) )
+ #elseif ( $decoration.custom.getChild
svn commit: r1224615 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
Author: rfscholte
Date: Sun Dec 25 17:35:54 2011
New Revision: 1224615
URL: http://svn.apache.org/viewvc?rev=1224615view=rev
Log:
Fix MDEP-297: outputType is indeed part of 2.2 instead of 2.1
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java?rev=1224615r1=1224614r2=1224615view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
Sun Dec 25 17:35:54 2011
@@ -154,7 +154,7 @@ public class TreeMojo extends AbstractMo
* pygraphviz can be found a
href=http://networkx.lanl.gov/pygraphviz/tutorial.html#layout-and-drawing;here/a
*
* @parameter expression=${outputType} default-value=text
- * @since 2.1
+ * @since 2.2
*/
private String outputType;
svn commit: r1224834 - in /maven/skins/trunk/maven-stylus-skin/src: it/mskins-20/ it/mskins-20/src/ it/mskins-20/src/site/ it/mskins-20/src/site/apt/ main/resources/META-INF/maven/
Author: rfscholte
Date: Mon Dec 26 23:18:28 2011
New Revision: 1224834
URL: http://svn.apache.org/viewvc?rev=1224834view=rev
Log:
Add IT for MSKINS-20
Added:
maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/
maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/pom.xml
maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/
maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/site/
maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/site/apt/
maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/site/apt/index.apt.vm
maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/site/site.xml
maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/verify.groovy
Modified:
maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm
Added: maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/pom.xml?rev=1224834view=auto
==
--- maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/pom.xml (added)
+++ maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/pom.xml Mon Dec 26
23:18:28 2011
@@ -0,0 +1,65 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+ 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.
+--
+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/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.skins.its/groupId
+ artifactIdmskins-20/artifactId
+ version1.0-SNAPSHOT/version
+
+ properties
+skinName@project.name@/skinName
+skinDescription@project.description@/skinDescription
+skinGroupId@project.groupId@/skinGroupId
+skinArtifactId@project.artifactId@/skinArtifactId
+skinVersion@project.version@/skinVersion
+ /properties
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-site-plugin/artifactId
+version3.0/version
+ /plugin
+/plugins
+ /build
+
+ reporting
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-project-info-reports-plugin/artifactId
+version2.4/version
+configuration
+ dependencyDetailsEnabledfalse/dependencyDetailsEnabled
+ dependencyLocationsEnabledfalse/dependencyLocationsEnabled
+/configuration
+reportSets
+ reportSet
+reports
+ reportindex/report
+/reports
+ /reportSet
+/reportSets
+ /plugin
+/plugins
+ /reporting
+
+/project
\ No newline at end of file
Added:
maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/site/apt/index.apt.vm?rev=1224834view=auto
==
---
maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/site/apt/index.apt.vm
(added)
+++
maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/site/apt/index.apt.vm
Mon Dec 26 23:18:28 2011
@@ -0,0 +1,16 @@
+ --
+ ${project.name}
+ --
+ Robert Scholte
+ --
+ 2011-12-23
+ --
+
+${project.name}
+
+ This is a test for ${skinName} to verify the custom publish date.
+ ${skinDescription}
+
+* Actual configuration
+
+%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
Added: maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/site/site.xml?rev=1224834view=auto
==
--- maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/site/site.xml
(added)
+++ maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/site/site.xml Mon
Dec 26 23:18:28 2011
@@ -0,0 +1,43 @@
+?xml version=1.0 encoding=UTF-8?
+
+!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See
svn commit: r1226063 - /maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css
Author: rfscholte
Date: Sat Dec 31 11:02:21 2011
New Revision: 1226063
URL: http://svn.apache.org/viewvc?rev=1226063view=rev
Log:
Set background color of zebra-striped table to white to avoid broken page
background
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css?rev=1226063r1=1226062r2=1226063view=diff
==
--- maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css
(original)
+++ maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css
Sat Dec 31 11:02:21 2011
@@ -54,4 +54,7 @@ li.collapsed{list-style-image: url('../i
tt{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New,
monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background-color:#fee9cc;color:rgba(0,
0, 0, 0.75);padding:1px 3px;}
/* avoid greyed list items */
-li{color:#404040;}
\ No newline at end of file
+li{color:#404040;}
+
+/* avoid transparent background of table */
+table.zebra-striped{background-color:#FFF}
\ No newline at end of file
svn commit: r1228615 - in /maven/doxia/doxia/trunk/doxia-core/src: main/java/org/apache/maven/doxia/sink/RandomAccessSink.java site/apt/using-randomaccesssink.apt site/site.xml test/java/org/apache/ma
Author: rfscholte
Date: Sat Jan 7 13:50:47 2012
New Revision: 1228615
URL: http://svn.apache.org/viewvc?rev=1228615view=rev
Log:
Fix DOXIA-387: Add RandomAccessSink
Added:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/RandomAccessSink.java
maven/doxia/doxia/trunk/doxia-core/src/site/apt/using-randomaccesssink.apt
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/RandomAccessSinkTest.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/site/site.xml
Added:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/RandomAccessSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/RandomAccessSink.java?rev=1228615view=auto
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/RandomAccessSink.java
(added)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/RandomAccessSink.java
Sat Jan 7 13:50:47 2012
@@ -0,0 +1,898 @@
+package org.apache.maven.doxia.sink;
+
+/*
+ * 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.
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.doxia.logging.Log;
+
+/**
+ * The RandomAccessSink provides the ability to create a {@link Sink} with
hooks.
+ * A page can be prepared by first creating its structure and specifying the
positions of these hooks.
+ * After specifying the structure, the page can be filled with content from
one or more models.
+ * These hooks can prevent you to have to loop over the model multiple times
to build the page as desired.
+ *
+ * @author Robert Scholte
+ * @since 1.3
+ */
+public class RandomAccessSink
+implements Sink
+{
+private SinkFactory sinkFactory;
+
+private String encoding;
+
+private OutputStream coreOutputStream;
+
+private Sink coreSink;
+
+private ListSink sinks = new ArrayListSink();
+
+private ListByteArrayOutputStream outputStreams = new
ArrayListByteArrayOutputStream();
+
+private Sink currentSink;
+
+public RandomAccessSink( SinkFactory sinkFactory, OutputStream stream )
+throws IOException
+{
+this.sinkFactory = sinkFactory;
+this.coreOutputStream = stream;
+this.coreSink = this.currentSink = sinkFactory.createSink( stream );
+}
+
+public RandomAccessSink( SinkFactory sinkFactory, OutputStream stream,
String encoding )
+throws IOException
+{
+this.sinkFactory = sinkFactory;
+this.coreOutputStream = stream;
+this.encoding = encoding;
+this.coreSink = this.currentSink = sinkFactory.createSink( stream,
encoding );
+}
+
+public RandomAccessSink( SinkFactory sinkFactory, File outputDirectory,
String outputName )
+throws IOException
+{
+this.sinkFactory = sinkFactory;
+this.coreOutputStream = new FileOutputStream( new File(
outputDirectory, outputName ) );
+this.coreSink = this.currentSink = sinkFactory.createSink(
coreOutputStream );
+}
+
+public RandomAccessSink( SinkFactory sinkFactory, File outputDirectory,
String outputName, String encoding )
+throws IOException
+{
+this.sinkFactory = sinkFactory;
+this.coreOutputStream = new FileOutputStream( new File(
outputDirectory, outputName ) );
+this.encoding = encoding;
+this.coreSink = this.currentSink = sinkFactory.createSink(
coreOutputStream, encoding );
+}
+
+/**
+ * By calling this method a sink reference is added at the current
position. You can write to both the new sink
+ * reference and the original sink. After flushing all sinks will be
flushed in the right order.
+ *
+ * @return a subsink reference you can write to
+ */
+public Sink addSinkHook()
+{
+Sink subSink = null;
+try
+{
+ByteArrayOutputStream subOut = new ByteArrayOutputStream
svn commit: r1228836 - in /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear: AbstractEarModule.java AbstractEarMojo.java ApplicationXmlWriterContext.java EarModule.java E
Author: rfscholte
Date: Sun Jan 8 12:59:53 2012
New Revision: 1228836
URL: http://svn.apache.org/viewvc?rev=1228836view=rev
Log:
Add generics
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java?rev=1228836r1=1228835r2=1228836view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
Sun Jan 8 12:59:53 2012
@@ -97,7 +97,8 @@ public abstract class AbstractEarModule
this.earExecutionContext = earExecutionContext;
}
-public void resolveArtifact( Set artifacts )
+/** {@inheritDoc} */
+public void resolveArtifact( SetArtifact artifacts )
throws EarPluginException, MojoFailureException
{
// If the artifact is already set no need to resolve it
@@ -114,7 +115,8 @@ public abstract class AbstractEarModule
// Artifact has not been found
if ( artifact == null )
{
-Set candidates = ar.getArtifacts( groupId, artifactId,
getType() );
+@SuppressWarnings( unchecked )
+SetArtifact candidates = ar.getArtifacts( groupId,
artifactId, getType() );
if ( candidates.size() 1 )
{
throw new MojoFailureException( Artifact[ + this + ]
has + candidates.size()
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java?rev=1228836r1=1228835r2=1228836view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
Sun Jan 8 12:59:53 2012
@@ -19,6 +19,11 @@ package org.apache.maven.plugin.ear;
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.plugin.AbstractMojo;
@@ -30,12 +35,6 @@ import org.apache.maven.project.MavenPro
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.PlexusConfigurationException;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
/**
* A base class for EAR-processing related tasks.
*
@@ -141,12 +140,13 @@ public abstract class AbstractEarMojo
*/
private String mainArtifactId = none;
-private List earModules;
+private ListEarModule earModules;
-private List allModules;
+private ListEarModule allModules;
private JbossConfiguration jbossConfiguration;
+@SuppressWarnings( unchecked )
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -183,7 +183,7 @@ public abstract class AbstractEarMojo
typeMappingService );
getLog().debug( Resolving ear modules ... );
-allModules = new ArrayList();
+allModules = new ArrayListEarModule();
try
{
if ( modules != null modules.length 0 )
@@ -202,11 +202,9 @@ public abstract class AbstractEarMojo
}
// Let's add other modules
-Set artifacts = project.getArtifacts();
-for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
+SetArtifact artifacts = project.getArtifacts();
+for ( Artifact artifact : artifacts )
{
-Artifact artifact = (Artifact) iter.next();
-
// If the artifact's type is POM, ignore and continue
// since it's used for transitive deps only.
if ( pom.equals( artifact.getType
svn commit: r1228837 - /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/
Author: rfscholte
Date: Sun Jan 8 13:19:38 2012
New Revision: 1228837
URL: http://svn.apache.org/viewvc?rev=1228837view=rev
Log:
Add more generics
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JarModule.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java?rev=1228837r1=1228836r2=1228837view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
Sun Jan 8 13:19:38 2012
@@ -19,12 +19,11 @@ package org.apache.maven.plugin.ear;
* under the License.
*/
+import java.io.Writer;
+
import org.apache.maven.plugin.ear.util.JavaEEVersion;
import org.codehaus.plexus.util.xml.XMLWriter;
-import java.io.Writer;
-import java.util.Iterator;
-
/**
* An ttXmlWriter/tt based implementation used to generate an
* ttapplication.xml/tt file
@@ -102,18 +101,13 @@ final class ApplicationXmlWriter
}
// Do not change this unless you really know what you're doing :)
-
-final Iterator moduleIt = context.getEarModules().iterator();
-while ( moduleIt.hasNext() )
+for ( EarModule module : context.getEarModules() )
{
-EarModule module = (EarModule) moduleIt.next();
module.appendModule( writer, version.getVersion(),
generateModuleId );
}
-final Iterator securityRoleIt = context.getSecurityRoles().iterator();
-while ( securityRoleIt.hasNext() )
+for ( SecurityRole securityRole : context.getSecurityRoles() )
{
-SecurityRole securityRole = (SecurityRole) securityRoleIt.next();
securityRole.appendSecurityRole( writer );
}
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java?rev=1228837r1=1228836r2=1228837view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
Sun Jan 8 13:19:38 2012
@@ -67,6 +67,7 @@ public final class EarModuleFactory
* @return an ear module for this artifact
* @throws UnknownArtifactTypeException if the artifact is not handled
*/
+@SuppressWarnings( deprecation )
public static EarModule newEarModule( Artifact artifact, JavaEEVersion
javaEEVersion, String defaultLibBundleDir,
Boolean includeInApplicationXml,
ArtifactTypeMappingService
typeMappingService )
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=1228837r1=1228836r2=1228837view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Sun Jan 8 13:19:38 2012
@@ -51,7 +51,6 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import java.util.zip.ZipException;
@@ -293,14 +292,12 @@ public class EarMojo
final JavaEEVersion javaEEVersion = JavaEEVersion.getJavaEEVersion(
version );
// Initializes unpack types
-List unpackTypesList = new ArrayList
svn commit: r1228846 - in /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear: output/ util/
Author: rfscholte
Date: Sun Jan 8 13:53:34 2012
New Revision: 1228846
URL: http://svn.apache.org/viewvc?rev=1228846view=rev
Log:
Add more generics
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMappingFactory.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactRepository.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMappingFactory.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMappingFactory.java?rev=1228846r1=1228845r2=1228846view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMappingFactory.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMappingFactory.java
Sun Jan 8 13:53:34 2012
@@ -74,7 +74,7 @@ public class FileNameMappingFactory
}
try
{
-final Class c = Class.forName( nameOrClass );
+final Class? c = Class.forName( nameOrClass );
return (FileNameMapping) c.newInstance();
}
catch ( ClassNotFoundException e )
@@ -98,4 +98,4 @@ public class FileNameMappingFactory
Specified class[ + nameOrClass + ] does not implement[ +
FileNameMapping.class.getName() + ] );
}
}
-}
+}
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactRepository.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactRepository.java?rev=1228846r1=1228845r2=1228846view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactRepository.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactRepository.java
Sun Jan 8 13:53:34 2012
@@ -19,12 +19,11 @@ package org.apache.maven.plugin.ear.util
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-
-import java.util.Iterator;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.maven.artifact.Artifact;
+
/**
* An artifact repository used to resolve {@link
org.apache.maven.plugin.ear.EarModule}.
*
@@ -33,7 +32,7 @@ import java.util.TreeSet;
*/
public class ArtifactRepository
{
-private final Set artifacts;
+private final SetArtifact artifacts;
private final String mainArtifactId;
@@ -46,7 +45,7 @@ public class ArtifactRepository
* @param mainArtifactId the id to use for the main artifact
(no classifier)
* @param artifactTypeMappingService
*/
-public ArtifactRepository( Set artifacts, String mainArtifactId,
+public ArtifactRepository( SetArtifact artifacts, String mainArtifactId,
ArtifactTypeMappingService
artifactTypeMappingService )
{
this.artifacts = artifacts;
@@ -73,21 +72,19 @@ public class ArtifactRepository
*/
public Artifact getUniqueArtifact( String groupId, String artifactId,
String type, String classifier )
{
-final Set candidates = getArtifacts( groupId, artifactId, type );
+final SetArtifact candidates = getArtifacts( groupId, artifactId,
type );
if ( candidates.size() == 0 )
{
return null;
}
else if ( candidates.size() == 1 classifier == null )
{
-return (Artifact) candidates.iterator().next();
+return candidates.iterator().next();
}
else if ( classifier != null )
{
-final Iterator it = candidates.iterator();
-while ( it.hasNext() )
+for ( Artifact a : candidates )
{
-Artifact a = (Artifact) it.next();
if ( a.getClassifier() == null classifier.equals(
mainArtifactId ) )
{
return a;
@@ -131,14 +128,11 @@ public class ArtifactRepository
* @param type the type
* @return the artifacts or an empty set if no artifact were found
*/
-public Set getArtifacts( String groupId, String artifactId, String type )
+public SetArtifact getArtifacts( String groupId, String artifactId,
String type
svn commit: r1228849 - in /maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear: AbstractEarTest.java it/AbstractEarPluginIT.java util/ArtifactTypeMappingServiceTest.java uti
Author: rfscholte
Date: Sun Jan 8 14:04:07 2012
New Revision: 1228849
URL: http://svn.apache.org/viewvc?rev=1228849view=rev
Log:
Generics for tests too
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java?rev=1228849r1=1228848r2=1228849view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
Sun Jan 8 14:04:07 2012
@@ -43,24 +43,24 @@ public abstract class AbstractEarTest
}
-protected Set createArtifacts( String[] artifactsId )
+protected SetArtifact createArtifacts( String[] artifactsId )
{
return createArtifacts( artifactsId, null );
}
-protected Set createArtifacts( String[] artifactsId, String[] types )
+protected SetArtifact createArtifacts( String[] artifactsId, String[]
types )
{
return createArtifacts( artifactsId, types, null );
}
-protected Set createArtifacts( String[] artifactsId, String[] types,
String[] groupsId )
+protected SetArtifact createArtifacts( String[] artifactsId, String[]
types, String[] groupsId )
{
return createArtifacts( artifactsId, types, groupsId, null );
}
-protected Set createArtifacts( String[] artifactsId, String[] types,
String[] groupsId, String[] classifiers )
+protected SetArtifact createArtifacts( String[] artifactsId, String[]
types, String[] groupsId, String[] classifiers )
{
-Set result = new TreeSet();
+SetArtifact result = new TreeSetArtifact();
if ( artifactsId == null || artifactsId.length == 0 )
{
return result;
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java?rev=1228849r1=1228848r2=1228849view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
Sun Jan 8 14:04:07 2012
@@ -76,6 +76,7 @@ public abstract class AbstractEarPluginI
* @return the base directory of the project
* @throws Exception if an error occurred
*/
+@SuppressWarnings( unchecked )
protected File executeMojo( final String projectName, final Properties
properties, boolean expectNoError )
throws Exception
{
@@ -245,7 +246,7 @@ public abstract class AbstractEarPluginI
File dir = getEarDirectory( baseDir, projectName );
// Let's build the expected directories sort list
-final List expectedDirectories = new ArrayList();
+final ListFile expectedDirectories = new ArrayListFile();
for ( int i = 0; i artifactsDirectory.length; i++ )
{
if ( artifactsDirectory[i] )
@@ -254,7 +255,7 @@ public abstract class AbstractEarPluginI
}
}
-final List actualFiles = buildArchiveContentFiles( dir,
expectedDirectories );
+final ListFile actualFiles = buildArchiveContentFiles( dir,
expectedDirectories );
assertEquals( Artifacts mismatch + actualFiles,
artifactNames.length, actualFiles.size() );
for ( int i = 0; i artifactNames.length; i++ )
{
@@ -270,15 +271,15 @@ public abstract class AbstractEarPluginI
}
}
-protected List buildArchiveContentFiles( final File baseDir, final List
expectedDirectories )
+protected ListFile buildArchiveContentFiles( final File baseDir, final
ListFile expectedDirectories )
{
-final List result = new ArrayList();
+final ListFile result = new ArrayListFile();
addFiles( baseDir, result, expectedDirectories );
return result;
}
-private void addFiles( final File directory, final List files, final List
expectedDirectories )
+private void addFiles( final File directory, final ListFile files, final
svn commit: r1228887 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: rfscholte Date: Sun Jan 8 16:23:33 2012 New Revision: 1228887 URL: http://svn.apache.org/viewvc?rev=1228887view=rev Log: Update mavenArchiverVersion from 2.4.1 to 2.4.2 Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1228887r1=1228886r2=1228887view=diff == --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sun Jan 8 16:23:33 2012 @@ -53,7 +53,7 @@ under the License. /issueManagement properties -mavenArchiverVersion2.4.1/mavenArchiverVersion +mavenArchiverVersion2.4.2/mavenArchiverVersion mavenFilteringVersion1.0-beta-2/mavenFilteringVersion mavenVersion2.0.6/mavenVersion /properties
svn commit: r1228917 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: rfscholte
Date: Sun Jan 8 18:56:15 2012
New Revision: 1228917
URL: http://svn.apache.org/viewvc?rev=1228917view=rev
Log:
Cleanup m-invoker-p, already configured in maven-plugins parent, which caused a
duplicate invocation of this plugin
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1228917r1=1228916r2=1228917view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sun Jan 8 18:56:15 2012
@@ -170,31 +170,13 @@ under the License.
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-invoker-plugin/artifactId
configuration
- debugtrue/debug
- projectsDirectorysrc/it/projectsDirectory
- cloneProjectsTo${project.build.directory}/it/cloneProjectsTo
- pomIncludes
-pomInclude*/pom.xml/pomInclude
- /pomIncludes
- preBuildHookScriptsetup/preBuildHookScript
- postBuildHookScriptverify/postBuildHookScript
!-- NOTE: Must be synced with the repo path used by
AbstractEarPluginIT --
localRepositoryPath${project.build.testOutputDirectory}/m2repo/localRepositoryPath
- settingsFilesrc/it/settings.xml/settingsFile
goals
goalclean/goal
goalpackage/goal
/goals
/configuration
-executions
- execution
-idintegration-test/id
-goals
- goalinstall/goal
- goalrun/goal
-/goals
- /execution
-/executions
/plugin
plugin
artifactIdmaven-surefire-plugin/artifactId
svn commit: r1228968 - /maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
Author: rfscholte
Date: Sun Jan 8 22:02:52 2012
New Revision: 1228968
URL: http://svn.apache.org/viewvc?rev=1228968view=rev
Log:
Fix MSHARED-3: Infinite-loop in DefaultDownloader.download
Resolved by throwing a RuntimeException with the alternative, that's be best we
can do.
At least it's better than an infinitive loop without a clue
Modified:
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
Modified:
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java?rev=1228968r1=1228967r2=1228968view=diff
==
---
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
(original)
+++
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
Sun Jan 8 22:02:52 2012
@@ -1,5 +1,8 @@
package org.apache.maven.shared.downloader;
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -8,9 +11,6 @@ import org.apache.maven.artifact.resolve
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.versioning.VersionRange;
-import java.io.File;
-import java.util.List;
-
/**
* @author Jason van Zyl
* @plexus.component
@@ -28,7 +28,6 @@ public class DefaultDownloader
*/
private ArtifactFactory artifactFactory;
-// FIXME! This calls itself, and couldn't work even if it called the other
download method!
public File download( String groupId,
String artifactId,
String version,
@@ -37,7 +36,8 @@ public class DefaultDownloader
throws DownloadException, DownloadNotFoundException
{
-return download( groupId, artifactId, version, localRepository,
remoteRepositories );
+throw new RuntimeException( Unsupported method, instead use +
+
org.apache.maven.shared.downloader.DefaultDownloader.download( String, String,
String, ArtifactRepository, List ) );
}
public File download( String groupId,
svn commit: r1229389 - in /maven/plugins/trunk/maven-remote-resources-plugin: ./ src/it/ src/it/resources/bootstrap/ src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/ src/it/resourc
Author: rfscholte
Date: Mon Jan 9 22:10:40 2012
New Revision: 1229389
URL: http://svn.apache.org/viewvc?rev=1229389view=rev
Log:
Fix MRRESOURCES-55: Support groupId:artifactId:version:type and
groupId:artifactId:version:type:classifier as resource bundle references
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/main/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/main/resources/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/main/resources/DEPENDENCIES.vm
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/rresource/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/rresource/it/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/rresource/it/App.java
maven/plugins/trunk/maven-remote-resources-plugin/src/it/settings.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=1229389r1=1229388r2=1229389view=diff
==
--- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Mon Jan 9
22:10:40 2012
@@ -112,11 +112,6 @@ under the License.
/dependency
dependency
groupIdorg.apache.maven.shared/groupId
- artifactIdmaven-downloader/artifactId
- version1.1/version
-/dependency
-dependency
- groupIdorg.apache.maven.shared/groupId
artifactIdmaven-filtering/artifactId
version${mavenFilteringVersion}/version
/dependency
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml?rev=1229389r1=1229388r2=1229389view=diff
==
---
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml
Mon Jan 9 22:10:40 2012
@@ -48,6 +48,7 @@
modules
moduleresource-bundle-with-template/module
moduleresource-bundle-with-org
svn commit: r1229750 - /maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt.vm
Author: rfscholte Date: Tue Jan 10 21:38:47 2012 New Revision: 1229750 URL: http://svn.apache.org/viewvc?rev=1229750view=rev Log: Fix MRELEASE-687: assembly:assembly goal as mentioned in the documentation is deprecated Modified: maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt.vm Modified: maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt.vm URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt.vm?rev=1229750r1=1229749r2=1229750view=diff == --- maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt.vm (original) +++ maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt.vm Tue Jan 10 21:38:47 2012 @@ -65,7 +65,7 @@ mvn release:perform -DconnectionUrl=scm: During release:perform, enable the release profile -- releaseProfilesrelease/releaseProfiles - goalsdeploy assembly:assembly/goals + goalsdeploy assembly:single/goals /configuration /plugin ---
svn commit: r1229755 - /maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
Author: rfscholte
Date: Tue Jan 10 21:58:14 2012
New Revision: 1229755
URL: http://svn.apache.org/viewvc?rev=1229755view=rev
Log:
Add generics
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java?rev=1229755r1=1229754r2=1229755view=diff
==
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
Tue Jan 10 21:58:14 2012
@@ -153,7 +153,7 @@ public abstract class AbstractReleaseMoj
* @parameter
* @since 2.0-beta-6
*/
-private Map providerImplementations;
+private MapString, String providerImplementations;
/**
* The M2_HOME parameter to use for forked Maven invocations.
@@ -245,10 +245,9 @@ public abstract class AbstractReleaseMoj
{
if ( providerImplementations != null )
{
-for ( Iterator i = providerImplementations.keySet().iterator();
i.hasNext(); )
+for ( String providerType : providerImplementations.keySet() )
{
-String providerType = (String) i.next();
-String providerImplementation = (String)
providerImplementations.get( providerType );
+String providerImplementation = providerImplementations.get(
providerType );
getLog().info( Change the default ' + providerType + '
provider implementation to '
+ providerImplementation + '. );
scmManager.setScmProviderImplementation( providerType,
providerImplementation );
@@ -282,7 +281,8 @@ public abstract class AbstractReleaseMoj
descriptor.setPushChanges( pushChanges );
-List profiles = project.getActiveProfiles();
+@SuppressWarnings(unchecked)
+ ListProfile profiles = project.getActiveProfiles();
String arguments = this.arguments;
if ( profiles != null !profiles.isEmpty() )
@@ -296,9 +296,9 @@ public abstract class AbstractReleaseMoj
arguments = -P ;
}
-for ( Iterator it = profiles.iterator(); it.hasNext(); )
+for ( IteratorProfile it = profiles.iterator(); it.hasNext(); )
{
-Profile profile = (Profile) it.next();
+Profile profile = it.next();
arguments += profile.getId();
if ( it.hasNext() )
svn commit: r1229757 - in /maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release: AbstractReleaseMojo.java UpdateVersionsMojo.java
Author: rfscholte
Date: Tue Jan 10 22:01:40 2012
New Revision: 1229757
URL: http://svn.apache.org/viewvc?rev=1229757view=rev
Log:
Add more generics
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java?rev=1229757r1=1229756r2=1229757view=diff
==
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
Tue Jan 10 22:01:40 2012
@@ -145,7 +145,7 @@ public abstract class AbstractReleaseMoj
* @required
* @readonly
*/
-protected List reactorProjects;
+protected ListMavenProject reactorProjects;
/**
* List of provider implementations.
@@ -367,7 +367,7 @@ public abstract class AbstractReleaseMoj
*
* @return The list of reactor project, never codenull/code.
*/
-public List getReactorProjects()
+public ListMavenProject getReactorProjects()
{
return reactorProjects;
}
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java?rev=1229757r1=1229756r2=1229757view=diff
==
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
Tue Jan 10 22:01:40 2012
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.Scm;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.shared.release.ReleaseExecutionException;
@@ -92,7 +93,7 @@ public class UpdateVersionsMojo
config.setAutoVersionSubmodules( autoVersionSubmodules );
config.setDefaultDevelopmentVersion( developmentVersion );
-Map originalScmInfo = new HashMap();
+MapString, Scm originalScmInfo = new HashMapString, Scm();
originalScmInfo.put( ArtifactUtils.versionlessKey(
project.getGroupId(), project.getArtifactId() ), project.getScm() );
config.setOriginalScmInfo( originalScmInfo );
svn commit: r1229771 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
Author: rfscholte
Date: Tue Jan 10 22:31:31 2012
New Revision: 1229771
URL: http://svn.apache.org/viewvc?rev=1229771view=rev
Log:
Add generics
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?rev=1229771r1=1229770r2=1229771view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
Tue Jan 10 22:31:31 2012
@@ -91,10 +91,8 @@ public class CheckDependencySnapshotsPha
Map originalVersions = releaseDescriptor.getOriginalVersions(
reactorProjects );
-for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+for ( MavenProject project : reactorProjects )
{
-MavenProject project = (MavenProject) i.next();
-
checkProject( project, originalVersions, releaseDescriptor );
}
}
@@ -110,12 +108,13 @@ public class CheckDependencySnapshotsPha
private void checkProject( MavenProject project, Map originalVersions,
ReleaseDescriptor releaseDescriptor )
throws ReleaseFailureException, ReleaseExecutionException
{
-Map artifactMap = ArtifactUtils.artifactMapByVersionlessId(
project.getArtifacts() );
+@SuppressWarnings(unchecked)
+ MapString, Artifact artifactMap =
ArtifactUtils.artifactMapByVersionlessId( project.getArtifacts() );
-Set snapshotDependencies = new HashSet();
-Set snapshotReportDependencies = new HashSet();
-Set snapshotExtensionsDependencies = new HashSet();
-Set snapshotPluginDependencies = new HashSet();
+SetArtifact snapshotDependencies = new HashSetArtifact();
+SetArtifact snapshotReportDependencies = new HashSetArtifact();
+SetArtifact snapshotExtensionsDependencies = new HashSetArtifact();
+SetArtifact snapshotPluginDependencies = new HashSetArtifact();
if ( project.getParentArtifact() != null )
{
@@ -127,12 +126,11 @@ public class CheckDependencySnapshotsPha
try
{
-Set dependencyArtifacts = project.createArtifacts(
artifactFactory, null, null );
+@SuppressWarnings(unchecked)
+ SetArtifact dependencyArtifacts =
project.createArtifacts( artifactFactory, null, null );
-for ( Iterator i = dependencyArtifacts.iterator(); i.hasNext(); )
+for ( Artifact artifact : dependencyArtifacts )
{
-Artifact artifact = (Artifact) i.next();
-
if ( checkArtifact( artifact, originalVersions, artifactMap,
releaseDescriptor ) )
{
snapshotDependencies.add( getArtifactFromMap( artifact,
artifactMap ) );
@@ -144,10 +142,11 @@ public class CheckDependencySnapshotsPha
throw new ReleaseExecutionException( Failed to create dependency
artifacts, e );
}
-for ( Iterator i = project.getPluginArtifacts().iterator();
i.hasNext(); )
+@SuppressWarnings(unchecked)
+ SetArtifact pluginArtifacts = project.getPluginArtifacts();
+
+for ( Artifact artifact : pluginArtifacts )
{
-Artifact artifact = (Artifact) i.next();
-
if ( checkArtifact( artifact, originalVersions, artifactMap,
releaseDescriptor ) )
{
boolean addToFailures;
@@ -210,10 +209,11 @@ public class CheckDependencySnapshotsPha
}
}
-for ( Iterator i = project.getReportArtifacts().iterator();
i.hasNext(); )
+@SuppressWarnings(unchecked)
+ SetArtifact reportArtifacts = project.getReportArtifacts();
+
+for ( Artifact artifact : reportArtifacts )
{
-Artifact artifact = (Artifact) i.next();
-
if ( checkArtifact( artifact, originalVersions, artifactMap,
releaseDescriptor ) )
{
//snapshotDependencies.add( artifact );
@@ -221,10 +221,11 @@ public class CheckDependencySnapshotsPha
}
}
-for ( Iterator i = project.getExtensionArtifacts().iterator();
i.hasNext(); )
+@SuppressWarnings(unchecked)
+ SetArtifact extensionArtifacts =
project.getExtensionArtifacts();
+
+for ( Artifact artifact : extensionArtifacts
svn commit: r1230230 - /maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
Author: rfscholte Date: Wed Jan 11 20:16:53 2012 New Revision: 1230230 URL: http://svn.apache.org/viewvc?rev=1230230view=rev Log: Fix typo's in text Modified: maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo Modified: maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo?rev=1230230r1=1230229r2=1230230view=diff == --- maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo (original) +++ maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo Wed Jan 11 20:16:53 2012 @@ -175,7 +175,7 @@ multiplicity*/multiplicity /association description -A map of projects to versions to use when moving the given projects back into devlopment after release. +A map of projects to versions to use when moving the given projects back into development after release. /description /field field @@ -267,7 +267,7 @@ version1.0.0+/version typeboolean/type description -Whether to use the parent pom version for submodule verstions. +Whether to use the parent pom version for submodule versions. /description /field field
svn commit: r1230247 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/
Author: rfscholte
Date: Wed Jan 11 20:53:22 2012
New Revision: 1230247
URL: http://svn.apache.org/viewvc?rev=1230247view=rev
Log:
Another set of generics applied
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhase.java
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=1230247r1=1230246r2=1230247view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
Wed Jan 11 20:53:22 2012
@@ -380,12 +380,12 @@ public abstract class AbstractRewritePom
}
}
-private void rewriteVersion( Element rootElement, Namespace namespace, Map
mappedVersions, String projectId,
+private void rewriteVersion( Element rootElement, Namespace namespace,
MapString, String mappedVersions, String projectId,
MavenProject project, String parentVersion )
throws ReleaseFailureException
{
Element versionElement = rootElement.getChild( version, namespace );
-String version = (String) mappedVersions.get( projectId );
+String version = mappedVersions.get( projectId );
if ( version == null )
{
throw new ReleaseFailureException( Version for ' +
project.getName() + ' was not mapped );
@@ -743,12 +743,12 @@ public abstract class AbstractRewritePom
return result;
}
-protected abstract String getResolvedSnapshotVersion( String
artifactVersionlessKey, Map resolvedSnapshots );
+protected abstract String getResolvedSnapshotVersion( String
artifactVersionlessKey, MapString, MapString,String resolvedSnapshots );
-protected abstract Map getOriginalVersionMap( ReleaseDescriptor
releaseDescriptor, ListMavenProject reactorProjects,
+protected abstract MapString, String getOriginalVersionMap(
ReleaseDescriptor releaseDescriptor, ListMavenProject reactorProjects,
boolean simulate );
-protected abstract Map getNextVersionMap( ReleaseDescriptor
releaseDescriptor );
+protected abstract MapString,String getNextVersionMap( ReleaseDescriptor
releaseDescriptor );
protected abstract void transformScm( MavenProject project, Element
rootElement, Namespace namespace,
ReleaseDescriptor releaseDescriptor,
String projectId,
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java?rev=1230247r1=1230246r2=1230247view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
Wed Jan 11 20:53:22 2012
@@ -212,8 +212,8 @@ public class GenerateReleasePomsPhase
ReleaseResult result )
throws ReleaseFailureException, ReleaseExecutionException
{
-Map originalVersions = getOriginalVersionMap( releaseDescriptor,
reactorProjects );
-Map mappedVersions = getNextVersionMap( releaseDescriptor );
+MapString, String originalVersions = getOriginalVersionMap(
releaseDescriptor, reactorProjects );
+MapString, String mappedVersions = getNextVersionMap(
releaseDescriptor );
MavenProject releaseProject = new
svn commit: r1230268 - in /maven/plugins/trunk/maven-pmd-plugin/src/main/resources: cpd-report_nl.properties pmd-report_nl.properties
Author: rfscholte Date: Wed Jan 11 21:47:39 2012 New Revision: 1230268 URL: http://svn.apache.org/viewvc?rev=1230268view=rev Log: Add dutch resource bundles Added: maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_nl.properties maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_nl.properties Added: maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_nl.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_nl.properties?rev=1230268view=auto == --- maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_nl.properties (added) +++ maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_nl.properties Wed Jan 11 21:47:39 2012 @@ -0,0 +1,26 @@ +# 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. + +report.cpd.name=CPD Rapport +report.cpd.description=Dubbele code detectie. +report.cpd.title=CPD Resultaten +report.cpd.column.file=Bestand +report.cpd.column.project=Project +report.cpd.column.line=Regel +report.cpd.cpdlink=Het volgende document bevat de resultaten van PMD's +report.cpd.dupes=Dubbelingen +report.cpd.noProblems=CPD heeft geen fouten gevonden in de code. Added: maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_nl.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_nl.properties?rev=1230268view=auto == --- maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_nl.properties (added) +++ maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_nl.properties Wed Jan 11 21:47:39 2012 @@ -0,0 +1,25 @@ +# 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. + +report.pmd.name=PMD Rapport +report.pmd.description=Controle van programmeerregels. +report.pmd.title=PMD Resultaten +report.pmd.column.violation=Overtreding +report.pmd.column.line=Regel +report.pmd.pmdlink=Het volgende document bevat de resultaten van +report.pmd.files=Bestanden +report.pmd.noProblems=PMD heeft geen fouten gevonden in de code.
svn commit: r1230298 - in /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release: config/ phase/
Author: rfscholte
Date: Wed Jan 11 22:39:25 2012
New Revision: 1230298
URL: http://svn.apache.org/viewvc?rev=1230298view=rev
Log:
Again another set of generics
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java?rev=1230298r1=1230297r2=1230298view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
Wed Jan 11 22:39:25 2012
@@ -210,27 +210,27 @@ public class ReleaseUtils
private static void loadResolvedDependencies( Properties prop,
ReleaseDescriptor descriptor )
{
-Map resolvedDependencies = new HashMap();
+MapString, MapString, String resolvedDependencies = new
HashMapString, MapString, String();
Set entries = prop.entrySet();
-Iterator iterator = entries.iterator();
+IteratorEntryString, String iterator = entries.iterator();
String propertyName;
-Entry currentEntry;
+EntryString, String currentEntry;
while ( iterator.hasNext() )
{
-currentEntry = (Entry) iterator.next();
+currentEntry = iterator.next();
propertyName = (String) currentEntry.getKey();
if ( propertyName.startsWith( dependency. ) )
{
-Map versionMap;
+MapString, String versionMap;
String artifactVersionlessKey;
int startIndex;
int endIndex;
String versionType;
-versionMap = new HashMap();
+versionMap = new HashMapString, String();
startIndex = propertyName.lastIndexOf( dependency. );
if ( propertyName.indexOf( .development ) != -1 )
@@ -248,11 +248,11 @@ public class ReleaseUtils
if ( resolvedDependencies.containsKey( artifactVersionlessKey
) )
{
-versionMap = (Map) resolvedDependencies.get(
artifactVersionlessKey );
+versionMap = resolvedDependencies.get(
artifactVersionlessKey );
}
else
{
-versionMap = new HashMap();
+versionMap = new HashMapString, String();
resolvedDependencies.put( artifactVersionlessKey,
versionMap );
}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=1230298r1=1230297r2=1230298view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
Wed Jan 11 22:39:25 2012
@@ -253,7 +253,8 @@ public abstract class AbstractRewritePom
Namespace namespace = rootElement.getNamespace();
MapString, String mappedVersions = getNextVersionMap(
releaseDescriptor );
MapString, String originalVersions = getOriginalVersionMap(
releaseDescriptor, reactorProjects, simulate );
-Map resolvedSnapshotDependencies =
releaseDescriptor.getResolvedSnapshotDependencies();
+@SuppressWarnings(unchecked
svn commit: r1230814 - /maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
Author: rfscholte
Date: Thu Jan 12 22:12:42 2012
New Revision: 1230814
URL: http://svn.apache.org/viewvc?rev=1230814view=rev
Log:
Use entrySet to fill scmProviderImplementations of the scmManager
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java?rev=1230814r1=1230813r2=1230814view=diff
==
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
Thu Jan 12 22:12:42 2012
@@ -245,12 +245,11 @@ public abstract class AbstractReleaseMoj
{
if ( providerImplementations != null )
{
-for ( String providerType : providerImplementations.keySet() )
+for ( Map.EntryString, String providerEntry :
providerImplementations.entrySet() )
{
-String providerImplementation = providerImplementations.get(
providerType );
-getLog().info( Change the default ' + providerType + '
provider implementation to '
-+ providerImplementation + '. );
-scmManager.setScmProviderImplementation( providerType,
providerImplementation );
+getLog().info( Change the default ' + providerEntry.getKey()
+ ' provider implementation to '
++ providerEntry.getValue() + '. );
+scmManager.setScmProviderImplementation(
providerEntry.getKey(), providerEntry.getValue() );
}
}
}
svn commit: r1231408 - /maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListener.java
Author: rfscholte
Date: Fri Jan 13 23:56:46 2012
New Revision: 1231408
URL: http://svn.apache.org/viewvc?rev=1231408view=rev
Log:
Fix MCHECKSTYLE-170: Test errors and failures on Windows
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListener.java
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListener.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListener.java?rev=1231408r1=1231407r2=1231408view=diff
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListener.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListener.java
Fri Jan 13 23:56:46 2012
@@ -24,6 +24,7 @@ import com.puppycrawl.tools.checkstyle.a
import com.puppycrawl.tools.checkstyle.api.AutomaticBean;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.api.SeverityLevel;
+
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -122,10 +123,12 @@ public class CheckstyleReportListener
/** {@inheritDoc} */
public void fileStarted( AuditEvent event )
{
+final String fileName = StringUtils.replace( event.getFileName(),
\\, / );
+
for ( File sourceDirectory : sourceDirectories )
{
-String sourceDirectoryPath = sourceDirectory.getPath();
-String fileName = StringUtils.replace( event.getFileName(), \\,
/ );
+String sourceDirectoryPath = StringUtils.replace(
sourceDirectory.getPath(), \\, / );
+
if ( fileName.startsWith( sourceDirectoryPath + / ) )
{
currentFile = StringUtils.substring( fileName,
sourceDirectoryPath.length() + 1 );
svn commit: r1231523 - in /maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd: AbstractPmdReport.java AbstractPmdViolationCheckMojo.java
Author: rfscholte
Date: Sat Jan 14 16:36:56 2012
New Revision: 1231523
URL: http://svn.apache.org/viewvc?rev=1231523view=rev
Log:
Add generics
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java?rev=1231523r1=1231522r2=1231523view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
Sat Jan 14 16:36:56 2012
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.pmd;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -127,7 +126,7 @@ public abstract class AbstractPmdReport
* @parameter
* @since 2.2
*/
-private String[] excludes;
+private ListString excludes;
/**
* A list of files to include from checking. Can contain Ant-style
wildcards and double wildcards.
@@ -136,7 +135,7 @@ public abstract class AbstractPmdReport
* @parameter
* @since 2.2
*/
-private String[] includes;
+private ListString includes;
/**
* The directories containing the sources to be compiled.
@@ -145,7 +144,7 @@ public abstract class AbstractPmdReport
* @required
* @readonly
*/
-private List compileSourceRoots;
+private ListString compileSourceRoots;
/**
* The directories containing the test-sources to be compiled.
@@ -154,7 +153,7 @@ public abstract class AbstractPmdReport
* @required
* @readonly
*/
-private List testSourceRoots;
+private ListString testSourceRoots;
/**
* The project source directories that should be excluded.
@@ -162,7 +161,7 @@ public abstract class AbstractPmdReport
* @parameter
* @since 2.2
*/
-private File[] excludeRoots;
+private ListFile excludeRoots;
/**
* Run PMD on the tests.
@@ -202,7 +201,7 @@ public abstract class AbstractPmdReport
* @parameter expression=${reactorProjects}
* @readonly
*/
-protected List reactorProjects;
+protected ListMavenProject reactorProjects;
/** {@inheritDoc} */
protected MavenProject getProject()
@@ -238,10 +237,10 @@ public abstract class AbstractPmdReport
else
{
// Not yet generated - check if the report is on its way
-for ( Iterator reports =
project.getReportPlugins().iterator(); reports.hasNext(); )
+@SuppressWarnings( unchecked )
+ListReportPlugin reportPlugins = project.getReportPlugins();
+for ( ReportPlugin plugin : reportPlugins )
{
-ReportPlugin plugin = (ReportPlugin) reports.next();
-
String artifactId = plugin.getArtifactId();
if ( maven-jxr-plugin.equals( artifactId ) ||
jxr-maven-plugin.equals( artifactId ) )
{
@@ -264,7 +263,7 @@ public abstract class AbstractPmdReport
* @return a List of the files where the PMD tool will be executed
* @throws java.io.IOException
*/
-protected Map getFilesToProcess()
+protected MapFile, PmdFileInfo getFilesToProcess()
throws IOException
{
String sourceXref = constructXRefLocation( false );
@@ -272,18 +271,18 @@ public abstract class AbstractPmdReport
if ( aggregate !project.isExecutionRoot() )
{
-return Collections.EMPTY_MAP;
+return Collections.emptyMap();
}
if ( excludeRoots == null )
{
-excludeRoots = new File[0];
+excludeRoots = Collections.emptyList();
}
-CollectionFile excludeRootFiles = new HashSetFile(
excludeRoots.length );
+
+CollectionFile excludeRootFiles = new HashSetFile(
excludeRoots.size() );
-for ( int i = 0; i excludeRoots.length; i++ )
+for ( File file : excludeRoots )
{
-File file = excludeRoots[i];
if ( file.isDirectory() )
{
excludeRootFiles.add( file );
@@ -295,9 +294,8 @@ public abstract class AbstractPmdReport
if ( compileSourceRoots != null )
{
-for ( Iterator i = compileSourceRoots.iterator(); i.hasNext(); )
+for ( String root : compileSourceRoots
svn commit: r1231525 - in /maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd: PmdFileInfo.java PmdReport.java PmdReportListener.java PmdViolationCheckMojo.java
Author: rfscholte
Date: Sat Jan 14 16:54:12 2012
New Revision: 1231525
URL: http://svn.apache.org/viewvc?rev=1231525view=rev
Log:
Add more generics
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdFileInfo.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdFileInfo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdFileInfo.java?rev=1231525r1=1231524r2=1231525view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdFileInfo.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdFileInfo.java
Sat Jan 14 16:54:12 2012
@@ -33,7 +33,6 @@ public class PmdFileInfo
private File sourceDir;
private String xref;
-
public PmdFileInfo( MavenProject project,
File dir,
String x )
@@ -50,7 +49,6 @@ public class PmdFileInfo
this.xref = x;
}
-
public String getXrefLocation()
{
return xref;
@@ -66,5 +64,4 @@ public class PmdFileInfo
return project;
}
-
-}
+}
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java?rev=1231525r1=1231524r2=1231525view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
Sat Jan 14 16:54:12 2012
@@ -19,6 +19,20 @@ package org.apache.maven.plugin.pmd;
* under the License.
*/
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+
import net.sourceforge.pmd.IRuleViolation;
import net.sourceforge.pmd.PMD;
import net.sourceforge.pmd.PMDException;
@@ -33,6 +47,7 @@ import net.sourceforge.pmd.renderers.HTM
import net.sourceforge.pmd.renderers.Renderer;
import net.sourceforge.pmd.renderers.TextRenderer;
import net.sourceforge.pmd.renderers.XMLRenderer;
+
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.plexus.resource.ResourceManager;
@@ -44,21 +59,6 @@ import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-
/**
* Creates a PMD report.
*
@@ -243,7 +243,7 @@ public class PmdReport
throw new MavenReportException( e.getMessage(), e );
}
-Map files;
+MapFile, PmdFileInfo files;
try
{
files = getFilesToProcess();
@@ -259,11 +259,10 @@ public class PmdReport
+ , i.e. build is platform dependent! );
}
-for ( Iterator i = files.entrySet().iterator(); i.hasNext(); )
+for ( Map.EntryFile, PmdFileInfo entry : files.entrySet() )
{
-Map.Entry entry = (Map.Entry) i.next();
-File file = (File) entry.getKey();
-PmdFileInfo fileInfo = (PmdFileInfo) entry.getValue();
+File file = entry.getKey();
+PmdFileInfo fileInfo = entry.getValue();
// TODO: lazily call beginFile in case there are no rules
@@ -611,4 +610,4 @@ public class PmdReport
return null;
}
}
-}
+}
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven
svn commit: r1233066 - in /maven/plugins/trunk/maven-pmd-plugin: ./ src/it/mpmd-138/ src/it/mpmd-138/mod-1/ src/it/mpmd-138/mod-1/src/ src/it/mpmd-138/mod-1/src/main/ src/it/mpmd-138/mod-1/src/main/co
Author: rfscholte Date: Wed Jan 18 20:59:15 2012 New Revision: 1233066 URL: http://svn.apache.org/viewvc?rev=1233066view=rev Log: Fix MPMD-138: Use modello to generate models to read pmd and cpd files Added: maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/invoker.properties maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-1/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-1/pom.xml maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-1/src/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-1/src/main/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-1/src/main/config/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-1/src/main/config/pmd/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-1/src/main/config/pmd/latin-1.xml maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-1/src/main/config/pmd/utf-8.xml maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-1/src/main/java/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-1/src/main/java/test/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-1/src/main/java/test/MyClass.java maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-2/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-2/pom.xml maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-2/rulesets/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-2/rulesets/basic.xml maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-2/src/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-2/src/main/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-2/src/main/java/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-2/src/main/java/test/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-2/src/main/java/test/MyClass.java maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/pom.xml maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/src/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/src/main/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/src/main/java/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/src/main/java/test/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/src/main/java/test/MyClass.java maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/src/main/java/test/sub/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/src/main/java/test/sub/MyClass.java maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-4/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-4/pom.xml maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-4/src/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-4/src/main/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-4/src/main/java/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-4/src/main/java/test/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-4/src/main/java/test/MyClass.java maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-4/src/main/java/test/OtherClass.java maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-4/src/main/java/test/sub/ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-4/src/main/java/test/sub/MyClass.java maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/pom.xml maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/verify.groovy maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ViolationDetails.java maven/plugins/trunk/maven-pmd-plugin/src/main/mdo/ maven/plugins/trunk/maven-pmd-plugin/src/main/mdo/cpd.mdo maven/plugins/trunk/maven-pmd-plugin/src/main/mdo/pmd.mdo Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1233066r1=1233065r2=1233066view=diff == --- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Wed Jan 18 20:59:15 2012 @@ -68,6 +68,33 @@ under the License. sitePluginVersion3.0/sitePluginVersion /properties + build +plugins + plugin +groupIdorg.codehaus.modello/groupId +artifactIdmodello-maven-plugin/artifactId +version1.4.1/version +configuration + useJava5true/useJava5
svn commit: r1234303 - /maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
Author: rfscholte
Date: Sat Jan 21 11:31:26 2012
New Revision: 1234303
URL: http://svn.apache.org/viewvc?rev=1234303view=rev
Log:
format code, no changes
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java?rev=1234303r1=1234302r2=1234303view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
Sat Jan 21 11:31:26 2012
@@ -1,4 +1,5 @@
package org.apache.maven.plugins.enforcer;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -43,148 +44,183 @@ import org.codehaus.plexus.i18n.I18N;
/**
* @author a href=mailto:r...@e-hoffman.org;Rex Hoffman/a
*/
-public class DependencyConvergence implements EnforcerRule {
-
- private static Log log;
-
- private static I18N i18n;
-
- /**
- * Uses the {@link EnforcerRuleHelper} to populate the values of the {@link
DependencyTreeBuilder#buildDependencyTree(MavenProject, ArtifactRepository,
ArtifactFactory, ArtifactMetadataSource, ArtifactFilter, ArtifactCollector)}
- * factory method. br/
- *
- * This method simply exists to hide all the ugly lookup that the {@link
EnforcerRuleHelper} has to do.
- *
- * @param helper
- * @return a Dependency Node which is the root of the project's dependency
tree
- * @throws EnforcerRuleException
- */
- private DependencyNode getNode(EnforcerRuleHelper helper) throws
EnforcerRuleException {
-try {
- MavenProject project= (MavenProject)
helper.evaluate(${project});
- DependencyTreeBuilder dependencyTreeBuilder = (DependencyTreeBuilder)
helper.getComponent(DependencyTreeBuilder.class);
- ArtifactRepository repository =
(ArtifactRepository)helper.evaluate(${localRepository});
- ArtifactFactoryfactory=
(ArtifactFactory)helper.getComponent(ArtifactFactory.class);
- ArtifactMetadataSource metadataSource =
(ArtifactMetadataSource)helper.getComponent(ArtifactMetadataSource.class);
- ArtifactCollector collector =
(ArtifactCollector)helper.getComponent(ArtifactCollector.class);
- ArtifactFilter filter = null; //we need to evaluate all
scopes
- DependencyNode node =
dependencyTreeBuilder.buildDependencyTree(project, repository, factory,
metadataSource, filter, collector);
- return node;
-} catch (ExpressionEvaluationException e) {
- throw new EnforcerRuleException(Unable to lookup an expression +
e.getLocalizedMessage(), e);
-} catch (ComponentLookupException e){
- throw new EnforcerRuleException(Unable to lookup a component +
e.getLocalizedMessage(), e);
-} catch (DependencyTreeBuilderException e){
- throw new EnforcerRuleException(Could not build dependency tree +
e.getLocalizedMessage(), e);
-}
- }
-
- public void execute(EnforcerRuleHelper helper) throws EnforcerRuleException {
-if (log == null){
- log = helper.getLog();
-}
-try {
- if (i18n == null){
-i18n = (I18N) helper.getComponent(I18N.class);
- }
- DependencyNode node = getNode(helper);
- MavenProject project = (MavenProject) helper.evaluate(${project});
- DependencyVersionMap visitor = new
DependencyVersionMap(project.getArtifact().isRelease(), log);
- node.accept(visitor);
- ListCharSequence errorMsgs = new ArrayListCharSequence();
-
errorMsgs.addAll(getConvergenceErrorMsgs(visitor.getConflictedVersionNumbers()));
- for (CharSequence errorMsg : errorMsgs) {
-log.error(errorMsg);
- }
- if (errorMsgs.size() 0) {
-throw new EnforcerRuleException(Failed while enforcing releasability
the error(s) are + errorMsgs);
- }
-} catch (ExpressionEvaluationException e) {
- throw new EnforcerRuleException(Unable to lookup an expression +
e.getLocalizedMessage(), e);
-} catch (ComponentLookupException e){
- throw new EnforcerRuleException(Unable to lookup a component +
e.getLocalizedMessage(), e);
-} catch (Exception e){
- throw new EnforcerRuleException(e.getLocalizedMessage(), e);
-}
- }
-
- private String getFullArtifactName(Artifact artifact){
-return artifact.getGroupId() + : + artifact.getArtifactId() +:+
artifact.getVersion();
- }
-
- private StringBuilder buildTreeString(DependencyNode node) {
-ListString loc = new ArrayListString
svn commit: r1234304 - /maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java
Author: rfscholte
Date: Sat Jan 21 11:48:12 2012
New Revision: 1234304
URL: http://svn.apache.org/viewvc?rev=1234304view=rev
Log:
format code, no changes
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java?rev=1234304r1=1234303r2=1234304view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java
Sat Jan 21 11:48:12 2012
@@ -1,4 +1,5 @@
package org.apache.maven.plugins.enforcer.utils;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,96 +28,122 @@ import org.apache.maven.plugin.logging.L
import org.apache.maven.shared.dependency.tree.DependencyNode;
import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
-public class DependencyVersionMap implements DependencyNodeVisitor {
-
- private boolean demandReleasedVersions = false;
-
- private MapString, ListDependencyNode idsToNode;
-
- private ListDependencyNode snapshots;
-
- public DependencyVersionMap(Log log){
-idsToNode = new HashMapString, ListDependencyNode();
-snapshots = new ArrayListDependencyNode();
- }
-
- public DependencyVersionMap(boolean demandReleasedVersions, Log log){
-this(log);
-this.demandReleasedVersions = demandReleasedVersions;
- }
-
- public boolean visit(DependencyNode node) {
-addDependency(node);
-if (containsConflicts(node)){
- return false;
-}
-if (demandReleasedVersions){
- if (node.getArtifact().isSnapshot()){
-snapshots.add(node);
+public class DependencyVersionMap
+implements DependencyNodeVisitor
+{
+
+private boolean demandReleasedVersions = false;
+
+private MapString, ListDependencyNode idsToNode;
+
+private ListDependencyNode snapshots;
+
+public DependencyVersionMap( Log log )
+{
+idsToNode = new HashMapString, ListDependencyNode();
+snapshots = new ArrayListDependencyNode();
+}
+
+public DependencyVersionMap( boolean demandReleasedVersions, Log log )
+{
+this( log );
+this.demandReleasedVersions = demandReleasedVersions;
+}
+
+public boolean visit( DependencyNode node )
+{
+addDependency( node );
+if ( containsConflicts( node ) )
+{
+return false;
+}
+if ( demandReleasedVersions )
+{
+if ( node.getArtifact().isSnapshot() )
+{
+snapshots.add( node );
+return false;
+}
+}
+return true;
+}
+
+public boolean endVisit( DependencyNode node )
+{
+return true;
+}
+
+private String constructKey( DependencyNode node )
+{
+return constructKey( node.getArtifact() );
+}
+
+private String constructKey( Artifact artifact )
+{
+return artifact.getGroupId() + : + artifact.getArtifactId();
+}
+
+public void addDependency( DependencyNode node )
+{
+String key = constructKey( node );
+if ( node.getArtifact().isSnapshot() )
+{
+snapshots.add( node );
+}
+ListDependencyNode nodes = idsToNode.get( key );
+if ( nodes == null )
+{
+nodes = new ArrayListDependencyNode();
+idsToNode.put( key, nodes );
+}
+nodes.add( node );
+}
+
+public ListDependencyNode getSnapshots()
+{
+return snapshots;
+}
+
+private boolean containsConflicts( DependencyNode node )
+{
+return containsConflicts( node.getArtifact() );
+}
+
+private boolean containsConflicts( Artifact artifact )
+{
+return containsConflicts( idsToNode.get( constructKey( artifact ) ) );
+}
+
+private boolean containsConflicts( ListDependencyNode nodes )
+{
+String version = null;
+for ( DependencyNode node : nodes )
+{
+if ( version == null )
+{
+version = node.getArtifact().getVersion();
+}
+else
+{
+if ( version.compareTo( node.getArtifact().getVersion() ) != 0
)
+{
+return true;
+}
+}
+}
return false;
- }
}
-return true;
- }
- public boolean endVisit(DependencyNode node) {
-return true
svn commit: r1234414 - in /maven/enforcer/trunk: enforcer-rules/pom.xml enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java pom.xml
Author: rfscholte
Date: Sat Jan 21 20:50:50 2012
New Revision: 1234414
URL: http://svn.apache.org/viewvc?rev=1234414view=rev
Log:
Replace easymock with mockito
Modified:
maven/enforcer/trunk/enforcer-rules/pom.xml
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java
maven/enforcer/trunk/pom.xml
Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1234414r1=1234413r2=1234414view=diff
==
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Sat Jan 21 20:50:50 2012
@@ -82,8 +82,8 @@
artifactIdjunit/artifactId
/dependency
dependency
- groupIdeasymock/groupId
- artifactIdeasymock/artifactId
+ groupIdorg.mockito/groupId
+ artifactIdmockito-core/artifactId
/dependency
dependency
groupIdorg.apache.maven.shared/groupId
Modified:
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java?rev=1234414r1=1234413r2=1234414view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java
Sat Jan 21 20:50:50 2012
@@ -19,13 +19,14 @@ package org.apache.maven.plugins.enforce
* under the License.
*/
+import static org.mockito.Mockito.*;
+
import junit.framework.TestCase;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import org.easymock.MockControl;
/**
* The Class TestEvaluateBeanshell.
@@ -105,14 +106,11 @@ public class TestEvaluateBeanshell
EvaluateBeanshell rule = new EvaluateBeanshell();
rule.condition = ${env} == null;
rule.message = We have a variable : ${env};
-MockControl evalControl = MockControl.createControl(
ExpressionEvaluator.class );
+
+ExpressionEvaluator eval = mock( ExpressionEvaluator.class );
+when( eval.evaluate( rule.condition ) ).thenThrow( new
ExpressionEvaluationException( expected error ) );
try
{
-ExpressionEvaluator eval = (ExpressionEvaluator)
evalControl.getMock();
-eval.evaluate( rule.condition );
-evalControl.expectAndDefaultThrow( null, new
ExpressionEvaluationException( expected error ) );
-evalControl.replay();
-
EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( project,
eval );
rule.execute( helper );
fail( Expected an exception. );
@@ -121,8 +119,7 @@ public class TestEvaluateBeanshell
{
assertFalse( e.getLocalizedMessage().equals( rule.message ) );
}
-
-evalControl.verify();
+verify( eval );
}
public void testRuleInvalidBeanshell()
Modified: maven/enforcer/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1234414r1=1234413r2=1234414view=diff
==
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Sat Jan 21 20:50:50 2012
@@ -212,9 +212,9 @@
scopetest/scope
/dependency
dependency
-groupIdeasymock/groupId
-artifactIdeasymock/artifactId
-version1.2_Java1.3/version
+groupIdorg.mockito/groupId
+artifactIdmockito-core/artifactId
+version1.9.0/version
scopetest/scope
/dependency
dependency
