From 2aa6c322d9d536574e31f547e92ac3f40123ac0d Mon Sep 17 00:00:00 2001 From: Edd Grant Date: Wed, 22 Aug 2012 22:02:45 +0100 Subject: [PATCH 1/3] Adding empty db directories which seem to be required in order to allow maven to build the planet-business module. Note these are present in the SVN repo so I'm wondering if they were removed when the repo was moved to GitHub as Git doesn't allow empty directories (hence the empty .gitignore file in each directory) --- .gitignore | 1 + planet-business/src/main/resources/sql/db2/.gitignore | 0 planet-business/src/main/resources/sql/derby/.gitignore | 0 planet-business/src/main/resources/sql/hsqldb/.gitignore | 0 planet-business/src/main/resources/sql/ignored-by-git | 0 planet-business/src/main/resources/sql/mssql/.gitignore | 0 planet-business/src/main/resources/sql/mysql/.gitignore | 0 planet-business/src/main/resources/sql/oracle/.gitignore | 0 planet-business/src/main/resources/sql/postgresql/.gitignore | 0 9 files changed, 1 insertion(+) create mode 100644 .gitignore create mode 100644 planet-business/src/main/resources/sql/db2/.gitignore create mode 100644 planet-business/src/main/resources/sql/derby/.gitignore create mode 100644 planet-business/src/main/resources/sql/hsqldb/.gitignore create mode 100644 planet-business/src/main/resources/sql/ignored-by-git create mode 100644 planet-business/src/main/resources/sql/mssql/.gitignore create mode 100644 planet-business/src/main/resources/sql/mysql/.gitignore create mode 100644 planet-business/src/main/resources/sql/oracle/.gitignore create mode 100644 planet-business/src/main/resources/sql/postgresql/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..2f7896d1d1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +target/ diff --git a/planet-business/src/main/resources/sql/db2/.gitignore b/planet-business/src/main/resources/sql/db2/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/planet-business/src/main/resources/sql/derby/.gitignore b/planet-business/src/main/resources/sql/derby/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/planet-business/src/main/resources/sql/hsqldb/.gitignore b/planet-business/src/main/resources/sql/hsqldb/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/planet-business/src/main/resources/sql/ignored-by-git b/planet-business/src/main/resources/sql/ignored-by-git new file mode 100644 index 0000000000..e69de29bb2 diff --git a/planet-business/src/main/resources/sql/mssql/.gitignore b/planet-business/src/main/resources/sql/mssql/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/planet-business/src/main/resources/sql/mysql/.gitignore b/planet-business/src/main/resources/sql/mysql/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/planet-business/src/main/resources/sql/oracle/.gitignore b/planet-business/src/main/resources/sql/oracle/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/planet-business/src/main/resources/sql/postgresql/.gitignore b/planet-business/src/main/resources/sql/postgresql/.gitignore new file mode 100644 index 0000000000..e69de29bb2 From 9128bedfa74cbd13935b9833ac2a81ace8a2505e Mon Sep 17 00:00:00 2001 From: Edd Grant Date: Wed, 22 Aug 2012 22:33:32 +0100 Subject: [PATCH 2/3] Support users who have a non-standard local Maven repo location by locating it through the ${settings.localRepository} property. --- planet-business/pom.xml | 2 +- weblogger-business/pom.xml | 2 +- weblogger-web/pom.xml | 2 +- weblogger-webapp/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/planet-business/pom.xml b/planet-business/pom.xml index 5e70e4bc28..5a094db392 100644 --- a/planet-business/pom.xml +++ b/planet-business/pom.xml @@ -197,7 +197,7 @@ once - -javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar" + -javaagent:"${settings.localRepository}/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar" diff --git a/weblogger-business/pom.xml b/weblogger-business/pom.xml index cbb402f9cd..f415fee644 100644 --- a/weblogger-business/pom.xml +++ b/weblogger-business/pom.xml @@ -236,7 +236,7 @@ once - -javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar" + -javaagent:"${settings.localRepository}/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar" diff --git a/weblogger-web/pom.xml b/weblogger-web/pom.xml index 8fc09f1e90..c0b8ea616f 100644 --- a/weblogger-web/pom.xml +++ b/weblogger-web/pom.xml @@ -522,7 +522,7 @@ once - -javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar" + -javaagent:"${settings.localRepository}/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar" diff --git a/weblogger-webapp/pom.xml b/weblogger-webapp/pom.xml index 83f684887e..537ad4789a 100644 --- a/weblogger-webapp/pom.xml +++ b/weblogger-webapp/pom.xml @@ -183,7 +183,7 @@ once - -javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar" + -javaagent:"${settings.localRepository}/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar" From 9ad093facf5e8036893dcec11cc8dc7e9428ff4f Mon Sep 17 00:00:00 2001 From: Edd Grant Date: Thu, 23 Aug 2012 09:15:27 +0100 Subject: [PATCH 3/3] Adding empty db directories which seem to be required in order to allow maven to build the weblogger-business module. Note these are present in the SVN repo so I'm wondering if they were removed when the repo was moved to GitHub as Git doesn't allow empty directories (hence the empty .gitignore file in each directory) Also updated main .gitignore to ignore weblogger-web/roller-startup.log which is produced by Maven at build time. --- .gitignore | 1 + weblogger-business/src/main/resources/sql/db2/.gitignore | 0 weblogger-business/src/main/resources/sql/derby/.gitignore | 0 weblogger-business/src/main/resources/sql/hsqldb/.gitignore | 0 weblogger-business/src/main/resources/sql/mssql/.gitignore | 0 weblogger-business/src/main/resources/sql/mysql/.gitignore | 0 weblogger-business/src/main/resources/sql/oracle/.gitignore | 0 weblogger-business/src/main/resources/sql/postgresql/.gitignore | 0 8 files changed, 1 insertion(+) create mode 100644 weblogger-business/src/main/resources/sql/db2/.gitignore create mode 100644 weblogger-business/src/main/resources/sql/derby/.gitignore create mode 100644 weblogger-business/src/main/resources/sql/hsqldb/.gitignore create mode 100644 weblogger-business/src/main/resources/sql/mssql/.gitignore create mode 100644 weblogger-business/src/main/resources/sql/mysql/.gitignore create mode 100644 weblogger-business/src/main/resources/sql/oracle/.gitignore create mode 100644 weblogger-business/src/main/resources/sql/postgresql/.gitignore diff --git a/.gitignore b/.gitignore index 2f7896d1d1..927271c9ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ target/ +weblogger-web/roller-startup.log diff --git a/weblogger-business/src/main/resources/sql/db2/.gitignore b/weblogger-business/src/main/resources/sql/db2/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/weblogger-business/src/main/resources/sql/derby/.gitignore b/weblogger-business/src/main/resources/sql/derby/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/weblogger-business/src/main/resources/sql/hsqldb/.gitignore b/weblogger-business/src/main/resources/sql/hsqldb/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/weblogger-business/src/main/resources/sql/mssql/.gitignore b/weblogger-business/src/main/resources/sql/mssql/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/weblogger-business/src/main/resources/sql/mysql/.gitignore b/weblogger-business/src/main/resources/sql/mysql/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/weblogger-business/src/main/resources/sql/oracle/.gitignore b/weblogger-business/src/main/resources/sql/oracle/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/weblogger-business/src/main/resources/sql/postgresql/.gitignore b/weblogger-business/src/main/resources/sql/postgresql/.gitignore new file mode 100644 index 0000000000..e69de29bb2