Author: olamy
Date: Tue Feb 28 00:04:05 2012
New Revision: 1294407
URL: http://svn.apache.org/viewvc?rev=1294407&view=rev
Log:
fix regression in json/boolean due to parameter to fix transformation of 2.0 to
2
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml?rev=1294407&r1=1294406&r2=1294407&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
Tue Feb 28 00:04:05 2012
@@ -42,6 +42,7 @@
<bean id="jsonProvider" class="org.apache.cxf.jaxrs.provider.JSONProvider">
<!-- without that String 2.0 are transformed to 2 which is not correct for
versions -->
+ <!-- side effect json boolean are string rather than boolean -->
<property name="convertTypesToStrings" value="true"/>
<!--property name="serializeAsArray" value="true"/-->
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1294407&r1=1294406&r2=1294407&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
Tue Feb 28 00:04:05 2012
@@ -149,9 +149,11 @@ $(function() {
if (data==null){
return null;
}
- return new
ManagedRepository(data.id,data.name,data.layout,data.indexDirectory,data.location,data.snapshots,data.releases,
- data.blockRedeployments,data.cronExpression,
-
data.scanned,data.daysOlder,data.retentionCount,data.deleteReleasedSnapshots,data.stageRepoNeeded);
+ return new
ManagedRepository(data.id,data.name,data.layout,data.indexDirectory,data.location,data.snapshots=='true'
+ ,data.releases=='true',
+
data.blockRedeployments=='true',data.cronExpression,
+
data.scanned=='true',data.daysOlder,data.retentionCount,data.deleteReleasedSnapshots=='true',
+ data.stageRepoNeeded=='true');
}
mapArchivaRepositoryStatistics=function(data){
@@ -591,8 +593,8 @@ $(function() {
return null;
}
return new
RemoteRepository(data.id,data.name,data.layout,data.indexDirectory,data.url,data.userName,data.password,
-
data.timeout,data.downloadRemoteIndex,data.remoteIndexUrl,data.remoteDownloadNetworkProxyId,
-
data.cronExpression,data.remoteDownloadTimeout,data.downloadRemoteIndexOnStartup);
+
data.timeout,data.downloadRemoteIndex=='true',data.remoteIndexUrl,data.remoteDownloadNetworkProxyId,
+
data.cronExpression,data.remoteDownloadTimeout,data.downloadRemoteIndexOnStartup=='true');
}
mapRemoteRepositories=function(data){
