rave-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Chris Geer <ch...@cxtsoftware.com>
Subject Re: svn commit: r1504810 - in /rave/trunk: ./ rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/ rave-integration-tests/ rave-integration-tests/rave-admin-tests/src/main/java/org/apache/rave/integrationtests/ste...
Date Fri, 19 Jul 2013 15:11:34 GMT
Jasha,

On the jackson upgrade, I'm pretty sure CXF doesn't work with Jackson 2.2
which is why I only jumped to 2.1.x. You should be able to test with this
URL though: http://localhost:8080/portal/api/rest/people/1. CXF has fixed
this but it's in a version we can't use yet.

I will also try and pull this down sometime this weekend and check.

Chris


On Fri, Jul 19, 2013 at 2:36 AM, <jasha@apache.org> wrote:

> Author: jasha
> Date: Fri Jul 19 09:36:06 2013
> New Revision: 1504810
>
> URL: http://svn.apache.org/r1504810
> Log:
> RAVE-991 upgrade 3rd part java dependencies
>
> Modified:
>     rave/trunk/pom.xml
>
> rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
>     rave/trunk/rave-integration-tests/pom.xml
>
> rave/trunk/rave-integration-tests/rave-admin-tests/src/main/java/org/apache/rave/integrationtests/steps/CommonSteps.java
>
> rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/DefaultAccountSteps.java
>
> rave/trunk/rave-integration-tests/rave-newuser-tests/src/main/java/org/apache/rave/integrationtests/steps/NewUserSteps.java
>     rave/trunk/rave-portal/pom.xml
>
> Modified: rave/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1504810&r1=1504809&r2=1504810&view=diff
>
> ==============================================================================
> --- rave/trunk/pom.xml (original)
> +++ rave/trunk/pom.xml Fri Jul 19 09:36:06 2013
> @@ -44,41 +44,40 @@
>      <properties>
>          <apache.shindig.version>2.5.0-beta5</apache.shindig.version>
>          <apache.wookie.version>0.13.1</apache.wookie.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.version>3.2.3.RELEASE</org.springframework.version>
> +
>  <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
>
>  <org.springframework.mobile.version>1.0.1.RELEASE</org.springframework.mobile.version>
>
>  <org.springframework.data.mongodb.version>1.0.3.RELEASE</org.springframework.data.mongodb.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.7.2</org.slf4j.version>
> +        <org.slf4j.version>1.7.5</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.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>
> +        <commons-codec.version>1.8</commons-codec.version>
> +        <icu4j.version>51.2</icu4j.version>
> +        <easymock.version>3.2</easymock.version>
> +        <com.h2database.version>1.3.172</com.h2database.version>
> +        <openjpa.version>2.2.2</openjpa.version>
>          <org.openid4java.version>0.9.6</org.openid4java.version>
> -        <jersey-server.version>1.16</jersey-server.version>
> -        <jersey-spring.version>1.16</jersey-spring.version>
> -        <jackson.version>2.1.5</jackson.version>
> +        <jackson.version>2.2.2</jackson.version>
> +        <joda-time-version>2.2</joda-time-version>
>          <json.version>20090211</json.version>
>          <guice.version>3.0</guice.version>
> -        <httpclient.version>4.2.2</httpclient.version>
> -        <httpcore.version>4.2.3</httpcore.version>
> +        <httpclient.version>4.2.5</httpclient.version>
> +        <httpcore.version>4.2.4</httpcore.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.5</javax.mail.version>
> +        <javax.mail.version>1.4.7</javax.mail.version>
>          <javax.activation.version>1.1.1</javax.activation.version>
> -        <freemarker.version>2.3.19</freemarker.version>
> +        <freemarker.version>2.3.20</freemarker.version>
>          <org.mongodb.driver.version>2.9.1</org.mongodb.driver.version>
>
>  <de.flapdoodle.embed.mongo.version>1.28</de.flapdoodle.embed.mongo.version>
>          <cxf.version>2.7.3</cxf.version>
> @@ -108,12 +107,12 @@
>            $mvn filesync:generate -Dmaven.filesync.override=true -->
>          <maven.filesync.override>false</maven.filesync.override>
>
> -        <cargo.version>1.3.1</cargo.version>
> +        <cargo.version>1.4.2</cargo.version>
> +        <tomcat.version>6.0.37</tomcat.version>
>          <!-- default empty javaagent
>          if needed you can specify it on the command line with
> -Djavaagent="..." -->
>          <javaagent />
> -        <maven-war-plugin.version>2.3</maven-war-plugin.version>
> -        <joda-time-version>2.0</joda-time-version>
> +        <maven-war-plugin.version>2.4</maven-war-plugin.version>
>      </properties>
>
>      <repositories>
> @@ -412,40 +411,6 @@
>              </dependency>
>
>              <dependency>
> -                <groupId>com.sun.jersey</groupId>
> -                <artifactId>jersey-spring</artifactId>
> -                <version>${jersey-spring.version}</version>
> -                <exclusions>
> -                    <exclusion>
> -                        <groupId>org.springframework</groupId>
> -                        <artifactId>spring</artifactId>
> -                    </exclusion>
> -                    <exclusion>
> -                        <groupId>org.springframework</groupId>
> -                        <artifactId>spring-core</artifactId>
> -                    </exclusion>
> -                    <exclusion>
> -                        <groupId>org.springframework</groupId>
> -                        <artifactId>spring-web</artifactId>
> -                    </exclusion>
> -                    <exclusion>
> -                        <groupId>org.springframework</groupId>
> -                        <artifactId>spring-beans</artifactId>
> -                    </exclusion>
> -                    <exclusion>
> -                        <groupId>org.springframework</groupId>
> -                        <artifactId>spring-context</artifactId>
> -                    </exclusion>
> -                </exclusions>
> -            </dependency>
> -
> -            <dependency>
> -                <groupId>com.sun.jersey</groupId>
> -                <artifactId>jersey-server</artifactId>
> -                <version>${jersey-server.version}</version>
> -            </dependency>
> -
> -            <dependency>
>                  <groupId>org.openid4java</groupId>
>                  <artifactId>openid4java-consumer</artifactId>
>                  <version>${org.openid4java.version}</version>
>
> Modified:
> rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml?rev=1504810&r1=1504809&r2=1504810&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
> (original)
> +++
> rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
> Fri Jul 19 09:36:06 2013
> @@ -294,7 +294,7 @@
>                          <timeout>180000</timeout>
>                          <zipUrlInstaller>
>
>  <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
> -                            <url>
> http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
> </url>
> +                            <url>
> http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz
> </url>
>                          </zipUrlInstaller>
>                          <systemProperties>
>
>  <net.sf.ehcache.skipUpdateCheck>true</net.sf.ehcache.skipUpdateCheck>
>
> Modified: rave/trunk/rave-integration-tests/pom.xml
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-integration-tests/pom.xml?rev=1504810&r1=1504809&r2=1504810&view=diff
>
> ==============================================================================
> --- rave/trunk/rave-integration-tests/pom.xml (original)
> +++ rave/trunk/rave-integration-tests/pom.xml Fri Jul 19 09:36:06 2013
> @@ -36,13 +36,13 @@
>      <description>Test stories verifying functionality of Apache Rave
> using Java and Spring</description>
>
>      <properties>
> -        <jbehave.core.version>3.7.5</jbehave.core.version>
> +        <jbehave.core.version>3.8</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.3</org.hamcrest.version>
> -        <commons-logging.version>1.1.1</commons-logging.version>
> +        <commons-logging.version>1.1.3</commons-logging.version>
>          <!-- New Selenium versions are often needed after an upgrade of
> Mozilla Firefox -->
> -        <selenium.version>2.31.0</selenium.version>
> +        <selenium.version>2.33.0</selenium.version>
>          <meta.filter />
>
>          <!-- Cargo configuration properties -->
> @@ -340,7 +340,7 @@
>
>  <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives
>                                      </downloadDir>
>                                      <url>
> -
> http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
> +
> http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz
>                                      </url>
>                                  </zipUrlInstaller>
>                                  <systemProperties>
>
> Modified:
> rave/trunk/rave-integration-tests/rave-admin-tests/src/main/java/org/apache/rave/integrationtests/steps/CommonSteps.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-integration-tests/rave-admin-tests/src/main/java/org/apache/rave/integrationtests/steps/CommonSteps.java?rev=1504810&r1=1504809&r2=1504810&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-integration-tests/rave-admin-tests/src/main/java/org/apache/rave/integrationtests/steps/CommonSteps.java
> (original)
> +++
> rave/trunk/rave-integration-tests/rave-admin-tests/src/main/java/org/apache/rave/integrationtests/steps/CommonSteps.java
> Fri Jul 19 09:36:06 2013
> @@ -42,37 +42,37 @@ public class CommonSteps {
>
>      @Then("I see the login page")
>      public void isLoginPage() {
> -        final WebElement title = portal.findElement(By.tagName("title"));
> -        assertThat(title.getText().trim(), equalTo("Login - Rave"));
> +        final String title = portal.getTitle();
> +        assertThat(title.trim(), equalTo("Login - Rave"));
>      }
>
>      @When("I log in as an administrator with username \"$username\" and
> password \"$password\"")
>      public void loginAsAdmin(String username, String password) {
> -        portal.login(username,password);
> +        portal.login(username, password);
>      }
>
>      @Then("I see the admin interface link")
>      public void getAdminInterfaceLink() {
>          //TODO: make sure the admin interface actually is loaded
> -        final WebElement
> adminInterfaceLink=portal.findElement(By.linkText("Admin interface"));
> +        final WebElement adminInterfaceLink =
> portal.findElement(By.linkText("Admin interface"));
>      }
>
>      @When("I click the admin interface link")
>      public void clickAdminInterfaceLink() {
>          //TODO: there should be consequences if this fails.
> -        final WebElement
> adminInterfaceLink=portal.findElement(By.linkText("Admin interface"));
> +        final WebElement adminInterfaceLink =
> portal.findElement(By.linkText("Admin interface"));
>          portal.clickLink(adminInterfaceLink);
>      }
>
>      @Then("I see the admin interface")
>      public void getAdminInterface() {
> -        final WebElement
> adminInterface=portal.findElement(By.tagName("title"));
> -        assertThat(adminInterface.getText().trim(),startsWith("Rave admin
> interface"));
> +        final String adminInterface = portal.getTitle();
> +        assertThat(adminInterface.trim(), startsWith("Rave admin
> interface"));
>      }
>
>      @When("I click the \"$linkName\" link")
>      public void clickLink(String linkName) {
> -        final WebElement
> usersLink=portal.findElement(By.linkText(linkName));
> +        final WebElement usersLink =
> portal.findElement(By.linkText(linkName));
>          usersLink.click();
>      }
>
> @@ -83,7 +83,7 @@ public class CommonSteps {
>
>      @Then("I see the Rave login page")
>      public void backToLoginPage() {
> -        final WebElement title = portal.findElement(By.tagName("title"));
> -        assertThat(title.getText().trim(), equalTo("Login - Rave"));
> +        final String title = portal.getTitle();
> +        assertThat(title.trim(), equalTo("Login - Rave"));
>      }
>  }
>
> Modified:
> rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/DefaultAccountSteps.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/DefaultAccountSteps.java?rev=1504810&r1=1504809&r2=1504810&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/DefaultAccountSteps.java
> (original)
> +++
> rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/DefaultAccountSteps.java
> Fri Jul 19 09:36:06 2013
> @@ -45,49 +45,49 @@ public class DefaultAccountSteps {
>
>      @Then("I see the login page")
>      public void isLoginPage() {
> -        final WebElement title = portal.findElement(By.tagName("title"));
> -        assertThat(title.getText().trim(), equalTo("Login - Rave"));
> +        final String title = portal.getTitle();
> +        assertThat(title.trim(), equalTo("Login - Rave"));
>      }
>
>      @When("I log in with username \"$username\" and password
> \"$password\"")
>      public void loginAsUser(String username, String password) {
> -                 portal.login(username,password);
> +        portal.login(username, password);
>      }
>
>      @Then("I see the message \"$welcomeMessage\" for the user
> \"$username\"")
>      public void getLoggedInPage(String welcomeMessage, String username) {
> -                 final WebElement
> displayedWelcome=portal.findElement(By.className("brand"));
> -
> assertThat(displayedWelcome.getText().trim(),equalTo(welcomeMessage));
> +        final WebElement displayedWelcome =
> portal.findElement(By.className("brand"));
> +        assertThat(displayedWelcome.getText().trim(),
> equalTo(welcomeMessage));
> +    }
> +
> +    @When("I provide my OpenID identity \"$openIdUrl\"")
> +    public void openIdLogin(String openIdUrl) {
> +        portal.openIdLogin(openIdUrl);
> +    }
> +
> +    @Then("I see the OpenID authentication page")
> +    public void getOpenIdPage() {
> +        //Note this is specific to MyOpenID (and presumably their English
> page)
> +        final WebElement openIdPage =
> portal.findElement(By.linkText("myOpenID - The free, secure OpenID
> server"));
> +    }
> +
> +    @When("I provide my OpenID password \"$openIdPassword\"")
> +    public void loginToOpenIdProvider(String openIdPassword) {
> +        final WebElement openIdLoginForm =
> portal.findElement(By.id("password-signin-form"));
> +
>  openIdLoginForm.findElement(By.id("password")).sendKeys(openIdPassword);
> +        openIdLoginForm.submit();
> +    }
> +
> +
> +    @When("I log out")
> +    public void iLogOut() {
> +        portal.logout();
> +    }
> +
> +    @Then("I see the Rave login page")
> +    public void backToLoginPage() {
> +        final String title = portal.getTitle();
> +        assertThat(title.trim(), equalTo("Login - Rave"));
>      }
> -
> -        @When("I provide my OpenID identity \"$openIdUrl\"")
> -        public void openIdLogin(String openIdUrl) {
> -                 portal.openIdLogin(openIdUrl);
> -        }
> -
> -        @Then("I see the OpenID authentication page")
> -        public void getOpenIdPage(){
> -                 //Note this is specific to MyOpenID (and presumably
> their English page)
> -                 final WebElement
> openIdPage=portal.findElement(By.linkText("myOpenID - The free, secure
> OpenID server"));
> -        }
> -
> -        @When("I provide my OpenID password \"$openIdPassword\"")
> -        public void loginToOpenIdProvider(String openIdPassword){
> -                 final WebElement
> openIdLoginForm=portal.findElement(By.id("password-signin-form"));
> -
> openIdLoginForm.findElement(By.id("password")).sendKeys(openIdPassword);
> -                 openIdLoginForm.submit();
> -        }
> -
> -
> -        @When("I log out")
> -        public void iLogOut() {
> -                 portal.logout();
> -        }
> -
> -        @Then("I see the Rave login page")
> -        public void backToLoginPage() {
> -        final WebElement title = portal.findElement(By.tagName("title"));
> -        assertThat(title.getText().trim(), equalTo("Login - Rave"));
> -        }
>
>  }
>
> Modified:
> rave/trunk/rave-integration-tests/rave-newuser-tests/src/main/java/org/apache/rave/integrationtests/steps/NewUserSteps.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-integration-tests/rave-newuser-tests/src/main/java/org/apache/rave/integrationtests/steps/NewUserSteps.java?rev=1504810&r1=1504809&r2=1504810&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-integration-tests/rave-newuser-tests/src/main/java/org/apache/rave/integrationtests/steps/NewUserSteps.java
> (original)
> +++
> rave/trunk/rave-integration-tests/rave-newuser-tests/src/main/java/org/apache/rave/integrationtests/steps/NewUserSteps.java
> Fri Jul 19 09:36:06 2013
> @@ -19,14 +19,13 @@
>
>  package org.apache.rave.integrationtests.steps;
>
> +import org.apache.rave.integrationtests.pages.Portal;
>  import org.jbehave.core.annotations.Then;
>  import org.jbehave.core.annotations.When;
>  import org.openqa.selenium.By;
>  import org.openqa.selenium.WebElement;
>  import org.springframework.beans.factory.annotation.Autowired;
>
> -import org.apache.rave.integrationtests.pages.Portal;
> -
>  import static org.hamcrest.CoreMatchers.equalTo;
>  import static org.hamcrest.MatcherAssert.assertThat;
>
> @@ -46,8 +45,8 @@ public class NewUserSteps {
>
>      @Then("I see the login page")
>      public void isLoginPage() {
> -        final WebElement title = portal.findElement(By.tagName("title"));
> -        assertThat(title.getText().trim(), equalTo("Login - Rave"));
> +        final String title = portal.getTitle();
> +        assertThat(title.trim(), equalTo("Login - Rave"));
>      }
>
>      @When("I follow the new account link")
>
> Modified: rave/trunk/rave-portal/pom.xml
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-portal/pom.xml?rev=1504810&r1=1504809&r2=1504810&view=diff
>
> ==============================================================================
> --- rave/trunk/rave-portal/pom.xml (original)
> +++ rave/trunk/rave-portal/pom.xml Fri Jul 19 09:36:06 2013
> @@ -136,7 +136,6 @@
>                  <artifactId>cargo-maven2-plugin</artifactId>
>                  <version>${cargo.version}</version>
>                  <configuration>
> -                    <wait>true</wait>
>                      <deployables>
>                          <deployable>
>                              <groupId>org.apache.wookie</groupId>
> @@ -208,7 +207,7 @@
>                          <zipUrlInstaller>
>
>  <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
>                              <url>
> -
> http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
> +
> http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz
>                              </url>
>                          </zipUrlInstaller>
>                          <systemProperties>
>
>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message