You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by es...@apache.org on 2011/10/14 16:08:04 UTC
svn commit: r1183365 - in /esme/trunk/server: Procfile build.sbt
project/plugins/build.sbt src/main/scala/JettyLauncher.scala
Author: esjewett
Date: Fri Oct 14 14:08:04 2011
New Revision: 1183365
URL: http://svn.apache.org/viewvc?rev=1183365&view=rev
Log:
Heroku configuration
Added:
esme/trunk/server/Procfile
esme/trunk/server/src/main/scala/JettyLauncher.scala
Modified:
esme/trunk/server/build.sbt
esme/trunk/server/project/plugins/build.sbt
Added: esme/trunk/server/Procfile
URL: http://svn.apache.org/viewvc/esme/trunk/server/Procfile?rev=1183365&view=auto
==============================================================================
--- esme/trunk/server/Procfile (added)
+++ esme/trunk/server/Procfile Fri Oct 14 14:08:04 2011
@@ -0,0 +1 @@
+web: target/start JettyLauncher
\ No newline at end of file
Modified: esme/trunk/server/build.sbt
URL: http://svn.apache.org/viewvc/esme/trunk/server/build.sbt?rev=1183365&r1=1183364&r2=1183365&view=diff
==============================================================================
--- esme/trunk/server/build.sbt (original)
+++ esme/trunk/server/build.sbt Fri Oct 14 14:08:04 2011
@@ -1,3 +1,7 @@
+import com.typesafe.startscript.StartScriptPlugin
+
+seq(StartScriptPlugin.startScriptForClassesSettings: _*)
+
name := "Apache Enterprise Social Messaging Environment (ESME)"
version := "1.4"
@@ -38,7 +42,9 @@ libraryDependencies ++= {
"org.apache.lucene" % "lucene-snowball" % luceneVersion % "compile->default",
"commons-httpclient" % "commons-httpclient" % "3.1" % "compile->default",
"org.apache.derby" % "derby" % "10.5.3.0_1" % "compile->default",
- "org.mortbay.jetty" % "jetty" % "[6.1.6,)" % "container",
+ "org.mortbay.jetty" % "jetty" % "[6.1.6,)" % "container",
+ "org.eclipse.jetty" % "jetty-server" % "7.3.1.v20110307" % "compile->default",
+ "org.eclipse.jetty" % "jetty-servlet" % "7.3.1.v20110307" % "compile->default",
"junit" % "junit" % "3.8.1" % "test->default",
"junit" % "junit" % "4.4" % "test->default",
"log4j" % "log4j" % "1.2.16" % "compile->default",
@@ -58,7 +64,7 @@ resolvers += "Compass Repository" at "ht
resolvers += "Twitter Repository" at "http://maven.twttr.com"
-resolvers += "Java.net Maven2 Repository" at "http://download.java.net/maven/2/"
+resolvers += "Java.net Maven2 Repository" at "http://download.java.net/maven/2/"
// Execute tests in the current project serially.
// Tests from other projects may still run concurrently.
Modified: esme/trunk/server/project/plugins/build.sbt
URL: http://svn.apache.org/viewvc/esme/trunk/server/project/plugins/build.sbt?rev=1183365&r1=1183364&r2=1183365&view=diff
==============================================================================
--- esme/trunk/server/project/plugins/build.sbt (original)
+++ esme/trunk/server/project/plugins/build.sbt Fri Oct 14 14:08:04 2011
@@ -1,6 +1,10 @@
resolvers ++= Seq(
"Web plugin repo" at "http://siasia.github.com/maven2",
Resolver.url("Typesafe repository", new java.net.URL("http://typesafe.artifactoryonline.com/typesafe/ivy-releases/"))(Resolver.defaultIvyPatterns)
-)
+)
-libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-web-plugin" % (v+"-0.2.4"))
\ No newline at end of file
+libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-web-plugin" % (v+"-0.2.4"))
+
+resolvers += Classpaths.typesafeResolver
+
+addSbtPlugin("com.typesafe.startscript" % "xsbt-start-script-plugin" % "0.3.0")
\ No newline at end of file
Added: esme/trunk/server/src/main/scala/JettyLauncher.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/JettyLauncher.scala?rev=1183365&view=auto
==============================================================================
--- esme/trunk/server/src/main/scala/JettyLauncher.scala (added)
+++ esme/trunk/server/src/main/scala/JettyLauncher.scala Fri Oct 14 14:08:04 2011
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ import org.eclipse.jetty.server.Server
+ import org.eclipse.jetty.servlet.{DefaultServlet, ServletContextHandler}
+ import org.eclipse.jetty.server.nio.SelectChannelConnector
+ import net.liftweb.http.LiftFilter
+
+ object JettyLauncher extends Application {
+ val port = if(System.getenv("PORT") != null) System.getenv("PORT").toInt else 8080
+ val server = new Server
+ val scc = new SelectChannelConnector
+ scc.setPort(port)
+ server.setConnectors(Array(scc))
+
+ val context = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS)
+ context.addServlet(classOf[DefaultServlet], "/");
+ context.addFilter(classOf[LiftFilter], "/*", 0)
+ context.setResourceBase("src/main/webapp")
+
+ server.start
+ server.join
+ }
+
+