[jboss-svn-commits] JBL Code SVN: r10138 - in labs/jbossrules/trunk/drools-repository/src: test/java/org/drools/repository and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 12 19:38:49 EDT 2007
Author: michael.neale at jboss.com
Date: 2007-03-12 19:38:49 -0400 (Mon, 12 Mar 2007)
New Revision: 10138
Modified:
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RepositoryConfigurator.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java
Log:
JBRULES-650
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java 2007-03-12 23:22:22 UTC (rev 10137)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java 2007-03-12 23:38:49 UTC (rev 10138)
@@ -141,8 +141,9 @@
Calendar lastModified = Calendar.getInstance();
ruleNode.setProperty( AssetItem.LAST_MODIFIED_PROPERTY_NAME, lastModified );
-
ruleNode.setProperty( AssetItem.PACKAGE_NAME_PROPERTY, this.getName() );
+ ruleNode.setProperty( CREATOR_PROPERTY_NAME, this.node.getSession().getUserID() );
+
AssetItem rule = new AssetItem( this.rulesRepository, ruleNode );
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RepositoryConfigurator.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RepositoryConfigurator.java 2007-03-12 23:22:22 UTC (rev 10137)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RepositoryConfigurator.java 2007-03-12 23:38:49 UTC (rev 10138)
@@ -52,7 +52,7 @@
public Session login(Repository repository) throws LoginException,
RepositoryException {
Session session = repository.login(
- new SimpleCredentials("username", "password".toCharArray()));
+ new SimpleCredentials("alan_parsons", "password".toCharArray()));
if(session == null) {
log.error("LOGIN FAILED! SESSION IS NULL!");
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 2007-03-12 23:22:22 UTC (rev 10137)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2007-03-12 23:38:49 UTC (rev 10138)
@@ -606,10 +606,12 @@
rulePackageNode.setProperty(AssetItem.DESCRIPTION_PROPERTY_NAME, description);
rulePackageNode.setProperty(AssetItem.FORMAT_PROPERTY_NAME, PackageItem.PACKAGE_FORMAT);
+ rulePackageNode.setProperty( PackageItem.CREATOR_PROPERTY_NAME, this.session.getUserID() );
Calendar lastModified = Calendar.getInstance();
rulePackageNode.setProperty(PackageItem.LAST_MODIFIED_PROPERTY_NAME, lastModified);
+
PackageItem item = new PackageItem(this, rulePackageNode);
item.checkin( "Initial" );
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java 2007-03-12 23:22:22 UTC (rev 10137)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java 2007-03-12 23:38:49 UTC (rev 10138)
@@ -240,10 +240,6 @@
TITLE_PROPERTY_NAME );
}
- public void updateLastContributor(String contibName) {
- updateStringProperty( contibName,
- LAST_CONTRIBUTOR_PROPERTY_NAME );
- }
public void updateType(String type) {
updateStringProperty( type,
@@ -502,6 +498,7 @@
try {
this.node.setProperty( LAST_MODIFIED_PROPERTY_NAME, Calendar.getInstance() );
this.node.setProperty( CHECKIN_COMMENT, comment );
+ this.node.setProperty( LAST_CONTRIBUTOR_PROPERTY_NAME, this.node.getSession().getUserID() );
long nextVersion = getVersionNumber() + 1;
this.node.setProperty( VERSION_NUMBER_PROPERTY_NAME, nextVersion );
this.node.getSession().save();
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java 2007-03-12 23:22:22 UTC (rev 10137)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java 2007-03-12 23:38:49 UTC (rev 10138)
@@ -73,9 +73,13 @@
public void testUpdateContent() throws Exception {
AssetItem ruleItem1 = getDefaultPackage().addAsset("testUpdateContent", "test description");
+
+ assertFalse(ruleItem1.getCreator().equals( "" ));
ruleItem1.updateContent( "test content" );
ruleItem1.checkin( "yeah" );
+ assertFalse(ruleItem1.getLastContributor().equals( "" ));
+
ruleItem1.updateContent( "new rule content");
assertEquals("new rule content", ruleItem1.getContent());
@@ -598,14 +602,12 @@
ruleItem.updateCoverage( "b" );
assertEquals("b",ruleItem.getCoverage());
- ruleItem.updateLastContributor( "me" );
ruleItem.checkin( "woo" );
pkg = getRepo().loadPackage( "testDublinCore" );
ruleItem = (AssetItem) pkg.getAssets().next();
assertEquals("b", ruleItem.getCoverage());
- assertEquals("me", ruleItem.getLastContributor());
assertEquals("", ruleItem.getExternalRelation());
assertEquals("", ruleItem.getExternalSource());
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java 2007-03-12 23:22:22 UTC (rev 10137)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java 2007-03-12 23:38:49 UTC (rev 10138)
@@ -10,8 +10,11 @@
public void testListPackages() throws Exception {
RulesRepository repo = getRepo();
- repo.createPackage( "testListPackages1", "lalalala" );
+ PackageItem item = repo.createPackage( "testListPackages1", "lalalala" );
+ assertNotNull(item.getCreator());
+ assertFalse(item.getCreator().equals( "" ));
+
List list = iteratorToList( repo.listPackages() );
int prevSize = list.size();
repo.createPackage( "testListPackages2", "abc" );
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java 2007-03-12 23:22:22 UTC (rev 10137)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java 2007-03-12 23:38:49 UTC (rev 10138)
@@ -37,6 +37,9 @@
assertNotNull(def);
assertEquals("default", def.getName());
+ String userId = repo.getSession().getUserID();
+ assertNotNull(userId);
+ assertFalse(userId.equals( "" ));
}
More information about the jboss-svn-commits
mailing list