You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ja...@apache.org on 2012/12/27 11:29:55 UTC
svn commit: r1426155 - in /rave/trunk: ./ rave-components/rave-commons/
rave-components/rave-commons/src/test/java/org/apache/rave/persistence/jpa/impl/
rave-components/rave-core/
rave-components/rave-core/src/test/java/org/apache/rave/portal/service/i...
Author: jasha
Date: Thu Dec 27 10:29:55 2012
New Revision: 1426155
URL: http://svn.apache.org/viewvc?rev=1426155&view=rev
Log:
RAVE-862 Check and update 3rd party dependencies
Delete reference to Spring Milestone repository
Use explicit static imports for hamcrest and easymock (name conflicts)
Modified:
rave/trunk/pom.xml
rave/trunk/rave-components/rave-commons/pom.xml
rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/persistence/jpa/impl/H2OpenJpaDialectTest.java
rave/trunk/rave-components/rave-core/pom.xml
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java
rave/trunk/rave-components/rave-jpa/pom.xml
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java
rave/trunk/rave-integration-tests/pom.xml
rave/trunk/rave-portal-resources/pom.xml
rave/trunk/rave-portal/pom.xml
Modified: rave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1426155&r1=1426154&r2=1426155&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Thu Dec 27 10:29:55 2012
@@ -44,44 +44,44 @@
<properties>
<apache.shindig.version>2.5.0-beta5</apache.shindig.version>
<apache.wookie.version>0.10.0-incubating</apache.wookie.version>
- <org.springframework.version>3.1.2.RELEASE</org.springframework.version>
- <org.springframework.security.version>3.1.1.RELEASE</org.springframework.security.version>
- <org.springframework.mobile.version>1.0.0.RELEASE</org.springframework.mobile.version>
+ <org.springframework.version>3.2.0.RELEASE</org.springframework.version>
+ <org.springframework.security.version>3.1.3.RELEASE</org.springframework.security.version>
+ <org.springframework.mobile.version>1.0.1.RELEASE</org.springframework.mobile.version>
<jstl.version>1.2</jstl.version>
<javax.servlet.version>2.5</javax.servlet.version>
<jsp-api.version>2.1</jsp-api.version>
<el-api.version>1.0</el-api.version>
- <org.slf4j.version>1.6.1</org.slf4j.version>
- <log4j.version>1.2.16</log4j.version>
- <junit.version>4.7</junit.version>
+ <org.slf4j.version>1.7.2</org.slf4j.version>
+ <log4j.version>1.2.17</log4j.version>
+ <junit.version>4.11</junit.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-validator.version>1.4.0</commons-validator.version>
<commons-collections.version>3.2.1</commons-collections.version>
- <commons-codec.version>1.4</commons-codec.version>
- <icu4j.version>4.8.1.1</icu4j.version>
- <easymock.version>3.0</easymock.version>
- <com.h2database.version>1.3.167</com.h2database.version>
- <openjpa.version>2.2.0</openjpa.version>
+ <commons-codec.version>1.7</commons-codec.version>
+ <icu4j.version>50.1.1</icu4j.version>
+ <easymock.version>3.1</easymock.version>
+ <com.h2database.version>1.3.170</com.h2database.version>
+ <openjpa.version>2.2.1</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>
+ <jersey-server.version>1.16</jersey-server.version>
+ <jersey-spring.version>1.16</jersey-spring.version>
+ <jackson.version>1.9.11</jackson.version>
+ <json.version>20090211</json.version>
<guice.version>3.0</guice.version>
- <cobertura.version>2.5.1</cobertura.version>
- <org.hamcrest.version>1.1</org.hamcrest.version>
+ <cobertura.version>2.5.2</cobertura.version>
+ <org.hamcrest.version>1.3</org.hamcrest.version>
<tiles.version>2.2.2</tiles.version>
<recaptcha4j.version>0.0.7</recaptcha4j.version>
<apacheds.version>1.5.5</apacheds.version>
- <javax.mail.version>1.4.4</javax.mail.version>
- <javax.activation.version>1.1</javax.activation.version>
- <freemarker.version>2.3.18</freemarker.version>
+ <javax.mail.version>1.4.5</javax.mail.version>
+ <javax.activation.version>1.1.1</javax.activation.version>
+ <freemarker.version>2.3.19</freemarker.version>
<!-- The location of Rave's H2 file DB. No trailing / -->
<rave.database.location>/tmp/rave_db</rave.database.location>
<!-- Force maven-filesync-plugin rewrite the Eclipse FileSync plugin configuration with
$mvn filesync:generate -Dmaven.filesync.override=true -->
<maven.filesync.override>false</maven.filesync.override>
- <jackson.version>1.8.1</jackson.version>
-
<!-- default empty javaagent
if needed you can specify it on the command line with -Djavaagent="..." -->
@@ -97,11 +97,6 @@
<enabled>false</enabled>
</releases>
</repository>
- <repository>
- <id>spring-milestone</id>
- <name>Spring Maven MILESTONE Repository</name>
- <url>http://maven.springframework.org/milestone</url>
- </repository>
</repositories>
<!-- Global management of all dependencies -->
@@ -310,6 +305,16 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${json.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-persist</artifactId>
<version>${guice.version}</version>
@@ -557,7 +562,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -566,7 +571,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.3</version>
</plugin>
<plugin>
<groupId>com.googlecode.mavenfilesync</groupId>
@@ -662,7 +667,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2.1</version>
</plugin>
</plugins>
</pluginManagement>
Modified: rave/trunk/rave-components/rave-commons/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/pom.xml?rev=1426155&r1=1426154&r2=1426155&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-commons/pom.xml (original)
+++ rave/trunk/rave-components/rave-commons/pom.xml Thu Dec 27 10:29:55 2012
@@ -8,7 +8,7 @@
"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
+ 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
@@ -16,9 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
- $Id$
--->
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -103,12 +101,12 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.6.9</version>
+ <version>1.7.1</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.6.9</version>
+ <version>1.7.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/persistence/jpa/impl/H2OpenJpaDialectTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/persistence/jpa/impl/H2OpenJpaDialectTest.java?rev=1426155&r1=1426154&r2=1426155&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/persistence/jpa/impl/H2OpenJpaDialectTest.java (original)
+++ rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/persistence/jpa/impl/H2OpenJpaDialectTest.java Thu Dec 27 10:29:55 2012
@@ -1,28 +1,33 @@
/*
- * Copyright 2011 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.
*/
package org.apache.rave.persistence.jpa.impl;
-import org.apache.rave.persistence.impl.TranslatedH2Exception;
import org.apache.rave.exception.DuplicateItemException;
+import org.apache.rave.persistence.impl.TranslatedH2Exception;
+import org.h2.constant.ErrorCode;
import org.h2.jdbc.JdbcSQLException;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
-import org.h2.constant.ErrorCode;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
/**
*
@@ -42,9 +47,9 @@ public class H2OpenJpaDialectTest {
@Test
public void testTranslateExceptionIfPossible_uniqueContstraintViolation() {
JdbcSQLException jdbcEx = new JdbcSQLException("message", "sql statement", "state", ErrorCode.DUPLICATE_KEY_1, null, "stacktrace");
- RuntimeException re = new RuntimeException("dummy runtime exception", jdbcEx);
-
- assertThat(dialect.translateExceptionIfPossible(re), is(DuplicateItemException.class));
+ RuntimeException re = new RuntimeException("dummy runtime exception", jdbcEx);
+
+ assertTrue(dialect.translateExceptionIfPossible(re) instanceof DuplicateItemException);
}
@Test
Modified: rave/trunk/rave-components/rave-core/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/pom.xml?rev=1426155&r1=1426154&r2=1426155&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/pom.xml (original)
+++ rave/trunk/rave-components/rave-core/pom.xml Thu Dec 27 10:29:55 2012
@@ -8,7 +8,7 @@
"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
+ 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
@@ -16,9 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
- $Id$
--->
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -91,14 +89,12 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.8.1</version>
</dependency>
<!-- JSON Support -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20090211</version>
</dependency>
<!-- Logging -->
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java?rev=1426155&r1=1426154&r2=1426155&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java Thu Dec 27 10:29:55 2012
@@ -19,14 +19,32 @@
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.*;
-import org.apache.rave.portal.model.impl.*;
-import org.apache.rave.portal.repository.*;
+import org.apache.rave.portal.model.Page;
+import org.apache.rave.portal.model.PageLayout;
+import org.apache.rave.portal.model.PageTemplate;
+import org.apache.rave.portal.model.PageType;
+import org.apache.rave.portal.model.PageUser;
+import org.apache.rave.portal.model.Region;
+import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.impl.PageImpl;
+import org.apache.rave.portal.model.impl.PageLayoutImpl;
+import org.apache.rave.portal.model.impl.PageTemplateImpl;
+import org.apache.rave.portal.model.impl.PageUserImpl;
+import org.apache.rave.portal.model.impl.RegionImpl;
+import org.apache.rave.portal.model.impl.RegionWidgetImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
+import org.apache.rave.portal.model.impl.WidgetImpl;
+import org.apache.rave.portal.repository.PageLayoutRepository;
+import org.apache.rave.portal.repository.PageRepository;
+import org.apache.rave.portal.repository.PageTemplateRepository;
+import org.apache.rave.portal.repository.RegionRepository;
+import org.apache.rave.portal.repository.RegionWidgetRepository;
+import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.portal.service.PageService;
import org.apache.rave.portal.service.UserService;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
-import org.hamcrest.CoreMatchers;
import org.junit.Before;
import org.junit.Test;
@@ -35,8 +53,17 @@ import javax.persistence.NonUniqueResult
import java.util.ArrayList;
import java.util.List;
-import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -148,7 +175,7 @@ public class DefaultPageServiceTest {
expect(pageRepository.getAllPages(VALID_USER_ID, PageType.USER)).andReturn(VALID_PAGES);
replay(pageRepository);
- assertThat(pageService.getAllUserPages(VALID_USER_ID), CoreMatchers.sameInstance(VALID_PAGES));
+ assertThat(pageService.getAllUserPages(VALID_USER_ID), sameInstance(VALID_PAGES));
verify(pageRepository);
}
@@ -163,7 +190,7 @@ public class DefaultPageServiceTest {
expect(pageRepository.getAllPages(VALID_USER_ID, PageType.PERSON_PROFILE)).andReturn(VALID_PAGES);
replay(pageRepository,userService,pageTemplateRepository);
- assertThat(pageService.getPersonProfilePage(VALID_USER_ID), CoreMatchers.sameInstance(personPage));
+ assertThat(pageService.getPersonProfilePage(VALID_USER_ID), sameInstance(personPage));
verify(pageRepository,userService,pageTemplateRepository);
}
@@ -181,7 +208,7 @@ public class DefaultPageServiceTest {
expect(pageRepository.createPageForUser(user, pageTemplate)).andReturn(personPage);
replay(pageRepository, userService, pageTemplateRepository);
- assertThat(pageService.getPersonProfilePage(VALID_USER_ID), CoreMatchers.sameInstance(personPage));
+ assertThat(pageService.getPersonProfilePage(VALID_USER_ID), sameInstance(personPage));
verify(pageRepository, userService, pageTemplateRepository);
}
@@ -961,7 +988,7 @@ public class DefaultPageServiceTest {
String layoutName = "layout name";
PageLayoutImpl layout = createStrictMock(PageLayoutImpl.class);
- expect(layout.getNumberOfRegions()).andReturn(new Long(2)).anyTimes();
+ expect(layout.getNumberOfRegions()).andReturn(Long.valueOf(2L)).anyTimes();
replay(layout);
//create a strict mock that ensures that the appropriate setters are
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java?rev=1426155&r1=1426154&r2=1426155&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java Thu Dec 27 10:29:55 2012
@@ -19,13 +19,23 @@
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.Page;
+import org.apache.rave.portal.model.PageTemplate;
+import org.apache.rave.portal.model.PageType;
+import org.apache.rave.portal.model.Person;
+import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.impl.AuthorityImpl;
import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.model.impl.PageTemplateImpl;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.util.SearchResult;
-import org.apache.rave.portal.repository.*;
+import org.apache.rave.portal.repository.CategoryRepository;
+import org.apache.rave.portal.repository.PageRepository;
+import org.apache.rave.portal.repository.PageTemplateRepository;
+import org.apache.rave.portal.repository.PersonRepository;
+import org.apache.rave.portal.repository.UserRepository;
+import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.portal.service.UserService;
import org.junit.After;
import org.junit.Before;
@@ -44,10 +54,20 @@ import org.springframework.security.open
import java.util.ArrayList;
import java.util.List;
-import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
public class DefaultUserServiceTest {
Modified: rave/trunk/rave-components/rave-jpa/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/pom.xml?rev=1426155&r1=1426154&r2=1426155&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/pom.xml (original)
+++ rave/trunk/rave-components/rave-jpa/pom.xml Thu Dec 27 10:29:55 2012
@@ -8,7 +8,7 @@
"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
+ 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
@@ -16,9 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
- $Id: pom.xml 1343841 2012-05-29 16:48:53Z mfranklin $
--->
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -76,14 +74,12 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.8.1</version>
</dependency>
<!-- JSON Support -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20090211</version>
</dependency>
<!--Persistence-->
@@ -163,9 +159,9 @@
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>2.2.1</version>
<configuration>
<includes>org/apache/rave/portal/model/*.class</includes>
<includes>org/apache/rave/portal/repository/JpaApplicationDataRepository$JpaSerializableApplicationData.class</includes>
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java?rev=1426155&r1=1426154&r2=1426155&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java Thu Dec 27 10:29:55 2012
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.rave.portal.model.conversion;
import org.apache.rave.model.ModelConverter;
@@ -30,8 +31,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
/**
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java?rev=1426155&r1=1426154&r2=1426155&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java Thu Dec 27 10:29:55 2012
@@ -16,10 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.rave.portal.model.conversion;
import org.apache.rave.model.ModelConverter;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.Address;
+import org.apache.rave.portal.model.Group;
+import org.apache.rave.portal.model.JpaAddress;
+import org.apache.rave.portal.model.JpaPageLayout;
+import org.apache.rave.portal.model.JpaPerson;
+import org.apache.rave.portal.model.PageLayout;
+import org.apache.rave.portal.model.Person;
import org.apache.rave.portal.model.impl.AddressImpl;
import org.apache.rave.portal.model.impl.GroupImpl;
import org.apache.rave.portal.model.impl.PersonImpl;
@@ -35,9 +42,15 @@ import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
-import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java?rev=1426155&r1=1426154&r2=1426155&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java Thu Dec 27 10:29:55 2012
@@ -44,8 +44,18 @@ import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
-import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.same;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
/**
Modified: rave/trunk/rave-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-integration-tests/pom.xml?rev=1426155&r1=1426154&r2=1426155&view=diff
==============================================================================
--- rave/trunk/rave-integration-tests/pom.xml (original)
+++ rave/trunk/rave-integration-tests/pom.xml Thu Dec 27 10:29:55 2012
@@ -39,14 +39,14 @@
<jbehave.core.version>3.7.4</jbehave.core.version>
<jbehave.web.version>3.5.5</jbehave.web.version>
<jbehave.site.version>3.1.1</jbehave.site.version>
- <org.hamcrest.version>1.2.1</org.hamcrest.version>
+ <org.hamcrest.version>1.3</org.hamcrest.version>
<commons-logging.version>1.1.1</commons-logging.version>
<!-- New Selenium versions are often needed after an upgrade of Mozilla Firefox -->
<selenium.version>[2.25.0,2.28.99)</selenium.version>
<meta.filter />
<!-- Cargo configuration properties -->
- <cargo.version>1.2.1</cargo.version>
+ <cargo.version>1.3.1</cargo.version>
<!-- if you want a remote debugging on a different a address
override on command line with -Dcargo.debug.addres=xxxx -->
<cargo.debug.address>8000</cargo.debug.address>
@@ -179,7 +179,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.1</version>
+ <version>3.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -262,6 +262,40 @@
</execution>
</executions>
<configuration>
+ <deployables>
+ <deployable>
+ <groupId>org.apache.wookie</groupId>
+ <artifactId>wookie</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/wookie</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-shindig</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/ROOT</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-demo-gadgets</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/demogadgets</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-portal</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/portal</context>
+ </properties>
+ </deployable>
+ </deployables>
<configuration>
<properties>
<cargo.jvmargs>
@@ -270,40 +304,6 @@
<cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
</properties>
<home>${project.build.directory}/tomcat6x</home>
- <deployables>
- <deployable>
- <groupId>org.apache.wookie</groupId>
- <artifactId>wookie</artifactId>
- <type>war</type>
- <properties>
- <context>/wookie</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-shindig</artifactId>
- <type>war</type>
- <properties>
- <context>/ROOT</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-demo-gadgets</artifactId>
- <type>war</type>
- <properties>
- <context>/demogadgets</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-portal</artifactId>
- <type>war</type>
- <properties>
- <context>/portal</context>
- </properties>
- </deployable>
- </deployables>
<configfiles>
<configfile>
<file>
Modified: rave/trunk/rave-portal-resources/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/pom.xml?rev=1426155&r1=1426154&r2=1426155&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/pom.xml (original)
+++ rave/trunk/rave-portal-resources/pom.xml Thu Dec 27 10:29:55 2012
@@ -8,7 +8,7 @@
"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
+ 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
@@ -16,9 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
- $Id$
--->
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -131,7 +129,7 @@
<plugin>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>
- <version>1.4.5</version>
+ <version>1.6.1</version>
<executions>
<execution>
<phase>compile</phase>
Modified: rave/trunk/rave-portal/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/pom.xml?rev=1426155&r1=1426154&r2=1426155&view=diff
==============================================================================
--- rave/trunk/rave-portal/pom.xml (original)
+++ rave/trunk/rave-portal/pom.xml Thu Dec 27 10:29:55 2012
@@ -8,7 +8,7 @@
"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
+ 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
@@ -16,9 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
- $Id$
--->
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -35,7 +33,7 @@
<packaging>war</packaging>
<properties>
- <cargo.version>1.2.1</cargo.version>
+ <cargo.version>1.3.1</cargo.version>
<!-- if you want a remote debugging on a different a address
override on command line with -Dcargo.debug.addres=xxxx -->
<cargo.debug.address>8000</cargo.debug.address>
@@ -139,6 +137,41 @@
<version>${cargo.version}</version>
<configuration>
<wait>true</wait>
+ <deployables>
+ <deployable>
+ <groupId>org.apache.wookie</groupId>
+ <artifactId>wookie</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/wookie</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-shindig</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/ROOT</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-demo-gadgets</artifactId>
+ <type>war</type>
+ <!-- /gadgets is already taken in Shindig which runs on the ROOT context (/) -->
+ <properties>
+ <context>/demogadgets</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-portal</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/portal</context>
+ </properties>
+ </deployable>
+ </deployables>
<configuration>
<properties>
<cargo.jvmargs>
@@ -147,41 +180,6 @@
<cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
</properties>
<home>${project.build.directory}/tomcat6x</home>
- <deployables>
- <deployable>
- <groupId>org.apache.wookie</groupId>
- <artifactId>wookie</artifactId>
- <type>war</type>
- <properties>
- <context>/wookie</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-shindig</artifactId>
- <type>war</type>
- <properties>
- <context>/ROOT</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-demo-gadgets</artifactId>
- <type>war</type>
- <!-- /gadgets is already taken in Shindig which runs on the ROOT context (/) -->
- <properties>
- <context>/demogadgets</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-portal</artifactId>
- <type>war</type>
- <properties>
- <context>/portal</context>
- </properties>
- </deployable>
- </deployables>
<configfiles>
<configfile>
<file>${project.basedir}/../rave-portal-resources/src/main/dist/conf/tomcat-users.xml</file>