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/02/13 09:57:39 UTC
svn commit: r1243438 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js: pom.xml
src/main/webapp/index-dev.html
Author: olamy
Date: Mon Feb 13 08:57:39 2012
New Revision: 1243438
URL: http://svn.apache.org/viewvc?rev=1243438&view=rev
Log:
start working on css/js minification: will need 2 index one for dev with debug js and an other one for live with minify/packed files
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index-dev.html (with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
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=1243438&r1=1243437&r2=1243438&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 Mon Feb 13 08:57:39 2012
@@ -544,6 +544,78 @@
<plugins>
<plugin>
+ <groupId>com.samaxes.maven</groupId>
+ <artifactId>maven-minify-plugin</artifactId>
+ <version>1.3.5</version>
+ <executions>
+ <execution>
+ <id>startup-minify</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <webappSourceDir>${basedir}/src/main/webapp</webappSourceDir>
+ <cssSourceDir>css</cssSourceDir>
+ <cssSourceFiles>
+ <cssSourceFile>jquery-ui-1.8.16.custom.css</cssSourceFile>
+ <cssSourceFile>jquery.ui.1.8.16.ie.css</cssSourceFile>
+ <cssSourceFile>bootstrap.css</cssSourceFile>
+ <cssSourceFile>archiva.css</cssSourceFile>
+ </cssSourceFiles>
+ <cssFinalFile>apache-archiva-${project.version}.css</cssFinalFile>
+ <jsSourceDir>js</jsSourceDir>
+ <jsSourceFiles>
+ <jsSourceFile>jquery-1.7.1.js</jsSourceFile>
+ <jsSourceFile>lab.js</jsSourceFile>
+ <jsSourceFile>require.1.0.1.js</jsSourceFile>
+ </jsSourceFiles>
+ <jsFinalFile>apache-archiva-startup-${project.version}.js</jsFinalFile>
+ </configuration>
+ <goals>
+ <goal>minify</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>main-minify</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <webappSourceDir>${basedir}/src/main/webapp</webappSourceDir>
+ <jsSourceDir>js</jsSourceDir>
+ <jsSourceFiles>
+ <jsSourceFile>jquery.tmpl.js</jsSourceFile>
+ <jsSourceFile>archiva/utils.js</jsSourceFile>
+ <jsSourceFile>jquery.i18n.properties-1.0.9.js</jsSourceFile>
+ <jsSourceFile>archiva/i18nload.js</jsSourceFile>
+ <jsSourceFile>jquery.cookie.1.0.0.js</jsSourceFile>
+ <jsSourceFile>knockout-debug.js</jsSourceFile>
+ <jsSourceFile>jquery-ui-1.8.16.custom.min.js</jsSourceFile>
+ <jsSourceFile>jquery.validate.js</jsSourceFile>
+ <jsSourceFile>jquery.json-2.3.min.js</jsSourceFile>
+ <jsSourceFile>archiva/main-tmpl.js</jsSourceFile>
+ <jsSourceFile>archiva/repositories.js</jsSourceFile>
+ <jsSourceFile>archiva/network-proxies.js</jsSourceFile>
+ <jsSourceFile>archiva/proxy-connectors.js</jsSourceFile>
+ <jsSourceFile>redback/operation.js</jsSourceFile>
+ <jsSourceFile>redback/redback-tmpl.js</jsSourceFile>
+ <jsSourceFile>bootstrap.js</jsSourceFile>
+ <jsSourceFile>knockout.simpleGrid.js</jsSourceFile>
+ <jsSourceFile>redback/user.js</jsSourceFile>
+ <jsSourceFile>redback/users.js</jsSourceFile>
+ <jsSourceFile>redback/redback.js</jsSourceFile>
+ <jsSourceFile>redback/register.js</jsSourceFile>
+ <jsSourceFile>redback/permission.js</jsSourceFile>
+ <jsSourceFile>redback/resource.js</jsSourceFile>
+ <jsSourceFile>redback/roles.js</jsSourceFile>
+ <jsSourceFile>archiva/main.js</jsSourceFile>
+ </jsSourceFiles>
+ <jsFinalFile>apache-archiva-main-${project.version}.js</jsFinalFile>
+ </configuration>
+ <goals>
+ <goal>minify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat6-maven-plugin</artifactId>
<configuration>
Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index-dev.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index-dev.html?rev=1243438&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index-dev.html (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index-dev.html Mon Feb 13 08:57:39 2012
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <link rel="stylesheet" href="css/jquery-ui-1.8.16.custom.css"/>
+ <link rel="stylesheet" href="css/bootstrap.css">
+ <link rel="stylesheet" href="css/archiva.css">
+
+
+ <script type="text/javascript" src="js/jquery-1.7.1.js"></script>
+
+ <script type="text/javascript" src="js/lab.js"></script>
+ <script type="text/javascript" src="js/require.1.0.1.js"></script>
+ <title>Apache Archiva</title>
+
+</head>
+
+<body style="padding-top: 42px;">
+
+<div id="topbar-menu-container"></div>
+
+<div class="container-fluid" style="min-height: 450px">
+ <div class="row-fluid">
+ <div class="span2 columns">
+ <div class="well sidebar-nav" id="sidebar-content"></div>
+ </div>
+ <div class="span10 columns">
+ <div class="content">
+ <div id="user-messages"></div>
+ <div id="main-content"></div>
+ </div>
+ </div>
+ </div>
+
+</div>
+
+<footer id="footer-content" style="vertical-align: bottom">
+</footer>
+
+<div id="html-fragments"></div>
+
+</body>
+
+<div id="dialog-confirm" title="" style="display: none">
+</div>
+
+
+
+<script type="text/javascript">
+appendArchivaVersion=function(){
+ return "_archivaVersion="+window.archivaRuntimeInfo.version;
+}
+buildLoadJsUrl=function(srcScript){
+ return srcScript+"?"+appendArchivaVersion();
+}
+$.ajax(
+ {
+ url: "restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo",
+ dataType: 'json',
+ success:function(data){
+ window.archivaDevMode=data.applicationRuntimeInfo.devMode;
+ window.archivaJavascriptLog=data.applicationRuntimeInfo.javascriptLog;
+ window.archivaRuntimeInfo=data.applicationRuntimeInfo;
+ require.config({
+ baseUrl: "js/"
+ });
+ // CacheBust is for dev purpose use false in prod env !
+ var options = {
+ AlwaysPreserveOrder:true,
+ BasePath:"js/",
+ explicit_preloading:false,
+ CacheBust:window.archivaDevMode
+ };
+ $LAB.setGlobalDefaults(options);
+ $LAB
+ .script(buildLoadJsUrl("jquery.tmpl.js")).wait()
+ .script(buildLoadJsUrl("archiva/utils.js")).wait()
+ .script("jquery.i18n.properties-1.0.9.js").wait()
+ .script(buildLoadJsUrl("archiva/i18nload.js")).wait()
+ .script("jquery.cookie.1.0.0.js").wait()
+ .script(buildLoadJsUrl("knockout-debug.js")).wait()
+ .script("jquery-ui-1.8.16.custom.min.js").wait()
+ .script(buildLoadJsUrl("jquery.validate.js")).wait()
+ .script("jquery.json-2.3.min.js").wait()
+ .script(buildLoadJsUrl("archiva/main-tmpl.js")).wait()
+ .script(buildLoadJsUrl("archiva/repositories.js")).wait()
+ .script(buildLoadJsUrl("archiva/network-proxies.js")).wait()
+ .script(buildLoadJsUrl("archiva/proxy-connectors.js")).wait()
+ .script(buildLoadJsUrl("redback/operation.js")).wait()
+ .script(buildLoadJsUrl("redback/redback-tmpl.js")).wait()
+ .script(buildLoadJsUrl("bootstrap.js"))
+ .script(buildLoadJsUrl("knockout.simpleGrid.js"))
+ //.script("knockout.mapping-latest.debug.js")
+ .script(buildLoadJsUrl("redback/user.js")).wait()
+ .script(buildLoadJsUrl("redback/users.js")).wait()
+ .script(buildLoadJsUrl("redback/redback.js")).wait()
+ .script(buildLoadJsUrl("redback/register.js")).wait()
+ .script(buildLoadJsUrl("redback/permission.js")).wait()
+ .script(buildLoadJsUrl("redback/resource.js")).wait()
+ .script(buildLoadJsUrl("redback/roles.js")).wait()
+ .script(buildLoadJsUrl("archiva/main.js"));
+ }
+ })
+</script>
+
+</html>
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index-dev.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index-dev.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision