You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/11/22 14:03:18 UTC
svn commit: r1544519 - in /syncope/trunk: build-tools/pom.xml
console/pom.xml console/src/main/resources/log4j2.xml
console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
core/pom.xml pom.xml
Author: ilgrosso
Date: Fri Nov 22 13:03:17 2013
New Revision: 1544519
URL: http://svn.apache.org/r1544519
Log:
Aligning Servlet spec version to 3.0 + minor fixes
Modified:
syncope/trunk/build-tools/pom.xml
syncope/trunk/console/pom.xml
syncope/trunk/console/src/main/resources/log4j2.xml
syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
syncope/trunk/core/pom.xml
syncope/trunk/pom.xml
Modified: syncope/trunk/build-tools/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/build-tools/pom.xml?rev=1544519&r1=1544518&r2=1544519&view=diff
==============================================================================
--- syncope/trunk/build-tools/pom.xml (original)
+++ syncope/trunk/build-tools/pom.xml Fri Nov 22 13:03:17 2013
@@ -42,9 +42,10 @@ under the License.
</distributionManagement>
<dependencies>
+
<dependency>
- <artifactId>servlet-api</artifactId>
<groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
Modified: syncope/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1544519&r1=1544518&r2=1544519&view=diff
==============================================================================
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Fri Nov 22 13:03:17 2013
@@ -46,7 +46,7 @@ under the License.
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
Modified: syncope/trunk/console/src/main/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/log4j2.xml?rev=1544519&r1=1544518&r2=1544519&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/log4j2.xml (original)
+++ syncope/trunk/console/src/main/resources/log4j2.xml Fri Nov 22 13:03:17 2013
@@ -52,10 +52,6 @@ under the License.
<asyncLogger name="org.springframework" additivity="false" level="ERROR">
<appender-ref ref="main"/>
</asyncLogger>
-
- <asyncLogger name="org.apache.http" additivity="false" level="ERROR">
- <appender-ref ref="main"/>
- </asyncLogger>
<asyncLogger name="org.apache.cxf" additivity="false" level="ERROR">
<appender-ref ref="main"/>
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java?rev=1544519&r1=1544518&r2=1544519&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java Fri Nov 22 13:03:17 2013
@@ -96,7 +96,7 @@ public class ConfigurationTestITCase ext
selenium.click("//div[@id='tabs']/ul/li[6]/a/span");
- selenium.waitForCondition("selenium.isElementPresent(\"//*[@id='workflowDefArea']\");", "30000");
+ selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='workflow']/div/span/img\");", "30000");
}
@Test
Modified: syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1544519&r1=1544518&r2=1544519&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Fri Nov 22 13:03:17 2013
@@ -50,14 +50,9 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.syncope</groupId>
- <artifactId>syncope-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
@@ -249,6 +244,12 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1544519&r1=1544518&r2=1544519&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Fri Nov 22 13:03:17 2013
@@ -292,7 +292,7 @@ under the License.
<properties>
<targetJdk>1.6</targetJdk>
- <servlet-api.version>2.5</servlet-api.version>
+ <servlet-api.version>3.0.1</servlet-api.version>
<jsp-api.version>2.2</jsp-api.version>
<jstl.version>1.2</jstl.version>
<jax-rs.version>2.0-m15</jax-rs.version>
@@ -382,7 +382,7 @@ under the License.
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>