empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From franci...@apache.org
Subject svn commit: r1063047 - in /incubator/empire-db/trunk: ./ empire-db-codegen/ empire-db-config/ empire-db-dist/ empire-db-dist/src/assemble/ empire-db-examples/ empire-db-examples/empire-db-example-advanced/ empire-db-examples/empire-db-example-advanced/...
Date Mon, 24 Jan 2011 22:48:18 GMT
Author: francisdb
Date: Mon Jan 24 22:48:17 2011
New Revision: 1063047

URL: http://svn.apache.org/viewvc?rev=1063047&view=rev
Log:
revert EMPIREDB-98 Split off the xml configuration mechanism to an optional module

Added:
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/XMLConfiguration.java
      - copied unchanged from r1062861, incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/XMLConfiguration.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/XMLWriter.java
      - copied unchanged from r1062861, incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/XMLWriter.java
Removed:
    incubator/empire-db/trunk/empire-db-config/
Modified:
    incubator/empire-db/trunk/empire-db-codegen/pom.xml
    incubator/empire-db/trunk/empire-db-dist/pom.xml
    incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/config.xml   (props
changed)
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/pom.xml
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/
  (props changed)
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/config.xml   (props
changed)
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/pom.xml
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/
  (props changed)
    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
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/
  (props changed)
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/log4j.dtd
  (props changed)
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/log4j.xml
  (props changed)
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/messages_de.properties
  (props changed)
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/messages_en.properties
  (props changed)
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.properties
  (props changed)
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.xml
  (props changed)
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/
  (props changed)
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/css/
  (props changed)
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/index.html
  (props changed)
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/jsp/
  (props changed)
    incubator/empire-db/trunk/empire-db-examples/tutorial.pdf   (props changed)
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/   (props changed)
    incubator/empire-db/trunk/empire-db-struts2/src/main/resources/META-INF/   (props changed)
    incubator/empire-db/trunk/empire-db/pom.xml
    incubator/empire-db/trunk/empire-db/src/main/java/org/   (props changed)
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/package.html
    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=1063047&r1=1063046&r2=1063047&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-codegen/pom.xml Mon Jan 24 22:48:17 2011
@@ -33,10 +33,6 @@
 		    <groupId>org.apache.empire-db</groupId>
 		    <artifactId>empire-db</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.empire-db</groupId>
-			<artifactId>empire-db-config</artifactId>
-		</dependency>
 		 
 		<dependency>
 			<groupId>org.apache.velocity</groupId>

Modified: incubator/empire-db/trunk/empire-db-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-dist/pom.xml?rev=1063047&r1=1063046&r2=1063047&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-dist/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-dist/pom.xml Mon Jan 24 22:48:17 2011
@@ -76,10 +76,6 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.empire-db</groupId>
-			<artifactId>empire-db-config</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.empire-db</groupId>
 			<artifactId>empire-db</artifactId>
 			<version>${project.version}</version>
 			<classifier>javadoc</classifier>
@@ -90,12 +86,6 @@
 			<version>${project.version}</version>
 			<classifier>javadoc</classifier>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.empire-db</groupId>
-			<artifactId>empire-db-config</artifactId>
-			<version>${project.version}</version>
-			<classifier>javadoc</classifier>
-		</dependency>
 	</dependencies>
 
 </project>
\ No newline at end of file

Modified: incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml?rev=1063047&r1=1063046&r2=1063047&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml (original)
+++ incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml Mon Jan
24 22:48:17 2011
@@ -35,7 +35,6 @@
 				<include>empire-assembly-all.xml</include>
 				<include>empire-db/**</include>
 				<include>empire-db-struts2/**</include>
-				<include>empire-db-config/**</include>
 				<include>empire-db-examples/**</include>
 				<include>empire-db-maven-plugin/**</include>
 				<include>empire-db-codegen/**</include>
@@ -94,7 +93,6 @@
 			<includes>
 				<include>org.apache.empire-db:empire-db:*:javadoc</include>
 				<include>org.apache.empire-db:empire-db-struts2:*:javadoc</include>
-				<include>org.apache.empire-db:empire-db-config:*:javadoc</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>
@@ -103,7 +101,6 @@
             <includes>
                 <include>org.apache.empire-db:empire-db:jar</include>
                 <include>org.apache.empire-db:empire-db-struts2:jar</include>
-                <include>org.apache.empire-db:empire-db-config:jar</include>
             </includes>
         </dependencySet>
     </dependencySets>

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/config.xml
            ('svn:mergeinfo' removed)

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/pom.xml?rev=1063047&r1=1063046&r2=1063047&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/pom.xml Mon Jan
24 22:48:17 2011
@@ -30,10 +30,6 @@
 			<groupId>org.apache.empire-db</groupId>
 			<artifactId>empire-db</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.empire-db</groupId>
-			<artifactId>empire-db-config</artifactId>
-		</dependency>
 		<!-- This dependency should be declared as runtime but the exec plugin is broken atm...
-->
 		<dependency>
 		    <groupId>hsqldb</groupId>

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/config.xml
            ('svn:mergeinfo' removed)

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/pom.xml?rev=1063047&r1=1063046&r2=1063047&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/pom.xml Mon Jan 24
22:48:17 2011
@@ -30,11 +30,6 @@
 			<groupId>org.apache.empire-db</groupId>
 			<artifactId>empire-db</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.empire-db</groupId>
-			<artifactId>empire-db-config</artifactId>
-		</dependency>
-		
 		<!-- This dependency should be declared as runtime but the exec plugin is broken atm...
-->
 		<dependency>
 		    <groupId>hsqldb</groupId>

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/
            ('svn:mergeinfo' removed)

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=1063047&r1=1063046&r2=1063047&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 Mon Jan 24
22:48:17 2011
@@ -31,11 +31,6 @@
 			<groupId>org.apache.empire-db</groupId>
 			<artifactId>empire-db</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.empire-db</groupId>
-			<artifactId>empire-db-config</artifactId>
-		</dependency>
-		
 		<!--
 			This dependency should be declared as runtime but the exec plugin is
 			broken atm...

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=1063047&r1=1063046&r2=1063047&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 Mon Jan
24 22:48:17 2011
@@ -38,11 +38,6 @@
 			<groupId>org.apache.empire-db</groupId>
 			<artifactId>empire-db</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.empire-db</groupId>
-			<artifactId>empire-db-config</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=1063047&r1=1063046&r2=1063047&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 Mon
Jan 24 22:48:17 2011
@@ -39,11 +39,6 @@
 			<groupId>org.apache.empire-db</groupId>
 			<artifactId>empire-db-struts2</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.empire-db</groupId>
-			<artifactId>empire-db-config</artifactId>
-		</dependency>
-
 
 		<dependency>
 			<groupId>org.apache.cxf</groupId>

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=1063047&r1=1063046&r2=1063047&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 Mon Jan
24 22:48:17 2011
@@ -36,12 +36,6 @@
 			<artifactId>empire-db-struts2</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.empire-db</groupId>
-			<artifactId>empire-db-config</artifactId>
-		</dependency>
-		
-		
-		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
 			<scope>provided</scope>

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/log4j.dtd
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/log4j.xml
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/messages_de.properties
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/messages_en.properties
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.properties
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.xml
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/css/
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/index.html
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/jsp/
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-examples/tutorial.pdf
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/
            ('svn:mergeinfo' removed)

Propchange: incubator/empire-db/trunk/empire-db-struts2/src/main/resources/META-INF/
            ('svn:mergeinfo' removed)

Modified: incubator/empire-db/trunk/empire-db/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/pom.xml?rev=1063047&r1=1063046&r2=1063047&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db/pom.xml Mon Jan 24 22:48:17 2011
@@ -35,7 +35,13 @@
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
 		</dependency>-->
-
+		<!-- TODO we should get rid of this dependency -->
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<!-- <scope>runtime</scope>-->
+			<!-- <optional>true</optional> -->
+		</dependency>
 		<!-- TEST -->
 		<dependency>
 		    <groupId>hsqldb</groupId>

Propchange: incubator/empire-db/trunk/empire-db/src/main/java/org/
            ('svn:mergeinfo' removed)

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/package.html
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/package.html?rev=1063047&r1=1063046&r2=1063047&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/package.html (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/package.html Mon
Jan 24 22:48:17 2011
@@ -22,6 +22,6 @@
 </head>
 <body>
 
-This package contains classes for XML generation
+This package contains classes for XML generation and configuration.
 
 </body></html>
\ No newline at end of file

Modified: incubator/empire-db/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/pom.xml?rev=1063047&r1=1063046&r2=1063047&view=diff
==============================================================================
--- incubator/empire-db/trunk/pom.xml (original)
+++ incubator/empire-db/trunk/pom.xml Mon Jan 24 22:48:17 2011
@@ -34,7 +34,6 @@
 	
 	<modules>
 		<module>empire-db</module>
-		<module>empire-db-config</module>
 		<module>empire-db-struts2</module>
 		<module>empire-db-codegen</module>
 		<module>empire-db-maven-plugin</module>
@@ -198,7 +197,6 @@
 	</issueManagement>
 	<dependencyManagement>
 		<dependencies>
-			<!-- our own project dependencies -->
 			<dependency>
 				<groupId>org.apache.empire-db</groupId>
 				<artifactId>empire-db</artifactId>
@@ -218,14 +216,6 @@
 				<type>jar</type>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.empire-db</groupId>
-				<artifactId>empire-db-config</artifactId>
-				<version>${project.version}</version>
-				<type>jar</type>
-			</dependency>
-			
-			<!-- external dependencies -->
-			<dependency>
 				<groupId>commons-logging</groupId>
 				<artifactId>commons-logging</artifactId>
 				<version>1.0.4</version>



Mime
View raw message