[jboss-svn-commits] JBL Code SVN: r26168 - 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 Apr 21 03:58:03 EDT 2009
Author: Rikkola
Date: 2009-04-21 03:58:03 -0400 (Tue, 21 Apr 2009)
New Revision: 26168
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-260 : Categories can be deleted if used by a rule in a previous version - restoring is not possible any more
Modified: labs/jbossrules/trunk/drools-guvnor/Guvnor.launch
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/Guvnor.launch 2009-04-21 04:40:41 UTC (rev 26167)
+++ labs/jbossrules/trunk/drools-guvnor/Guvnor.launch 2009-04-21 07:58:03 UTC (rev 26168)
@@ -27,13 +27,6 @@
<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.0.1.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.0.1.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.0.1.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.0.1.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.0.1.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.0.1.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.0.1.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"/> "/>
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-04-21 04:40:41 UTC (rev 26167)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt 2009-04-21 07:58:03 UTC (rev 26168)
@@ -1 +1 @@
-5.0.0 26089:26090M
\ No newline at end of file
+5.0.1.SNAPSHOT svn: This client is too old to work with working copy '.'; please get a newer Subversion client
\ 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-04-21 04:40:41 UTC (rev 26167)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2009-04-21 07:58:03 UTC (rev 26168)
@@ -602,24 +602,15 @@
public void restoreHistoricalAsset(AssetItem versionToRestore,
AssetItem headVersion,
String comment) {
+ headVersion.checkout();
- long oldVersionNumber = headVersion.getVersionNumber();
-
- Object vToRestore = versionToRestore.getNode();
- Version v = (Version) vToRestore;
- try {
- headVersion.getNode().restore( v,
- true );
- AssetItem newHead = loadAssetByUUID( headVersion.getUUID() );
- newHead.checkout();
- newHead.getNode().setProperty( VersionableItem.VERSION_NUMBER_PROPERTY_NAME,
- oldVersionNumber );
- newHead.checkin( comment );
- } catch ( RepositoryException e ) {
- log.error( "Unable to restore version of asset.",
- e );
- throw new RulesRepositoryException( e );
+ if ( versionToRestore.isBinary() ) {
+ headVersion.updateBinaryContentAttachment( versionToRestore.getBinaryContentAttachment() );
+ } else {
+ headVersion.updateContent( versionToRestore.getContent() );
}
+
+ headVersion.checkin( comment );
}
/**
More information about the jboss-svn-commits
mailing list