[Tynstep-svn] r223 - in trunk/step: . step-parent step-server step-server/src/main/java/com/tyndalehouse/step/server step-server/src/main/resources step-web/src/main/webapp step-web/src/main/webapp/WEB-INF
ChrisBurrell at crosswire.org
ChrisBurrell at crosswire.org
Tue Mar 22 03:16:44 MST 2011
Author: ChrisBurrell
Date: 2011-03-22 03:16:44 -0700 (Tue, 22 Mar 2011)
New Revision: 223
Added:
trunk/step/step-web/src/main/webapp/index.html
Removed:
trunk/step/step-web/src/main/webapp/WEB-INF/mvc-config.xml
trunk/step/step-web/src/main/webapp/WEB-INF/step-rest-servlet.xml
trunk/step/step-web/src/main/webapp/index.jsp
Modified:
trunk/step/README.txt
trunk/step/pom.xml
trunk/step/step-parent/pom.xml
trunk/step/step-server/pom.xml
trunk/step/step-server/src/main/java/com/tyndalehouse/step/server/StepServer.java
trunk/step/step-server/src/main/resources/jetty.xml
trunk/step/step-web/src/main/webapp/WEB-INF/web.xml
Log:
fixing the start up script for step-server
Modified: trunk/step/README.txt
===================================================================
--- trunk/step/README.txt 2011-03-21 18:24:07 UTC (rev 222)
+++ trunk/step/README.txt 2011-03-22 10:16:44 UTC (rev 223)
@@ -0,0 +1 @@
+When assembled, this file is used as a placeholder for an empty directory to ensure jetty works correctly.
Modified: trunk/step/pom.xml
===================================================================
--- trunk/step/pom.xml 2011-03-21 18:24:07 UTC (rev 222)
+++ trunk/step/pom.xml 2011-03-22 10:16:44 UTC (rev 223)
@@ -40,4 +40,34 @@
<module>step-web</module>
<module>step-server</module>
</modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <final-name>step-standalone-${project.version}</final-name>
+ <descriptors>
+ <descriptor>standalone.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifest>
+ <mainClass>com.tyndalehouse.step.server.StepServer</mainClass>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <id>packaging-application</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/step/step-parent/pom.xml
===================================================================
--- trunk/step/step-parent/pom.xml 2011-03-21 18:24:07 UTC (rev 222)
+++ trunk/step/step-parent/pom.xml 2011-03-22 10:16:44 UTC (rev 223)
@@ -34,7 +34,7 @@
<guice.version>2.1.8</guice.version>
<guice-servlet.version>2.9.1</guice-servlet.version>
<opencsv.version>2.1</opencsv.version>
- <jetty.version>6.1.22</jetty.version>
+ <jetty.version>6.1.26</jetty.version>
<!-- <ormlite.version>4.6</ormlite.version> -->
<ebean.version>2.7.2</ebean.version>
<lucene.version>3.0.3</lucene.version>
@@ -64,6 +64,15 @@
<url>https://crosswire.org/svn/tynstep/trunk/</url>
</scm>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>crosswire.mvn</id>
+ <url>http://crosswire.org/mvn/content/repositories/snapshots/</url>
+ <uniqueVersion>true</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+
+
<dependencyManagement>
<dependencies>
<dependency>
Modified: trunk/step/step-server/pom.xml
===================================================================
--- trunk/step/step-server/pom.xml 2011-03-21 18:24:07 UTC (rev 222)
+++ trunk/step/step-server/pom.xml 2011-03-22 10:16:44 UTC (rev 223)
@@ -33,13 +33,14 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
<configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
<archive>
<manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
<mainClass>com.tyndalehouse.step.server.StepServer</mainClass>
</manifest>
</archive>
@@ -47,4 +48,4 @@
</plugin>
</plugins>
</build>
-</project>
+ </project>
Modified: trunk/step/step-server/src/main/java/com/tyndalehouse/step/server/StepServer.java
===================================================================
--- trunk/step/step-server/src/main/java/com/tyndalehouse/step/server/StepServer.java 2011-03-21 18:24:07 UTC (rev 222)
+++ trunk/step/step-server/src/main/java/com/tyndalehouse/step/server/StepServer.java 2011-03-22 10:16:44 UTC (rev 223)
@@ -1,6 +1,7 @@
package com.tyndalehouse.step.server;
import java.awt.Desktop;
+import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URL;
@@ -37,11 +38,11 @@
final Server jetty = new Server();
final ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
final URL jettyConfig = currentClassLoader.getResource("jetty.xml");
- final URL warURL = currentClassLoader.getResource("war");
// configure jetty
XmlConfiguration configuration;
try {
+ final URL warURL = new File("step-web").toURI().toURL();
configuration = new XmlConfiguration(jettyConfig);
configuration.configure(jetty);
@@ -70,7 +71,7 @@
try {
final StepServer ms = new StepServer();
ms.start();
- Desktop.getDesktop().browse(new URI("http://localhost:8080/step-web"));
+ Desktop.getDesktop().browse(new URI("http://localhost:8989/step-web/index.html"));
} catch (final Exception e) {
LOGGER.debug(e.getMessage(), e);
Modified: trunk/step/step-server/src/main/resources/jetty.xml
===================================================================
--- trunk/step/step-server/src/main/resources/jetty.xml 2011-03-21 18:24:07 UTC (rev 222)
+++ trunk/step/step-server/src/main/resources/jetty.xml 2011-03-22 10:16:44 UTC (rev 223)
@@ -36,7 +36,7 @@
<Call name="addConnector">
<Arg>
<New class="org.mortbay.jetty.nio.SelectChannelConnector">
- <Set name="port"><SystemProperty name="jetty.port" default="8080"/></Set>
+ <Set name="port"><SystemProperty name="jetty.port" default="8989"/></Set>
<Set name="maxIdleTime">30000</Set>
<Set name="Acceptors">1</Set>
<Set name="statsOn">false</Set>
Deleted: trunk/step/step-web/src/main/webapp/WEB-INF/mvc-config.xml
===================================================================
--- trunk/step/step-web/src/main/webapp/WEB-INF/mvc-config.xml 2011-03-21 18:24:07 UTC (rev 222)
+++ trunk/step/step-web/src/main/webapp/WEB-INF/mvc-config.xml 2011-03-22 10:16:44 UTC (rev 223)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:mvc="http://www.springframework.org/schema/mvc"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
-
- <!-- Configures the @Controller programming model -->
- <mvc:annotation-driven />
-
- <!-- Forwards requests to the "/" resource to the "welcome" view -->
- <mvc:view-controller path="/" view-name="welcome"/>
-
- <!-- Configures Handler Interceptors -->
- <mvc:interceptors>
- <!-- Changes the locale when a 'locale' request parameter is sent; e.g. /?locale=de -->
- <bean class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor" />
- </mvc:interceptors>
-
- <!-- Saves a locale change using a cookie -->
- <bean id="localeResolver" class="org.springframework.web.servlet.i18n.CookieLocaleResolver" />
-
- <!-- Handle exceptions neatly -->
- <bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
- <property name="mediaTypes">
- <map>
- <entry key="json" value="application/json" />
- </map>
- </property>
- <property name="defaultContentType" value="application/json" />
- <property name="defaultViews">
- <list>
- <bean name="MappingJacksonJsonView" class="org.springframework.web.servlet.view.json.MappingJacksonJsonView" />
- </list>
- </property>
- </bean>
-
- <bean id="exceptionResolver" class="com.tyndalehouse.step.rest.JsonExceptionResolver" />
-
-</beans>
Deleted: trunk/step/step-web/src/main/webapp/WEB-INF/step-rest-servlet.xml
===================================================================
--- trunk/step/step-web/src/main/webapp/WEB-INF/step-rest-servlet.xml 2011-03-21 18:24:07 UTC (rev 222)
+++ trunk/step/step-web/src/main/webapp/WEB-INF/step-rest-servlet.xml 2011-03-22 10:16:44 UTC (rev 223)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-
- <context:component-scan base-package="com.tyndalehouse.step.rest" />
- <context:annotation-config />
-
- <bean id="bibleInformation" class="com.tyndalehouse.step.core.service.impl.BibleInformationServiceImpl">
- </bean>
-
- <bean id="moduleService" class="com.tyndalehouse.step.core.service.impl.ModuleServiceImpl">
- <property name="defaultModuleLexicons">
- <map>
- <entry key="strong:H" value="StrongsHebrew" />
- <entry key="strong:G" value="StrongsGreek" />
- <entry key="robinson:" value="Robinson" />
- </map>
- </property>
- </bean>
-
- <!-- Configures Spring MVC -->
- <import resource="mvc-config.xml" />
-
-
-</beans>
Modified: trunk/step/step-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/step/step-web/src/main/webapp/WEB-INF/web.xml 2011-03-21 18:24:07 UTC (rev 222)
+++ trunk/step/step-web/src/main/webapp/WEB-INF/web.xml 2011-03-22 10:16:44 UTC (rev 223)
@@ -30,6 +30,6 @@
</listener>
<welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.html</welcome-file>
</welcome-file-list>
</web-app>
Copied: trunk/step/step-web/src/main/webapp/index.html (from rev 222, trunk/step/step-web/src/main/webapp/index.jsp)
===================================================================
--- trunk/step/step-web/src/main/webapp/index.html (rev 0)
+++ trunk/step/step-web/src/main/webapp/index.html 2011-03-22 10:16:44 UTC (rev 223)
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML>
+<HEAD>
+
+ <META http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <TITLE>STEP :: Scripture Tools for Every Pastor</TITLE>
+
+ <link rel="stylesheet" type="text/css" href="css/ui-lightness/jquery-ui-1.8.5.custom.css" />
+ <link rel="stylesheet" type="text/css" href="css/initial-layout.css" />
+ <link rel="stylesheet" type="text/css" href="css/initial-fonts.css" />
+ <link rel="stylesheet" type="text/css" href="css/passage.css" />
+
+ <link rel="stylesheet" type="text/css" href="libs/menu/ddsmoothmenu.css" />
+ <link rel="stylesheet" type="text/css" href="libs/menu/ddsmoothmenu-v.css" />
+
+ <script src="js/initLib.js"></script>
+ <script src="libs/timeline_js/timeline-api.js?bundle=true" type="text/javascript"></script>
+ <script src="libs/jquery-1.4.2.min.js" type="text/javascript"></script>
+ <script src="libs/jquery-ui-1.8.5.custom.min.js" type="text/javascript"></script>
+ <script src="libs/jquery-shout.js" type="text/javascript"></script>
+ <script src="libs/menu/ddsmoothmenu.js" type="text/javascript"></script>
+ <script src="libs/cookies/jquery_cookie.js" type="text/javascript"></script>
+
+ <script src="js/util.js" type="text/javascript"></script>
+ <script src="js/passage.js" type="text/javascript"></script>
+ <script src="js/bookmark.js" type="text/javascript"></script>
+ <script src="js/lexicon_definition.js" type="text/javascript"></script>
+ <script src="js/ui_hooks.js" type="text/javascript"></script>
+ <script src="js/timeline.js" type="text/javascript"></script>
+ <script src="js/toolbar_menu.js" type="text/javascript"></script>
+ <script src="js/interlinear_popup.js" type="text/javascript"></script>
+ <script src="js/login.js" type="text/javascript"></script>
+ <script src="js/init.js" type="text/javascript"></script>
+
+</HEAD>
+<body>
+
+<div id="topMenu" class="ddsmoothmenu">
+</div>
+<div class="column">
+ <div class="passageContainer">
+ <div id="leftPaneMenu" class="innerMenus"></div>
+ <div class="passageText ui-widget">
+ <div class="headingContainer">
+ <a class="bookmarkPassageLink">Add a bookmark</a>
+ <input id="leftPassageReference" class="heading editable passageReference" size="30" value="Rom 1:1-7" />
+ <input id="leftPassageBook" class="heading editable passageVersion" size="5" value="KJV" />
+ </div>
+ <div class="passageContent"></div>
+ </div>
+ </div>
+</div>
+
+<div class="bookmarks" id="centerPane">
+ <div class="northBookmark">
+ <img id="topLogo" src="images/step-logo.png" alt="STEP :: Scripture Tools for Every Pastor" />
+ </div>
+ <div id="bookmarkPane" class="bookmarkPane ui-corner-all">
+ <h3 class="ui-helper-reset ui-state-default ui-corner-all">
+ <span class="leftBookmarkArrow ui-icon ui-icon-triangle-1-e"></span>History
+ </h3>
+ <div id="historyDisplayPane" class="bookmarkContents"><br /></div>
+ <h3 id="bookmarkHeader" class="ui-helper-reset ui-state-default ui-corner-all">
+ <span class="leftBookmarkArrow ui-icon ui-icon-triangle-1-e"></span>Bookmarks
+ </h3>
+ <div id="bookmarkDisplayPane" class="bookmarkContents"><br /></div>
+ </div>
+ <div class="logo">
+ <span class="copyright">© Tyndale House</span>
+ </div>
+</div>
+
+
+<div class="column">
+ <div class="passageContainer">
+ <div id="rightPaneMenu" class="innerMenus"></div>
+ <div class="passageText ui-widget">
+ <div class="headingContainer">
+ <a class="bookmarkPassageLink">Add a bookmark</a>
+ <input id="leftPassageReference" class="heading editable passageReference" size="30" value="Jhn 1:1" />
+ <input id="leftPassageBook" class="heading editable passageVersion" size="5" value="ESV" />
+ </div>
+ <div class="passageContent"></div>
+ </div>
+ </div>
+</div>
+
+<div class="interlinearPopup">
+ <input type="text" class="interlinearVersions"/>
+ <div class="interlinearChoices"></div>
+</div>
+<div class="interlinearPopup">
+ <input type="text" class="interlinearVersions"/>
+ <div class="interlinearChoices"></div>
+</div>
+
+
+
+<!--<div id="bottomSection" class="timeline">No modules have yet been loaded.</div>-->
+<!---->
+<!--<div id="loading"><img alt="Loading..." src="images/wait16.gif" />Loading...</div>-->
+<div id="error">A placeholder for error messages</div>
+
+<!-- The about popup -->
+
+<div id="about">
+ <img id="aboutLogo" src="images/step-logo.png" />
+ <h3 id="aboutTitle">STEP :: Scripture Tools for Every Pastor</h3>
+ <p>© Tyndale House 2011</p>
+</div>
+
+<div id="login">
+ <div id="loginPopup">
+ <label for="emailAddress">Email address:</label><input id="emailAddress" type="text" size="20" /><br />
+ <label for="password">Password:</label><input id="password" type="password" size="20" /><br />
+ </div>
+ <div id="registerPopup">
+ <label for="name">Your name</label><input id="name" type="text" size="20" /><br />
+ <label for="country">Country</label><input id="country" type="text" size="20" /><br />
+ </div>
+</div>
+
+</body>
+
+</HTML>
Deleted: trunk/step/step-web/src/main/webapp/index.jsp
===================================================================
--- trunk/step/step-web/src/main/webapp/index.jsp 2011-03-21 18:24:07 UTC (rev 222)
+++ trunk/step/step-web/src/main/webapp/index.jsp 2011-03-22 10:16:44 UTC (rev 223)
@@ -1,125 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML>
-<HEAD>
-
- <META http-equiv="Content-Type" content="text/html; charset=utf-8">
- <TITLE>STEP :: Scripture Tools for Every Pastor</TITLE>
-
- <link rel="stylesheet" type="text/css" href="css/ui-lightness/jquery-ui-1.8.5.custom.css" />
- <link rel="stylesheet" type="text/css" href="css/initial-layout.css" />
- <link rel="stylesheet" type="text/css" href="css/initial-fonts.css" />
- <link rel="stylesheet" type="text/css" href="css/passage.css" />
-
- <link rel="stylesheet" type="text/css" href="libs/menu/ddsmoothmenu.css" />
- <link rel="stylesheet" type="text/css" href="libs/menu/ddsmoothmenu-v.css" />
-
- <script src="js/initLib.js"></script>
- <script src="libs/timeline_js/timeline-api.js?bundle=true" type="text/javascript"></script>
- <script src="libs/jquery-1.4.2.min.js" type="text/javascript"></script>
- <script src="libs/jquery-ui-1.8.5.custom.min.js" type="text/javascript"></script>
- <script src="libs/jquery-shout.js" type="text/javascript"></script>
- <script src="libs/menu/ddsmoothmenu.js" type="text/javascript"></script>
- <script src="libs/cookies/jquery_cookie.js" type="text/javascript"></script>
-
- <script src="js/util.js" type="text/javascript"></script>
- <script src="js/passage.js" type="text/javascript"></script>
- <script src="js/bookmark.js" type="text/javascript"></script>
- <script src="js/lexicon_definition.js" type="text/javascript"></script>
- <script src="js/ui_hooks.js" type="text/javascript"></script>
- <script src="js/timeline.js" type="text/javascript"></script>
- <script src="js/toolbar_menu.js" type="text/javascript"></script>
- <script src="js/interlinear_popup.js" type="text/javascript"></script>
- <script src="js/login.js" type="text/javascript"></script>
- <script src="js/init.js" type="text/javascript"></script>
-
-</HEAD>
-<body>
-
-<div id="topMenu" class="ddsmoothmenu">
-</div>
-<div class="column">
- <div class="passageContainer">
- <div id="leftPaneMenu" class="innerMenus"></div>
- <div class="passageText ui-widget">
- <div class="headingContainer">
- <a class="bookmarkPassageLink">Add a bookmark</a>
- <input id="leftPassageReference" class="heading editable passageReference" size="30" value="Rom 1:1-7" />
- <input id="leftPassageBook" class="heading editable passageVersion" size="5" value="KJV" />
- </div>
- <div class="passageContent"></div>
- </div>
- </div>
-</div>
-
-<div class="bookmarks" id="centerPane">
- <div class="northBookmark">
- <img id="topLogo" src="images/step-logo.png" alt="STEP :: Scripture Tools for Every Pastor" />
- </div>
- <div id="bookmarkPane" class="bookmarkPane ui-corner-all">
- <h3 class="ui-helper-reset ui-state-default ui-corner-all">
- <span class="leftBookmarkArrow ui-icon ui-icon-triangle-1-e"></span>History
- </h3>
- <div id="historyDisplayPane" class="bookmarkContents"><br /></div>
- <h3 id="bookmarkHeader" class="ui-helper-reset ui-state-default ui-corner-all">
- <span class="leftBookmarkArrow ui-icon ui-icon-triangle-1-e"></span>Bookmarks
- </h3>
- <div id="bookmarkDisplayPane" class="bookmarkContents"><br /></div>
- </div>
- <div class="logo">
- <span class="copyright">© Tyndale House</span>
- </div>
-</div>
-
-
-<div class="column">
- <div class="passageContainer">
- <div id="rightPaneMenu" class="innerMenus"></div>
- <div class="passageText ui-widget">
- <div class="headingContainer">
- <a class="bookmarkPassageLink">Add a bookmark</a>
- <input id="leftPassageReference" class="heading editable passageReference" size="30" value="Jhn 1:1" />
- <input id="leftPassageBook" class="heading editable passageVersion" size="5" value="ESV" />
- </div>
- <div class="passageContent"></div>
- </div>
- </div>
-</div>
-
-<div class="interlinearPopup">
- <input type="text" class="interlinearVersions"/>
- <div class="interlinearChoices"></div>
-</div>
-<div class="interlinearPopup">
- <input type="text" class="interlinearVersions"/>
- <div class="interlinearChoices"></div>
-</div>
-
-
-
-<!--<div id="bottomSection" class="timeline">No modules have yet been loaded.</div>-->
-<!---->
-<!--<div id="loading"><img alt="Loading..." src="images/wait16.gif" />Loading...</div>-->
-<div id="error">A placeholder for error messages</div>
-
-<!-- The about popup -->
-
-<div id="about">
- <img id="aboutLogo" src="images/step-logo.png" />
- <h3 id="aboutTitle">STEP :: Scripture Tools for Every Pastor</h3>
- <p>© Tyndale House 2011</p>
-</div>
-
-<div id="login">
- <div id="loginPopup">
- <label for="emailAddress">Email address:</label><input id="emailAddress" type="text" size="20" /><br />
- <label for="password">Password:</label><input id="password" type="password" size="20" /><br />
- </div>
- <div id="registerPopup">
- <label for="name">Your name</label><input id="emailAddress" type="text" size="20" /><br />
- <label for="country">Country</label><input id="password" type="password" size="20" /><br />
- </div>
-</div>
-
-</body>
-
-</HTML>
More information about the Tynstep-svn
mailing list