Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 21:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #96)Improve Jetty embedding process.

Browse Source
This commit is contained in:
takezoe
2013-09-27 02:43:22 +09:00
parent 38c7e3cdf8
commit e6ad069509
12 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
build.xml
View File

@@ -1,15 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<project name="example" default="rename" basedir="."> <project name="example" default="rename" basedir=".">
<property name="boot.classes.dir" value="boot_classes"/>
<property name="target.dir" value="target"/> <property name="target.dir" value="target"/>
<property name="embed.classes.dir" value="${target.dir}/embed-classes"/>
<property name="jetty.dir" value="embed-jetty"/>
<property name="scala.version" value="2.10"/> <property name="scala.version" value="2.10"/>
<property name="gitbucket.version" value="0.0.1"/> <property name="gitbucket.version" value="0.0.1"/>
<property name="jetty.version" value="8.1.8.v20121106"/> <property name="jetty.version" value="8.1.8.v20121106"/>
<property name="servlet.version" value="3.0.0.v201112011016"/> <property name="servlet.version" value="3.0.0.v201112011016"/>
<target name="clean"> <target name="clean">
<delete dir="${boot.classes.dir}"/> <delete dir="${embed.classes.dir}"/>
<delete file="${target.dir}/scala-${scala.version}/gitbucket.war"/>
</target> </target>
<target name="war" depends="clean"> <target name="war" depends="clean">
@@ -17,20 +19,21 @@
</target> </target>
<target name="embed" depends="war"> <target name="embed" depends="war">
<mkdir dir="${boot.classes.dir}"/> <mkdir dir="${embed.classes.dir}"/>
<unzip dest="${boot.classes.dir}" src="${target.dir}/webapp/WEB-INF/lib/javax.servlet-${servlet.version}.jar" />
<unzip dest="${boot.classes.dir}" src="${target.dir}/webapp/WEB-INF/lib/jetty-continuation-${jetty.version}.jar" /> <unzip dest="${embed.classes.dir}" src="${jetty.dir}/javax.servlet-${servlet.version}.jar" />
<unzip dest="${boot.classes.dir}" src="${target.dir}/webapp/WEB-INF/lib/jetty-http-${jetty.version}.jar" /> <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-continuation-${jetty.version}.jar" />
<unzip dest="${boot.classes.dir}" src="${target.dir}/webapp/WEB-INF/lib/jetty-io-${jetty.version}.jar" /> <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-http-${jetty.version}.jar" />
<unzip dest="${boot.classes.dir}" src="${target.dir}/webapp/WEB-INF/lib/jetty-security-${jetty.version}.jar" /> <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-io-${jetty.version}.jar" />
<unzip dest="${boot.classes.dir}" src="${target.dir}/webapp/WEB-INF/lib/jetty-server-${jetty.version}.jar" /> <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-security-${jetty.version}.jar" />
<unzip dest="${boot.classes.dir}" src="${target.dir}/webapp/WEB-INF/lib/jetty-servlet-${jetty.version}.jar" /> <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-server-${jetty.version}.jar" />
<unzip dest="${boot.classes.dir}" src="${target.dir}/webapp/WEB-INF/lib/jetty-util-${jetty.version}.jar" /> <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-servlet-${jetty.version}.jar" />
<unzip dest="${boot.classes.dir}" src="${target.dir}/webapp/WEB-INF/lib/jetty-webapp-${jetty.version}.jar" /> <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-util-${jetty.version}.jar" />
<unzip dest="${boot.classes.dir}" src="${target.dir}/webapp/WEB-INF/lib/jetty-xml-${jetty.version}.jar" /> <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-webapp-${jetty.version}.jar" />
<unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-xml-${jetty.version}.jar" />
<zip destfile="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war" <zip destfile="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
basedir="${boot.classes.dir}" basedir="${embed.classes.dir}"
update = "true" update = "true"
includes="javax/**,org/**"/> includes="javax/**,org/**"/>

BIN
embed-jetty/javax.servlet-3.0.0.v201112011016.jar Normal file
View File

Binary file not shown.

BIN
embed-jetty/jetty-continuation-8.1.8.v20121106.jar Normal file
View File

Binary file not shown.

BIN
embed-jetty/jetty-http-8.1.8.v20121106.jar Normal file
View File

Binary file not shown.

BIN
embed-jetty/jetty-io-8.1.8.v20121106.jar Normal file
View File

Binary file not shown.

BIN
embed-jetty/jetty-security-8.1.8.v20121106.jar Normal file
View File

Binary file not shown.

BIN
embed-jetty/jetty-server-8.1.8.v20121106.jar Normal file
View File

Binary file not shown.

BIN
embed-jetty/jetty-servlet-8.1.8.v20121106.jar Normal file
View File

Binary file not shown.

BIN
embed-jetty/jetty-util-8.1.8.v20121106.jar Normal file
View File

Binary file not shown.

BIN
embed-jetty/jetty-webapp-8.1.8.v20121106.jar Normal file
View File

Binary file not shown.

BIN
embed-jetty/jetty-xml-8.1.8.v20121106.jar Normal file
View File

Binary file not shown.

4
project/build.scala
View File

@@ -41,8 +41,8 @@ object MyBuild extends Build {
"com.novell.ldap" % "jldap" % "2009-10-07", "com.novell.ldap" % "jldap" % "2009-10-07",
"com.h2database" % "h2" % "1.3.171", "com.h2database" % "h2" % "1.3.171",
"ch.qos.logback" % "logback-classic" % "1.0.6" % "runtime", "ch.qos.logback" % "logback-classic" % "1.0.6" % "runtime",
"org.eclipse.jetty" % "jetty-webapp" % "8.1.8.v20121106" % "compile;container", "org.eclipse.jetty" % "jetty-webapp" % "8.1.8.v20121106" % "container;provided",
"org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "compile;container;provided;test" artifacts (Artifact("javax.servlet", "jar", "jar")) "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts (Artifact("javax.servlet", "jar", "jar"))
), ),
EclipseKeys.withSource := true, EclipseKeys.withSource := true,
packageOptions += Package.MainClass("JettyLauncher") packageOptions += Package.MainClass("JettyLauncher")