Added: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/META-INF/redback/redback-core.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/META-INF/redback/redback-core.xml?rev=1175928&view=auto ============================================================================== --- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/META-INF/redback/redback-core.xml (added) +++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/META-INF/redback/redback-core.xml Mon Sep 26 16:07:16 2011 @@ -0,0 +1,228 @@ +<redback-role-model> + <modelVersion>1.0.0</modelVersion> + <applications> + <application> + <id>System</id> + <description>Roles that apply system-wide, across all of the applications</description> + <version>1.0.0</version> + <resources> + <resource> + <id>global</id> + <name>*</name> + <permanent>true</permanent> + <description>global resource implies full access for authorization</description> + </resource> + <resource> + <id>username</id> + <name>${username}</name> + <permanent>true</permanent> + <description>replaced with the username of the principal at authorization check time</description> + </resource> + </resources> + <operations> + <operation> + <id>configuration-edit</id> + <name>configuration-edit</name> + <description>edit configuration</description> + <permanent>true</permanent> + </operation> + <operation> + <id>user-management-user-create</id> + <name>user-management-user-create</name> + <description>create user</description> + <permanent>true</permanent> + </operation> + <operation> + <id>user-management-user-edit</id> + <name>user-management-user-edit</name> + <description>edit user</description> + <permanent>true</permanent> + </operation> + <operation> + <id>user-management-user-role</id> + <name>user-management-user-role</name> + <description>user roles</description> + <permanent>true</permanent> + </operation> + <operation> + <id>user-management-user-delete</id> + <name>user-management-user-delete</name> + <description>delete user</description> + <permanent>true</permanent> + </operation> + <operation> + <id>user-management-user-list</id> + <name>user-management-user-list</name> + <description>list users</description> + <permanent>true</permanent> + </operation> + <operation> + <id>user-management-role-grant</id> + <name>user-management-role-grant</name> + <description>grant role</description> + <permanent>true</permanent> + </operation> + <operation> + <id>user-management-role-drop</id> + <name>user-management-role-drop</name> + <description>drop role</description> + <permanent>true</permanent> + </operation> + <operation> + <id>user-management-rbac-admin</id> + <name>user-management-rbac-admin</name> + <description>administer rbac</description> + <permanent>true</permanent> + </operation> + <operation> + <id>guest-access</id> + <name>guest-access</name> + <description>access guest</description> + <permanent>true</permanent> + </operation> + <operation> + <id>user-management-manage-data</id> + <name>user-management-manage-data</name> + <description>manage data</description> + <permanent>true</permanent> + </operation> + </operations> + <roles> + <role> + <id>system-administrator</id> + <name>System Administrator</name> + <permanent>true</permanent> + <assignable>true</assignable> + <permissions> + <permission> + <id>edit-redback-configuration</id> + <name>Edit Redback Configuration</name> + <operation>configuration-edit</operation> + <resource>global</resource> + <permanent>true</permanent> + </permission> + <permission> + <id>manage-rbac-setup</id> + <name>User RBAC Management</name> + <operation>user-management-rbac-admin</operation> + <resource>global</resource> + <permanent>true</permanent> + </permission> + <permission> + <id>manage-rbac-data</id> + <name>RBAC Manage Data</name> + <operation>user-management-manage-data</operation> + <resource>global</resource> + <permanent>true</permanent> + </permission> + </permissions> + <childRoles> + <childRole>user-administrator</childRole> + </childRoles> + </role> + <role> + <id>user-administrator</id> + <name>User Administrator</name> + <permanent>true</permanent> + <assignable>true</assignable> + <permissions> + <permission> + <id>drop-roles-for-anyone</id> + <name>Drop Roles for Anyone</name> + <operation>user-management-role-drop</operation> + <resource>global</resource> + <permanent>true</permanent> + </permission> + <permission> + <id>grant-roles-for-anyone</id> + <name>Grant Roles for Anyone</name> + <operation>user-management-role-grant</operation> + <resource>global</resource> + <permanent>true</permanent> + </permission> + <permission> + <id>user-create</id> + <name>Create Users</name> + <operation>user-management-user-create</operation> + <resource>global</resource> + <permanent>true</permanent> + </permission> + <permission> + <id>user-delete</id> + <name>Delete Users</name> + <operation>user-management-user-delete</operation> + <resource>global</resource> + <permanent>true</permanent> + </permission> + <permission> + <id>user-edit</id> + <name>Edit Users</name> + <operation>user-management-user-edit</operation> + <resource>global</resource> + <permanent>true</permanent> + </permission> + <permission> + <id>access-users-roles</id> + <name>Access Users Roles</name> + <operation>user-management-user-role</operation> + <resource>global</resource> + <permanent>true</permanent> + </permission> + <permission> + <id>access-user-list</id> + <name>Access User List</name> + <operation>user-management-user-list</operation> + <resource>global</resource> + <permanent>true</permanent> + </permission> + </permissions> + </role> + <role> + <id>edit-users-list</id> + <name>edit users list</name> + <permanent>true</permanent> + <assignable>true</assignable> + <permissions> + <permission> + <id>access-user-list</id> + <name>Access User List</name> + <operation>user-management-user-list</operation> + <resource>global</resource> + <permanent>true</permanent> + </permission> + </permissions> + </role> + <role> + <id>registered-user</id> + <name>Registered User</name> + <permanent>true</permanent> + <assignable>true</assignable> + <permissions> + <permission> + <id>edit-user-by-username</id> + <name>Edit User Data by Username</name> + <operation>user-management-user-edit</operation> + <resource>username</resource> + <permanent>true</permanent> + </permission> + </permissions> + </role> + <role> + <id>guest</id> + <name>Guest</name> + <permanent>true</permanent> + <assignable>true</assignable> + <permissions> + <permission> + <id>guest-permission</id> + <name>Guest Permission</name> + <operation>guest-access</operation> + <resource>global</resource> + <permanent>true</permanent> + </permission> + </permissions> + </role> + </roles> + </application> + </applications> +</redback-role-model> \ No newline at end of file
Copied: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j.xml (from r1175927, archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf) URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j.xml?p2=archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j.xml&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf&r1=1175927&r2=1175928&rev=1175928&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf (original) +++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j.xml Mon Sep 26 16:07:16 2011 @@ -1,4 +1,5 @@ -<%-- +<?xml version="1.0" encoding="UTF-8" ?> +<!-- ~ 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 @@ -7,7 +8,7 @@ ~ "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 + ~ 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 @@ -15,15 +16,29 @@ ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations ~ under the License. - --%> + --> -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> -<s:textfield name="repository.name" label="Name" size="50" required="true"/> -<s:textfield name="repository.url" label="URL" size="50" required="true"/> -<s:textfield name="repository.userName" label="Username" size="25" required="false"/> -<s:password name="repository.password" label="Password" size="25" required="false"/> -<s:textfield name="repository.timeout" label="Timeout in seconds" size="3" required="false"/> -<s:select list="#@java.util.LinkedHashMap@{'default' : 'Maven 2.x Repository', 'legacy' : 'Maven 1.x Repository'}" - name="repository.layout" label="Type"/> +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> + + <appender name="console" class="org.apache.log4j.ConsoleAppender"> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/> + </layout> + </appender> + + <logger name="org.springframework"> + <level value="ERROR"/> + </logger> + + <logger name="org.apache.archiva.scheduler.indexing"> + <level value="debug"/> + </logger> + + <root> + <priority value ="info" /> + <appender-ref ref="console" /> + </root> + +</log4j:configuration> Added: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/spring-context.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/spring-context.xml?rev=1175928&view=auto ============================================================================== --- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/spring-context.xml (added) +++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/spring-context.xml Mon Sep 26 16:07:16 2011 @@ -0,0 +1,62 @@ +<?xml version="1.0"?> + +<!-- + ~ 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. + --> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"; default-lazy-init="true"> + + <bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler"> + <property name="properties"> + <props> + <prop key="org.quartz.scheduler.instanceName">scheduler1</prop> + <prop key="org.quartz.threadPool.class">org.quartz.simpl.SimpleThreadPool</prop> + <prop key="org.quartz.threadPool.threadCount">2</prop> + <prop key="org.quartz.threadPool.threadPriority">4</prop> + <prop key="org.quartz.jobStore.class">org.quartz.simpl.RAMJobStore</prop> + </props> + </property> + </bean> + + + <!-- wire up more basic configuration so it doesn't overwrite any config files --> + <bean name="archivaConfiguration#default" class="org.apache.archiva.configuration.DefaultArchivaConfiguration"> + <property name="registry" ref="registry#default"/> + </bean> + + <alias name="archivaConfiguration#default" alias="archivaConfiguration"/> + + <bean name="registry#default" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry"> + <property name="properties"> + <value> + <![CDATA[ + <configuration> + <system/> + <xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true" + config-optional="true" + config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/> + </configuration> + ]]> + </value> + </property> + </bean> + + +</beans> \ No newline at end of file Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java?rev=1175928&r1=1175927&r2=1175928&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java (original) +++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java Mon Sep 26 16:07:16 2011 @@ -53,7 +53,7 @@ import java.util.Date; */ @Service( "taskExecutor#repository-scanning" ) public class ArchivaRepositoryScanningTaskExecutor - implements TaskExecutor, Initializable + implements TaskExecutor { private Logger log = LoggerFactory.getLogger( ArchivaRepositoryScanningTaskExecutor.class ); Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java?rev=1175928&r1=1175927&r2=1175928&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java (original) +++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java Mon Sep 26 16:07:16 2011 @@ -24,6 +24,7 @@ import org.apache.archiva.admin.model.ad import org.apache.archiva.admin.model.beans.FileType; import org.apache.archiva.admin.model.beans.LegacyArtifactPath; import org.apache.archiva.admin.model.beans.OrganisationInformation; +import org.apache.archiva.admin.model.beans.UiConfiguration; import org.apache.archiva.configuration.ArchivaConfiguration; import java.util.ArrayList; @@ -162,4 +163,16 @@ public class MockArchivaAdministration { this.archivaConfiguration = archivaConfiguration; } + + public UiConfiguration getUiConfiguration() + throws RepositoryAdminException + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public void updateUiConfiguration( UiConfiguration uiConfiguration ) + throws RepositoryAdminException + { + //To change body of implemented methods use File | Settings | File Templates. + } } Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1175928&r1=1175927&r2=1175928&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml Mon Sep 26 16:07:16 2011 @@ -252,6 +252,7 @@ <systemPropertyVariables> <plexus.home>${project.build.outputDirectory}</plexus.home> <appserver.base>${basedir}/target/appserver-base</appserver.base> + <java.io.tmpdir>${project.build.outputDirectory}</java.io.tmpdir> </systemPropertyVariables> </configuration> </plugin> Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1175928&r1=1175927&r2=1175928&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Mon Sep 26 16:07:16 2011 @@ -172,6 +172,10 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + </dependency> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-bundle-jaxrs</artifactId> <exclusions> @@ -518,7 +522,7 @@ <dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml,WEB-INF/lib/** </dependentWarExcludes> <warSourceExcludes> - WEB-INF/lib/xalan-*.jar,WEB-INF/lib/velocity-dep-*.jar,WEB-INF/lib/xml-apis-*.jar,WEB-INF/lib/wstx-asl-*.jar,WEB-INF/lib/stax-utils-*.jar,WEB-INF/lib/xercesImpl-*.jar + WEB-INF/lib/xalan-*.jar,WEB-INF/lib/velocity-dep-*.jar,WEB-INF/lib/xml-apis-*.jar,WEB-INF/lib/wstx-asl-*.jar,WEB-INF/lib/stax-utils-*.jar,WEB-INF/lib/xercesImpl-*.jar,WEB-INF/lib/commons-lang-*.jar </warSourceExcludes> </configuration> </plugin> Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java?rev=1175928&r1=1175927&r2=1175928&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java Mon Sep 26 16:07:16 2011 @@ -20,7 +20,7 @@ package org.apache.archiva.web.action.ad */ import com.opensymphony.xwork2.Preparable; -import org.apache.archiva.admin.model.AbstractRepository; +import org.apache.archiva.admin.model.beans.AbstractRepository; import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.admin.model.beans.ProxyConnector; import org.springframework.context.annotation.Scope; Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java?rev=1175928&r1=1175927&r2=1175928&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java Mon Sep 26 16:07:16 2011 @@ -22,10 +22,14 @@ package org.apache.archiva.web.action.ad import com.opensymphony.xwork2.Preparable; import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.admin.model.beans.RemoteRepository; +import org.apache.archiva.scheduler.indexing.DownloadRemoteIndexException; +import org.apache.archiva.scheduler.indexing.DownloadRemoteIndexScheduler; import org.apache.commons.lang.StringUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; +import javax.inject.Inject; + /** * EditRemoteRepositoryAction * @@ -47,6 +51,11 @@ public class EditRemoteRepositoryAction */ private String repoid; + private boolean now, fullDownload; + + @Inject + private DownloadRemoteIndexScheduler downloadRemoteIndexScheduler; + public void prepare() throws RepositoryAdminException { @@ -83,6 +92,20 @@ public class EditRemoteRepositoryAction return result; } + public String downloadRemoteIndex() + { + try + { + downloadRemoteIndexScheduler.scheduleDownloadRemote( repoid, now, fullDownload ); + } + catch ( DownloadRemoteIndexException e ) + { + addActionError( "DownloadRemoteIndexException: " + e.getMessage() ); + return INPUT; + } + return SUCCESS; + } + public RemoteRepository getRepository() { return repository; @@ -102,4 +125,24 @@ public class EditRemoteRepositoryAction { this.repoid = repoid; } + + public boolean isNow() + { + return now; + } + + public void setNow( boolean now ) + { + this.now = now; + } + + public boolean isFullDownload() + { + return fullDownload; + } + + public void setFullDownload( boolean fullDownload ) + { + this.fullDownload = fullDownload; + } } Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp?rev=1175928&r1=1175927&r2=1175928&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp Mon Sep 26 16:07:16 2011 @@ -40,6 +40,12 @@ <%@ include file="/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf" %> <s:submit value="Update Repository"/> </s:form> + <s:form method="post" action="editRemoteRepository!downloadRemoteIndex" namespace="/admin" validate="false"> + <s:hidden name="repoid"/> + <s:checkbox name="now" label="Now" /> + <s:checkbox name="fullDownload" label="Full download"/> + <s:submit value="download Remote Index"/> + </s:form> <script type="text/javascript"> document.getElementById("editRemoteRepository_repository_name").focus(); Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf?rev=1175928&r1=1175927&r2=1175928&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf Mon Sep 26 16:07:16 2011 @@ -21,9 +21,15 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <s:textfield name="repository.name" label="Name" size="50" required="true"/> -<s:textfield name="repository.url" label="URL" size="50" required="true"/> +<s:textfield name="repository.url" label="URL" size="60" required="true"/> <s:textfield name="repository.userName" label="Username" size="25" required="false"/> <s:password name="repository.password" label="Password" size="25" required="false"/> <s:textfield name="repository.timeout" label="Timeout in seconds" size="3" required="false"/> +<s:checkbox name="repository.downloadRemoteIndex" label="Activate download remote index" /> +<s:textfield name="repository.remoteIndexUrl" label="Remote index url, can be relative to url" size="60" required="false"/> +<s:textfield name="repository.cronExpression" label="Cron expression" size="10" required="false"/> +<s:textfield name="repository.indexDirectory" label="Directory index storage" size="60" required="false"/> + + <s:select list="#@java.util.LinkedHashMap@{'default' : 'Maven 2.x Repository', 'legacy' : 'Maven 1.x Repository'}" name="repository.layout" label="Type"/> Modified: archiva/trunk/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1175928&r1=1175927&r2=1175928&view=diff ============================================================================== --- archiva/trunk/pom.xml (original) +++ archiva/trunk/pom.xml Mon Sep 26 16:07:16 2011 @@ -538,6 +538,11 @@ <version>2.5</version> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>1.2</version> + </dependency> + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <version>10.1.3.1</version>
