diff --git a/.gitignore b/.gitignore index 87a279ad7..f45750910 100644 --- a/.gitignore +++ b/.gitignore @@ -8,11 +8,11 @@ test-output /.metadata .cache derby.log -/querydsl-devops/.tmp -/querydsl-devops/.librarian -/querydsl-devops/.vagrant -/querydsl-devops/Puppetfile.lock -/querydsl-devops/modules -/querydsl-devops/*.rpm.zip -/querydsl-devops/**/*.semaphore -/querydsl-devops/test-connection/.lein-repl-history +/devops/.tmp +/devops/.librarian +/devops/.vagrant +/devops/Puppetfile.lock +/devops/modules +/devops/*.rpm.zip +/devops/**/*.semaphore +/devops/test-connection/.lein-repl-history diff --git a/README.md b/README.md index c2621b840..8a2669db3 100644 --- a/README.md +++ b/README.md @@ -39,12 +39,12 @@ For running tests, a Vagrant/Puppet setup is provided. It is based on Ubuntu 12. You will need to install [VirtualBox], [Puppet], [Vagrant], the [vagrant-vbguest] plugin and [librarian-puppet]. You will also need to download the Oracle XE 11g installer file (```oracle-xe-11.2.0-1.0.x86_64.rpm.zip```) manually and -place it in the ```querydsl-devops``` directory. +place it in the ```devops``` directory. To launch the virtual machine: ``` -$> cd querydsl-devops +$> cd devops devops$> librarian-puppet install devops$> vagrant up ``` diff --git a/querydsl-devops/Puppetfile b/devops/Puppetfile similarity index 100% rename from querydsl-devops/Puppetfile rename to devops/Puppetfile diff --git a/querydsl-devops/Vagrantfile b/devops/Vagrantfile similarity index 100% rename from querydsl-devops/Vagrantfile rename to devops/Vagrantfile diff --git a/querydsl-devops/manifests/site.pp b/devops/manifests/site.pp similarity index 100% rename from querydsl-devops/manifests/site.pp rename to devops/manifests/site.pp diff --git a/querydsl-devops/sql-snippets/mysql.sql b/devops/sql-snippets/mysql.sql similarity index 100% rename from querydsl-devops/sql-snippets/mysql.sql rename to devops/sql-snippets/mysql.sql diff --git a/querydsl-devops/sql-snippets/oracle.sql b/devops/sql-snippets/oracle.sql similarity index 62% rename from querydsl-devops/sql-snippets/oracle.sql rename to devops/sql-snippets/oracle.sql index 303b2a358..44befd90c 100644 --- a/querydsl-devops/sql-snippets/oracle.sql +++ b/devops/sql-snippets/oracle.sql @@ -1,4 +1,5 @@ CREATE USER querydsl IDENTIFIED BY querydsl; GRANT CREATE SESSION TO querydsl; GRANT CREATE TABLE TO querydsl; -GRANT unlimited tablespace TO querydsl; \ No newline at end of file +GRANT unlimited tablespace TO querydsl; +GRANT resource TO querydsl; diff --git a/querydsl-devops/test-connection/project.clj b/devops/test-connection/project.clj similarity index 100% rename from querydsl-devops/test-connection/project.clj rename to devops/test-connection/project.clj diff --git a/querydsl-devops/test-connection/src/test_connection/core.clj b/devops/test-connection/src/test_connection/core.clj similarity index 100% rename from querydsl-devops/test-connection/src/test_connection/core.clj rename to devops/test-connection/src/test_connection/core.clj