Author: snoopdave
Date: Mon Jun 17 13:17:23 2013
New Revision: 1493753
URL: http://svn.apache.org/r1493753
Log:
Fix broken jetty:run goal, add back HttpClient 3.0.1 dependency
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/test/resources/roller-jettyrun.properties
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1493753&r1=1493752&r2=1493753&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Mon Jun 17 13:17:23 2013
@@ -525,10 +525,6 @@
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
</exclusion>
- <exclusion>
- <artifactId>httpclient</artifactId>
- <groupId>org.apache.httpcomponents</groupId>
- </exclusion>
</exclusions>
</dependency>
@@ -1046,7 +1042,7 @@
<testResources>
<testResource>
-
<directory>${project.basedir}/../weblogger-webapp/src/main/webapp/</directory>
+
<directory>${project.basedir}/../app/src/main/webapp/</directory>
<filtering>false</filtering>
<includes>
<include>themes/**</include>
Modified: roller/trunk/app/src/test/resources/roller-jettyrun.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/test/resources/roller-jettyrun.properties?rev=1493753&r1=1493752&r2=1493753&view=diff
==============================================================================
--- roller/trunk/app/src/test/resources/roller-jettyrun.properties (original)
+++ roller/trunk/app/src/test/resources/roller-jettyrun.properties Mon Jun 17
13:17:23 2013
@@ -16,7 +16,7 @@ openjpa.Log=commons
passwds.encryption.enabled=false
# use src copy of themes for read-only access
-themes.dir=${basedir}/../weblogger-webapp/src/main/webapp/themes
+themes.dir=${basedir}/../app/src/main/webapp/themes
# put work in work dir
search.index.dir =${project.build.directory}/work/search-index
