svn commit: r1144946 - /maven/pom/trunk/maven/pom.xml

2011-07-10 Thread rfscholte 
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: r1144952 - in /maven/core-integration-testing/trunk/core-it-support: ./ core-it-component/ core-it-extension/ core-it-plugins/ core-it-support-artifacts/ core-it-toolchain/ core-it-wagon/

2011-07-10 Thread hboutemy 
Author: hboutemy
Date: Sun Jul 10 20:10:12 2011
New Revision: 1144952

URL: http://svn.apache.org/viewvc?rev=1144952view=rev
Log:
renamed core-integration-testing to core-it-support to match directory name

Modified:

maven/core-integration-testing/trunk/core-it-support/core-it-component/pom.xml

maven/core-integration-testing/trunk/core-it-support/core-it-extension/pom.xml
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml

maven/core-integration-testing/trunk/core-it-support/core-it-support-artifacts/pom.xml

maven/core-integration-testing/trunk/core-it-support/core-it-toolchain/pom.xml
maven/core-integration-testing/trunk/core-it-support/core-it-wagon/pom.xml
maven/core-integration-testing/trunk/core-it-support/maven-it-helper/pom.xml

maven/core-integration-testing/trunk/core-it-support/maven-it-sample-archetype/pom.xml
maven/core-integration-testing/trunk/core-it-support/pom.xml

Modified: 
maven/core-integration-testing/trunk/core-it-support/core-it-component/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-component/pom.xml?rev=1144952r1=1144951r2=1144952view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-support/core-it-component/pom.xml 
(original)
+++ 
maven/core-integration-testing/trunk/core-it-support/core-it-component/pom.xml 
Sun Jul 10 20:10:12 2011
@@ -19,12 +19,12 @@ specific language governing permissions 
 under the License.
 --
 
-project
+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.its/groupId
-artifactIdcore-integration-testing/artifactId
+artifactIdcore-it-support/artifactId
 version2.1-SNAPSHOT/version
   /parent
 

Modified: 
maven/core-integration-testing/trunk/core-it-support/core-it-extension/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-extension/pom.xml?rev=1144952r1=1144951r2=1144952view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-support/core-it-extension/pom.xml 
(original)
+++ 
maven/core-integration-testing/trunk/core-it-support/core-it-extension/pom.xml 
Sun Jul 10 20:10:12 2011
@@ -23,8 +23,8 @@ under the License.
   modelVersion4.0.0/modelVersion
 
   parent
-artifactIdcore-integration-testing/artifactId
 groupIdorg.apache.maven.its/groupId
+artifactIdcore-it-support/artifactId
 version2.1-SNAPSHOT/version
   /parent
 

Modified: 
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml?rev=1144952r1=1144951r2=1144952view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml 
(original)
+++ 
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml 
Sun Jul 10 20:10:12 2011
@@ -1,4 +1,5 @@
 ?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
@@ -16,12 +17,14 @@ software distributed under the License i
 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;
+--
+
+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
-artifactIdcore-integration-testing/artifactId
 groupIdorg.apache.maven.its/groupId
+artifactIdcore-it-support/artifactId
 version2.1-SNAPSHOT/version
   /parent
 

Modified: 
maven/core-integration-testing/trunk/core-it-support/core-it-support-artifacts/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-support-artifacts/pom.xml?rev=1144952r1=1144951r2=1144952view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-support/core-it-support-artifacts/pom.xml
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-support/core-it-support-artifacts/pom.xml
 Sun Jul 10 20:10:12 2011
@@ -24,12 +24,11 @@ under the License.
 
   parent

svn commit: r1144958 - /maven/core-integration-testing/trunk/core-it-support/maven-it-sample/pom.xml

2011-07-10 Thread hboutemy 
Author: hboutemy
Date: Sun Jul 10 20:44:30 2011
New Revision: 1144958

URL: http://svn.apache.org/viewvc?rev=1144958view=rev
Log:
declared new apache.snapshots repository location

Modified:
maven/core-integration-testing/trunk/core-it-support/maven-it-sample/pom.xml

Modified: 
maven/core-integration-testing/trunk/core-it-support/maven-it-sample/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/maven-it-sample/pom.xml?rev=1144958r1=1144957r2=1144958view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-support/maven-it-sample/pom.xml 
(original)
+++ 
maven/core-integration-testing/trunk/core-it-support/maven-it-sample/pom.xml 
Sun Jul 10 20:44:30 2011
@@ -51,13 +51,11 @@ under the License.
   repositories
 repository
   idapache.snapshots/id
-  urlhttp://people.apache.org/repo/m2-snapshot-repository/url
+  nameApache Snapshot Repository/name
+  urlhttp://repository.apache.org/snapshots/url
   releases
 enabledfalse/enabled
   /releases
-  snapshots
-enabledtrue/enabled
-  /snapshots
 /repository
   /repositories
 /project

svn commit: r1144961 - /maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml

2011-07-10 Thread hboutemy 
Author: hboutemy
Date: Sun Jul 10 21:03:16 2011
New Revision: 1144961

URL: http://svn.apache.org/viewvc?rev=1144961view=rev
Log:
updated repositories locations

Modified:
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml

Modified: 
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml?rev=1144961r1=1144960r2=1144961view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml 
(original)
+++ 
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml 
Sun Jul 10 21:03:16 2011
@@ -84,8 +84,8 @@ under the License.
   distributionManagement
 repository
   idmaven.it/id
-  nameApache Maven Integration Testing Repository/name
-  
urlhttp://repository.sonatype.org/content/repositories/maven-it-plugins/url
+  nameApache Maven IT Repository/name
+  urlhttps://repository.apache.org/content/repositories/snapshots/url
 /repository
 snapshotRepository
   idmaven.it/id
@@ -95,7 +95,7 @@ under the License.
   /distributionManagement
 
   properties
-distMgmtSnapshotsNameApache Maven Integration Testing Snapshot 
Repository/distMgmtSnapshotsName
-
distMgmtSnapshotsUrlhttp://repository.sonatype.org/content/repositories/maven-it-plugin-snapshots/distMgmtSnapshotsUrl
+distMgmtSnapshotsNameApache Maven IT Snapshot 
Repository/distMgmtSnapshotsName
+
distMgmtSnapshotsUrlhttps://repository.apache.org/content/repositories/snapshots/distMgmtSnapshotsUrl
   /properties
 /project

svn commit: r1144973 - /maven/site/trunk/src/site/filtered-resources/.htaccess

2011-07-10 Thread hboutemy 
Author: hboutemy
Date: Sun Jul 10 22:00:19 2011
New Revision: 1144973

URL: http://svn.apache.org/viewvc?rev=1144973view=rev
Log:
added redirect for every core module

Modified:
maven/site/trunk/src/site/filtered-resources/.htaccess

Modified: maven/site/trunk/src/site/filtered-resources/.htaccess
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/filtered-resources/.htaccess?rev=1144973r1=1144972r2=1144973view=diff
==
--- maven/site/trunk/src/site/filtered-resources/.htaccess (original)
+++ maven/site/trunk/src/site/filtered-resources/.htaccess Sun Jul 10 22:00:19 
2011
@@ -21,8 +21,29 @@ Redirect Permanent /plugins/maven-checks
 RedirectMatch ^/maven2/(.*)$ /$1
 RedirectMatch ^/reference/(.*)$ /maven-1.x/reference/$1
 RedirectMatch ^/maven-1.x/reference/plugins/(.*)$ /maven-1.x/plugins/$1
+RedirectMatch ^/maven-aether-provider/(.*)$ 
/ref/${currentStableVersion}/maven-aether-provider/$1
+RedirectMatch ^/maven-artifact/(.*)$ 
/ref/${currentStableVersion}/maven-artifact/$1
+RedirectMatch ^/maven-compat/(.*)$ /ref/${currentStableVersion}/maven-compat/$1
+RedirectMatch ^/maven-core/(.*)$ /ref/${currentStableVersion}/maven-core/$1
+RedirectMatch ^/maven-embedder/(.*)$ 
/ref/${currentStableVersion}/maven-embedder/$1
 RedirectMatch ^/maven-model/(.*)$ /ref/${currentStableVersion}/maven-model/$1
+RedirectMatch ^/maven-model-builder/(.*)$ 
/ref/${currentStableVersion}/maven-model-builder/$1
+RedirectMatch ^/maven-plugin-api/(.*)$ 
/ref/${currentStableVersion}/maven-plugin-api/$1
+RedirectMatch ^/maven-repository-metadata/(.*)$ 
/ref/${currentStableVersion}/maven-repository-metadata/$1
 RedirectMatch ^/maven-settings/(.*)$ 
/ref/${currentStableVersion}/maven-settings/$1
+RedirectMatch ^/maven-settings-builder/(.*)$ 
/ref/${currentStableVersion}/maven-settings-builder/$1
+RedirectMatch ^/maven-artifact-manager/(.*)$ 
/ref/${current20xVersion}/maven-artifact-manager/$1
+RedirectMatch ^/maven-artifact-test/(.*)$ 
/ref/${current20xVersion}/maven-artifact-test/$1
+RedirectMatch ^/maven-error-diagnostics/(.*)$ 
/ref/${current20xVersion}/maven-error-diagnostics/$1
+RedirectMatch ^/maven-monitor/(.*)$ /ref/${current20xVersion}/maven-monitor/$1
+RedirectMatch ^/maven-plugin-descriptor/(.*)$ 
/ref/${current20xVersion}/maven-plugin-descriptor/$1
+RedirectMatch ^/maven-plugin-parameter-documenter/(.*)$ 
/ref/${current20xVersion}/maven-plugin-parameter-documenter/$1
+RedirectMatch ^/maven-plugin-registry/(.*)$ 
/ref/${current20xVersion}/maven-plugin-registry/$1
+RedirectMatch ^/maven-profile/(.*)$ /ref/${current20xVersion}/maven-profile/$1
+RedirectMatch ^/maven-project/(.*)$ /ref/${current20xVersion}/maven-project/$1
+RedirectMatch ^/maven-reporting/(.*)$ 
/ref/${current20xVersion}/maven-reporting/$1
+RedirectMatch ^/maven-script/(.*)$ /ref/${current20xVersion}/maven-script/$1
+RedirectMatch ^/maven-toolchain/(.*)$ 
/ref/${current20xVersion}/maven-toolchain/$1
 RedirectMatch ^/maven-1.x/plugins-sandbox/(.*)$ /maven-1.x/plugins/$1
 
 RedirectMatch permanent ^/repository-manager/(.*)$ http://archiva.apache.org/$1

svn commit: r1144975 - /maven/site/trunk/src/site/apt/shared/index.apt

2011-07-10 Thread hboutemy 
Author: hboutemy
Date: Sun Jul 10 22:02:31 2011
New Revision: 1144975

URL: http://svn.apache.org/viewvc?rev=1144975view=rev
Log:
maven-reporting-exec 1.0 released

Modified:
maven/site/trunk/src/site/apt/shared/index.apt

Modified: maven/site/trunk/src/site/apt/shared/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/shared/index.apt?rev=1144975r1=1144974r2=1144975view=diff
==
--- maven/site/trunk/src/site/apt/shared/index.apt (original)
+++ maven/site/trunk/src/site/apt/shared/index.apt Sun Jul 10 22:02:31 2011
@@ -4,7 +4,7 @@
  Dennis Lundberg
  John Casey
  -
- 2011-05-07
+ 2011-05-09
  -
 
 Shared Components
@@ -37,7 +37,7 @@ Shared Components
 
*+--+---+--++-+
 | {{{/shared/maven-reporting-api/} maven-reporting-api}}   | 
3.0  | 2010-05-12| API to manage report generation. | 
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-reporting-api/}SVN}}
 | {{{http://jira.codehaus.org/browse/MSHARED/component/14413}JIRA}}
 
*+--+---+--++-+
-| {{{/shared/maven-reporting-exec/} maven-reporting-exec}} | 
 |   | API to manage report plugin executions with 
Maven 3. | 
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-reporting-exec/}SVN}}
 | {{{http://jira.codehaus.org/browse/MSHARED/component/14716}JIRA}}
+| {{{/shared/maven-reporting-exec/} maven-reporting-exec}} | 
1.0  | 2011-07-09| API to manage report plugin executions with 
Maven 3. | 
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-reporting-exec/}SVN}}
 | {{{http://jira.codehaus.org/browse/MSHARED/component/14716}JIRA}}
 
*+--+---+--++-+
 | {{{/shared/maven-reporting-impl/} maven-reporting-impl}} | 
2.1  | 2010-05-12| Abstract classes to manage report 
generation. | 
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-reporting-impl/}SVN}}
 | {{{http://jira.codehaus.org/browse/MSHARED/component/13274}JIRA}}
 
*+--+---+--++-+

svn commit: r1144981 - in /maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-online/src/main/java/org/apache/maven: plugin/ plugins/

2011-07-10 Thread hboutemy 
Author: hboutemy
Date: Sun Jul 10 22:23:12 2011
New Revision: 1144981

URL: http://svn.apache.org/viewvc?rev=1144981view=rev
Log:
fixed directory name which does not match package

Added:

maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-online/src/main/java/org/apache/maven/plugin/
  - copied from r1144459, 
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-online/src/main/java/org/apache/maven/plugins/
Removed:

maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-online/src/main/java/org/apache/maven/plugins/

svn commit: r1144983 - /maven/shared/trunk/maven-shared-components/pom.xml

2011-07-10 Thread hboutemy 
Author: hboutemy
Date: Sun Jul 10 22:31:50 2011
New Revision: 1144983

URL: http://svn.apache.org/viewvc?rev=1144983view=rev
Log:
declared apache.snapshots repository like in ASF pom for use when parent is 
SNAPSHOT

Modified:
maven/shared/trunk/maven-shared-components/pom.xml

Modified: maven/shared/trunk/maven-shared-components/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-components/pom.xml?rev=1144983r1=1144982r2=1144983view=diff
==
--- maven/shared/trunk/maven-shared-components/pom.xml (original)
+++ maven/shared/trunk/maven-shared-components/pom.xml Sun Jul 10 22:31:50 2011
@@ -131,6 +131,17 @@ under the License.
 /site
   /distributionManagement
 
+  repositories
+repository
+  idapache.snapshots/id
+  nameApache Snapshot Repository/name
+  urlhttp://repository.apache.org/snapshots/url
+  releases
+enabledfalse/enabled
+  /releases
+/repository
+  /repositories
+
   build
 pluginManagement
   plugins
@@ -178,20 +189,5 @@ under the License.
 /plugins
   /build
 /profile
-profile
-  idapache.shapshots/id
-  repositories
-repository
-  idapache.snapshots/id
-  
urlhttps://repository.apache.org/content/groups/snapshots-group//url
-  releases
-enabledfalse/enabled
-  /releases
-  snapshots
-enabledtrue/enabled
-  /snapshots
-/repository
-  /repositories
-/profile
   /profiles
 /project

svn commit: r1145003 - in /maven/jxr/trunk/maven-jxr-plugin/src: it/aggregate/ it/aggregate/p1/ it/aggregate/p1/src/ it/aggregate/p1/src/main/ it/aggregate/p1/src/main/java/ it/aggregate/p1/src/main/j

2011-07-10 Thread bimargulies 
Author: bimargulies
Date: Mon Jul 11 01:14:29 2011
New Revision: 1145003

URL: http://svn.apache.org/viewvc?rev=1145003view=rev
Log:
JXR-88: create jxr:aggregate and jxr:test-aggregate

o initial attempt at adding aggregate goal, but not working yet.

Added:
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/pom.xml   (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App.java
   (with props)

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App2.java
   (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/jxr/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/jxr/it/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/jxr/it/AppTest.java
   (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/pom.xml   (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java
   (with props)

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java
   (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/jxr/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/jxr/it/

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/jxr/it/AppTest.java
   (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml   (with props)

maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrReport.java
   (with props)
Modified:

maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java

maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java

Added: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/pom.xml?rev=1145003view=auto
==
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/pom.xml (added)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/pom.xml Mon Jul 11 
01:14:29 2011
@@ -0,0 +1,36 @@
+?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

svn commit: r1145006 - in /maven/jxr/trunk/maven-jxr-plugin: pom.xml src/it/aggregate/pom.xml

2011-07-10 Thread bimargulies 
Author: bimargulies
Date: Mon Jul 11 01:23:37 2011
New Revision: 1145006

URL: http://svn.apache.org/viewvc?rev=1145006view=rev
Log:
JXR-88: jxr:aggregate and jxr:test-aggregate
o some debugging support.

Modified:
maven/jxr/trunk/maven-jxr-plugin/pom.xml
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml

Modified: maven/jxr/trunk/maven-jxr-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/pom.xml?rev=1145006r1=1145005r2=1145006view=diff
==
--- maven/jxr/trunk/maven-jxr-plugin/pom.xml (original)
+++ maven/jxr/trunk/maven-jxr-plugin/pom.xml Mon Jul 11 01:23:37 2011
@@ -130,7 +130,7 @@ under the License.
 dependency
   groupIdorg.apache.maven.wagon/groupId
   artifactIdwagon-provider-api/artifactId
-  version1.0-beta-2/version
+  version1.0/version
 /dependency
 dependency
   groupIdorg.apache.maven.doxia/groupId

Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml?rev=1145006r1=1145005r2=1145006view=diff
==
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml (original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml Mon Jul 11 
01:23:37 2011
@@ -30,6 +30,11 @@ under the License.
   nameaggregate/name
   urlhttp://maven.apache.org/url
 
+  properties
+jxr-plugin-version@pom.version@/jxr-plugin-version
+site-plugin-version@sitePluginVersion@/site-plugin-version
+  /properties
+
   dependencies
 dependency
   groupIdjunit/groupId
@@ -44,18 +49,19 @@ under the License.
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-jxr-plugin/artifactId
-version@pom.version@/version
+version${jxr-plugin-version}/version
executions
  execution
-   idjxr/id
+   idaggregate/id
goalsgoalaggregate/goal/goals
+   phasesite/phase
  /execution
/executions
   /plugin
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-site-plugin/artifactId
-version@sitePluginVersion@/version
+version${site-plugin-version}/version
   /plugin
 /plugins
   /build

svn commit: r1145008 - in /maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate: p2/src/main/java/org/apache/maven/jxr/it2/App.java p2/src/main/java/org/apache/maven/jxr/it2/App2.java pom.xml

2011-07-10 Thread bimargulies 
Author: bimargulies
Date: Mon Jul 11 01:39:50 2011
New Revision: 1145008

URL: http://svn.apache.org/viewvc?rev=1145008view=rev
Log:
JXR-88:  jxr:aggregate and jxr:test-aggregate
o fix up test case, turn on javadoc. There's a lot still to be tested in this 
vicinity.

Modified:

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java

maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml

Modified: 
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java?rev=1145008r1=1145007r2=1145008view=diff
==
--- 
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java
 (original)
+++ 
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java
 Mon Jul 11 01:39:50 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.jxr.it;
+package org.apache.maven.jxr.it2;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: 
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java?rev=1145008r1=1145007r2=1145008view=diff
==
--- 
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java
 (original)
+++ 
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java
 Mon Jul 11 01:39:50 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.jxr.it;
+package org.apache.maven.jxr.it2;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml?rev=1145008r1=1145007r2=1145008view=diff
==
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml (original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml Mon Jul 11 
01:39:50 2011
@@ -57,7 +57,21 @@ under the License.
phasesite/phase
  /execution
/executions
-  /plugin
+  /plugin 
+  plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-javadoc-plugin/artifactId
+version2.8/version
+executions
+  execution
+idaggregate/id
+goals
+  goalaggregate/goal
+/goals
+phasesite/phase
+  /execution
+/executions
+  /plugin   
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-site-plugin/artifactId
@@ -77,7 +91,12 @@ under the License.
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-jxr-plugin/artifactId
-version@pom.version@/version
+version${jxr-plugin-version}/version
+  /plugin
+  plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-javadoc-plugin/artifactId
+version2.8/version
   /plugin
 /plugins
   /reporting