Return-Path: 
 <empire-db-commits-return-887-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 3726 invoked from network); 1 Nov 2010 22:56:48 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 1 Nov 2010 22:56:48 -0000
Received: (qmail 18542 invoked by uid 500); 1 Nov 2010 22:57:19 -0000
Delivered-To: apmail-incubator-empire-db-commits-archive@incubator.apache.org
Received: (qmail 18519 invoked by uid 500); 1 Nov 2010 22:57:19 -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 18511 invoked by uid 99); 1 Nov 2010 22:57:19 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Nov 2010 22:57:19 +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; Mon, 01 Nov 2010 22:57:16 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 516D323888FD; Mon,  1 Nov 2010 22:56:02 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1029879 - in /incubator/empire-db/trunk: ./
 empire-db-codegen/
 empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/
 empire-db-maven-plugin/ empire-db-struts2/ empire-db/
Date: Mon, 01 Nov 2010 22:56:02 -0000
To: empire-db-commits@incubator.apache.org
From: francisdb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101101225602.516D323888FD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: francisdb
Date: Mon Nov  1 22:56:01 2010
New Revision: 1029879

URL: http://svn.apache.org/viewvc?rev=1029879&view=rev
Log:
EMPIREDB-85 Remove declarations of unused dependencies (from pom.xml)

Modified:
    incubator/empire-db/trunk/empire-db-codegen/pom.xml
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java
    incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml
    incubator/empire-db/trunk/empire-db-struts2/pom.xml
    incubator/empire-db/trunk/empire-db/pom.xml
    incubator/empire-db/trunk/pom.xml

Modified: incubator/empire-db/trunk/empire-db-codegen/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-codegen/pom.xml?rev=1029879&r1=1029878&r2=1029879&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-codegen/pom.xml Mon Nov  1 22:56:01 2010
@@ -45,7 +45,7 @@
 		<dependency>
 		    <groupId>hsqldb</groupId>
 		    <artifactId>hsqldb</artifactId>
-		    <!-- <scope>runtime</scope> -->
+		    <scope>test</scope>
 		</dependency>
 
 		<!-- mysql -->

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java?rev=1029879&r1=1029878&r2=1029879&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java Mon Nov  1 22:56:01 2010
@@ -215,7 +215,8 @@ public class SampleApplication implement
         script.run(driver, conn, false);
         db.commit(conn);
         // Open again
-        if (!db.isOpen() && !db.open(driver, conn)){
+        if (!db.isOpen() && !db.open(driver, conn))
+        {
             throw new RuntimeException(driver.getErrorMessage());
         }
 		// Insert Sample Departments

Modified: incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml?rev=1029879&r1=1029878&r2=1029879&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml Mon Nov  1 22:56:01 2010
@@ -32,14 +32,23 @@
 			<artifactId>empire-db-codegen</artifactId>
 		</dependency>
 		<dependency>
+			<groupId>org.apache.empire-db</groupId>
+			<artifactId>empire-db</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-plugin-api</artifactId>
 			<version>2.0</version>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-core</artifactId>
 			<version>2.0</version>
+		</dependency> -->
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-project</artifactId>
+			<version>2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>

Modified: incubator/empire-db/trunk/empire-db-struts2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/pom.xml?rev=1029879&r1=1029878&r2=1029879&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-struts2/pom.xml Mon Nov  1 22:56:01 2010
@@ -39,10 +39,15 @@
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-portlet-plugin</artifactId>
         </dependency>
-		<dependency>
+        <dependency>
+            <groupId>org.apache.struts.xwork</groupId>
+            <artifactId>xwork-core</artifactId>
+            <!-- <version>2.2.1</version> -->
+        </dependency>
+		<!-- <dependency>
 		    <groupId>javassist</groupId>
 		    <artifactId>javassist</artifactId>
-		</dependency>
+		</dependency> -->
 		<dependency>
 		    <groupId>javax.servlet</groupId>
 		    <artifactId>servlet-api</artifactId>
@@ -55,5 +60,10 @@
             <groupId>javax.portlet</groupId>
             <artifactId>portlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+        
 	</dependencies>
 </project>
\ No newline at end of file

Modified: incubator/empire-db/trunk/empire-db/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/pom.xml?rev=1029879&r1=1029878&r2=1029879&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db/pom.xml Mon Nov  1 22:56:01 2010
@@ -31,10 +31,10 @@
 			<groupId>commons-beanutils</groupId>
 			<artifactId>commons-beanutils</artifactId>
 		</dependency>
-		<dependency>
+		<!--<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
-		</dependency>
+		</dependency>-->
 		<!-- TODO we should get rid of this dependency -->
 		<dependency>
 			<groupId>log4j</groupId>
@@ -55,4 +55,4 @@
 		    <scope>test</scope>
 		</dependency> 
 	</dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/empire-db/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/pom.xml?rev=1029879&r1=1029878&r2=1029879&view=diff
==============================================================================
--- incubator/empire-db/trunk/pom.xml (original)
+++ incubator/empire-db/trunk/pom.xml Mon Nov  1 22:56:01 2010
@@ -231,11 +231,6 @@
 				<version>1.7.0</version>
 			</dependency>
 			<dependency>
-				<groupId>commons-collections</groupId>
-				<artifactId>commons-collections</artifactId>
-				<version>3.2.1</version>
-			</dependency>
-			<dependency>
 				<groupId>hsqldb</groupId>
 				<artifactId>hsqldb</artifactId>
 				<version>1.8.0.10</version>
@@ -249,13 +244,13 @@
 				<groupId>org.apache.struts</groupId>
 				<artifactId>struts2-portlet-plugin</artifactId>
 				<version>2.2.1</version>
-			</dependency> 
-			<dependency>
-			    <groupId>javassist</groupId>
-			    <artifactId>javassist</artifactId>
-			    <version>3.8.0.GA</version>
 			</dependency>
 			<dependency>
+	            <groupId>org.apache.struts.xwork</groupId>
+	            <artifactId>xwork-core</artifactId>
+	            <version>2.2.1</version>
+	        </dependency>
+			<dependency>
 				<groupId>javax.servlet</groupId>
 				<artifactId>servlet-api</artifactId>
 				<version>2.4</version>