You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2010/01/19 07:15:20 UTC
svn commit: r900664 [2/7] - in /archiva/branches/MRM-1025: ./ archiva-cli/
archiva-docs/ archiva-docs/src/site/ archiva-docs/src/site/apt/
archiva-docs/src/site/apt/adminguide/ archiva-docs/src/site/apt/userguide/
archiva-docs/src/site/resources/images...
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java Tue Jan 19 06:15:09 2010
@@ -19,13 +19,25 @@
* under the License.
*/
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.archiva.metadata.model.MetadataFacet;
+
/**
* AuditEvent
- *
+ *
* @version $Id$
*/
public class AuditEvent
+ implements MetadataFacet
{
+ public static final String TIMESTAMP_FORMAT = "yyyy/MM/dd/HHmmss.SSS";
+
public static final String CREATE_DIR = "Created Directory";
public static final String CREATE_FILE = "Created File";
@@ -82,47 +94,51 @@
public static final String DISABLE_REPO_CONSUMER = "Disabled Content Consumer";
- public static final String ENABLE_DB_CONSUMER = "Enabled Database Consumer";
-
- public static final String DISABLE_DB_CONSUMER = "Disabled Database Consumer";
-
public static final String ADD_PATTERN = "Added File Type Pattern";
public static final String REMOVE_PATTERN = "Removed File Type Pattern";
- public static final String DB_SCHEDULE = "Modified Scanning Schedule";
-
private String repositoryId;
private String userId;
private String remoteIP;
+ // TODO: change to artifact reference? does it ever refer to just a path?
+
private String resource;
private String action;
+ private Date timestamp;
+
+ public static final String FACET_ID = "org.apache.archiva.audit";
+
public AuditEvent()
{
/* do nothing */
}
+ public AuditEvent( String name, String repositoryId )
+ {
+ try
+ {
+ timestamp = new SimpleDateFormat( TIMESTAMP_FORMAT ).parse( name );
+ }
+ catch ( ParseException e )
+ {
+ throw new IllegalArgumentException( "Improperly formatted timestamp for audit log event: " + name );
+ }
+ this.repositoryId = repositoryId;
+ }
+
public AuditEvent( String repoId, String user, String resource, String action )
{
this.repositoryId = repoId;
this.userId = user;
this.resource = resource;
this.action = action;
- }
-
- public AuditEvent( String user, String resource, String action )
- {
- this( null, user, resource, action );
- }
-
- public AuditEvent( String principal, String action2 )
- {
- this( null, principal, action2 );
+ this.timestamp = Calendar.getInstance().getTime();
}
public String getRepositoryId()
@@ -174,4 +190,113 @@
{
this.remoteIP = remoteIP;
}
+
+ public Date getTimestamp()
+ {
+ return timestamp;
+ }
+
+ public void setTimestamp( Date timestamp )
+ {
+ this.timestamp = timestamp;
+ }
+
+ public String getFacetId()
+ {
+ return FACET_ID;
+ }
+
+ public String getName()
+ {
+ return new SimpleDateFormat( TIMESTAMP_FORMAT ).format( timestamp );
+ }
+
+ public Map<String, String> toProperties()
+ {
+ Map<String, String> properties = new HashMap<String, String>();
+ properties.put( "action", this.action );
+ if ( this.userId != null )
+ {
+ properties.put( "user", this.userId );
+ }
+ if ( this.remoteIP != null )
+ {
+ properties.put( "remoteIP", this.remoteIP );
+ }
+ if ( this.resource != null )
+ {
+ properties.put( "resource", this.resource );
+ }
+ return properties;
+ }
+
+ public void fromProperties( Map<String, String> properties )
+ {
+ this.action = properties.get( "action" );
+ this.remoteIP = properties.get( "remoteIP" );
+ this.userId = properties.get( "user" );
+ this.resource = properties.get( "resource" );
+ }
+
+ @Override
+ public boolean equals( Object o )
+ {
+ if ( this == o )
+ {
+ return true;
+ }
+ if ( o == null || getClass() != o.getClass() )
+ {
+ return false;
+ }
+
+ AuditEvent that = (AuditEvent) o;
+
+ if ( !action.equals( that.action ) )
+ {
+ return false;
+ }
+ if ( remoteIP != null ? !remoteIP.equals( that.remoteIP ) : that.remoteIP != null )
+ {
+ return false;
+ }
+ if ( repositoryId != null ? !repositoryId.equals( that.repositoryId ) : that.repositoryId != null )
+ {
+ return false;
+ }
+ if ( resource != null ? !resource.equals( that.resource ) : that.resource != null )
+ {
+ return false;
+ }
+ if ( !timestamp.equals( that.timestamp ) )
+ {
+ return false;
+ }
+ if ( userId != null ? !userId.equals( that.userId ) : that.userId != null )
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int result = repositoryId != null ? repositoryId.hashCode() : 0;
+ result = 31 * result + ( userId != null ? userId.hashCode() : 0 );
+ result = 31 * result + ( remoteIP != null ? remoteIP.hashCode() : 0 );
+ result = 31 * result + ( resource != null ? resource.hashCode() : 0 );
+ result = 31 * result + action.hashCode();
+ result = 31 * result + timestamp.hashCode();
+ return result;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "AuditEvent{" + "repositoryId='" + repositoryId + '\'' + ", userId='" + userId + '\'' + ", remoteIP='" +
+ remoteIP + '\'' + ", resource='" + resource + '\'' + ", action='" + action + '\'' + ", timestamp=" +
+ timestamp + '}';
+ }
}
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
<parent>
<artifactId>archiva-base</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<artifactId>archiva-repository-scanner</artifactId>
<name>Archiva Repository Scanner</name>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-transaction/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-transaction/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-transaction/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-transaction/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-base</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<artifactId>archiva-transaction</artifactId>
<name>Archiva Transactions</name>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-xml-tools/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-xml-tools/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-xml-tools/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-base</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>archiva-xml-tools</artifactId>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-modules</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<artifactId>archiva-base</artifactId>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml Tue Jan 19 06:15:09 2010
@@ -5,7 +5,7 @@
<parent>
<artifactId>archiva-scheduler</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<artifactId>archiva-scheduler-api</artifactId>
<name>Archiva Base :: Scheduled Tasks :: API</name>
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:825850-882054,882055-899477*
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml Tue Jan 19 06:15:09 2010
@@ -5,7 +5,7 @@
<parent>
<artifactId>archiva-scheduler</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<artifactId>archiva-scheduler-indexing</artifactId>
<name>Archiva Base :: Scheduled Tasks :: Indexing</name>
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:825850-899477
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml Tue Jan 19 06:15:09 2010
@@ -5,7 +5,7 @@
<parent>
<artifactId>archiva-scheduler</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<artifactId>archiva-scheduler-repository</artifactId>
<name>Archiva Base :: Scheduled Tasks :: Repository Scanning</name>
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java:825850-882054,887040-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java:825850-882054,887040-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java:825850-882054,887040-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java:825850-882054,887040-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:825850-882054,882055-891135*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:825850-882054,882055-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:825850-891135
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:825850-899477
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-modules</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>archiva-scheduler</artifactId>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-applet/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-applet/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-applet/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-applet/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-web</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<artifactId>archiva-applet</artifactId>
<name>Archiva Web :: Applet</name>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-rss/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-rss/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-rss/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-rss/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
<parent>
<artifactId>archiva-web</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>archiva-rss</artifactId>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-web</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>archiva-security</artifactId>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java Tue Jan 19 06:15:09 2010
@@ -65,6 +65,8 @@
public static final String OPERATION_REPOSITORY_UPLOAD = "archiva-upload-repository";
public static final String OPERATION_REPOSITORY_DELETE = "archiva-delete-artifact";
+
+ public static final String OPERATION_VIEW_AUDIT_LOG = "archiva-view-audit-logs";
// Role templates
public static final String TEMPLATE_REPOSITORY_MANAGER = "archiva-repository-manager";
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml Tue Jan 19 06:15:09 2010
@@ -66,6 +66,11 @@
<description>Access Archiva Repository</description>
</operation>
<operation>
+ <id>archiva-view-audit-logs</id>
+ <name>archiva-view-audit-logs</name>
+ <description>View Archiva Audit Logs</description>
+ </operation>
+ <operation>
<id>archiva-guest</id>
<name>archiva-guest</name>
<description>Active Archiva Guest</description>
@@ -219,6 +224,12 @@
<operation>archiva-upload-repository</operation>
<resource>${resource}</resource>
</permission>
+ <permission>
+ <id>archiva-view-audit-logs</id>
+ <name>Archiva View Audit Logs</name>
+ <operation>archiva-view-audit-logs</operation>
+ <resource>${resource}</resource>
+ </permission>
</permissions>
<childTemplates>
<childTemplate>archiva-repository-observer</childTemplate>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-web</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<artifactId>archiva-webapp-test</artifactId>
<packaging>pom</packaging>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml Tue Jan 19 06:15:09 2010
@@ -33,6 +33,7 @@
<include name= "reposcan" />
<include name= "artifactmanagement" />
<include name= "search" />
+ <include name= "auditlogsreport" />
<include name= "browse" />
<include name= "reports" />
<include name= "virtualrepository" />
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java Tue Jan 19 06:15:09 2010
@@ -83,34 +83,36 @@
assertTextPresent( "Please add a file to upload." );
}
+ @Test( enabled = false )
public void testAddArtifactValidValues()
{
- addArtifact( getGroupId() , getArtifactId(), getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() );
+ // TODO: disable test on non *chrome browsers, there is no way to do file uploads (SEL-63)
+ addArtifact( getGroupId() , "testAddArtifactValidValues", getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() );
assertTextPresent( "Artifact 'test:test:1.0' was successfully deployed to repository 'internal'" );
}
//MRM-747
- @Test(dependsOnMethods = { "testAddArtifactValidValues" } )
+ @Test( enabled = false )
public void testAddArtifactBlockRedeployments()
{
- addArtifact( getGroupId() , getArtifactId(), getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() );
- assertTextPresent( "Overwriting released artifacts in repository '" + getRepositoryId() + "' is not allowed." );
+ // TODO: disable test on non *chrome browsers, there is no way to do file uploads (SEL-63)
+ addArtifact( getGroupId() , getArtifactId(), getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() );
+ assertTextPresent( "Overwriting released artifacts in repository '" + getRepositoryId() + "' is not allowed." );
}
- public void testAddArtifactValidValues1()
+ @Test( enabled = false )
+ public void testDeleteArtifact()
{
+ //prep
String groupId = getProperty( "GROUPID1" );
String artifactId = getProperty( "ARTIFACTID1" );
String version = getProperty( "VERSION1" );
String packaging = getProperty( "PACKAGING1" );
String repositoryId = getProperty( "REPOSITORYID1" );
+ // TODO: do this differently as it only works in Firefox's chrome mode
addArtifact( groupId , artifactId, version, packaging , getArtifactFilePath(), repositoryId );
assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deployed to repository 'internal'" );
- }
-
- @Test(dependsOnMethods = { "testAddArtifactValidValues1" } )
- public void testDeleteArtifact()
- {
+
deleteArtifact( "delete", "delete", "1.0", "internal");
assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deleted from repository 'internal'" );
}
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java Tue Jan 19 06:15:09 2010
@@ -45,6 +45,7 @@
}
// MRM-1278
+ @Test( enabled = false )
public void testCorrectRepositoryInBrowse()
{
File artifact =
@@ -63,6 +64,7 @@
String snapshotsRepo = getProperty( "SNAPSHOTS_REPOSITORY" );
+ // TODO: do this differently as uploading doesn't work on browsers other than *chrome (below as well)
// upload a snapshot artifact to repository 'releases'
addArtifact( "archiva", "archiva-webapp", "1.0-SNAPSHOT", "jar", artifact.getPath(),
releasesRepo );
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
import org.apache.archiva.web.test.parent.AbstractArchivaTest;
import org.testng.annotations.Test;
-@Test( groups = { "findartifact" }, dependsOnMethods = { "testAddArtifactValidValues1" }, sequential = true )
+@Test( groups = { "findartifact" }, sequential = true )
public class FindArtifactTest
extends AbstractArchivaTest
{
@@ -33,9 +33,9 @@
assertTextPresent( "You must select a file, or enter the checksum. If the file was given and you receive this message, there may have been an error generating the checksum." );
}
- @Test( dependsOnMethods = { "testFindArtifactNullValues" })
public void testFindArtifactUsingChecksum()
{
+ goToFindArtifactPage();
setFieldValue( "checksumSearch_q" , "8e896baea663a45d7bd2737f8e464481" );
clickButtonWithValue( "Search" );
assertTextPresent( "No results found" );
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java Tue Jan 19 06:15:09 2010
@@ -22,13 +22,12 @@
import org.apache.archiva.web.test.parent.AbstractArtifactReportsTest;
import org.testng.annotations.Test;
-@Test( groups = { "reports" }, dependsOnMethods = { "testAddArtifactValidValues" } )
+@Test( groups = { "reports" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } )
public class ReportsTest
extends AbstractArtifactReportsTest
{
//TODO Tests for repository with defects
-// @Test(dependsOnMethods = { "testAddArtifactValidValues" } )
public void testRepoStatisticsWithoutRepoCompared()
{
goToReportsPage();
@@ -57,7 +56,6 @@
assertTextPresent( "Start Date must be earlier than the End Date" );
}
- @Test(dependsOnMethods = { "testAddArtifactValidValues" } )
public void testRepositoryStatistics()
{
String repositoryName = getProperty( "REPOSITORY_NAME" ) ;
@@ -78,7 +76,6 @@
assertTextPresent( "Statistics Report" );
}
- @Test(dependsOnMethods = { "testAddArtifactValidValues" } )
public void testRepositoryHealthWithoutDefect()
{
goToReportsPage();
@@ -89,7 +86,6 @@
assertTextPresent( "The operation generated an empty report." );
}
- @Test(dependsOnMethods = { "testAddArtifactValidValues" } )
public void testRepositoryHealthWithoutGroupId()
{
goToReportsPage();
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java Tue Jan 19 06:15:09 2010
@@ -1,8 +1,5 @@
package org.apache.archiva.web.test;
-import org.apache.archiva.web.test.parent.AbstractRepositoryTest;
-import org.testng.annotations.Test;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,6 +19,10 @@
* under the License.
*/
+import org.apache.archiva.web.test.parent.AbstractRepositoryTest;
+import org.testng.annotations.Test;
+import org.testng.Assert;
+
@Test( groups = { "reposcan" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true )
public class RepositoryScanningTest
extends AbstractRepositoryTest
@@ -38,7 +39,7 @@
{
setFieldValue( "newpattern_0" , "**/*.dll" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[1]/table/tbody/tr[14]/td[2]/a/img" );
- assertTextPresent( "**/*.dll" );
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[1]/table.13.0"), "**/*.dll" );
}
@Test (dependsOnMethods = { "testAddArtifactFileType" } )
@@ -46,14 +47,15 @@
{
setFieldValue( "newpattern_0" , "**/*.zip" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[1]/table/tbody/tr[15]/td[2]/a/img" );
- assertTextPresent( "Not adding pattern \"**/*.zip\" to filetype artifacts as it already exists." );
+ Assert.assertEquals(getSelenium().getText("//span[@class='errorMessage']"), "Not adding pattern \"**/*.zip\" to filetype artifacts as it already exists." );
}
@Test (dependsOnMethods = { "testAddArtifactFileType_ExistingValue" } )
public void testDeleteArtifactFileType()
{
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[1]/table.13.0"), "**/*.dll" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[1]/table/tbody/tr[14]/td[2]/a/img" );
- assertTextNotPresent( "dll" );
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[1]/table.13.0"), "" );
}
@Test (dependsOnMethods = { "testDeleteArtifactFileType" } )
@@ -69,7 +71,7 @@
{
setFieldValue( "newpattern_1" , "**/*-" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
- assertTextPresent( "Not adding pattern \"**/*-\" to filetype auto-remove as it already exists." );
+ Assert.assertEquals(getSelenium().getText("//span[@class='errorMessage']"), "Not adding pattern \"**/*-\" to filetype auto-remove as it already exists." );
}
@Test (dependsOnMethods = { "testAddAutoRemove_ExistingValue" } )
@@ -77,14 +79,15 @@
{
setFieldValue( "newpattern_1" , "**/*.test" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
- assertTextPresent( "**/*.test" );
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[2]/table.3.0"), "**/*.test" );
}
@Test (dependsOnMethods = { "testAddAutoRemove" } )
public void testDeleteAutoRemove()
{
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[2]/table.3.0"), "**/*.test" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
- assertTextNotPresent( "test" );
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[2]/table.3.0"), "" );
}
@Test (dependsOnMethods = { "testDeleteAutoRemove" } )
@@ -92,7 +95,7 @@
{
setFieldValue( "newpattern_2" , "" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
- assertTextPresent( "Unable to process blank pattern." );
+ Assert.assertEquals(getSelenium().getText("//span[@class='errorMessage']"), "Unable to process blank pattern." );
}
@Test (dependsOnMethods = { "testAddIgnoredArtifacts_NullValue" } )
@@ -100,7 +103,7 @@
{
setFieldValue( "newpattern_2" , "**/*.sh" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
- assertTextPresent( "Not adding pattern \"**/*.sh\" to filetype ignored as it already exists." );
+ Assert.assertEquals(getSelenium().getText("//span[@class='errorMessage']"), "Not adding pattern \"**/*.sh\" to filetype ignored as it already exists." );
}
@Test (dependsOnMethods = { "testAddIgnoredArtifacts_ExistingValue" } )
@@ -108,14 +111,15 @@
{
setFieldValue( "newpattern_2" , "**/*.log" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
- assertTextPresent( "**/*.log" );
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[3]/table.6.0"), "**/*.log" );
}
@Test (dependsOnMethods = { "testAddIgnoredArtifacts" } )
public void testDeleteIgnoredArtifacts()
{
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[3]/table.6.0"), "**/*.log" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
- assertTextNotPresent( "log" );
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[3]/table.6.0"), "" );
}
//
@@ -124,7 +128,7 @@
{
setFieldValue( "newpattern_3" , "" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
- assertTextPresent( "Unable to process blank pattern." );
+ Assert.assertEquals(getSelenium().getText("//span[@class='errorMessage']"), "Unable to process blank pattern." );
}
@Test (dependsOnMethods = { "testAddIndexableContent_NullValue" } )
@@ -132,7 +136,7 @@
{
setFieldValue( "newpattern_3" , "**/*.xml" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
- assertTextPresent( "Not adding pattern \"**/*.xml\" to filetype indexable-content as it already exists." );
+ Assert.assertEquals(getSelenium().getText("//span[@class='errorMessage']"), "Not adding pattern \"**/*.xml\" to filetype indexable-content as it already exists." );
}
@Test (dependsOnMethods = { "testAddIndexableContent_ExistingValue" } )
@@ -140,14 +144,15 @@
{
setFieldValue( "newpattern_3" , "**/*.html" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
- assertTextPresent( "**/*.html" );
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[4]/table.9.0"), "**/*.html" );
}
@Test (dependsOnMethods = { "testAddIndexableContent" } )
public void testDeleteIndexableContent()
{
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[4]/table.9.0"), "**/*.html" );
clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
- assertTextNotPresent( "html" );
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[4]/table.9.0"), "" );
}
@Test (dependsOnMethods = { "testDeleteIndexableContent" } )
@@ -172,10 +177,6 @@
getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='validate-checksums']" );
clickButtonWithValue( "Update Consumers" );
- // remove the ff. 2 lines if MRM-1238 will be fixed.
- getSelenium().goBack();
- waitPage();
-
assertPage( "Apache Archiva \\ Administration - Repository Scanning" );
}