[Tynstep-svn] r211 - in trunk/step: step-core step-core/src/main/java/com/tyndalehouse/step/core/service/impl step-core/src/main/java/com/tyndalehouse/step/core/utils step-parent step-server step-web
ChrisBurrell at crosswire.org
ChrisBurrell at crosswire.org
Sat Feb 12 07:21:36 MST 2011
Author: ChrisBurrell
Date: 2011-02-12 07:21:36 -0700 (Sat, 12 Feb 2011)
New Revision: 211
Modified:
trunk/step/step-core/pom.xml
trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/service/impl/BibleInformationServiceImpl.java
trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/utils/PassageReferenceUtils.java
trunk/step/step-parent/pom.xml
trunk/step/step-server/
trunk/step/step-web/pom.xml
Log:
Modified: trunk/step/step-core/pom.xml
===================================================================
--- trunk/step/step-core/pom.xml 2011-02-07 19:03:46 UTC (rev 210)
+++ trunk/step/step-core/pom.xml 2011-02-12 14:21:36 UTC (rev 211)
@@ -15,6 +15,29 @@
<version>1.0-SNAPSHOT</version>
<name>STEP :: Step Core functionality</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <includes>
+ <include>**/*PreReq.java</include>
+ </includes>
+ </configuration>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
@@ -35,12 +58,6 @@
<artifactId>jdom</artifactId>
</dependency>
- <!-- common utils -->
-<!-- <dependency>-->
-<!-- <groupId>commons-beanutils</groupId>-->
-<!-- <artifactId>commons-beanutils</artifactId>-->
-<!-- </dependency>-->
-
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -72,35 +89,33 @@
<artifactId>opencsv</artifactId>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>javax.persistence</groupId>-->
-<!-- <artifactId>persistence-api</artifactId>-->
-<!-- </dependency>-->
+ <dependency>
+ <groupId>org.avaje</groupId>
+ <artifactId>ebean</artifactId>
+ </dependency>
-<!-- <dependency>-->
-<!-- <groupId>com.j256.ormlite</groupId>-->
-<!-- <artifactId>ormlite-core</artifactId>-->
-<!-- </dependency>-->
-
-<dependency>
- <groupId>org.avaje</groupId>
- <artifactId>ebean</artifactId>
-</dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>com.j256.ormlite</groupId>-->
-<!-- <artifactId>ormlite-jdbc</artifactId>-->
-<!-- </dependency>-->
-
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
+ <!-- transitive dependencies not picked up by jsword -->
+ <dependency>
+ <groupId>javatar</groupId>
+ <artifactId>javatar</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient </artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/service/impl/BibleInformationServiceImpl.java
===================================================================
--- trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/service/impl/BibleInformationServiceImpl.java 2011-02-07 19:03:46 UTC (rev 210)
+++ trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/service/impl/BibleInformationServiceImpl.java 2011-02-12 14:21:36 UTC (rev 211)
@@ -52,8 +52,8 @@
}
@Override
- public String getPassageText(final String version, final String reference, final List<LookupOption> options,
- final String interlinearVersion) {
+ public String getPassageText(final String version, final String reference,
+ final List<LookupOption> options, final String interlinearVersion) {
return this.jsword.getOsisText(version, reference, options, interlinearVersion);
}
Modified: trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/utils/PassageReferenceUtils.java
===================================================================
--- trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/utils/PassageReferenceUtils.java 2011-02-07 19:03:46 UTC (rev 210)
+++ trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/utils/PassageReferenceUtils.java 2011-02-12 14:21:36 UTC (rev 211)
@@ -73,7 +73,7 @@
}
} catch (final NoSuchVerseException nsve) {
// Nehemiah 6.20 might not exist for example...
- LOG.error("Scripture reference does not exist [{}]", nsve);
+ LOG.error("Scripture reference does not exist", nsve);
} catch (final NoSuchKeyException e) {
throw new StepInternalException(e.getMessage(), e);
}
Modified: trunk/step/step-parent/pom.xml
===================================================================
--- trunk/step/step-parent/pom.xml 2011-02-07 19:03:46 UTC (rev 210)
+++ trunk/step/step-parent/pom.xml 2011-02-12 14:21:36 UTC (rev 211)
@@ -47,6 +47,7 @@
<commons-dbcp.version>1.3</commons-dbcp.version>
<commons-io.version>1.4</commons-io.version>
<commons-dbutils.version>1.3</commons-dbutils.version>
+ <commons-httpclient.version>3.1</commons-httpclient.version>
<!-- testing dependencies -->
<mockito.version>1.8.5</mockito.version>
@@ -189,11 +190,6 @@
<artifactId>org.restlet.ext.json</artifactId>
<version>${restlet.version}</version>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>commons-beanutils</groupId>-->
-<!-- <artifactId>commons-beanutils</artifactId>-->
-<!-- <version>${commons-beanutils.version}</version>-->
-<!-- </dependency>-->
<dependency>
<groupId>commons-lang</groupId>
@@ -225,6 +221,11 @@
<version>${commons-dbutils.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -254,30 +255,12 @@
</dependency>
<dependency>
- <groupId>com.j256.ormlite</groupId>
- <artifactId>ormlite-core</artifactId>
- <version>${ormlite.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.j256.ormlite</groupId>
- <artifactId>ormlite-jdbc</artifactId>
- <version>${ormlite.version}</version>
- </dependency>
-
- <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
<scope>test</scope>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>javax.persistence</groupId>-->
-<!-- <artifactId>persistence-api</artifactId>-->
-<!-- <version>${persistence-api.version}</version>-->
-<!-- </dependency>-->
-
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
Property changes on: trunk/step/step-server
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.checkstyle.config.xml
.classpath
.fbprefs
.pmd
.project
.settings
target
+ .checkstyle
.checkstyle.config.xml
.classpath
.fbprefs
.pmd
.project
.settings
target
.LICENSE.txt
.checkstyle.config.test.xml
Modified: trunk/step/step-web/pom.xml
===================================================================
--- trunk/step/step-web/pom.xml 2011-02-07 19:03:46 UTC (rev 210)
+++ trunk/step/step-web/pom.xml 2011-02-12 14:21:36 UTC (rev 211)
@@ -81,7 +81,6 @@
<dependency>
<groupId>javatar</groupId>
<artifactId>javatar</artifactId>
- <version>${javatar.version}</version>
</dependency>
<dependency>
More information about the Tynstep-svn
mailing list