You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/01/24 19:23:39 UTC
svn commit: r1235395 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/
archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/
archiva-webapp-js...
Author: olamy
Date: Tue Jan 24 18:23:38 2012
New Revision: 1235395
URL: http://svn.apache.org/viewvc?rev=1235395&view=rev
Log:
javascript logging optionnal too
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/CommonServices.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/CommonServices.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/CommonServices.java?rev=1235395&r1=1235394&r2=1235395&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/CommonServices.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/CommonServices.java Tue Jan 24 18:23:38 2012
@@ -18,6 +18,7 @@ package org.apache.archiva.rest.api.serv
* under the License.
*/
+import org.apache.archiva.rest.api.model.ArchivaRuntimeInfo;
import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
import javax.ws.rs.GET;
@@ -60,9 +61,9 @@ public interface CommonServices
String getAllI18nResources( @QueryParam( "locale" ) String locale )
throws ArchivaRestServiceException;
- @Path( "devMode" )
+ @Path( "archivaRuntimeInfo" )
@GET
- @Produces( { MediaType.TEXT_PLAIN } )
+ @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( noRestriction = true )
- Boolean devMode();
+ ArchivaRuntimeInfo archivaRuntimeInfo();
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java?rev=1235395&r1=1235394&r2=1235395&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java Tue Jan 24 18:23:38 2012
@@ -18,6 +18,7 @@ package org.apache.archiva.rest.services
* under the License.
*/
+import org.apache.archiva.rest.api.model.ArchivaRuntimeInfo;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
import org.apache.archiva.rest.api.services.CommonServices;
import org.apache.commons.io.IOUtils;
@@ -169,8 +170,8 @@ public class DefaultCommonServices
}
}
- public Boolean devMode()
+ public ArchivaRuntimeInfo archivaRuntimeInfo()
{
- return Boolean.getBoolean( "archiva.devMode" );
+ return new ArchivaRuntimeInfo();
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1235395&r1=1235394&r2=1235395&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Tue Jan 24 18:23:38 2012
@@ -35,6 +35,7 @@
<tomcatRunPort>9091</tomcatRunPort>
<tomcatRunPath>/archiva</tomcatRunPath>
<archiva.devMode>true</archiva.devMode>
+ <archiva.javascriptLog>true</archiva.javascriptLog>
</properties>
<dependencies>
@@ -546,6 +547,7 @@
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
<archiva.user.configFileName>${project.build.directory}/appserver-base/conf/archiva.xml</archiva.user.configFileName>
<archiva.devMode>${archiva.devMode}</archiva.devMode>
+ <archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
</systemProperties>
</configuration>
<dependencies>
@@ -579,6 +581,7 @@
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
<archiva.user.configFileName>${project.build.directory}/appserver-base/conf/archiva.xml</archiva.user.configFileName>
<archiva.devMode>${archiva.devMode}</archiva.devMode>
+ <archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
</systemProperties>
</configuration>
<dependencies>
@@ -610,6 +613,7 @@
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
<archiva.user.configFileName>${project.build.directory}/appserver-base/conf/archiva.xml</archiva.user.configFileName>
<archiva.devMode>${archiva.devMode}</archiva.devMode>
+ <archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
</systemProperties>
</configuration>
<dependencies>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1235395&r1=1235394&r2=1235395&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html Tue Jan 24 18:23:38 2012
@@ -42,9 +42,11 @@
<script type="text/javascript">
$.ajax(
{
- url: "restServices/archivaServices/commonServices/devMode",
+ url: "restServices/archivaServices/commonServices/archivaRuntimeInfo",
+ dataType: 'json',
success:function(data){
- window.archivaDevMode=data=='true';
+ window.archivaDevMode=data.archivaRuntimeInfo.devMode;
+ window.archivaJavascriptLog=data.archivaRuntimeInfo.javascriptLog;
require.config({
baseUrl: "js/"
});
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1235395&r1=1235394&r2=1235395&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Tue Jan 24 18:23:38 2012
@@ -26,9 +26,9 @@ $(function() {
$.log("devMode:"+window.archivaDevMode);
- // no cache for ajax queries
+ // no cache for ajax queries as we get datas from servers so preventing caching !!
jQuery.ajaxSetup( {
- cache: !window.archivaDevMode
+ cache: false//!window.archivaDevMode
} );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1235395&r1=1235394&r2=1235395&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js Tue Jan 24 18:23:38 2012
@@ -21,6 +21,9 @@
* log message in the console
*/
$.log = (function(message) {
+ if ( !window.archivaJavascriptLog ){
+ return;
+ }
if (typeof window.console != 'undefined' && typeof window.console.log != 'undefined') {
console.log(message);
} else {