Repository: tomee Updated Branches: refs/heads/develop 00c63f630 -> 9a9efa35b
web app removed Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9a9efa35 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9a9efa35 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9a9efa35 Branch: refs/heads/develop Commit: 9a9efa35b645a92f640c1cf32a3fba9aef1a5e72 Parents: 00c63f6 Author: tveronezi <tveronezi@sweethome> Authored: Mon Jan 19 16:21:23 2015 -0500 Committer: tveronezi <tveronezi@sweethome> Committed: Mon Jan 19 16:21:23 2015 -0500 ---------------------------------------------------------------------- tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy | 3 +-- .../src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy | 1 - tomee/tomee-deb/src/main/resources/control/postinst.sh | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/9a9efa35/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy ---------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy b/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy index cf5aa9c..f86a5ce 100644 --- a/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy +++ b/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy @@ -106,8 +106,7 @@ class SetupCommand { ant.chmod(dir: "${workDir}/apache-tomcat-${tomcatVersion}/bin", perm: 'u+x', includes: '**/*.sh') ant.delete(dir: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/examples") - ant.delete(file: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee/META-INF/LICENSE") - ant.delete(file: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee/META-INF/NOTICE") + ant.delete(dir: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee") } } http://git-wip-us.apache.org/repos/asf/tomee/blob/9a9efa35/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy ---------------------------------------------------------------------- diff --git a/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy b/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy index d16ca89..fa5992e 100644 --- a/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy +++ b/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy @@ -113,7 +113,6 @@ class PackageBuilder { .buildDataDir() .move('lib', "usr/share/tomee-${classifier}/lib") .eachFileRecurse("usr/share/tomee-${classifier}/lib", recurse) - .move('webapps/tomee', "usr/share/tomee-${classifier}/extras/tomee") .move('endorsed', "usr/share/tomee-${classifier}/endorsed") .move('bin', "usr/share/tomee-${classifier}/bin") .move('conf', "etc/tomee-${classifier}") http://git-wip-us.apache.org/repos/asf/tomee/blob/9a9efa35/tomee/tomee-deb/src/main/resources/control/postinst.sh ---------------------------------------------------------------------- diff --git a/tomee/tomee-deb/src/main/resources/control/postinst.sh b/tomee/tomee-deb/src/main/resources/control/postinst.sh index d5dfbe6..6039ba5 100644 --- a/tomee/tomee-deb/src/main/resources/control/postinst.sh +++ b/tomee/tomee-deb/src/main/resources/control/postinst.sh @@ -30,7 +30,6 @@ ln -sf /etc/tomee-${classifier}/conf.d /var/lib/tomee-${classifier}/conf/conf.d if [ ! -d /var/lib/tomee-${classifier}-user-data ] ; then mkdir -p /var/lib/tomee-${classifier}-user-data/temp mkdir -p /var/lib/tomee-${classifier}-user-data/webapps - ln -sf /usr/share/tomee-${classifier}/extras/tomee /var/lib/tomee-${classifier}-user-data/webapps/tomee fi ln -sf /var/lib/tomee-${classifier}-user-data/temp /var/lib/tomee-${classifier}/temp ln -sf /var/lib/tomee-${classifier}-user-data/webapps /var/lib/tomee-${classifier}/webapps