Repository: archiva
Updated Branches:
  refs/heads/master 54e9209fe -> b3804c39b


split out problem facet

this avoids modules wanting to report a problem from having to depend on the
plugin itself and its consumer, etc.


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/75c63ff2
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/75c63ff2
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/75c63ff2

Branch: refs/heads/master
Commit: 75c63ff2eb458cd0f4ca971035789db62e5c92c3
Parents: 54e9209
Author: Brett Porter <[email protected]>
Authored: Wed Jul 30 12:02:04 2014 +1000
Committer: Brett Porter <[email protected]>
Committed: Wed Jul 30 12:02:04 2014 +1000

----------------------------------------------------------------------
 .../archiva-rest/archiva-rest-api/pom.xml       |   5 -
 .../api/services/ReportRepositoriesService.java |   2 +-
 .../DefaultReportRepositoriesService.java       |   2 +-
 .../model/facets/RepositoryProblemFacet.java    | 166 +++++++++++++++++++
 .../plugins/maven2-repository/pom.xml           |   4 -
 .../storage/maven2/Maven2RepositoryStorage.java |   2 +-
 .../reports/RepositoryProblemEventListener.java |   1 +
 .../archiva/reports/RepositoryProblemFacet.java | 166 -------------------
 .../reports/RepositoryProblemFacetFactory.java  |   1 +
 .../consumers/DuplicateArtifactsConsumer.java   |   2 +-
 .../DuplicateArtifactsConsumerTest.java         |   2 +-
 11 files changed, 173 insertions(+), 180 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/75c63ff2/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml 
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
index b2d6002..374b53a 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
@@ -71,11 +71,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>problem-reports</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.archiva.redback</groupId>
       <artifactId>redback-authorization-api</artifactId>
       <exclusions>

http://git-wip-us.apache.org/repos/asf/archiva/blob/75c63ff2/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ReportRepositoriesService.java
----------------------------------------------------------------------
diff --git 
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ReportRepositoriesService.java
 
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ReportRepositoriesService.java
index b2b10d7..1bb7185 100644
--- 
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ReportRepositoriesService.java
+++ 
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ReportRepositoriesService.java
@@ -18,9 +18,9 @@ package org.apache.archiva.rest.api.services;
  * under the License.
  */
 
+import org.apache.archiva.metadata.model.facets.RepositoryProblemFacet;
 import org.apache.archiva.metadata.repository.stats.RepositoryStatistics;
 import org.apache.archiva.redback.authorization.RedbackAuthorization;
-import org.apache.archiva.reports.RepositoryProblemFacet;
 import org.apache.archiva.security.common.ArchivaRoleConstants;
 
 import javax.ws.rs.GET;

http://git-wip-us.apache.org/repos/asf/archiva/blob/75c63ff2/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java
----------------------------------------------------------------------
diff --git 
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java
 
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java
index 37b5f9b..b8c1c74 100644
--- 
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java
+++ 
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java
@@ -18,12 +18,12 @@ package org.apache.archiva.rest.services;
  * under the License.
  */
 
+import org.apache.archiva.metadata.model.facets.RepositoryProblemFacet;
 import org.apache.archiva.metadata.repository.MetadataRepository;
 import org.apache.archiva.metadata.repository.MetadataRepositoryException;
 import org.apache.archiva.metadata.repository.RepositorySession;
 import org.apache.archiva.metadata.repository.stats.RepositoryStatistics;
 import 
org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
-import org.apache.archiva.reports.RepositoryProblemFacet;
 import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
 import org.apache.archiva.rest.api.services.ReportRepositoriesService;
 import org.apache.commons.lang.StringUtils;

http://git-wip-us.apache.org/repos/asf/archiva/blob/75c63ff2/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/facets/RepositoryProblemFacet.java
----------------------------------------------------------------------
diff --git 
a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/facets/RepositoryProblemFacet.java
 
b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/facets/RepositoryProblemFacet.java
new file mode 100644
index 0000000..dc202a1
--- /dev/null
+++ 
b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/facets/RepositoryProblemFacet.java
@@ -0,0 +1,166 @@
+package org.apache.archiva.metadata.model.facets;
+
+/*
+ * 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.HashMap;
+import java.util.Map;
+
+import org.apache.archiva.metadata.model.MetadataFacet;
+
+public class RepositoryProblemFacet
+    implements MetadataFacet
+{
+    public static final String FACET_ID = "org.apache.archiva.reports";
+
+    private String repositoryId;
+
+    private String namespace;
+
+    private String project;
+
+    private String version;
+
+    private String id;
+
+    private String message;
+
+    private String problem;
+
+    @Override
+    public String getFacetId()
+    {
+        return FACET_ID;
+    }
+
+    @Override
+    public String getName()
+    {
+        return createName( namespace, project, version, id );
+    }
+
+    @Override
+    public Map<String, String> toProperties()
+    {
+        Map<String, String> map = new HashMap<>();
+        map.put( "repositoryId", repositoryId );
+        map.put( "namespace", namespace );
+        map.put( "project", project );
+        map.put( "version", version );
+        if ( id != null )
+        {
+            map.put( "id", id );
+        }
+        map.put( "message", message );
+        map.put( "problem", problem );
+        return map;
+    }
+
+    @Override
+    public void fromProperties( Map<String, String> properties )
+    {
+        repositoryId = properties.get( "repositoryId" );
+        namespace = properties.get( "namespace" );
+        project = properties.get( "project" );
+        version = properties.get( "version" );
+        id = properties.get( "id" );
+        message = properties.get( "message" );
+        problem = properties.get( "problem" );
+    }
+
+    public void setRepositoryId( String repositoryId )
+    {
+        this.repositoryId = repositoryId;
+    }
+
+    public void setNamespace( String namespace )
+    {
+        this.namespace = namespace;
+    }
+
+    public String getRepositoryId()
+    {
+        return repositoryId;
+    }
+
+    public String getNamespace()
+    {
+        return namespace;
+    }
+
+    public void setProject( String project )
+    {
+        this.project = project;
+    }
+
+    public String getProject()
+    {
+        return project;
+    }
+
+    public void setVersion( String version )
+    {
+        this.version = version;
+    }
+
+    public String getVersion()
+    {
+        return version;
+    }
+
+    public void setId( String id )
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setMessage( String message )
+    {
+        this.message = message;
+    }
+
+    public String getMessage()
+    {
+        return message;
+    }
+
+    public void setProblem( String problem )
+    {
+        this.problem = problem;
+    }
+
+    public String getProblem()
+    {
+        return problem;
+    }
+
+    public static String createName( String namespace, String project, String 
projectVersion, String id )
+    {
+        String name = namespace + "/" + project + "/" + projectVersion;
+        if ( id != null )
+        {
+            name = name + "/" + id;
+        }
+        return name;
+    }
+}

http://git-wip-us.apache.org/repos/asf/archiva/blob/75c63ff2/archiva-modules/plugins/maven2-repository/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml 
b/archiva-modules/plugins/maven2-repository/pom.xml
index 3a74321..1289776 100644
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/archiva-modules/plugins/maven2-repository/pom.xml
@@ -50,10 +50,6 @@
     </dependency-->
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>problem-reports</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-proxy-api</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/archiva/blob/75c63ff2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
----------------------------------------------------------------------
diff --git 
a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
 
b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
index f1027f2..1f6cd2b 100644
--- 
a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
+++ 
b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
@@ -49,7 +49,7 @@ import org.apache.archiva.model.SnapshotVersion;
 import org.apache.archiva.policies.ProxyDownloadException;
 import org.apache.archiva.proxy.common.WagonFactory;
 import org.apache.archiva.proxy.model.RepositoryProxyConnectors;
-import org.apache.archiva.reports.RepositoryProblemFacet;
+import org.apache.archiva.metadata.model.facets.RepositoryProblemFacet;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.content.PathParser;
 import org.apache.archiva.repository.layout.LayoutException;

http://git-wip-us.apache.org/repos/asf/archiva/blob/75c63ff2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
----------------------------------------------------------------------
diff --git 
a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
 
b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
index 6be3232..304866a 100644
--- 
a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
+++ 
b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
@@ -20,6 +20,7 @@ package org.apache.archiva.reports;
  */
 
 import org.apache.archiva.metadata.model.ProjectVersionMetadata;
+import org.apache.archiva.metadata.model.facets.RepositoryProblemFacet;
 import org.apache.archiva.metadata.repository.MetadataRepository;
 import org.apache.archiva.metadata.repository.MetadataRepositoryException;
 import org.apache.archiva.metadata.repository.RepositorySession;

http://git-wip-us.apache.org/repos/asf/archiva/blob/75c63ff2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java
----------------------------------------------------------------------
diff --git 
a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java
 
b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java
deleted file mode 100644
index 2f6417d..0000000
--- 
a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.apache.archiva.reports;
-
-/*
- * 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.HashMap;
-import java.util.Map;
-
-import org.apache.archiva.metadata.model.MetadataFacet;
-
-public class RepositoryProblemFacet
-    implements MetadataFacet
-{
-    public static final String FACET_ID = "org.apache.archiva.reports";
-
-    private String repositoryId;
-
-    private String namespace;
-
-    private String project;
-
-    private String version;
-
-    private String id;
-
-    private String message;
-
-    private String problem;
-
-    @Override
-    public String getFacetId()
-    {
-        return FACET_ID;
-    }
-
-    @Override
-    public String getName()
-    {
-        return createName( namespace, project, version, id );
-    }
-
-    @Override
-    public Map<String, String> toProperties()
-    {
-        Map<String, String> map = new HashMap<>();
-        map.put( "repositoryId", repositoryId );
-        map.put( "namespace", namespace );
-        map.put( "project", project );
-        map.put( "version", version );
-        if ( id != null )
-        {
-            map.put( "id", id );
-        }
-        map.put( "message", message );
-        map.put( "problem", problem );
-        return map;
-    }
-
-    @Override
-    public void fromProperties( Map<String, String> properties )
-    {
-        repositoryId = properties.get( "repositoryId" );
-        namespace = properties.get( "namespace" );
-        project = properties.get( "project" );
-        version = properties.get( "version" );
-        id = properties.get( "id" );
-        message = properties.get( "message" );
-        problem = properties.get( "problem" );
-    }
-
-    public void setRepositoryId( String repositoryId )
-    {
-        this.repositoryId = repositoryId;
-    }
-
-    public void setNamespace( String namespace )
-    {
-        this.namespace = namespace;
-    }
-
-    public String getRepositoryId()
-    {
-        return repositoryId;
-    }
-
-    public String getNamespace()
-    {
-        return namespace;
-    }
-
-    public void setProject( String project )
-    {
-        this.project = project;
-    }
-
-    public String getProject()
-    {
-        return project;
-    }
-
-    public void setVersion( String version )
-    {
-        this.version = version;
-    }
-
-    public String getVersion()
-    {
-        return version;
-    }
-
-    public void setId( String id )
-    {
-        this.id = id;
-    }
-
-    public String getId()
-    {
-        return id;
-    }
-
-    public void setMessage( String message )
-    {
-        this.message = message;
-    }
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    public void setProblem( String problem )
-    {
-        this.problem = problem;
-    }
-
-    public String getProblem()
-    {
-        return problem;
-    }
-
-    public static String createName( String namespace, String project, String 
projectVersion, String id )
-    {
-        String name = namespace + "/" + project + "/" + projectVersion;
-        if ( id != null )
-        {
-            name = name + "/" + id;
-        }
-        return name;
-    }
-}

http://git-wip-us.apache.org/repos/asf/archiva/blob/75c63ff2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java
----------------------------------------------------------------------
diff --git 
a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java
 
b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java
index d14c156..e2ca9c5 100644
--- 
a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java
+++ 
b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java
@@ -21,6 +21,7 @@ package org.apache.archiva.reports;
 
 import org.apache.archiva.metadata.model.MetadataFacet;
 import org.apache.archiva.metadata.model.MetadataFacetFactory;
+import org.apache.archiva.metadata.model.facets.RepositoryProblemFacet;
 import org.springframework.stereotype.Service;
 
 /**

http://git-wip-us.apache.org/repos/asf/archiva/blob/75c63ff2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
----------------------------------------------------------------------
diff --git 
a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
 
b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
index dd12b7a..5cabece 100644
--- 
a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
+++ 
b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
@@ -36,7 +36,7 @@ import 
org.apache.archiva.metadata.repository.RepositorySessionFactory;
 import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
 import org.apache.archiva.redback.components.registry.Registry;
 import org.apache.archiva.redback.components.registry.RegistryListener;
-import org.apache.archiva.reports.RepositoryProblemFacet;
+import org.apache.archiva.metadata.model.facets.RepositoryProblemFacet;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/archiva/blob/75c63ff2/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
----------------------------------------------------------------------
diff --git 
a/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
 
b/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
index b86bee0..4af6bc7 100644
--- 
a/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
+++ 
b/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
@@ -28,7 +28,7 @@ import 
org.apache.archiva.metadata.repository.MetadataRepository;
 import org.apache.archiva.metadata.repository.RepositorySession;
 import org.apache.archiva.metadata.repository.RepositorySessionFactory;
 import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
-import org.apache.archiva.reports.RepositoryProblemFacet;
+import org.apache.archiva.metadata.model.facets.RepositoryProblemFacet;
 import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 import org.junit.Before;
 import org.junit.Test;

Reply via email to