You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2013/05/04 15:12:10 UTC
svn commit: r1479097 - in /archiva/branches/archiva-MRM-1756: ./
archiva-docs/ archiva-docs/src/site/apt/adminguide/ archiva-jetty/
archiva-jetty/src/main/conf/ archiva-modules/
archiva-modules/archiva-karaf/archiva-features/ archiva-modules/archiva-we...
Author: skygo
Date: Sat May 4 13:12:09 2013
New Revision: 1479097
URL: http://svn.apache.org/r1479097
Log: (empty)
Added:
archiva/branches/archiva-MRM-1756/archiva-modules/.gitignore
- copied unchanged from r1479094, archiva/trunk/archiva-modules/.gitignore
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/knockout-sortable.0.7.2.js
- copied unchanged from r1479094, archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/knockout-sortable.0.7.2.js
Removed:
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/knockout-sortable.js
Modified:
archiva/branches/archiva-MRM-1756/ (props changed)
archiva/branches/archiva-MRM-1756/archiva-docs/ (props changed)
archiva/branches/archiva-MRM-1756/archiva-docs/src/site/apt/adminguide/archiva-logs.apt
archiva/branches/archiva-MRM-1756/archiva-jetty/pom.xml
archiva/branches/archiva-MRM-1756/archiva-jetty/src/main/conf/jetty.xml
archiva/branches/archiva-MRM-1756/archiva-modules/ (props changed)
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/archiva-features/pom.xml
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/ (props changed)
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repository-groups.js
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
archiva/branches/archiva-MRM-1756/archiva-modules/deploySite.sh
archiva/branches/archiva-MRM-1756/archiva-modules/pom.xml
archiva/branches/archiva-MRM-1756/pom.xml
Propchange: archiva/branches/archiva-MRM-1756/
------------------------------------------------------------------------------
Merged /archiva/trunk:r1475941-1479094
Propchange: archiva/branches/archiva-MRM-1756/archiva-docs/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-docs:r1475941-1479094
Modified: archiva/branches/archiva-MRM-1756/archiva-docs/src/site/apt/adminguide/archiva-logs.apt
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-docs/src/site/apt/adminguide/archiva-logs.apt?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-docs/src/site/apt/adminguide/archiva-logs.apt (original)
+++ archiva/branches/archiva-MRM-1756/archiva-docs/src/site/apt/adminguide/archiva-logs.apt Sat May 4 13:12:09 2013
@@ -29,26 +29,29 @@ Archiva Logs
A typical record looks like this:
------
-2009-07-13 16:04:52,869 [WrapperSimpleAppMain] INFO org.apache.maven.archiva.security.ArchivaStandardRolesCheck -
- Checking the existance of required roles.
-2009-07-13 16:04:52,869 [WrapperSimpleAppMain] INFO org.apache.maven.archiva.security.ArchivaStandardRolesCheck -
- Checking the existance of required operations.
-2009-07-13 16:04:52,869 [WrapperSimpleAppMain] INFO org.apache.maven.archiva.web.startup.SecuritySynchronization -
- Environment Check: required-roles -> 0 violation(s)
-2009-07-13 16:04:53,371 [WrapperSimpleAppMain] INFO org.apache.maven.archiva.web.startup.Banner - _________________________
+2013-05-02 23:15:41,521 [pool-6-thread-1] INFO org.apache.archiva.scheduler.repository.ArchivaRepositoryScanningTaskExecutor [] - Gathering repository statistics
+2013-05-02 23:15:41,582 [pool-6-thread-1] INFO org.apache.archiva.metadata.repository.stats.DefaultRepositoryStatisticsManager [] - Gathering statistics executed in 60ms
+2013-05-02 23:15:41,615 [pool-6-thread-1] INFO org.apache.archiva.scheduler.repository.ArchivaRepositoryScanningTaskExecutor [] - Finished repository task: RepositoryTask [repositoryId=snapshots, resourceFile=null, scanAll=false, updateRelatedArtifacts=false]
+2013-05-02 23:15:41,626 [pool-5-thread-1] INFO org.apache.archiva.scheduler.indexing.ArchivaIndexingTaskExecutor [] - indexed maven repository: snapshots, onlyUpdate: false, time 106 ms
+2013-05-02 23:15:41,673 [WrapperSimpleAppMain] WARN org.apache.archiva.redback.components.scheduler.DefaultScheduler [] - Will not schedule this job as a job {rj:internal:rg} already exists.
+2013-05-02 23:15:41,675 [WrapperSimpleAppMain] WARN org.apache.archiva.redback.components.scheduler.DefaultScheduler [] - Will not schedule this job as a job {rj:snapshots:rg} already exists.
+2013-05-02 23:15:41,680 [WrapperSimpleAppMain] INFO org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler [] - Time to initalize DefaultRepositoryArchivaTaskScheduler: 8 ms
+2013-05-02 23:15:41,682 [WrapperSimpleAppMain] INFO org.apache.archiva.web.startup.Banner [] - _________________________
__________________________________
/\_ / \
/`/@), | On behalf of all of the alpacas |
| (~' __| toiling away on the Apache Archiva |
_,--.___/ | \ project team, I would like to |
,' , ( | \ welcome you to Archiva |
- | ( \ / | 1.2.1 |
+ | ( \ / | 1.4-M4-SNAPSHOT |
\ )\_/ ,_/ | |
/ / ( |/ | http://archiva.apache.org/ |
( | ( | | users@archiva.apache.org |
\| \| \__________________________________/
-2009-07-13 16:04:55,129 [WrapperSimpleAppMain] INFO org.apache.archiva.redback.struts2.interceptor.SecureActionInterceptor -
- org.apache.archiva.redback.struts2.interceptor.SecureActionInterceptor initialized!
+2013-05-02 23:15:41,707 [WrapperSimpleAppMain] INFO org.apache.jackrabbit.webdav.server.AbstractWebdavServlet [] - authenticate-header = Basic realm="Jackrabbit Webdav Server"
+2013-05-02 23:15:41,708 [WrapperSimpleAppMain] INFO org.apache.jackrabbit.webdav.server.AbstractWebdavServlet [] - csrf-protection = null
+2013-05-02 23:15:41,708 [WrapperSimpleAppMain] INFO org.apache.jackrabbit.webdav.server.AbstractWebdavServlet [] - createAbsoluteURI = true
+2013-05-02 23:15:41,726 [WrapperSimpleAppMain] INFO org.apache.archiva.webdav.RepositoryServlet [] - initServers done in 18Â ms
------
Modified: archiva/branches/archiva-MRM-1756/archiva-jetty/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-jetty/pom.xml?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-jetty/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-jetty/pom.xml Sat May 4 13:12:09 2013
@@ -121,7 +121,7 @@
</property>
<property>
<name>wrapper.logfile</name>
- <value>%ARCHIVA_BASE%/logs/wrapper.YYYYMMDD.log</value>
+ <value>%ARCHIVA_BASE%/logs/wrapper-YYYYMMDD.log</value>
</property>
<property>
<name>wrapper.logfile.rollmode</name>
Modified: archiva/branches/archiva-MRM-1756/archiva-jetty/src/main/conf/jetty.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-jetty/src/main/conf/jetty.xml?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-jetty/src/main/conf/jetty.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-jetty/src/main/conf/jetty.xml Sat May 4 13:12:09 2013
@@ -179,8 +179,8 @@
<Ref id="RequestLog">
<Set name="requestLog">
<New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
- <Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set>
- <Set name="filenameDateFormat">yyyy_MM_dd</Set>
+ <Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/request-yyyy_mm_dd.log</Set>
+ <Set name="filenameDateFormat">yyyyMMdd</Set>
<Set name="retainDays">90</Set>
<Set name="append">true</Set>
<Set name="extended">true</Set>
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 4 13:12:09 2013
@@ -3,3 +3,4 @@ target
.settings
.classpath
.project
+.site-content
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/archiva-features/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/archiva-features/pom.xml?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/archiva-features/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/archiva-features/pom.xml Sat May 4 13:12:09 2013
@@ -63,7 +63,7 @@
<rome.bundle.version>1.0_2</rome.bundle.version>
<servicemix.specs.version>1.9.0</servicemix.specs.version>
<sisu-inject-bean.version>2.3.0</sisu-inject-bean.version>
- <guava.version>13.0</guava.version>
+ <guava.version>14.0.1</guava.version>
<stax-utils.bundle.version>20040917_2</stax-utils.bundle.version>
<testng.version>6.3.1</testng.version>
<velocity.bundle.version>1.7_3</velocity.bundle.version>
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/archiva-web:r1475941-1479094
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java Sat May 4 13:12:09 2013
@@ -366,6 +366,10 @@ public class DefaultArchivaAdministratio
{
try
{
+ // fix for MRM-1757
+ // strip any trailing '/' at the end of the url so it won't affect url/link calculations in UI
+ uiConfiguration.setApplicationUrl(StringUtils.stripEnd(uiConfiguration.getApplicationUrl(), "/"));
+
archivaAdministration.updateUiConfiguration( uiConfiguration );
}
catch ( RepositoryAdminException e )
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java Sat May 4 13:12:09 2013
@@ -23,8 +23,9 @@ import org.apache.archiva.admin.model.be
import org.apache.archiva.admin.model.beans.LdapConfiguration;
import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin;
import org.apache.archiva.redback.authentication.Authenticator;
-import org.apache.archiva.redback.common.ldap.user.LdapUserMapper;
import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
+import org.apache.archiva.redback.common.ldap.user.LdapUserMapper;
+import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionConfiguration;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.common.ldap.connection.LdapException;
@@ -266,7 +267,7 @@ public class DefaultRedbackRuntimeConfig
}
catch ( LdapException e )
{
- log.warn( "fail to get LdapConnection: {}", e.getMessage() );
+ log.warn( "fail to get ldapConnection: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
finally
@@ -293,6 +294,7 @@ public class DefaultRedbackRuntimeConfig
ldapConfiguration.getBindDn(), ldapConfiguration.getPassword(),
ldapConfiguration.getAuthenticationMethod(),
toProperties( ldapConfiguration.getExtraProperties() ) );
+ ldapConnectionConfiguration.setSsl( ldapConfiguration.isSsl() );
ldapConnection = ldapConnectionFactory.getConnection( ldapConnectionConfiguration );
@@ -308,16 +310,18 @@ public class DefaultRedbackRuntimeConfig
ldapConfiguration.getAuthenticationMethod(),
toProperties( ldapConfiguration.getExtraProperties() ) );
+ ldapConnectionConfiguration.setSsl( ldapConfiguration.isSsl() );
+
ldapConnection = ldapConnectionFactory.getConnection( ldapConnectionConfiguration );
}
catch ( InvalidNameException e )
{
- log.warn( "fail to get LdapConnection: {}", e.getMessage() );
+ log.warn( "fail to get ldapConnection: {}", e.getMessage(), e);
throw new ArchivaRestServiceException( e.getMessage(), e );
}
catch ( LdapException e )
{
- log.warn( "fail to get LdapConnection: {}", e.getMessage() );
+ log.warn( "fail to get ldapConnection: {}", e.getMessage(), e);
throw new ArchivaRestServiceException( e.getMessage(), e );
}
finally
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java Sat May 4 13:12:09 2013
@@ -141,6 +141,35 @@ public class ArchivaAdministrationServic
}
@Test
+ public void uiConfigurationUpdate_ApplicationUrlHasTrailingSlash()
+ throws Exception {
+
+ UiConfiguration ui = getArchivaAdministrationService().getUiConfiguration();
+ assertNotNull( ui );
+ assertNull( ui.getApplicationUrl() );
+
+ String url = "http://foo.fr/bar/";
+ ui.setApplicationUrl( url );
+
+ getArchivaAdministrationService().setUiConfiguration( ui );
+
+ ui = getArchivaAdministrationService().getUiConfiguration();
+
+ assertEquals( "http://foo.fr/bar", ui.getApplicationUrl() );
+
+ // test if multiple '/' is trailing
+ url = "http://foo.fr/bar//";
+
+ ui.setApplicationUrl(url);
+
+ getArchivaAdministrationService().setUiConfiguration(ui);
+
+ ui = getArchivaAdministrationService().getUiConfiguration();
+
+ assertEquals( "http://foo.fr/bar", ui.getApplicationUrl() );
+ }
+
+ @Test
public void getKnownContentAdminRepositoryConsumer()
throws Exception
{
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Sat May 4 13:12:09 2013
@@ -130,7 +130,7 @@ managedRepository.location.help.content=
managedRepository.indexDirectory.help.title=Index Directory
managedRepository.indexDirectory.help.content=Path to the Maven Index directory
managedRepository.daysOlder.help.title=Days Older
-managedRepository.daysOlder.help.content=For snapshots repositories, maximun file days age you want to keep
+managedRepository.daysOlder.help.content=For snapshots repositories, maximum file days age you want to keep
managedRepository.retentionCount.help.title=Retention Count
managedRepository.retentionCount.help.content=For snapshots repositories, maximum of files you want to keep.
managedRepository.description.help.content=A free description for your repository
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt Sat May 4 13:12:09 2013
@@ -9,10 +9,6 @@ Run Selenium tests in src/test/testng ag
- modify src/test/resources/testng.properties as needed
- mvn clean install -Dcontainer-existing
-The Cargo installations are stored outside of target to avoid multiple downloads.
-To remove the Cargo installations and re-download them next run, use:
- - mvn -Pclean-cargo clean
-
Internet Explorer and Safari users must disable their popup blockers. Using *iexplore as
the browser requires running as an Administrator on Windows 7/Vista, or alternatively you
can use *iexploreproxy.
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/pom.xml Sat May 4 13:12:09 2013
@@ -1014,7 +1014,10 @@
<archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
<archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
<archiva.tmp.group.index.ttl>${archiva.groupIndexTtl}</archiva.tmp.group.index.ttl>
+ <!--
+ not needed as we use asyncLogger in configuration
<Log4jContextSelector>org.apache.logging.log4j.core.async.AsyncLoggerContextSelector</Log4jContextSelector>
+ -->
</systemProperties>
<additionalClasspathDirs>
<additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml Sat May 4 13:12:09 2013
@@ -27,111 +27,105 @@
<appenders>
- <RollingFile name="rolling" fileName="${logsDirectory}/archiva.log"
- filePattern="${logsDirectory}/archiva-%d{MM-dd-yyyy}.log">
+ <FastRollingFile name="rolling" fileName="${logsDirectory}/archiva.log"
+ filePattern="${logsDirectory}/archiva-%d{yyyyMMdd}.log"
+ immediateFlush="false" append="true">
<PatternLayout>
<pattern>%d [%t] %-5p %c %x - %m%n</pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy />
</Policies>
- </RollingFile>
+ </FastRollingFile>
- <RollingFile name="auditlog" fileName="${logsDirectory}/archiva-audit.log"
- filePattern="${logsDirectory}/logs/archiva-audit-%d{MM-dd-yyyy}.log">
+ <FastRollingFile name="auditlog" fileName="${logsDirectory}/archiva-audit.log"
+ filePattern="${logsDirectory}/archiva-audit-%d{yyyyMMdd}.log"
+ immediateFlush="false" append="true">
<PatternLayout>
<pattern>%d{yyyy-MM-dd HH:mm:ss} %m%n</pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy />
</Policies>
- </RollingFile>
+ </FastRollingFile>
- <RollingFile name="redbackAuditLog" fileName="${logsDirectory}/archiva-security-audit.log"
- filePattern="${logsDirectory}/archiva-security-audit.log-%d{MM-dd-yyyy}.log">
+ <FastRollingFile name="redbackAuditLog" fileName="${logsDirectory}/archiva-security-audit.log"
+ filePattern="${logsDirectory}/archiva-security-audit.log-%d{yyyyMMdd}.log"
+ immediateFlush="false" append="true">
<PatternLayout>
<pattern>%d{yyyy-MM-dd HH:mm:ss} - %X{redback.currentUser} - %m%n</pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy />
</Policies>
- </RollingFile>
+ </FastRollingFile>
</appenders>
<loggers>
- <logger name="org.apache.archiva.redback.struts2.action.AuditEvent" additivity="false" level="info">
+ <asyncLogger name="org.apache.archiva.redback.struts2.action.AuditEvent" additivity="false" level="info">
<appender-ref ref="redbackAuditLog" />
- </logger>
+ </asyncLogger>
- <logger name="org.apache.archiva.AuditLog" additivity="false" level="info">
+ <asyncLogger name="org.apache.archiva.AuditLog" additivity="false" level="info">
<appender-ref ref="auditlog" />
- </logger>
+ </asyncLogger>
<!-- INFO level loggers can use the default
- <logger name="org.apache.archiva.consumers" level="info"/>
+ <asyncLogger name="org.apache.archiva.consumers" level="info"/>
- <logger name="org.apache.archiva" level="info"/>
+ <asyncLogger name="org.apache.archiva" level="info"/>
+ <asyncLogger name="org.quartz" level="info"/>
- <logger name="org.quartz" level="info"/>
+ <asyncLogger name="org.apache.jasper" level="info"/>
- <logger name="org.apache.jasper" level="info"/>
+ <asyncLogger name="com.opensymphony.xwork2" level="info"/>
- <logger name="com.opensymphony.xwork2" level="info"/>
-
- <logger name="org.apache.struts2" level="info"/>
+ <asyncLogger name="org.apache.struts2" level="info"/>
-->
<!-- WebDav objects -->
- <logger name="org.apache.archiva.webdav.ArchivaDavResource" level="info"/>
-
-
- <logger name="org.apache.archiva.webdav.ArchivaDavResourceFactory" level="info"/>
+ <asyncLogger name="org.apache.archiva.webdav.ArchivaDavResource" level="info"/>
+ <asyncLogger name="org.apache.archiva.webdav.ArchivaDavResourceFactory" level="info"/>
<!-- squelch noisy objects (for now) -->
- <logger name="org.apache.commons" level="warn"/>
-
- <logger name="net.sf.ehcache" level="warn"/>
+ <asyncLogger name="org.apache.commons" level="warn"/>
+ <asyncLogger name="net.sf.ehcache" level="warn"/>
<!-- retained for Redback -->
- <logger name="JPOX" level="warn"/>
-
-
- <logger name="JPOX.MetaData" level="error"/>
-
-
- <logger name="JPOX.RDBMS.SQL" level="error"/>
-
+ <asyncLogger name="JPOX" level="warn"/>
- <logger name="SQL" level="error"/>
+ <asyncLogger name="JPOX.MetaData" level="error"/>
+ <asyncLogger name="JPOX.RDBMS.SQL" level="error"/>
+ <asyncLogger name="SQL" level="error"/>
- <logger name="org.apache.commons.configuration.DefaultConfigurationBuilder" level="error"/>
+ <asyncLogger name="org.apache.commons.configuration.DefaultConfigurationBuilder" level="error"/>
<!-- debug wagon transfer -->
<!--
- <logger name="org.apache.archiva.proxy.common" level="debug"/>
+ <asyncLogger name="org.apache.archiva.proxy.common" level="debug"/>
-->
<!-- apache httpclient debug content transfer verbose -->
<!--
- <logger name="org.apache.http.wire" level="debug"/>
+ <asyncLogger name="org.apache.http.wire" level="debug"/>
-->
<!-- apache httpclient log headers -->
<!--
- <logger name="org.apache.http.headers" level="debug"/>
+ <asyncLogger name="org.apache.http.headers" level="debug"/>
-->
- <root level="info">
+ <asyncRoot level="info" includeLocation="true">
<appender-ref ref="rolling"/>
- </root>
+ </asyncRoot>
</loggers>
</configuration>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js Sat May 4 13:12:09 2013
@@ -71,7 +71,7 @@ $.ajax({
"knockout": "knockout-2.2.0.debug",
"knockout.simpleGrid": "knockout.simpleGrid",
"knockout.select2": "knockout.select2",
- "knockout.sortable": "knockout-sortable",
+ "knockout.sortable": "knockout-sortable.0.7.2",
"jquery.iframe.transport": "jquery.iframe-transport-1.4",
"jquery.fileupload": "jquery.fileupload-5.10.0",
"jquery.fileupload.ip":"jquery.fileupload-ip-1.0.6",
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js Sat May 4 13:12:09 2013
@@ -1365,40 +1365,46 @@ define("archiva.general-admin",["jquery"
//save modified ldap group mappings if any
if(self.modifiesLdapGroupMappings().length>0){
$.log("save modifiesLdapGroupMappings");
+ var message=$.i18n.prop('redback-runtime-ldap-group-mapping.updated');
+ var userMessages=$("#user-messages");
+ var ldapGroupMappings=[];
$.each(self.modifiesLdapGroupMappings(),function(idx,item){
+
if(!(item.automatic&item.roleNames().length<2)){
$.log("update mapping for group:"+item.group());
- var mainContent=$("#main-content");
- var saveButton = mainContent.find("#redback-runtime-configuration-save" );
- saveButton.button('loading');
- clearUserMessages();
- var userMessages=$("#user-messages");
- userMessages.html(mediumSpinnerImg());
- $.ajax("restServices/redbackServices/ldapGroupMappingService",
- {
- type: "POST",
- contentType: 'application/json',
- data:ko.toJSON(item),
- dataType: 'json',
- success: function(data) {
- var message=$.i18n.prop('redback-runtime-ldap-group-mapping.updated');
- displaySuccessMessage(message);
- },
- error: function(data) {
- var res = $.parseJSON(data.responseText);
- displayRestError(res);
- },
- complete:function(data){
- removeMediumSpinnerImg(userMessages);
- saveButton.button('reset');
- self.redbackRuntimeConfiguration().modified(false);
- self.redbackRuntimeConfiguration().ldapConfiguration().modified(false);
- }
- }
- );
+ ldapGroupMappings.push(item);
}
});
+ if (ldapGroupMappings.length>0){
+
+ var mainContent=$("#main-content");
+ var saveButton = mainContent.find("#redback-runtime-configuration-save" );
+ saveButton.button('loading');
+ userMessages.html(mediumSpinnerImg());
+ $.ajax("restServices/redbackServices/ldapGroupMappingService",
+ {
+ type: "POST",
+ contentType: 'application/json',
+ data:ko.toJSON(new LdapGroupMappingUpdateRequest(ldapGroupMappings)),
+ dataType: 'json',
+ success: function(data) {
+ displaySuccessMessage(message);
+ },
+ error: function(data) {
+ var res = $.parseJSON(data.responseText);
+ displayRestError(res);
+ },
+ complete:function(data){
+ removeMediumSpinnerImg(userMessages);
+ saveButton.button('reset');
+ self.redbackRuntimeConfiguration().modified(false);
+ self.redbackRuntimeConfiguration().ldapConfiguration().modified(false);
+ }
+ }
+ );
+ }
+
} else {
$.log("not save modifiesLdapGroupMappings");
@@ -1736,6 +1742,10 @@ define("archiva.general-admin",["jquery"
this.update=true;
}
+ LdapGroupMappingUpdateRequest=function(ldapGroupMappings){
+ this.ldapGroupMappings=ko.observableArray(ldapGroupMappings?ldapGroupMappings:[]);
+ }
+
mapLdapGroupMappings=function(data,modifyLdapGroupMapping){
if(data!=null){
return $.map(data,function(item){
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repository-groups.js
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repository-groups.js?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repository-groups.js (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repository-groups.js Sat May 4 13:12:09 2013
@@ -293,7 +293,8 @@ function(jquery,i18n,jqueryTmpl,bootstra
dataType: 'text',
success: function(applicationUrl){
- self.repositoryGroupsViewModel.managedRepositories(mapManagedRepositories(data,applicationUrl));
+ self.repositoryGroupsViewModel.managedRepositories(
+ mapManagedRepositories(data,applicationUrl?applicationUrl:window.location.toString().substringBeforeLast("/")));
self.repositoryGroupsViewModel.applicationUrl=applicationUrl;
$.ajax("restServices/archivaServices/repositoryGroupService/getRepositoriesGroups", {
type: "GET",
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html Sat May 4 13:12:09 2013
@@ -205,7 +205,7 @@
<form id="managed-repository-edit-form" class="well form-horizontal">
<fieldset id="managed-repository-edit-fieldset">
<div class="control-group">
- <label class="control-label" for="id">${$.i18n.prop('id')}</label>
+ <label class="control-label" for="id">${$.i18n.prop('identifier')}</label>
<div class="controls">
{{if update}}
@@ -544,7 +544,7 @@
<form id="remote-repository-edit-form" class="well form-horizontal">
<fieldset id="remote-repository-edit-fieldset">
<div class="control-group">
- <label class="control-label" for="id">${$.i18n.prop('id')}</label>
+ <label class="control-label" for="id">${$.i18n.prop('identifier')}</label>
<div class="controls">
{{if update}}
@@ -904,7 +904,7 @@
<form id="network-proxy-edit-form" class="well form-horizontal">
<fieldset id="network-proxy-edit-fieldset">
<div class="control-group">
- <label class="control-label" for="id">${$.i18n.prop('id')}</label>
+ <label class="control-label" for="id">${$.i18n.prop('identifier')}</label>
<div class="controls">
{{if update}}
@@ -1429,7 +1429,7 @@
<form id="repository-group-edit-form" class="well">
<fieldset id="repository-group-edit-fieldset">
<div class="control-group">
- <label class="control-label" for="id">${$.i18n.prop('id')}</label>
+ <label class="control-label" for="id">${$.i18n.prop('identifier')}</label>
<div class="controls">
<input type="text" class="input-medium required" id="id" name="id" size="15"
data-bind="value: repositoryGroup.id,css:{'uneditable-input': update},readonly:update"/>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml Sat May 4 13:12:09 2013
@@ -30,17 +30,15 @@
<!--PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/-->
<PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n}" />
</Console>
-
- <FastFile name="rolling" fileName="${logsDirectory}/archiva.log"
- filePattern="${logsDirectory}/archiva-%d{MM-dd-yyyy}.log" immediateFlush="false" append="true">
+ <FastRollingFile name="rolling" fileName="${logsDirectory}/archiva.log"
+ filePattern="${logsDirectory}/archiva-%d{MM-dd-yyyy}.log" immediateFlush="false" append="true">
<PatternLayout>
<pattern>%d [%t] %-5p %c %x - %m%n</pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy />
</Policies>
- </FastFile>
-
+ </FastRollingFile>
</appenders>
<loggers>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/deploySite.sh
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/deploySite.sh?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/deploySite.sh (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/deploySite.sh Sat May 4 13:12:09 2013
@@ -1 +1 @@
-mvn clean site-deploy scm-publish:publish-scm $@
+mvn clean site site:stage -Preporting scm-publish:publish-scm $@
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/pom.xml?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/pom.xml Sat May 4 13:12:09 2013
@@ -32,7 +32,7 @@
<properties>
<siteFilePath>${user.home}/archiva-sites/archiva-ref-${project.version}/</siteFilePath>
<siteUrlDeployment>file://${siteFilePath}</siteUrlDeployment>
- <scmPubCheckoutDirectory>${user.home}/archiva-sites/archiva-ref-${project.version}-content</scmPubCheckoutDirectory>
+ <scmPubCheckoutDirectory>${basedir}/.site-content</scmPubCheckoutDirectory>
</properties>
<modules>
@@ -53,7 +53,7 @@
<configuration>
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/ref/${project.version}</pubScmUrl>
<checkinComment>Apache Archiva Versionned ref for ${project.version}</checkinComment>
- <content>${siteFilePath}</content>
+ <content>${project.build.directory}/staging</content>
</configuration>
</plugin>
</plugins>
@@ -76,18 +76,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyleVersion}</version>
- <inherited>false</inherited>
+ <!-- inherited is needed to use netbeans checkstyle based code formatting -->
+ <!-- 2013 05 03 may change in future release -->
+ <inherited>true</inherited>
<configuration>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<configLocation>config/maven_checks.xml</configLocation>
</configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>checkstyle-aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
</plugin>
<plugin>
<!-- No need for the standard project reports -->
@@ -166,6 +161,30 @@
</plugins>
</reporting>
+ <profiles>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyleVersion}</version>
+ <inherited>false</inherited>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>checkstyle-aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
+
+
<distributionManagement>
<site>
Modified: archiva/branches/archiva-MRM-1756/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/pom.xml?rev=1479097&r1=1479096&r2=1479097&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/pom.xml Sat May 4 13:12:09 2013
@@ -74,7 +74,7 @@
<redback.spring-utils.version>2.0</redback.spring-utils.version>
<redback.taskqueue.version>2.0</redback.taskqueue.version>
<slf4j.version>1.7.5</slf4j.version>
- <log4j.version>2.0-beta5</log4j.version>
+ <log4j.version>2.0-beta6-SNAPSHOT</log4j.version>
<spring.version>3.2.2.RELEASE</spring.version>
@@ -96,7 +96,7 @@
<redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl>
<redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver>
<sisu-inject-plexus.version>0.0.0.M2a</sisu-inject-plexus.version>
- <sisu-guice.version>3.1.2</sisu-guice.version>
+ <sisu-guice.version>3.1.4</sisu-guice.version>
<plexus-digest.version>1.1</plexus-digest.version>
<plexus-expression-evaluator.version>2.0</plexus-expression-evaluator.version>
<plexus-utils.version>3.0.8</plexus-utils.version>
@@ -531,7 +531,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>13.0</version>
+ <version>14.0.1</version>
</dependency>
<dependency>
<groupId>stax</groupId>
@@ -1537,11 +1537,13 @@
<exclude>commons-logging:commons-logging-api</exclude>
<exclude>log4j:log4j</exclude>
+
+ <exclude>org.sonatype.sisu:sisu-guava</exclude>
+
<!--
<exclude>org.slf4j:jcl-over-slf4j</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
-->
- <!-- TODO org.sonatype.sisu:sisu-guava -->
</excludes>
</bannedDependencies>
@@ -1722,11 +1724,6 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>1.1.4</version>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>