From 04575ed5bce65230709a4109358e2e31df5295c4 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Tue, 6 Jun 2006 07:26:13 +0000 Subject: [PATCH] add some checks and notes git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@412024 13f79535-47bb-0310-9956-ffa450edef68 --- maven-repository-application/pom.xml | 18 ++- maven-repository-artifact-applet/pom.xml | 14 +- maven-repository-proxy/pom.xml | 17 ++- .../repository/proxy/DefaultProxyManager.java | 9 +- .../maven/repository/proxy/ProxyManager.java | 1 + .../configuration/ProxyConfiguration.java | 1 + .../maven/repository/ArtifactUtils.java | 1 + maven-repository-webapp/pom.xml | 13 +- pom.xml | 123 +++++++++++++++--- 9 files changed, 171 insertions(+), 26 deletions(-) diff --git a/maven-repository-application/pom.xml b/maven-repository-application/pom.xml index d2f042856..ffe8183f4 100644 --- a/maven-repository-application/pom.xml +++ b/maven-repository-application/pom.xml @@ -15,7 +15,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> org.apache.maven.repository maven-repository-manager @@ -38,4 +38,20 @@ plexus-container-default + + + + org.codehaus.mojo + cobertura-maven-plugin + + + + + **/** + + + + + + diff --git a/maven-repository-artifact-applet/pom.xml b/maven-repository-artifact-applet/pom.xml index ca4f4b815..144879018 100644 --- a/maven-repository-artifact-applet/pom.xml +++ b/maven-repository-artifact-applet/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.maven.repository @@ -32,6 +32,18 @@ + + org.codehaus.mojo + cobertura-maven-plugin + + + + + **/** + + + + diff --git a/maven-repository-proxy/pom.xml b/maven-repository-proxy/pom.xml index 001447976..e6acb7e05 100644 --- a/maven-repository-proxy/pom.xml +++ b/maven-repository-proxy/pom.xml @@ -15,7 +15,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> org.apache.maven.repository maven-repository-manager @@ -47,4 +47,19 @@ wagon-provider-api + + + + org.codehaus.mojo + cobertura-maven-plugin + + + + 60 + 75 + + + + + diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java b/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java index bb9c4d76f..c1426bde3 100644 --- a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java +++ b/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java @@ -52,6 +52,7 @@ import java.util.Map; /** * @author Edwin Punzalan * @plexus.component role="org.apache.maven.repository.proxy.ProxyManager" + * @todo too much of wagon manager is reproduced here because checksums need to be downloaded separately - is that necessary? */ public class DefaultProxyManager extends AbstractLogEnabled @@ -289,17 +290,13 @@ public class DefaultProxyManager private ArtifactRepositoryPolicy getReleasesPolicy() { //todo get policy configuration from ProxyConfiguration - ArtifactRepositoryPolicy repositoryPolicy = new ArtifactRepositoryPolicy(); - - return repositoryPolicy; + return new ArtifactRepositoryPolicy(); } private ArtifactRepositoryPolicy getSnapshotsPolicy() { //todo get policy configuration from ProxyConfiguration - ArtifactRepositoryPolicy repositoryPolicy = new ArtifactRepositoryPolicy(); - - return repositoryPolicy; + return new ArtifactRepositoryPolicy(); } public URL getRepositoryCacheURL() diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java b/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java index bd9838022..68e3e2fa8 100644 --- a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java +++ b/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java @@ -25,6 +25,7 @@ import java.io.File; * Class used to bridge the servlet to the repository proxy implementation. * * @author Edwin Punzalan + * @todo the names get() and getRemoteFile() are confusing */ public interface ProxyManager { diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java b/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java index c7aae0c8b..b54f02a4f 100644 --- a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java +++ b/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java @@ -29,6 +29,7 @@ import java.util.List; * * @author Edwin Punzalan * @plexus.component role="org.apache.maven.repository.proxy.configuration.ProxyConfiguration" + * @todo investigate how these should be set - probably plexus configuration */ public class ProxyConfiguration { diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/ArtifactUtils.java b/maven-repository-utils/src/main/java/org/apache/maven/repository/ArtifactUtils.java index 41e5bf74b..e4d7d6602 100644 --- a/maven-repository-utils/src/main/java/org/apache/maven/repository/ArtifactUtils.java +++ b/maven-repository-utils/src/main/java/org/apache/maven/repository/ArtifactUtils.java @@ -33,6 +33,7 @@ import java.util.StringTokenizer; * Class used to build an artifact object based on a relative from a repository's basedir. * * @author Edwin Punzalan + * @todo I'm not sure why this class needs to exist. It seems like the perfect candidate for two implementations of an interface */ public class ArtifactUtils { diff --git a/maven-repository-webapp/pom.xml b/maven-repository-webapp/pom.xml index a987c31a8..cad86049f 100644 --- a/maven-repository-webapp/pom.xml +++ b/maven-repository-webapp/pom.xml @@ -52,7 +52,6 @@ org.mortbay.jetty maven-jetty6-plugin - 6.0.0beta11 10 @@ -87,6 +86,18 @@ + + org.codehaus.mojo + cobertura-maven-plugin + + + + + **/** + + + + diff --git a/pom.xml b/pom.xml index a5a2966d7..88ec547a2 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,10 @@ ~ 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. - --> + --> + + 4.0.0 org.apache.maven @@ -84,6 +87,19 @@ + + maven-compiler-plugin + + 1.4 + 1.4 + + + + maven-idea-plugin + + 1.4 + + maven-release-plugin @@ -199,17 +215,16 @@ - org.codehaus.mojo cobertura-maven-plugin - - + + maven-checkstyle-plugin + + config/maven_checks.xml + + org.codehaus.mojo changelog-maven-plugin @@ -218,24 +233,100 @@ org.codehaus.mojo taglist-maven-plugin - - org.codehaus.mojo - jxr-maven-plugin + maven-jxr-plugin + + true + - - org.codehaus.mojo - surefire-report-maven-plugin + maven-surefire-report-plugin - maven-javadoc-plugin + + true + - maven-pmd-plugin + + + + ciProfile + + + enableCiProfile + true + + + + + + org.apache.maven.plugins + maven-pmd-plugin + + + process-sources + + + cpd-check + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + process-sources + + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + + + + 80 + 95 + + + + + **/*$* + + + + + + clean + + clean + + + + check + + check + + + + + + + + -- 2.39.5