svn commit: r575627 - /maven/archiva/trunk/archiva-site/src/site/apt/guides/maven-configuration.apt
Author: oching
Date: Fri Sep 14 04:22:33 2007
New Revision: 575627
URL: http://svn.apache.org/viewvc?rev=575627view=rev
Log:
[MRM-385]
- Added Archiva as a Proxy section in maven-configuration.apt
- Updated some lines in the Configuring Maven-2 to use an Archiva repository
section
Modified:
maven/archiva/trunk/archiva-site/src/site/apt/guides/maven-configuration.apt
Modified:
maven/archiva/trunk/archiva-site/src/site/apt/guides/maven-configuration.apt
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-site/src/site/apt/guides/maven-configuration.apt?rev=575627r1=575626r2=575627view=diff
==
---
maven/archiva/trunk/archiva-site/src/site/apt/guides/maven-configuration.apt
(original)
+++
maven/archiva/trunk/archiva-site/src/site/apt/guides/maven-configuration.apt
Fri Sep 14 04:22:33 2007
@@ -33,13 +33,12 @@
URL-TO-ARCHIVA = where to find Archiva eg. http://localhost:8080/archiva
- REPOSITORY-ID = Identifer for the proxied repository inside Archiva
+ REPOSITORY-ID = Identifer for the proxied repository inside Archiva eg.
internal, releases
- URL-NAME = Another identifier, this time for normal repositories [one of
the these will go away]
+ ~~ URL-NAME = Another identifier, this time for normal repositories [one
of the these will go away]
-
* Configuring a Repository
-
+
[[1]] create a new profile to setup your repositories
+-+
@@ -83,7 +82,7 @@
+-+
repository
idrepository-1/id
-urlURL-TO-ARCHIVA/repository/URL-NAME/url
+urlURL-TO-ARCHIVA/repository/REPOSITORY-ID/url
releases
enabledtrue/enabled
/releases
@@ -199,3 +198,70 @@
-DrepositoryId=deployment.webdav
-Durl=dav:URL-TO-ARCHIVA/repository/REPOSITORY-ID
+--+
+
+Archiva as a Proxy
+
+* Creating a New Proxy Repository
+
+ Archiva has pre-configured proxy connectors for the 'internal' managed repo
and the 'central' and 'maven2-repository.dev.java.net' remote repositories.
+
+ To create a new proxy repository, just do the following:
+
+ [[1]] Add a new managed repository
+
+ Go to Repositories -- Add (Managed Repository)
+
+ Create the managed repository (let's say 'releases') which would serve as
the proxy repo.
+
+ Do not forget to set the necessary permissions or user roles in Users
Management if you want this repository to be secured.
+
+ [[2]] Add a remote repository
+
+ Go to Repositories -- Add (Remote Repository)
+
+ Add the remote repository you want to proxy.
+
+ [[3]] Create a proxy connector
+
+ Go to Proxy Connectors -- Add
+
+ Fill up the following fields:
+
+ * Network Proxy* - if your network connection has a network proxy, then this
should be configured via the Network Proxies in Archiva. Select the network
proxy, if you're using one, that will be used for this proxy connector.
+
+ * Managed Repository* - the managed repository you want to connect to the
remote repository.
+
+ * Remote Repository* - the repository you want to proxy
+
+ * Policies - the download policies that will be used by Archiva when proxying
+
+ * Properties
+
+ * Black List Patterns - the patterns that will be blacklisted during proxying
+
+ * White List Patterns - the patterns that will be included during proxying
+
+* Using the Proxy Repository with Maven
+
+ Set-up your settings.xml file as shown above in sections 1 and 2 of
Configuring a Repository. In this case, use the repository configuration of the
managed repository you've created.
+
+ Then, configure the server settings in the settings.xml file as shown
below:
+
++-+
+ settings
+...
+servers
+ server
+idreleases/id
+username{archiva-user}/username
+password{archiva-pwd}/password
+ /server
+ ...
+/servers
+...
+ /settings
++-+
+
+ Execute a Maven 2 build. Artifacts should be downloaded from the proxy
repository/repositories you've set in your settings.xml
+
+
\ No newline at end of file
svn commit: r575677 - in /maven/archiva/trunk: archiva-web/archiva-webapp/pom.xml archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java pom.xml
Author: evenisse
Date: Fri Sep 14 06:46:58 2007
New Revision: 575677
URL: http://svn.apache.org/viewvc?rev=575677view=rev
Log:
[MRM-498] Update to latest webwork/xwork
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
maven/archiva/trunk/pom.xml
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml?rev=575677r1=575676r2=575677view=diff
==
--- maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml Fri Sep 14 06:46:58
2007
@@ -140,7 +140,7 @@
scoperuntime/scope
/dependency
dependency
- groupIdopensymphony/groupId
+ groupIdcom.opensymphony/groupId
artifactIdwebwork/artifactId
/dependency
dependency
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java?rev=575677r1=575676r2=575677view=diff
==
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
Fri Sep 14 06:46:58 2007
@@ -114,7 +114,7 @@
private String determineBrowseActionUrl()
{
return determineActionURL( browse, NAMESPACE, method, req, res,
parameters, req.getScheme(), includeContext,
- encode );
+ encode, true );
}
private String determineBrowseGroupActionUrl( String gid )
@@ -122,7 +122,7 @@
parameters.put( groupId, gid );
return determineActionURL( ACTION, NAMESPACE, method, req, res,
parameters, req.getScheme(), includeContext,
- encode );
+ encode, true );
}
public String getGroupId()
Modified: maven/archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?rev=575677r1=575676r2=575677view=diff
==
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Fri Sep 14 06:46:58 2007
@@ -545,7 +545,7 @@
dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-xwork-integration/artifactId
-version1.0-alpha-6/version
+version1.0-alpha-7/version
/dependency
dependency
groupIdorg.codehaus.plexus.cache/groupId
@@ -639,9 +639,9 @@
version${wagon.version}/version
/dependency
dependency
-groupIdopensymphony/groupId
+groupIdcom.opensymphony/groupId
artifactIdwebwork/artifactId
-version2.2.4/version
+version2.2.6/version
/dependency
dependency
groupIdxmlunit/groupId
svn commit: r575681 - in /maven/archiva/trunk/archiva-web/archiva-webapp/src/main: resources/ webapp/template/xhtml/
Author: evenisse
Date: Fri Sep 14 06:51:32 2007
New Revision: 575681
URL: http://svn.apache.org/viewvc?rev=575681view=rev
Log:
[MRM-499] Add freemarker property and some missing templates for performance
Added:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/freemarker.properties
(with props)
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a-close.ftl
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a.ftl
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionerror.ftl
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionmessage.ftl
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/hidden.ftl
Added:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/freemarker.properties
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/freemarker.properties?rev=575681view=auto
==
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/freemarker.properties
(added)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/freemarker.properties
Fri Sep 14 06:51:32 2007
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+# 1 hour
+template_update_delay=360
\ No newline at end of file
Propchange:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/freemarker.properties
--
svn:eol-style = native
Propchange:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/freemarker.properties
--
svn:keywords = Author Date Id Revision
Added:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a-close.ftl
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a-close.ftl?rev=575681view=auto
==
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a-close.ftl
(added)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a-close.ftl
Fri Sep 14 06:51:32 2007
@@ -0,0 +1 @@
+/a#rt/
\ No newline at end of file
Added:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a.ftl
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a.ftl?rev=575681view=auto
==
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a.ftl
(added)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a.ftl
Fri Sep 14 06:51:32 2007
@@ -0,0 +1,22 @@
+a#rt/
+#if parameters.id?if_exists !=
+ id=${parameters.id?html}#rt/
+/#if
+#if parameters.href?if_exists !=
+ href=${parameters.href}#rt/
+/#if
+#if parameters.tabindex?exists
+ tabindex=${parameters.tabindex?html}#rt/
+/#if
+#if parameters.cssClass?exists
+ class=${parameters.cssClass?html}#rt/
+/#if
+#if parameters.cssStyle?exists
+ style=${parameters.cssStyle?html}#rt/
+/#if
+#if parameters.title?exists
+ title=${parameters.title?html}#rt/
+/#if
+#include /${parameters.templateDir}/simple/scripting-events.ftl /
+#include /${parameters.templateDir}/simple/common-attributes.ftl /
+#rt/
Added:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionerror.ftl
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionerror.ftl?rev=575681view=auto
==
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionerror.ftl
(added)
+++
svn commit: r575702 - /maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
Author: evenisse Date: Fri Sep 14 07:39:51 2007 New Revision: 575702 URL: http://svn.apache.org/viewvc?rev=575702view=rev Log: [MRM-497] Add resource reference entries. Submitted by: Aleksandr Tarutin Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml?rev=575702r1=575701r2=575702view=diff == --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml Fri Sep 14 07:39:51 2007 @@ -71,4 +71,23 @@ url-pattern/repository/*/url-pattern /servlet-mapping + resource-ref + res-ref-namejdbc/users/res-ref-name + res-typejavax.sql.DataSource/res-type + res-authContainer/res-auth + res-sharing-scopeShareable/res-sharing-scope + /resource-ref + resource-ref + res-ref-namejdbc/archiva/res-ref-name + res-typejavax.sql.DataSource/res-type + res-authContainer/res-auth + res-sharing-scopeShareable/res-sharing-scope + /resource-ref + resource-ref + res-ref-namemail/Session/res-ref-name + res-typejavax.mail.Session/res-type + res-authContainer/res-auth + res-sharing-scopeShareable/res-sharing-scope + /resource-ref + /web-app
svn commit: r575548 - /maven/sandbox/trunk/plugins/maven-xcode-plugin/STATUS
Author: carnold Date: Thu Sep 13 23:00:16 2007 New Revision: 575548 URL: http://svn.apache.org/viewvc?rev=575548view=rev Log: Update STATUS file Modified: maven/sandbox/trunk/plugins/maven-xcode-plugin/STATUS Modified: maven/sandbox/trunk/plugins/maven-xcode-plugin/STATUS URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-xcode-plugin/STATUS?rev=575548r1=575547r2=575548view=diff == --- maven/sandbox/trunk/plugins/maven-xcode-plugin/STATUS (original) +++ maven/sandbox/trunk/plugins/maven-xcode-plugin/STATUS Thu Sep 13 23:00:16 2007 @@ -1,6 +1,5 @@ -This plugin is still experimental and only partially functional. -The mojo has only been tested with trivial projects created by archetype:create -and with XCode 2.4.1. +This plugin is experimental. The mojo has only been tested +a small number of projects. To use:
svn commit: r575563 - in /maven/sandbox/trunk/shared/maven-extra-profile-activators: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/m
Author: jdcasey Date: Thu Sep 13 23:54:29 2007 New Revision: 575563 URL: http://svn.apache.org/viewvc?rev=575563view=rev Log: Splitting this properties/ based profile activator out of native-mojos for wider use, a la maven-common-artifact-filters. Added: maven/sandbox/trunk/shared/maven-extra-profile-activators/ maven/sandbox/trunk/shared/maven-extra-profile-activators/pom.xml (with props) maven/sandbox/trunk/shared/maven-extra-profile-activators/src/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/main/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/main/java/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/main/java/org/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/main/java/org/apache/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/main/java/org/apache/maven/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/main/java/org/apache/maven/shared/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/main/java/org/apache/maven/shared/profiles/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/main/java/org/apache/maven/shared/profiles/ModelPropertyProfileActivator.java (with props) maven/sandbox/trunk/shared/maven-extra-profile-activators/src/test/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/test/java/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/test/java/org/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/test/java/org/apache/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/test/java/org/apache/maven/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/test/java/org/apache/maven/shared/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/test/java/org/apache/maven/shared/profiles/ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/test/java/org/apache/maven/shared/profiles/ModelPropertyProfileActivatorTest.java (with props) Added: maven/sandbox/trunk/shared/maven-extra-profile-activators/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-extra-profile-activators/pom.xml?rev=575563view=auto == --- maven/sandbox/trunk/shared/maven-extra-profile-activators/pom.xml (added) +++ maven/sandbox/trunk/shared/maven-extra-profile-activators/pom.xml Thu Sep 13 23:54:29 2007 @@ -0,0 +1,50 @@ +?xml version=1.0 encoding=UTF-8?project + modelVersion4.0.0/modelVersion + + parent +groupIdorg.apache.maven.shared/groupId +artifactIdmaven-shared-components/artifactId +version4/version + /parent + + groupIdorg.apache.maven.shared/groupId + artifactIdmaven-extra-profile-activators/artifactId + version1.0-SNAPSHOT/version + + dependencies +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-build-context/artifactId + version2.1-SNAPSHOT/version +/dependency +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-project/artifactId + version2.1-SNAPSHOT/version +/dependency +dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + version3.8.1/version + scopetest/scope +/dependency + /dependencies + + build +plugins + plugin +groupIdorg.codehaus.plexus/groupId +artifactIdplexus-maven-plugin/artifactId +version1.3.5/version +executions + execution +idcreate-component-descriptor/id +goals + goaldescriptor/goal +/goals + /execution +/executions + /plugin +/plugins + /build +/project \ No newline at end of file Propchange: maven/sandbox/trunk/shared/maven-extra-profile-activators/pom.xml -- svn:eol-style = native Propchange: maven/sandbox/trunk/shared/maven-extra-profile-activators/pom.xml -- svn:keywords = Author Date Id Revision Added: maven/sandbox/trunk/shared/maven-extra-profile-activators/src/main/java/org/apache/maven/shared/profiles/ModelPropertyProfileActivator.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-extra-profile-activators/src/main/java/org/apache/maven/shared/profiles/ModelPropertyProfileActivator.java?rev=575563view=auto == --- maven/sandbox/trunk/shared/maven-extra-profile-activators/src/main/java/org/apache/maven/shared/profiles/ModelPropertyProfileActivator.java (added) +++ maven/sandbox/trunk/shared/maven-extra-profile-activators/src/main/java/org/apache/maven/shared/profiles/ModelPropertyProfileActivator.java Thu Sep 13 23:54:29 2007 @@ -0,0 +1,291 @@ +package org.apache.maven.shared.profiles; +
svn commit: r575564 - /maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
Author: jdcasey Date: Thu Sep 13 23:54:41 2007 New Revision: 575564 URL: http://svn.apache.org/viewvc?rev=575564view=rev Log: Removing weird property specification in this test, it only muddies the waters. Modified: maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java Modified: maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java?rev=575564r1=575563r2=575564view=diff == --- maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java (original) +++ maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java Thu Sep 13 23:54:41 2007 @@ -27,20 +27,22 @@ invoker.setMavenHome( findMavenHome() ); Properties props = new Properties(); -props.put( key with spaces, value with spaces ); +//props.put( key with spaces, value with spaces ); InvocationRequest request = new DefaultInvocationRequest(); request.setBaseDirectory( basedir ); request.setProperties( props ); +request.setDebug( true ); + List goals = new ArrayList(); goals.add( clean ); goals.add( package ); - + request.setGoals( goals ); - + InvocationResult result = invoker.execute( request ); - + assertEquals( 0, result.getExitCode() ); } @@ -54,11 +56,13 @@ InvocationRequest request = new DefaultInvocationRequest(); request.setBaseDirectory( basedir ); - + +request.setDebug( true ); + List goals = new ArrayList(); goals.add( clean ); goals.add( package ); - + request.setGoals( goals ); InvocationResult result = invoker.execute( request );
svn commit: r575565 - in /maven/plugins/trunk/maven-invoker-plugin: pom.xml src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Author: jdcasey
Date: Thu Sep 13 23:55:01 2007
New Revision: 575565
URL: http://svn.apache.org/viewvc?rev=575565view=rev
Log:
Adding support for profiles.
Modified:
maven/plugins/trunk/maven-invoker-plugin/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=575565r1=575564r2=575565view=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Thu Sep 13 23:55:01 2007
@@ -16,7 +16,7 @@
dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-invoker/artifactId
- version2.0.6/version
+ version2.0.7-SNAPSHOT/version
/dependency
dependency
groupIdorg.apache.maven/groupId
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java?rev=575565r1=575564r2=575565view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Thu Sep 13 23:55:01 2007
@@ -54,9 +54,9 @@
/**
* Searches for integration test Maven projects, and executes each, collecting
a log in the project directory, and
* outputting the results to the screen.
- *
+ *
* @goal run
- *
+ *
* @author a href=mailto:[EMAIL PROTECTED]Kenney Westerhof/a
* @author a href=mailto:[EMAIL PROTECTED]John Casey/a
*/
@@ -68,70 +68,70 @@
* the only indication of the build's success or failure will be the
effect it has on the main
* build (if it fails, the main build should fail as well). If streamLogs
is enabled, the sub-build
* summary will also provide an indication. By default, this parameter is
set to false.
- *
+ *
* @parameter default-value=false
*/
private boolean suppressSummaries;
-
+
/**
* Flag used to determine whether the build logs should be output to the
normal mojo log.
- *
+ *
* @parameter expression=${invoker.streamLogs} default-value=false
*/
private boolean streamLogs;
-
+
/**
* The local repository for caching artifacts.
- *
+ *
* @parameter expression=${invoker.localRepositoryPath}
*/
private String localRepositoryPath;
/**
* Directory to search for integration tests.
- *
+ *
* @parameter expression=${invoker.projectsDirectory}
default-value=${basedir}/src/projects/
*/
private File projectsDirectory;
-
+
/**
* Directory to which projects should be cloned prior to execution.
- *
+ *
* @parameter
*/
private File cloneProjectsTo;
-
+
/**
* A single POM to build, skipping any scanning parameters and behavior.
- *
+ *
* @parameter expression=${invoker.pom}
*/
private File pom;
/**
* Includes for searching the integration test directory. This parameter
is meant to be set from the POM.
- *
+ *
* @parameter
*/
private List pomIncludes = Collections.singletonList( */pom.xml );
/**
* Excludes for searching the integration test directory. This parameter
is meant to be set from the POM.
- *
+ *
* @parameter
*/
private List pomExcludes = Collections.EMPTY_LIST;
/**
* The comma-separated list of goals to execute on each project. Default
is 'package'.
- *
+ *
* @parameter
*/
private List goals = Collections.singletonList( package );
/**
* The name of the project-specific file that contains the enumeration of
goals to execute for that test.
- *
+ *
* @parameter expression=${invoker.goalsFile} default-value=goals.txt
*/
private String goalsFile;
@@ -143,53 +143,59 @@
/**
* relative path of a pre-build hook beanshell script to run prior to
executing the build.
- *
+ *
* @parameter expression=${invoker.preBuildHookScript}
default-value=prebuild.bsh
*/
private String preBuildHookScript;
/**
* relative path of a cleanup/verification beanshell script to run after
executing the build.
- *
+ *
* @parameter expression=${invoker.postBuildHookScript}
default-value=postbuild.bsh
*/
private String postBuildHookScript;
/**
* Location of a properties file that defines CLI properties for the test.
- *
+ *
svn commit: r575567 - in /maven/sandbox/trunk/doxia/doxia-module-fo/src: main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java main/java/org/apache/maven/doxia/module/fo/FoSink.java test/jav
Author: ltheussl
Date: Fri Sep 14 00:14:49 2007
New Revision: 575567
URL: http://svn.apache.org/viewvc?rev=575567view=rev
Log:
Factor out aggregate sink into a separate class. Fix link/anchor handling
between different source documents, for this we need to pass the name of the
source document into the sink.
Added:
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
(with props)
Modified:
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
maven/sandbox/trunk/doxia/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java
Added:
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java?rev=575567view=auto
==
---
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
(added)
+++
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
Fri Sep 14 00:14:49 2007
@@ -0,0 +1,356 @@
+package org.apache.maven.doxia.module.fo;
+
+/*
+ * 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.Writer;
+
+import org.apache.maven.doxia.util.HtmlTools;
+
+/**
+ * A Doxia Sink that produces an aggregated FO model.
+ */
+public class FoAggregateSink extends FoSink
+{
+
+/** Counts the current chapter level. */
+private int chapter = 0;
+
+/** A name for the current document. */
+private String docName;
+
+/** In fragment mode, some text has to be ignored (title...). */
+private boolean ignoreText;
+
+/**
+ * Constructor.
+ *
+ * @param writer The writer for writing the result.
+ */
+public FoAggregateSink( Writer writer )
+{
+super( writer );
+}
+
+// TODO page headers, page numbering
+// TODO add FOP compliance mode?
+
+/** [EMAIL PROTECTED] */
+public void head()
+{
+ignoreText = true;
+}
+
+/** [EMAIL PROTECTED] */
+public void head_()
+{
+ignoreText = false;
+newline();
+}
+
+/** [EMAIL PROTECTED] */
+public void title()
+{
+// ignored
+}
+
+/** [EMAIL PROTECTED] */
+public void title_()
+{
+// ignored
+}
+
+/** [EMAIL PROTECTED] */
+public void author()
+{
+// ignored
+}
+
+/** [EMAIL PROTECTED] */
+public void author_()
+{
+// ignored
+}
+
+/** [EMAIL PROTECTED] */
+public void date()
+{
+// ignored
+}
+
+/** [EMAIL PROTECTED] */
+public void date_()
+{
+// ignored
+}
+
+/** [EMAIL PROTECTED] */
+public void body()
+{
+startPageSequence();
+
+chapter++;
+
+if ( docName == null )
+{
+// TODO: log.warn( No document root specified, local links might
not be resolved correctly! )
+}
+else {
+writeStartTag( block, id, docName );
+}
+
+}
+
+/** [EMAIL PROTECTED] */
+public void body_()
+{
+newline();
+writeEndTag( block );
+writeEndTag( flow );
+writeEndTag( page-sequence );
+
+// reset document name
+docName = null;
+}
+
+/**
+ * Sets the name for the current document. This should allow anchors to be
resolved uniquely.
+ *
+ * @param name the name for the current document.
+ */
+public void setDocumentName( String name )
+{
+this.docName = name;
+
+// prepend ./ and strip extension
+if ( !docName.startsWith( ./ ) )
+{
+this.docName = ./ + docName;
+}
+
+if ( docName.indexOf( ., 2 ) != -1)
+{
+this.docName = docName.substring( 0, docName.indexOf( ., 2 ) );
+}
+}
+
+// ---
+//
+//
svn commit: r575568 - /maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
Author: ltheussl
Date: Fri Sep 14 00:16:21 2007
New Revision: 575568
URL: http://svn.apache.org/viewvc?rev=575568view=rev
Log:
Adjust to changes in the FO sink. Links between different source documents
should work now.
Modified:
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
Modified:
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java?rev=575568r1=575567r2=575568view=diff
==
---
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
(original)
+++
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
Fri Sep 14 00:16:21 2007
@@ -38,7 +38,7 @@
import org.apache.maven.doxia.docrenderer.document.io.xpp3.DocumentXpp3Reader;
import org.apache.maven.doxia.module.site.SiteModule;
import org.apache.maven.doxia.module.site.manager.SiteModuleManager;
-import org.apache.maven.doxia.module.fo.FoSink;
+import org.apache.maven.doxia.module.fo.FoAggregateSink;
import org.apache.maven.doxia.module.fo.FoUtils;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
@@ -116,7 +116,7 @@
pdfOutputFile.getParentFile().mkdirs();
}
-FoSink sink = new FoSink( new FileWriter( outputFOFile ), /**
aggregate */ true );
+FoAggregateSink sink = new FoAggregateSink( new FileWriter(
outputFOFile ) );
sink.beginDocument();
@@ -137,6 +137,8 @@
String fullPathDoc = new File( moduleBasedir, doc
).getPath();
+sink.setDocumentName( doc );
+
parse( fullPathDoc, module, sink );
}
}
@@ -206,10 +208,10 @@
}
-FoSink sink = new FoSink( new FileWriter( outputFOFile ), /**
aggregate */ true );
+FoAggregateSink sink = new FoAggregateSink( new FileWriter(
outputFOFile ) );
sink.beginDocument();
-
+
for ( Iterator k = documentModel.getToc().getItems().iterator();
k.hasNext(); )
{
DocumentTOCItem tocItem = (DocumentTOCItem) k.next();
@@ -219,14 +221,14 @@
// TODO: getLogger().info( No ref defined for an tocItem in
the document descriptor. );
continue;
}
-
+
String href = StringUtils.replace( tocItem.getRef(), \\, / );
-
+
if ( href.lastIndexOf( . ) != -1 )
{
href = href.substring( 0, href.lastIndexOf( . ) );
}
-
+
for ( Iterator i = siteModuleManager.getSiteModules().iterator();
i.hasNext(); )
{
SiteModule module = (SiteModule) i.next();
@@ -235,10 +237,14 @@
if ( moduleBasedir.exists() !fml.equals(
module.getExtension() ) )
{
-File source = new File( moduleBasedir, href + . +
module.getExtension() );
+String doc = href + . + module.getExtension();
+
+File source = new File( moduleBasedir, doc );
if ( source.exists() )
{
+sink.setDocumentName( doc );
+
parse( source.getPath(), module, sink );
}
}
@@ -259,7 +265,7 @@
* @throws DocRendererException
* @throws IOException
*/
-private void parse( String fullPathDoc, SiteModule module, FoSink sink )
+private void parse( String fullPathDoc, SiteModule module, FoAggregateSink
sink )
throws DocRendererException, IOException
{
try
svn commit: r575628 - in /maven/shared/trunk/maven-common-artifact-filters: ./ src/main/java/org/apache/maven/shared/artifact/filter/ src/test/java/org/apache/maven/shared/artifact/filter/
Author: markh
Date: Fri Sep 14 04:28:29 2007
New Revision: 575628
URL: http://svn.apache.org/viewvc?rev=575628view=rev
Log:
o Fixed StrictPatternArtifactFilters to use base version - this allows SNAPSHOT
patterns to match artifacts with timestamp snapshot versions
o Upgraded maven-artifact to 2.0.8-SNAPSHOT for proper artifact base version
setting introduced in r566206
Modified:
maven/shared/trunk/maven-common-artifact-filters/pom.xml
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilterTest.java
Modified: maven/shared/trunk/maven-common-artifact-filters/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/pom.xml?rev=575628r1=575627r2=575628view=diff
==
--- maven/shared/trunk/maven-common-artifact-filters/pom.xml (original)
+++ maven/shared/trunk/maven-common-artifact-filters/pom.xml Fri Sep 14
04:28:29 2007
@@ -15,7 +15,7 @@
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact/artifactId
- version2.0.2/version
+ version2.0.8-SNAPSHOT/version
/dependency
dependency
groupIdorg.codehaus.plexus/groupId
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java?rev=575628r1=575627r2=575628view=diff
==
---
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
(original)
+++
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
Fri Sep 14 04:28:29 2007
@@ -112,8 +112,12 @@
*/
private boolean include( Artifact artifact, String pattern )
{
-String[] tokens =
-new String[] { artifact.getGroupId(), artifact.getArtifactId(),
artifact.getType(), artifact.getVersion() };
+String[] tokens = new String[] {
+artifact.getGroupId(),
+artifact.getArtifactId(),
+artifact.getType(),
+artifact.getBaseVersion()
+};
String[] patternTokens = pattern.split( : );
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilterTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilterTest.java?rev=575628r1=575627r2=575628view=diff
==
---
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilterTest.java
(original)
+++
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilterTest.java
Fri Sep 14 04:28:29 2007
@@ -51,10 +51,7 @@
*/
protected void setUp() throws Exception
{
-VersionRange version = VersionRange.createFromVersion( version );
-ArtifactHandler handler = new DefaultArtifactHandler();
-
-artifact = new DefaultArtifact( groupId, artifactId, version,
null, type, null, handler );
+artifact = createArtifact( groupId, artifactId, type, version
);
}
// tests --
@@ -314,7 +311,35 @@
assertIncluded( group*:*Id:*:version );
}
+public void testSnapshotVersion()
+{
+artifact = createArtifact( groupId, artifactId, type,
version-12345678.123456-1 );
+
+assertIncluded( :::*-SNAPSHOT );
+}
+
// protected methods --
+
+/**
+ * Creates an artifact with the specified attributes.
+ *
+ * @param groupId
+ *the group id for the new artifact
+ * @param artifactId
+ *the artifact id for the new artifact
+ * @param type
+ *the type for the new artifact
+ * @param version
+ *the version for the new artifact
+ * @return the artifact
+ */
+protected Artifact createArtifact( String groupId, String artifactId,
String type, String version )
+{
+VersionRange versionRange = VersionRange.createFromVersion( version );
+
svn commit: r575636 - in /maven/sandbox/trunk/doxia/doxia-module-fo: ./ src/main/java/org/apache/maven/doxia/module/fo/ src/main/resources/ src/test/java/org/apache/maven/doxia/module/fo/
Author: ltheussl
Date: Fri Sep 14 04:44:23 2007
New Revision: 575636
URL: http://svn.apache.org/viewvc?rev=575636view=rev
Log:
Adding a cover page
Modified:
maven/sandbox/trunk/doxia/doxia-module-fo/pom.xml
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/resources/fo-styles.xslt
maven/sandbox/trunk/doxia/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java
Modified: maven/sandbox/trunk/doxia/doxia-module-fo/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-fo/pom.xml?rev=575636r1=575635r2=575636view=diff
==
--- maven/sandbox/trunk/doxia/doxia-module-fo/pom.xml (original)
+++ maven/sandbox/trunk/doxia/doxia-module-fo/pom.xml Fri Sep 14 04:44:23 2007
@@ -23,11 +23,17 @@
parent
artifactIddoxia/artifactId
groupIdorg.apache.maven.doxia/groupId
-version1.0-alpha-9-SNAPSHOT/version
+version1.0-alpha-9/version
/parent
modelVersion4.0.0/modelVersion
artifactIddoxia-module-fo/artifactId
+ version1.0-alpha-9-SNAPSHOT/version
nameDoxia :: FO Module/name
+
+ properties
+doxiaVersion1.0-alpha-9/doxiaVersion
+ /properties
+
developers
developer
idltheussl/id
@@ -44,14 +50,19 @@
dependency
groupIdorg.apache.maven.doxia/groupId
artifactIddoxia-core/artifactId
- version${projectVersion}/version
+ version${doxiaVersion}/version
/dependency
dependency
groupIdorg.apache.maven.doxia/groupId
artifactIddoxia-sink-api/artifactId
- version${projectVersion}/version
+ version${doxiaVersion}/version
/dependency
-dependency
+dependency
+ groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-doc-renderer/artifactId
+ version${doxiaVersion}/version
+/dependency
+dependency
groupIdcommons-configuration/groupId
artifactIdcommons-configuration/artifactId
version1.4/version
@@ -71,7 +82,7 @@
dependency
groupIdorg.apache.maven.doxia/groupId
artifactIddoxia-core/artifactId
- version${projectVersion}/version
+ version${doxiaVersion}/version
classifiertests/classifier
scopetest/scope
/dependency
Modified:
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java?rev=575636r1=575635r2=575636view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
Fri Sep 14 04:44:23 2007
@@ -21,6 +21,7 @@
import java.io.Writer;
+import org.apache.maven.doxia.docrenderer.document.DocumentMeta;
import org.apache.maven.doxia.util.HtmlTools;
/**
@@ -352,5 +353,124 @@
}
}
+public void coverPage( DocumentMeta meta )
+{
+String title = meta.getTitle();
+String author = meta.getAuthor();
+
+// TODO: remove hard-coded settings
+
+writeStartTag( page-sequence, master-reference, cover-page );
+writeStartTag( flow, flow-name, xsl-region-body );
+writeStartTag( block, text-align, center );
+//writeStartTag( table, table-layout, fixed );
+writeln( fo:table table-layout=\fixed\ width=\100%\ );
+writeEmptyTag( table-column, column-width, 3.125in );
+writeEmptyTag( table-column, column-width, 3.125in );
+writeStartTag( table-body, null );
+
+writeStartTag( table-row, height, 1.5in );
+writeStartTag( table-cell, null );
+// TODO: companyLogo
+writeEmptyTag( block, null );
+writeEndTag( table-cell );
+writeStartTag( table-cell, null );
+// TODO: projectLogo
+writeEmptyTag( block, null );
+writeEndTag( table-cell );
+writeEndTag( table-row );
+
+writeln( fo:table-row keep-with-previous=\always\
height=\0.014in\ );
+writeStartTag( table-cell, number-columns-spanned, 2 );
+writeStartTag( block, line-height, 0.014in );
+writeEmptyTag( leader, chapter.rule );
+writeEndTag( block );
+writeEndTag( table-cell );
+writeEndTag( table-row );
+
+writeStartTag( table-row, height, 7.447in );
+writeStartTag( table-cell, number-columns-spanned, 2 );
+//writeStartTag( table, table-layout, fixed );
+writeln( fo:table table-layout=\fixed\ width=\100%\ );
+
svn commit: r575637 - in /maven/sandbox/trunk/plugins/maven-pdf-plugin: pom.xml src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
Author: ltheussl
Date: Fri Sep 14 04:46:10 2007
New Revision: 575637
URL: http://svn.apache.org/viewvc?rev=575637view=rev
Log:
Add a cover page
Modified:
maven/sandbox/trunk/plugins/maven-pdf-plugin/pom.xml
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
Modified: maven/sandbox/trunk/plugins/maven-pdf-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-pdf-plugin/pom.xml?rev=575637r1=575636r2=575637view=diff
==
--- maven/sandbox/trunk/plugins/maven-pdf-plugin/pom.xml (original)
+++ maven/sandbox/trunk/plugins/maven-pdf-plugin/pom.xml Fri Sep 14 04:46:10
2007
@@ -51,7 +51,7 @@
dependency
groupIdorg.apache.maven.doxia/groupId
artifactIddoxia-doc-renderer/artifactId
- version1.0-alpha-9-SNAPSHOT/version
+ version1.0-alpha-9/version
/dependency
dependency
groupIdorg.apache.maven.doxia/groupId
Modified:
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java?rev=575637r1=575636r2=575637view=diff
==
---
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
(original)
+++
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
Fri Sep 14 04:46:10 2007
@@ -212,6 +212,8 @@
sink.beginDocument();
+sink.coverPage( documentModel.getMeta() );
+
for ( Iterator k = documentModel.getToc().getItems().iterator();
k.hasNext(); )
{
DocumentTOCItem tocItem = (DocumentTOCItem) k.next();
svn commit: r575651 - in /maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site: apt/index.apt apt/limitations.apt pdf.xml site.xml
Author: ltheussl
Date: Fri Sep 14 05:13:00 2007
New Revision: 575651
URL: http://svn.apache.org/viewvc?rev=575651view=rev
Log:
Add notes about current limitations
Added:
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/apt/limitations.apt
(with props)
Modified:
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/apt/index.apt
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/pdf.xml
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/site.xml
Modified: maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/apt/index.apt?rev=575651r1=575650r2=575651view=diff
==
--- maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/apt/index.apt
(original)
+++ maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/apt/index.apt Fri Sep
14 05:13:00 2007
@@ -35,7 +35,7 @@
The PDF Plugin only has one goal.
- * {{{pdf-mojo.html}pdf:pdf}} Generates a PDF document containing
+ * {{{./pdf-mojo.html}pdf:pdf}} Generates a PDF document containing
all project documentation.
* Usage
Added: maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/apt/limitations.apt
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/apt/limitations.apt?rev=575651view=auto
==
--- maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/apt/limitations.apt
(added)
+++ maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/apt/limitations.apt
Fri Sep 14 05:13:00 2007
@@ -0,0 +1,60 @@
+ --
+ Known Bugs and Limitations
+ --
+ Lukas Theussl
+ --
+ 14 September 2007
+ --
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
+Known Bugs and Limitations
+
+ Just a brief selection...
+
+* Current limitations
+
+ * FML parsing doesn't work due to
{{{http://jira.codehaus.org/browse/DOXIA-148}DOXIA-148}}.
+
+ * Xdoc tables don't work due to a bug in the xdoc parser.
+
+ * Maven generated pages (reports) are ignored.
+
+ * Links to other source documents have to start with ./ or ../.
+
+ * Table widths are always uniformly distributed (Apache FOP issue).
+
+ * Identical id attributes (eg anchors) within one document will lead to a
build failure.
+
+* Missing features
+
+ * Page numbering
+
+ * Table of contents
+
+ * Page headers and footers
+
+ * Different graphics formats (currently a FO sink limitation)
+
+
+* Known bugs
+
+ None.
Propchange:
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/apt/limitations.apt
--
svn:eol-style = native
Propchange:
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/apt/limitations.apt
--
svn:keywords = Author Date Id Revision
Modified: maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/pdf.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/pdf.xml?rev=575651r1=575650r2=575651view=diff
==
--- maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/pdf.xml (original)
+++ maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/pdf.xml Fri Sep 14
05:13:00 2007
@@ -29,8 +29,9 @@
/meta
toc name=Table of Contents
-item name=Introduction ref=index.html/
-item name=Usage ref=usage.html/
+item name=Introduction ref=index.apt/
+item name=Usage ref=usage.apt/
+item name=Limitations ref=limitations.apt/
/toc
/document
Modified: maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/site.xml?rev=575651r1=575650r2=575651view=diff
==
--- maven/sandbox/trunk/plugins/maven-pdf-plugin/src/site/site.xml (original)
+++
svn commit: r575678 [2/2] - in /maven/shared/trunk/maven-dependency-analyzer: ./ src/main/java/org/apache/maven/shared/dependency/analyzer/ src/main/java/org/apache/maven/shared/dependency/analyzer/as
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitorTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitorTest.java?rev=575678r1=575677r2=575678view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitorTest.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitorTest.java
Fri Sep 14 06:49:58 2007
@@ -1,67 +1,67 @@
-package org.apache.maven.shared.dependency.analyzer;
-
-/*
- * 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.util.HashSet;
-import java.util.Set;
-
-import org.apache.maven.shared.dependency.analyzer.CollectorClassFileVisitor;
-
-import junit.framework.TestCase;
-
-/**
- * Tests codeCollectorClassFileVisitor/code.
- *
- * @author a href=mailto:[EMAIL PROTECTED]Mark Hobson/a
- * @version $Id$
- * @see CollectorClassFileVisitor
- */
-public class CollectorClassFileVisitorTest
-extends TestCase
-{
-// fields -
-
-private CollectorClassFileVisitor visitor;
-
-// TestCase thods -
-
-/*
- * @see junit.framework.TestCase#setUp()
- */
-protected void setUp()
-throws Exception
-{
-visitor = new CollectorClassFileVisitor();
-}
-
-// tests --
-
-public void testVisitClass()
-{
-visitor.visitClass( a.b.c, null );
-visitor.visitClass( x.y.z, null );
-
-Set expected = new HashSet();
-expected.add( a.b.c );
-expected.add( x.y.z );
-
-assertEquals( expected, visitor.getClasses() );
-}
-}
+package org.apache.maven.shared.dependency.analyzer;
+
+/*
+ * 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.util.HashSet;
+import java.util.Set;
+
+import org.apache.maven.shared.dependency.analyzer.CollectorClassFileVisitor;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests codeCollectorClassFileVisitor/code.
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Mark Hobson/a
+ * @version $Id$
+ * @see CollectorClassFileVisitor
+ */
+public class CollectorClassFileVisitorTest
+extends TestCase
+{
+// fields -
+
+private CollectorClassFileVisitor visitor;
+
+// TestCase thods -
+
+/*
+ * @see junit.framework.TestCase#setUp()
+ */
+protected void setUp()
+throws Exception
+{
+visitor = new CollectorClassFileVisitor();
+}
+
+// tests --
+
+public void testVisitClass()
+{
+visitor.visitClass( a.b.c, null );
+visitor.visitClass( x.y.z, null );
+
+Set expected = new HashSet();
+expected.add( a.b.c );
+expected.add( x.y.z );
+
+assertEquals( expected, visitor.getClasses() );
+}
+}
Propchange:
svn commit: r575680 - /maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Author: markh
Date: Fri Sep 14 06:51:29 2007
New Revision: 575680
URL: http://svn.apache.org/viewvc?rev=575680view=rev
Log:
Fixed warnings
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java?rev=575680r1=575679r2=575680view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Fri Sep 14 06:51:29 2007
@@ -30,9 +30,7 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
/**
*
@@ -138,7 +136,6 @@
while ( iter2.hasNext() )
{
Artifact artifact2 = (Artifact) iter2.next();
-DefaultArtifact a;
if ( artifact.getDependencyConflictId().equals(
artifact2.getDependencyConflictId() ) )
{
found = true;
svn commit: r575732 - /maven/shared/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
Author: markh
Date: Fri Sep 14 09:02:31 2007
New Revision: 575732
URL: http://svn.apache.org/viewvc?rev=575732view=rev
Log:
Added readProjectWithDependencies methods to compliment readProject methods.
Modified:
maven/shared/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
Modified:
maven/shared/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java?rev=575732r1=575731r2=575732view=diff
==
---
maven/shared/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
(original)
+++
maven/shared/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
Fri Sep 14 09:02:31 2007
@@ -32,6 +32,8 @@
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.model.Build;
import org.apache.maven.model.DeploymentRepository;
import org.apache.maven.model.DistributionManagement;
@@ -113,6 +115,43 @@
return projectBuilder.build( pomFile, localRepository, null );
}
catch ( ProjectBuildingException e )
+{
+throw new TestToolsException( Error building MavenProject
instance from test pom: + pomFile, e );
+}
+}
+
+/**
+ * Construct a MavenProject instance from the specified POM file with
dependencies.
+ */
+public MavenProject readProjectWithDependencies( File pomFile )
+throws TestToolsException
+{
+return readProjectWithDependencies( pomFile,
repositoryTool.findLocalRepositoryDirectory() );
+}
+
+/**
+ * Construct a MavenProject instance from the specified POM file with
dependencies, using the specified local
+ * repository directory to resolve ancestor POMs as needed.
+ */
+public MavenProject readProjectWithDependencies( File pomFile, File
localRepositoryBasedir )
+throws TestToolsException
+{
+try
+{
+ArtifactRepository localRepository = repositoryTool
+.createLocalArtifactRepositoryInstance( localRepositoryBasedir
);
+
+return projectBuilder.buildWithDependencies( pomFile,
localRepository, null );
+}
+catch ( ProjectBuildingException e )
+{
+throw new TestToolsException( Error building MavenProject
instance from test pom: + pomFile, e );
+}
+catch ( ArtifactResolutionException e )
+{
+throw new TestToolsException( Error building MavenProject
instance from test pom: + pomFile, e );
+}
+catch ( ArtifactNotFoundException e )
{
throw new TestToolsException( Error building MavenProject
instance from test pom: + pomFile, e );
}
svn commit: r575733 - /maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Author: markh
Date: Fri Sep 14 09:03:52 2007
New Revision: 575733
URL: http://svn.apache.org/viewvc?rev=575733view=rev
Log:
Fixed potential NPE when project's dependencies are not yet initialised.
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java?rev=575733r1=575732r2=575733view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Fri Sep 14 09:03:52 2007
@@ -82,6 +82,11 @@
Set dependencyClasses = buildDependencyClasses( project );
Set declaredArtifacts = project.getDependencyArtifacts();
+
+if ( declaredArtifacts == null )
+{
+declaredArtifacts = Collections.EMPTY_SET;
+}
Set usedArtifacts = new HashSet();
svn commit: r575736 - /maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
Author: markh
Date: Fri Sep 14 09:08:07 2007
New Revision: 575736
URL: http://svn.apache.org/viewvc?rev=575736view=rev
Log:
o Implemented hashCode, equals and toString
o Added convenience default constructor
o Better set handling
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java?rev=575736r1=575735r2=575736view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
Fri Sep 14 09:08:07 2007
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.util.Collections;
+import java.util.HashSet;
import java.util.Set;
/**
@@ -38,13 +40,18 @@
private final Set unusedDeclaredArtifacts;
// constructors ---
+
+public ProjectDependencyAnalysis()
+{
+this( null, null, null );
+}
public ProjectDependencyAnalysis( Set usedDeclaredArtifacts, Set
usedUndeclaredArtifacts,
Set unusedDeclaredArtifacts )
{
-this.usedDeclaredArtifacts = usedDeclaredArtifacts;
-this.usedUndeclaredArtifacts = usedUndeclaredArtifacts;
-this.unusedDeclaredArtifacts = unusedDeclaredArtifacts;
+this.usedDeclaredArtifacts = safeCopy(usedDeclaredArtifacts);
+this.usedUndeclaredArtifacts = safeCopy(usedUndeclaredArtifacts);
+this.unusedDeclaredArtifacts = safeCopy(unusedDeclaredArtifacts);
}
// public methods -
@@ -62,5 +69,89 @@
public Set getUnusedDeclaredArtifacts()
{
return unusedDeclaredArtifacts;
+}
+
+// Object methods -
+
+/*
+ * @see java.lang.Object#hashCode()
+ */
+public int hashCode()
+{
+int hashCode = getUsedDeclaredArtifacts().hashCode();
+hashCode = (hashCode * 37) + getUsedUndeclaredArtifacts().hashCode();
+hashCode = (hashCode * 37) + getUnusedDeclaredArtifacts().hashCode();
+
+return hashCode;
+}
+
+/*
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+public boolean equals( Object object )
+{
+boolean equals;
+
+if ( object instanceof ProjectDependencyAnalysis )
+{
+ProjectDependencyAnalysis analysis = (ProjectDependencyAnalysis)
object;
+
+equals = getUsedDeclaredArtifacts().equals(
analysis.getUsedDeclaredArtifacts() )
+ getUsedUndeclaredArtifacts().equals(
analysis.getUsedUndeclaredArtifacts() )
+ getUnusedDeclaredArtifacts().equals(
analysis.getUnusedDeclaredArtifacts() );
+}
+else
+{
+equals = false;
+}
+
+return equals;
+}
+
+/*
+ * @see java.lang.Object#toString()
+ */
+public String toString()
+{
+StringBuffer buffer = new StringBuffer();
+
+if ( !getUsedDeclaredArtifacts().isEmpty() )
+{
+buffer.append( usedDeclaredArtifacts= ).append(
getUsedDeclaredArtifacts() );
+}
+
+if ( !getUsedUndeclaredArtifacts().isEmpty() )
+{
+if ( buffer.length() 0)
+{
+buffer.append( , );
+}
+
+buffer.append( usedUndeclaredArtifacts= ).append(
getUsedUndeclaredArtifacts() );
+}
+
+if ( !getUnusedDeclaredArtifacts().isEmpty() )
+{
+if ( buffer.length() 0)
+{
+buffer.append( , );
+}
+
+buffer.append( unusedDeclaredArtifacts= ).append(
getUnusedDeclaredArtifacts() );
+}
+
+buffer.insert( 0, [ );
+buffer.insert( 0, getClass().getName() );
+
+buffer.append( ] );
+
+return buffer.toString();
+}
+
+// private methods
+
+private Set safeCopy( Set set )
+{
+return ( set == null ) ? Collections.EMPTY_SET :
Collections.unmodifiableSet( new HashSet( set ) );
}
}
svn commit: r575737 - in /maven/shared/trunk/maven-invoker: pom.xml src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
Author: jdcasey Date: Fri Sep 14 09:10:18 2007 New Revision: 575737 URL: http://svn.apache.org/viewvc?rev=575737view=rev Log: Adjusting to make the main codebase compatible with plexus-utils 1.1, to allow this to run inside of a maven 2.0.7 build. Modified: maven/shared/trunk/maven-invoker/pom.xml maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=575737r1=575736r2=575737view=diff == --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Fri Sep 14 09:10:18 2007 @@ -31,7 +31,7 @@ dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId - version1.4.2/version + version1.4.5/version /dependency dependency groupIdorg.apache.maven/groupId Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java?rev=575737r1=575736r2=575737view=diff == --- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java (original) +++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java Fri Sep 14 09:10:18 2007 @@ -96,8 +96,8 @@ + . Using as-is., e ); } -cli.createArg().setValue( -s ); -cli.createArg().setValue( wrapStringWithQuotes( userSettingsFile.getPath() ) ); +cli.createArgument().setValue( -s ); +cli.createArgument().setValue( wrapStringWithQuotes( userSettingsFile.getPath() ) ); } } @@ -174,7 +174,7 @@ String key = (String) entry.getKey(); String value = (String) entry.getValue(); -cli.createArg().setValue( -D + wrapStringWithQuotes( key ) + = + wrapStringWithQuotes(value) ); +cli.createArgument().setValue( -D + wrapStringWithQuotes( key ) + = + wrapStringWithQuotes(value) ); } } } @@ -300,7 +300,7 @@ + \' is NOT a directory. ); } -cli.createArg().setValue( -Dmaven.repo.local= + wrapStringWithQuotes(localRepositoryDirectory.getPath()) ); +cli.createArgument().setValue( -Dmaven.repo.local= + wrapStringWithQuotes(localRepositoryDirectory.getPath()) ); } }
svn commit: r575740 - in /maven/shared/trunk/maven-dependency-analyzer: ./ src/test/java/org/apache/maven/shared/dependency/analyzer/ src/test/resources/jarWithDependency/ src/test/resources/jarWithDe
Author: markh Date: Fri Sep 14 09:15:52 2007 New Revision: 575740 URL: http://svn.apache.org/viewvc?rev=575740view=rev Log: Added framework for testing ProjectDependencyAnalyzer with a couple of simple initial tests. Added: maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java (with props) maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/pom.xml (with props) maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project1/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project1/pom.xml (with props) maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project1/src/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project1/src/main/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project1/src/main/java/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project1/src/main/java/jarWithDependency/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project1/src/main/java/jarWithDependency/project1/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project1/src/main/java/jarWithDependency/project1/Project1.java (with props) maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project2/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project2/pom.xml (with props) maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project2/src/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project2/src/main/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project2/src/main/java/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project2/src/main/java/jarWithDependency/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project2/src/main/java/jarWithDependency/project2/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/project2/src/main/java/jarWithDependency/project2/Project2.java (with props) maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithNoDependencies/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithNoDependencies/pom.xml (with props) maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithNoDependencies/src/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithNoDependencies/src/main/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithNoDependencies/src/main/java/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithNoDependencies/src/main/java/jarWithNoDependencies/ maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithNoDependencies/src/main/java/jarWithNoDependencies/Project.java (with props) Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=575740r1=575739r2=575740view=diff == --- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original) +++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Fri Sep 14 09:15:52 2007 @@ -95,6 +95,12 @@ version2.0.5/version /dependency dependency + groupIdorg.apache.maven.shared/groupId + artifactIdmaven-plugin-testing-tools/artifactId + version1.0-alpha-3-SNAPSHOT/version + scopetest/scope +/dependency +dependency groupIdjmock/groupId artifactIdjmock/artifactId version1.1.0/version Added: maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java?rev=575740view=auto == --- maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java (added) +++ maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java Fri Sep 14 09:15:52 2007 @@ -0,0 +1,118 @@ +/** + * $HeadURL$ + * + * (c)
svn commit: r575837 - /maven/retired/
Author: brianf Date: Fri Sep 14 17:52:53 2007 New Revision: 575837 URL: http://svn.apache.org/viewvc?rev=575837view=rev Log: creating the retired folder Added: maven/retired/
svn commit: r575838 - in /maven: plugins/trunk/maven-clover-plugin/ retired/maven-clover-plugin/
Author: brianf Date: Fri Sep 14 17:53:49 2007 New Revision: 575838 URL: http://svn.apache.org/viewvc?rev=575838view=rev Log: moving clover to retired Added: maven/retired/maven-clover-plugin/ - copied from r575837, maven/plugins/trunk/maven-clover-plugin/ Removed: maven/plugins/trunk/maven-clover-plugin/
svn commit: r575839 - in /maven: plugins/trunk/maven-antlr-plugin/ retired/maven-antlr-plugin/
Author: brianf Date: Fri Sep 14 17:57:35 2007 New Revision: 575839 URL: http://svn.apache.org/viewvc?rev=575839view=rev Log: moving antlr to retired -- was moved to mojo Added: maven/retired/maven-antlr-plugin/ - copied from r575838, maven/plugins/trunk/maven-antlr-plugin/ Removed: maven/plugins/trunk/maven-antlr-plugin/
svn commit: r575842 - /maven/plugins/trunk/pom.xml
Author: brianf Date: Fri Sep 14 18:09:06 2007 New Revision: 575842 URL: http://svn.apache.org/viewvc?rev=575842view=rev Log: clover was moved Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=575842r1=575841r2=575842view=diff == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Fri Sep 14 18:09:06 2007 @@ -96,7 +96,6 @@ modulemaven-changes-plugin/module modulemaven-checkstyle-plugin/module modulemaven-clean-plugin/module -modulemaven-clover-plugin/module modulemaven-compiler-plugin/module modulemaven-dependency-plugin/module modulemaven-deploy-plugin/module
svn commit: r575843 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: brianf
Date: Fri Sep 14 18:14:19 2007
New Revision: 575843
URL: http://svn.apache.org/viewvc?rev=575843view=rev
Log:
noted move to atlassian
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=575843r1=575842r2=575843view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Fri Sep 14 18:14:19 2007
@@ -59,7 +59,7 @@
*---++--+
| {{{/plugins/maven-checkstyle-plugin/} checkstyle}} | 2.1|
Generate a checkstyle report.
*---++--+
-| {{{/plugins/maven-clover-plugin/} clover}} | 2.4|
Generate a Clover report.
+| {{{/plugins/maven-clover-plugin/} clover}} | 2.4|
Generate a Clover report. NOTE: Moved to Atlassian.com
*---++--+
| {{{/plugins/maven-doap-plugin/} doap}} | 1.0-beta-1 |
Generate a Description of a Project (DOAP) file from a POM.
*---++--+
svn commit: r575878 - in /maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo: FoAggregateSink.java FoSink.java
Author: ltheussl
Date: Fri Sep 14 22:37:44 2007
New Revision: 575878
URL: http://svn.apache.org/viewvc?rev=575878view=rev
Log:
Add header, footer and page numbering
Modified:
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
Modified:
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java?rev=575878r1=575877r2=575878view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
Fri Sep 14 22:37:44 2007
@@ -353,6 +353,42 @@
}
}
+protected void regionBefore()
+{
+writeStartTag( static-content, flow-name, xsl-region-before );
+writeln( fo:table table-layout=\fixed\ width=\100%\ );
+writeEmptyTag( table-column, column-width, 5.625in );
+writeEmptyTag( table-column, column-width, 0.625in );
+writeStartTag( table-body, null );
+writeStartTag( table-row, null );
+writeStartTag( table-cell, null );
+writeStartTag( block, header.style );
+// TODO
+write( Header text );
+writeEndTag( block );
+writeEndTag( table-cell );
+writeStartTag( table-cell, null );
+writeStartTag( block, page.number );
+writeEmptyTag( page-number, null );
+writeEndTag( block );
+writeEndTag( table-cell );
+writeEndTag( table-row );
+writeEndTag( table-body );
+writeEndTag( table );
+writeEndTag( static-content );
+}
+
+protected void regionAfter()
+{
+writeStartTag( static-content, flow-name, xsl-region-after );
+writeStartTag( block, footer.style );
+// TODO
+write( Footer text );
+writeEndTag( block );
+writeEndTag( static-content );
+}
+
+
public void coverPage( DocumentMeta meta )
{
String title = meta.getTitle();
Modified:
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java?rev=575878r1=575877r2=575878view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
Fri Sep 14 22:37:44 2007
@@ -1080,7 +1080,19 @@
protected void startPageSequence( String initPageNumber )
{
writeln( fo:page-sequence initial-page-number=\ + initPageNumber +
\ master-reference=\body\ );
+regionBefore();
+regionAfter();
writeln( fo:flow flow-name=\xsl-region-body\ );
+}
+
+protected void regionBefore()
+{
+// do nothing, overridden by AggregateSink
+}
+
+protected void regionAfter()
+{
+// do nothing, overridden by AggregateSink
}
}
