You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by fr...@apache.org on 2011/01/24 17:52:39 UTC
svn commit: r1062873 - in /incubator/empire-db/trunk: ./ empire-db-codegen/
empire-db-config/ empire-db-config/src/main/java/org/apache/empire/xml/
empire-db-dist/ empire-db-dist/src/assemble/
empire-db-examples/empire-db-example-advanced/ empire-db-ex...
Author: francisdb
Date: Mon Jan 24 16:52:38 2011
New Revision: 1062873
URL: http://svn.apache.org/viewvc?rev=1062873&view=rev
Log:
EMPIREDB-98 Split off the xml configuration mechanism to an optional module
Added:
incubator/empire-db/trunk/empire-db-config/src/main/java/org/apache/empire/xml/XMLConfiguration.java
- copied unchanged from r1062858, incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/XMLConfiguration.java
incubator/empire-db/trunk/empire-db-config/src/main/java/org/apache/empire/xml/XMLWriter.java
- copied unchanged from r1062858, incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/XMLWriter.java
incubator/empire-db/trunk/empire-db-config/src/main/java/org/apache/empire/xml/package.html
- copied unchanged from r1062858, incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/package.html
Removed:
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
Modified:
incubator/empire-db/trunk/empire-db-codegen/pom.xml
incubator/empire-db/trunk/empire-db-config/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/pom.xml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/pom.xml
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/pom.xml
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=1062873&r1=1062872&r2=1062873&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-codegen/pom.xml Mon Jan 24 16:52:38 2011
@@ -33,6 +33,10 @@
<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-config/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-config/pom.xml?rev=1062873&r1=1062872&r2=1062873&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-config/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-config/pom.xml Mon Jan 24 16:52:38 2011
@@ -33,6 +33,14 @@
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db</artifactId>
</dependency>
+
+ <!-- TODO should we get rid of this dependency? -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <!-- <scope>runtime</scope>-->
+ <!-- <optional>true</optional> -->
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
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=1062873&r1=1062872&r2=1062873&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-dist/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-dist/pom.xml Mon Jan 24 16:52:38 2011
@@ -76,6 +76,10 @@
</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>
@@ -86,6 +90,12 @@
<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=1062873&r1=1062872&r2=1062873&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 16:52:38 2011
@@ -35,6 +35,7 @@
<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>
@@ -93,6 +94,7 @@
<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>
@@ -101,6 +103,7 @@
<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>
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=1062873&r1=1062872&r2=1062873&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 16:52:38 2011
@@ -30,6 +30,10 @@
<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>
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=1062873&r1=1062872&r2=1062873&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 16:52:38 2011
@@ -30,6 +30,11 @@
<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>
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=1062873&r1=1062872&r2=1062873&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 16:52:38 2011
@@ -31,6 +31,11 @@
<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=1062873&r1=1062872&r2=1062873&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 16:52:38 2011
@@ -38,6 +38,11 @@
<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=1062873&r1=1062872&r2=1062873&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 16:52:38 2011
@@ -39,6 +39,11 @@
<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=1062873&r1=1062872&r2=1062873&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 16:52:38 2011
@@ -36,6 +36,12 @@
<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>
Modified: incubator/empire-db/trunk/empire-db/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/pom.xml?rev=1062873&r1=1062872&r2=1062873&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db/pom.xml Mon Jan 24 16:52:38 2011
@@ -35,13 +35,7 @@
<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>
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=1062873&r1=1062872&r2=1062873&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 16:52:38 2011
@@ -22,6 +22,6 @@
</head>
<body>
-This package contains classes for XML generation and configuration.
+This package contains classes for XML generation
</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=1062873&r1=1062872&r2=1062873&view=diff
==============================================================================
--- incubator/empire-db/trunk/pom.xml (original)
+++ incubator/empire-db/trunk/pom.xml Mon Jan 24 16:52:38 2011
@@ -198,6 +198,7 @@
</issueManagement>
<dependencyManagement>
<dependencies>
+ <!-- our own project dependencies -->
<dependency>
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db</artifactId>
@@ -217,6 +218,14 @@
<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>