empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From benni...@apache.org
Subject svn commit: r1069533 - in /incubator/empire-db/trunk/empire-db-examples: empire-db-example-cxf/pom.xml empire-db-example-spring/pom.xml empire-db-example-struts2-cxf/pom.xml empire-db-example-struts2/pom.xml
Date Thu, 10 Feb 2011 19:03:48 GMT
Author: benniven
Date: Thu Feb 10 19:03:48 2011
New Revision: 1069533

URL: http://svn.apache.org/viewvc?rev=1069533&view=rev
Log:
This commit is for EMPIREDB-38 and EMPIRE-77:
- added bindings for slf4j in the example projects
- excluded conflicting slf4j bindings introduced by jetty
- all examples tested with success

Modified:
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/pom.xml
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/pom.xml
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/pom.xml
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/pom.xml

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/pom.xml?rev=1069533&r1=1069532&r2=1069533&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/pom.xml Thu Feb 10
19:03:48 2011
@@ -31,6 +31,11 @@
 			<groupId>org.apache.empire-db</groupId>
 			<artifactId>empire-db</artifactId>
 		</dependency>
+		<!-- use log4j for logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
 		<!--
 			This dependency should be declared as runtime but the exec plugin is
 			broken atm...
@@ -52,6 +57,12 @@
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-transports-http-jetty</artifactId>
 			<version>2.1.3</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-jdk14</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/pom.xml?rev=1069533&r1=1069532&r2=1069533&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-spring/pom.xml Thu Feb
10 19:03:48 2011
@@ -38,6 +38,11 @@
 			<groupId>org.apache.empire-db</groupId>
 			<artifactId>empire-db</artifactId>
 		</dependency>
+		<!-- use log4j for logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
 		<!-- Spring -->
         <dependency>
             <groupId>org.springframework</groupId>

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/pom.xml?rev=1069533&r1=1069532&r2=1069533&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/pom.xml Thu
Feb 10 19:03:48 2011
@@ -45,12 +45,24 @@
 			<artifactId>cxf-rt-frontend-jaxws</artifactId>
 			<version>2.1.3</version>
 		</dependency>
+		
+		<!-- use log4j for logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
 
 		<!-- Jetty is needed if you're are not using the CXFServlet -->
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-transports-http-jetty</artifactId>
 			<version>2.1.3</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-jdk14</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		
 		<dependency>

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/pom.xml?rev=1069533&r1=1069532&r2=1069533&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/pom.xml Thu Feb
10 19:03:48 2011
@@ -54,6 +54,11 @@
             <artifactId>portlet-api</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <!-- use log4j for logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>



Mime
View raw message