Return-Path: 
 <empire-db-commits-return-397-apmail-incubator-empire-db-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-empire-db-commits-archive@minotaur.apache.org
Received: (qmail 54173 invoked from network); 8 Apr 2009 04:31:54 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 8 Apr 2009 04:31:54 -0000
Received: (qmail 44489 invoked by uid 500); 8 Apr 2009 04:31:54 -0000
Delivered-To: apmail-incubator-empire-db-commits-archive@incubator.apache.org
Received: (qmail 44468 invoked by uid 500); 8 Apr 2009 04:31:54 -0000
Mailing-List: contact empire-db-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:empire-db-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:empire-db-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:empire-db-commits@incubator.apache.org>
List-Id: <empire-db-commits.incubator.apache.org>
Reply-To: empire-db-dev@incubator.apache.org
Delivered-To: mailing list empire-db-commits@incubator.apache.org
Received: (qmail 44458 invoked by uid 99); 8 Apr 2009 04:31:54 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Apr 2009 04:31:54 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Apr 2009 04:31:52 +0000
Received: by eris.apache.org (Postfix, from userid 1221)
	id E63282388B8B; Wed,  8 Apr 2009 04:31:19 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r762991 - in /incubator/empire-db/trunk:
 empire-assembly-all.xml
 empire-db-examples/empire-db-example-struts2-cxf/pom.xml
 empire-db-examples/empire-db-example-struts2/pom.xml pom.xml
Date: Wed, 08 Apr 2009 04:31:19 -0000
To: empire-db-commits@incubator.apache.org
From: francisdb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090408043119.E63282388B8B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: francisdb
Date: Tue Apr  7 22:06:40 2009
New Revision: 762991

URL: http://svn.apache.org/viewvc?rev=762991&view=rev
Log:
fix missing/wrong dependencies in the generated war files

Modified:
    incubator/empire-db/trunk/empire-assembly-all.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
    incubator/empire-db/trunk/pom.xml

Modified: incubator/empire-db/trunk/empire-assembly-all.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-assembly-all.xml?rev=762991&r1=762990&r2=762991&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-assembly-all.xml (original)
+++ incubator/empire-db/trunk/empire-assembly-all.xml Tue Apr  7 22:06:40 2009
@@ -46,7 +46,6 @@
 				<exclude>**/.settings/**</exclude>
 				<exclude>**/.amateras/**</exclude>
 				<exclude>**/.tomcatplugin/**</exclude>
-				<exclude>**/.tomcatplugin/**</exclude>
 				<exclude>empire-db-examples/tutorial.pdf</exclude>
 			</excludes>
 		</fileSet>

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=762991&r1=762990&r2=762991&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 Tue Apr  7 22:06:40 2009
@@ -43,6 +43,11 @@
 			<artifactId>cxf-rt-frontend-jaxws</artifactId>
 			<version>2.1.3</version>
 		</dependency>
+		
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+		</dependency>
 
 		<!-- Jetty is needed if you're are not using the CXFServlet -->
 		<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=762991&r1=762990&r2=762991&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 Tue Apr  7 22:06:40 2009
@@ -37,23 +37,34 @@
 			<artifactId>empire-db-struts2</artifactId>
 		</dependency>
 		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet.jsp</groupId>
+			<artifactId>jsp-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
-		
-			<!-- WTP-Eclipse-Projekt
-			<plugin>
+
+			<!--
+				WTP-Eclipse-Projekt <plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<configuration>
-					<m2eclipse>true</m2eclipse>
-					<downloadSources>true</downloadSources>
-					<wtpversion>1.5</wtpversion>
-				</configuration>
-			</plugin> -->
+				<artifactId>maven-eclipse-plugin</artifactId> <configuration>
+				<m2eclipse>true</m2eclipse> <downloadSources>true</downloadSources>
+				<wtpversion>1.5</wtpversion> </configuration> </plugin>
+			-->
 
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
@@ -65,24 +76,15 @@
 					<stopPort>9999</stopPort>
 				</configuration>
 				<executions>
-					<!-- <execution>
-						<id>start-jetty</id>
-						<phase>pre-integration-test</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<scanIntervalSeconds>0</scanIntervalSeconds>
-							<daemon>true</daemon>
-						</configuration>
-					</execution>
-					<execution>
-						<id>stop-jetty</id>
-						<phase>post-integration-test</phase>
-						<goals>
-							<goal>stop</goal>
-						</goals>
-					</execution>-->
+					<!--
+						<execution> <id>start-jetty</id>
+						<phase>pre-integration-test</phase> <goals> <goal>run</goal>
+						</goals> <configuration>
+						<scanIntervalSeconds>0</scanIntervalSeconds> <daemon>true</daemon>
+						</configuration> </execution> <execution> <id>stop-jetty</id>
+						<phase>post-integration-test</phase> <goals> <goal>stop</goal>
+						</goals> </execution>
+					-->
 				</executions>
 			</plugin>
 		</plugins>

Modified: incubator/empire-db/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/pom.xml?rev=762991&r1=762990&r2=762991&view=diff
==============================================================================
--- incubator/empire-db/trunk/pom.xml (original)
+++ incubator/empire-db/trunk/pom.xml Tue Apr  7 22:06:40 2009
@@ -253,11 +253,13 @@
 			    <groupId>javax.servlet</groupId>
 			    <artifactId>servlet-api</artifactId>
 			    <version>2.4</version>
+			    <scope>provided</scope>
 			</dependency>
 			<dependency>
 			    <groupId>javax.servlet.jsp</groupId>
 			    <artifactId>jsp-api</artifactId>
 			    <version>2.0</version>
+			    <scope>provided</scope>
 			</dependency> 
 			<dependency>
 			    <groupId>junit</groupId>