[jboss-svn-commits] JBL Code SVN: r26977 - in labs/jbossrules/trunk: drools-guvnor/src/main/java/org/drools/guvnor/public and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 16 01:33:49 EDT 2009
Author: Rikkola
Date: 2009-06-16 01:33:49 -0400 (Tue, 16 Jun 2009)
New Revision: 26977
Modified:
labs/jbossrules/trunk/drools-guvnor/Guvnor.launch
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
Log:
GUVNOR-138 : Duplicate snapshot names in export can not be imported
Modified: labs/jbossrules/trunk/drools-guvnor/Guvnor.launch
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/Guvnor.launch 2009-06-15 20:50:14 UTC (rev 26976)
+++ labs/jbossrules/trunk/drools-guvnor/Guvnor.launch 2009-06-16 05:33:49 UTC (rev 26977)
@@ -27,29 +27,22 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/core-3.4.2.v_883_R34x.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/derby-10.2.1.6.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/dom4j-1.6.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/drools-api-5.1.0.SNAPSHOT.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/drools-compiler-5.1.0.SNAPSHOT.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/drools-core-5.1.0.SNAPSHOT.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/drools-decisiontables-5.1.0.SNAPSHOT.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/drools-repository-5.1.0.SNAPSHOT.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/drools-templates-5.1.0.SNAPSHOT.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/drools-verifier-5.1.0.SNAPSHOT.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/ejb-api-3.0.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/el-api-1.2.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/el-ri-1.2.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/gwt-diagrams-0.2-RC00.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/gwt-servlet-1.5.2.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/gwt-servlet-1.5.3.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/gwtext-2.0.5.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/hibernate-validator-3.0.0.GA.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/hsqldb-1.8.0.2.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/identity-impl-2.0.2.CR6.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/identity-spi-2.0.2.CR6.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jackrabbit-api-1.4.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jackrabbit-core-1.4.5.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jackrabbit-jcr-commons-1.4.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jackrabbit-spi-1.4.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jackrabbit-spi-commons-1.4.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jackrabbit-text-extractors-1.4.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jackrabbit-api-1.5.0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jackrabbit-core-1.5.5.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jackrabbit-jcr-commons-1.5.5.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jackrabbit-spi-1.5.0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jackrabbit-spi-commons-1.5.5.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jackrabbit-text-extractors-1.5.0.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/janino-2.5.15.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/javassist-3.4.GA.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jboss-common-core-2.2.1.GA.jar" path="3" type="2"/> "/>
@@ -66,10 +59,13 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jta-1.0.1B.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/jxl-2.4.2.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/log4j-log4j-1.2.14.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/lucene-core-2.2.0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/lucene-core-2.3.2.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/mvel2-2.0.10.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/nekohtml-1.9.7.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/org.jboss.seam-jboss-seam-2.1.0.GA.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/persistence-api-1.0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/poi-3.0.2-FINAL.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/poi-scratchpad-3.0.2-FINAL.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/slf4j-api-1.5.0.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/slf4j-log4j12-1.5.0.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-guvnor/target/drools-guvnor/WEB-INF/lib/webdavlib-2.0.jar" path="3" type="2"/> "/>
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt 2009-06-15 20:50:14 UTC (rev 26976)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt 2009-06-16 05:33:49 UTC (rev 26977)
@@ -1 +1 @@
-5.1.0.SNAPSHOT 26937M
\ No newline at end of file
+5.1.0.SNAPSHOT 26969M
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2009-06-15 20:50:14 UTC (rev 26976)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2009-06-16 05:33:49 UTC (rev 26977)
@@ -976,6 +976,11 @@
if ( mig.needsMigration( this ) ) {
mig.migrate( this );
}
+ } catch ( ItemExistsException e ) {
+ String message = "Item already exists. At least two items with the path: " + e.getLocalizedMessage();
+ log.error( message,
+ e );
+ throw new RulesRepositoryException( message );
} catch ( RepositoryException e ) {
log.error(e);
throw new RulesRepositoryException("Repository error when importing from stream.", e);
More information about the jboss-svn-commits
mailing list