You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by at...@apache.org on 2011/06/21 16:43:00 UTC
svn commit: r1138027 - in /incubator/rave/trunk: pom.xml rave-portal/pom.xml
rave-portal/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java
rave-shindig/pom.xml
Author: ate
Date: Tue Jun 21 14:43:00 2011
New Revision: 1138027
URL: http://svn.apache.org/viewvc?rev=1138027&view=rev
Log:
RAVE-81: Fix classloading issue for StringUtils in ModelUtilsTest
See: http://issues.apache.org/jira/browse/RAVE-81
Patch contributed by Jasha Joachimsthal.
Thanks Jasha!
Modified:
incubator/rave/trunk/pom.xml
incubator/rave/trunk/rave-portal/pom.xml
incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java
incubator/rave/trunk/rave-shindig/pom.xml
Modified: incubator/rave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/pom.xml?rev=1138027&r1=1138026&r2=1138027&view=diff
==============================================================================
--- incubator/rave/trunk/pom.xml (original)
+++ incubator/rave/trunk/pom.xml Tue Jun 21 14:43:00 2011
@@ -58,7 +58,7 @@
<commons-lang.version>2.6</commons-lang.version>
<icu4j.version>4.6.1</icu4j.version>
<easymock.version>3.0</easymock.version>
- <openjpa-all.version>2.1.0</openjpa-all.version>
+ <openjpa.version>2.1.0</openjpa.version>
<org.openid4java.version>0.9.6</org.openid4java.version>
<jersey-server.version>1.6</jersey-server.version>
<jersey-spring.version>1.0</jersey-spring.version>
@@ -145,8 +145,8 @@
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-all</artifactId>
- <version>${openjpa-all.version}</version>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa.version}</version>
</dependency>
<dependency>
Modified: incubator/rave/trunk/rave-portal/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/pom.xml?rev=1138027&r1=1138026&r2=1138027&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/pom.xml (original)
+++ incubator/rave/trunk/rave-portal/pom.xml Tue Jun 21 14:43:00 2011
@@ -106,12 +106,12 @@ if needed you can specify it on the comm
<type>pom</type>
</dependency>
- <!-- Jackson JSON Mapper -->
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.8.1</version>
- </dependency>
+ <!-- Jackson JSON Mapper -->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.8.1</version>
+ </dependency>
<!-- JSON Support -->
<dependency>
@@ -123,7 +123,7 @@ if needed you can specify it on the comm
<!--Persistence-->
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-all</artifactId>
+ <artifactId>openjpa</artifactId>
</dependency>
<dependency>
Modified: incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java?rev=1138027&r1=1138026&r2=1138027&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java (original)
+++ incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java Tue Jun 21 14:43:00 2011
@@ -19,13 +19,13 @@
package org.apache.rave.portal.model.util;
-import org.apache.commons.lang.StringUtils;
import org.apache.rave.portal.model.RegionWidgetPreference;
import org.junit.Test;
import java.util.Arrays;
import java.util.List;
+import static org.apache.commons.lang.StringUtils.isAllLowerCase;
import static org.junit.Assert.assertTrue;
public class ModelUtilsTest {
@@ -56,18 +56,4 @@ public class ModelUtilsTest {
new RegionWidgetPreference(null, -100L, "UPPERCASENAME", "FOO"));
}
- //TODO: Figure out how to get commons-lang 2.6 available to our code
- //copied from commons-lang 2.5 since our openjpa maven dependency seems to fetch us an early version of commons-lang
- public static boolean isAllLowerCase(String str) {
- if (str == null || StringUtils.isEmpty(str)) {
- return false;
- }
- int sz = str.length();
- for (int i = 0; i < sz; i++) {
- if (Character.isLowerCase(str.charAt(i)) == false) {
- return false;
- }
- }
- return true;
- }
}
\ No newline at end of file
Modified: incubator/rave/trunk/rave-shindig/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/pom.xml?rev=1138027&r1=1138026&r2=1138027&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/pom.xml (original)
+++ incubator/rave/trunk/rave-shindig/pom.xml Tue Jun 21 14:43:00 2011
@@ -37,10 +37,10 @@
<description>Apache Rave Shindig App</description>
<packaging>war</packaging>
<version>0.1-incubating-SNAPSHOT</version>
-
- <properties>
- <com.h2database.version>1.3.154</com.h2database.version>
- </properties>
+
+ <properties>
+ <com.h2database.version>1.3.154</com.h2database.version>
+ </properties>
<dependencies>
<dependency>
@@ -48,25 +48,25 @@
<artifactId>shindig-server</artifactId>
<type>war</type>
</dependency>
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${com.h2database.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-all</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-social-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${com.h2database.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-social-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
<type>test-jar</type>
@@ -83,7 +83,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<defaultGoal>install</defaultGoal>
@@ -119,5 +119,5 @@
</plugins>
</build>
-
+
</project>