summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaria Odea B. Ching <oching@apache.org>2009-12-14 02:21:42 +0000
committerMaria Odea B. Ching <oching@apache.org>2009-12-14 02:21:42 +0000
commit0a6784f6c1bb9a972c09efd574c0fb0d57a7a560 (patch)
tree3e904e456c91ef855f508531862fa887a389ff7f
parent6a1209462fabc2ebb49046693cd42705741809db (diff)
downloadarchiva-0a6784f6c1bb9a972c09efd574c0fb0d57a7a560.tar.gz
archiva-0a6784f6c1bb9a972c09efd574c0fb0d57a7a560.zip
[MRM-1296] Audit Log Report
o update model version o remove unused import git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1296@890156 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xarchiva-modules/archiva-base/archiva-model/pom.xml2
-rw-r--r--archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml16
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java1
3 files changed, 9 insertions, 10 deletions
diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml
index 413dc92ea..f24fd3724 100755
--- a/archiva-modules/archiva-base/archiva-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-model/pom.xml
@@ -70,7 +70,7 @@
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
- <version>1.2.3</version>
+ <version>1.3.0</version>
<packageWithVersion>false</packageWithVersion>
<models>
<model>src/main/mdo/archiva-base.xml</model>
diff --git a/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml b/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
index 676e49ccd..93e4a295a 100644
--- a/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
+++ b/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
@@ -5,7 +5,7 @@
xsd.target-namespace="http://archiva.apache.org/model/1.2.0">
<id>archiva-base-model</id>
<name>ArchivaBaseModel</name>
- <version>1.2.3</version>
+ <version>1.3.0</version>
<description>Archiva Model</description>
<defaults>
<default>
@@ -2289,11 +2289,11 @@
<class stash.storable="true"
jpox.table="AUDIT_LOGS">
<name>ArchivaAuditLogs</name>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<fields>
<field stash.maxSize="50">
<name>repositoryId</name>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<identifier>false</identifier>
<required>true</required>
<type>String</type>
@@ -2303,7 +2303,7 @@
</field>
<field>
<name>eventDate</name>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<identifier>false</identifier>
<required>true</required>
<type>Date</type>
@@ -2313,7 +2313,7 @@
</field>
<field>
<name>artifact</name>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<identifier>false</identifier>
<required>false</required>
<type>String</type>
@@ -2323,7 +2323,7 @@
</field>
<field>
<name>event</name>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<identifier>false</identifier>
<required>false</required>
<type>String</type>
@@ -2333,7 +2333,7 @@
</field>
<field>
<name>username</name>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<identifier>false</identifier>
<required>true</required>
<type>String</type>
@@ -2344,7 +2344,7 @@
</fields>
<codeSegments>
<codeSegment>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<code><![CDATA[
private static final long serialVersionUID = -7113629916828442780L;
]]></code>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
index 8e0c83fbb..f1a1b6891 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
@@ -41,7 +41,6 @@ import org.apache.maven.archiva.common.utils.VersionUtil;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.database.ArchivaAuditLogsDao;
import org.apache.maven.archiva.model.ArchivaProjectModel;
import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
import org.apache.maven.archiva.model.ArtifactReference;