aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2012-01-17 12:28:48 +0100
committerSimon Brandhof <simon.brandhof@gmail.com>2012-01-17 12:28:48 +0100
commit7009396badff62eef6542983655c06c021c9aa8b (patch)
treec24c3312c44bb0a7233f105dea12298b7eff3410
parentd231aef15a9f8bf4faabac179b73f33731a64c06 (diff)
downloadsonarqube-7009396badff62eef6542983655c06c021c9aa8b.tar.gz
sonarqube-7009396badff62eef6542983655c06c021c9aa8b.zip
Fix development mode of webapp + remove useless files
-rw-r--r--sonar-server/pom.xml6
-rw-r--r--sonar-server/src/main/webapp/Rakefile10
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/INDEX2
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/Rakefile20
4 files changed, 1 insertions, 37 deletions
diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml
index 88f57bd6540..bcc816f2a72 100644
--- a/sonar-server/pom.xml
+++ b/sonar-server/pom.xml
@@ -303,11 +303,7 @@
<artifactId>maven-war-plugin</artifactId>
<configuration>
<packagingExcludes>
- **/*.log,*.iml,WEB-INF/script/,WEB-INF/test/,
- javascripts/application*.js,javascripts/prototype*.js,javascripts/scriptaculous*.js,javascripts/tablekit*.js,javascripts/tablekit*.js,
- javascripts/prototip*.js,javascripts/dashboard*.js,javascripts/protovis.js,javascripts/protovis-min.js,javascripts/protovis-sonar*.js,
- javascripts/protovis-msie-min.js,javascripts/duplication*.js,protovis-msie-min.js,resource*.js,
- stylesheets/yui-2.6.0*.css,stylesheets/calendar*.css,stylesheets/style*.css,stylesheets/sonar-colorizer*.css,stylesheets/dashboard*.css
+ **/*.log,*.iml,WEB-INF/script/,WEB-INF/test/,javascripts/*-min.js,javascripts/calendar/*-min.js,stylesheets/*-min.css
</packagingExcludes>
<warSourceExcludes>
**/*
diff --git a/sonar-server/src/main/webapp/Rakefile b/sonar-server/src/main/webapp/Rakefile
deleted file mode 100644
index 3bb0e8592a4..00000000000
--- a/sonar-server/src/main/webapp/Rakefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
-
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-require 'tasks/rails'
diff --git a/sonar-server/src/main/webapp/WEB-INF/INDEX b/sonar-server/src/main/webapp/WEB-INF/INDEX
deleted file mode 100644
index fe41f5cc24d..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/INDEX
+++ /dev/null
@@ -1,2 +0,0 @@
-Use this README file to introduce your application and point to useful places in the API for learning more.
-Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.
diff --git a/sonar-server/src/main/webapp/WEB-INF/Rakefile b/sonar-server/src/main/webapp/WEB-INF/Rakefile
deleted file mode 100644
index 0bf0264458b..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/Rakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
-
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-require 'tasks/rails'
-
-Rake::RDocTask.new(:rdoc) do |rdoc|
- rdoc.rdoc_files.add(['app/controllers/api/*.rb', 'INDEX'])
-
- rdoc.main = "INDEX"
- rdoc.title = "Sonar API"
- rdoc.template = 'lib/sonar_rdoc_template'
- rdoc.rdoc_dir = 'doc' # rdoc output folder
- rdoc.options << '--inline-source' << '--charset=UTF-8'
-end