[jboss-svn-commits] JBL Code SVN: r36290 - in labs/jbossrules/trunk: drools-guvnor/src/test/resources/modeshape and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Dec 9 00:36:38 EST 2010
Author: kurt.stam at jboss.com
Date: 2010-12-09 00:36:38 -0500 (Thu, 09 Dec 2010)
New Revision: 36290
Added:
labs/jbossrules/trunk/drools-repo/drools-repository/src/test/resources/log4j.xml
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java
labs/jbossrules/trunk/drools-guvnor/src/test/resources/modeshape/roles.properties
labs/jbossrules/trunk/drools-guvnor/src/test/resources/modeshape/users.properties
labs/jbossrules/trunk/drools-repo/drools-repository/pom.xml
labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/ClassUtil.java
labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/RepositorySessionUtil.java
labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/RulesRepositoryConfigurator.java
labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/migration/MigrateDroolsPackage.java
Log:
GUVNORSOA-47, merging ModeShape Integration removing System.outs and fixing logging
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java 2010-12-09 05:21:08 UTC (rev 36289)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java 2010-12-09 05:36:38 UTC (rev 36290)
@@ -30,6 +30,8 @@
import org.drools.repository.RepositorySessionUtil;
import org.drools.repository.RulesRepositoryAdministrator;
import org.drools.repository.RulesRepositoryConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is only to be used for testing, eg in hosted mode, or unit tests.
@@ -40,6 +42,7 @@
public class TestEnvironmentSessionHelper {
+ public static final Logger log = LoggerFactory.getLogger(TestEnvironmentSessionHelper.class);
public static Repository repository;
@@ -53,9 +56,9 @@
if (erase) {
File repoDir = new File("repository");
- System.out.println("DELETE test repo dir: " + repoDir.getAbsolutePath());
+ log.info("DELETE test repo dir: " + repoDir.getAbsolutePath());
RepositorySessionUtil.deleteDir( repoDir );
- System.out.println("TEST repo dir deleted.");
+ log.info("TEST repo dir deleted.");
}
RulesRepositoryConfigurator config = RulesRepositoryConfigurator.getInstance(null);
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/resources/modeshape/roles.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/resources/modeshape/roles.properties 2010-12-09 05:21:08 UTC (rev 36289)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/resources/modeshape/roles.properties 2010-12-09 05:36:38 UTC (rev 36290)
@@ -2,3 +2,5 @@
ADMINISTRATOR=admin
fdd=readwrite
thirdpartyuser=readwrite
+admin=admin
+mailman=readwrite
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/resources/modeshape/users.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/resources/modeshape/users.properties 2010-12-09 05:21:08 UTC (rev 36289)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/resources/modeshape/users.properties 2010-12-09 05:36:38 UTC (rev 36290)
@@ -2,3 +2,5 @@
ADMINISTRATOR=password
fdd=password
thirdpartyuser=password
+admin=password
+mailman=password
Modified: labs/jbossrules/trunk/drools-repo/drools-repository/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-repo/drools-repository/pom.xml 2010-12-09 05:21:08 UTC (rev 36289)
+++ labs/jbossrules/trunk/drools-repo/drools-repository/pom.xml 2010-12-09 05:36:38 UTC (rev 36290)
@@ -79,21 +79,5 @@
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
- <!-- Logging -->
- <!-- TODO JBRULES-1254 remove the above, and replace by these:
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- -->
</dependencies>
</project>
Modified: labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/ClassUtil.java
===================================================================
--- labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/ClassUtil.java 2010-12-09 05:21:08 UTC (rev 36289)
+++ labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/ClassUtil.java 2010-12-09 05:36:38 UTC (rev 36290)
@@ -41,6 +41,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
/**
* Utility methods to aid in class/resource loading.
*
Modified: labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/RepositorySessionUtil.java
===================================================================
--- labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/RepositorySessionUtil.java 2010-12-09 05:21:08 UTC (rev 36289)
+++ labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/RepositorySessionUtil.java 2010-12-09 05:36:38 UTC (rev 36290)
@@ -23,6 +23,9 @@
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This is a utility to simulate session behavior for the test suite.
*
@@ -33,6 +36,7 @@
private static ThreadLocal<RulesRepository> repo = new ThreadLocal<RulesRepository>();
private static Repository multiThreadedRepository;
private static Session session = null;
+ private static final Logger log = LoggerFactory.getLogger(RepositorySessionUtil.class);
// private static final Logger log = Logger.getLogger( RepositorySessionUtil.class );
@@ -53,17 +57,14 @@
public static RulesRepository getRepository() throws RulesRepositoryException {
RulesRepository repoInstance = repo.get();
- // System.out.println("----------getRepository");
if (repoInstance == null) {
- // System.out.println("----------repoInstance == null");
+ log.info("Creating a new Repository Instance..");
- System.out.println("----------repoInstance == null");
-
File dir = new File("repository");
- System.out.println("DELETING test repo: " + dir.getAbsolutePath());
+ log.info("DELETING test repo: " + dir.getAbsolutePath());
deleteDir(dir);
- System.out.println("TEST repo was deleted.");
+ log.info("TEST repo was deleted.");
try {
//configurator = new JackrabbitRepository
@@ -98,12 +99,11 @@
public static synchronized RulesRepository getMultiThreadedRepository() throws RulesRepositoryException {
if (multiThreadedRepository == null) {
- // System.out.println("----------repoInstance == null");
-
+
File dir = new File("repository");
- System.out.println("DELETING test repo: " + dir.getAbsolutePath());
+ log.info("DELETING test repo: " + dir.getAbsolutePath());
deleteDir(dir);
- System.out.println("TEST repo was deleted.");
+ log.info("TEST repo was deleted.");
try {
// create a repo instance (startup)
@@ -130,7 +130,6 @@
RulesRepository threadLocalRepo = new RulesRepository(session);
return threadLocalRepo;
} catch (LoginException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
} catch (RepositoryException e) {
// TODO Auto-generated catch block
Modified: labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/RulesRepositoryConfigurator.java
===================================================================
--- labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/RulesRepositoryConfigurator.java 2010-12-09 05:21:08 UTC (rev 36289)
+++ labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/RulesRepositoryConfigurator.java 2010-12-09 05:36:38 UTC (rev 36290)
@@ -37,7 +37,7 @@
public synchronized static RulesRepositoryConfigurator getInstance(Properties properties) throws RepositoryException
{
if (rulesRepositoryConfigurator == null ) {
- System.out.println("******* RULES CONFIG ");
+ log.info("Creating an instance of the RulesRepositoryConfigurator.");
rulesRepositoryConfigurator = new RulesRepositoryConfigurator();
if (properties==null) properties = new Properties();
Properties fileProperties = new Properties();
@@ -87,7 +87,7 @@
* @throws RepositoryException
*/
public void setupRepository(Session session) throws RepositoryException {
- System.out.println("Setting up the repository, registering node types etc.");
+ log.info("Setting up the repository, registering node types etc.");
try {
Node root = session.getRootNode();
Workspace ws = session.getWorkspace();
@@ -151,7 +151,7 @@
public void shutdown() {
jcrRepositoryConfigurator.shutdown();
- System.out.println("SHUTDOWN RULES CONFIG");
+ log.info("SHUTDOWN RULES CONFIG");
rulesRepositoryConfigurator = null;
}
}
Modified: labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/migration/MigrateDroolsPackage.java
===================================================================
--- labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/migration/MigrateDroolsPackage.java 2010-12-09 05:21:08 UTC (rev 36289)
+++ labs/jbossrules/trunk/drools-repo/drools-repository/src/main/java/org/drools/repository/migration/MigrateDroolsPackage.java 2010-12-09 05:36:38 UTC (rev 36290)
@@ -23,6 +23,8 @@
import org.drools.repository.PackageItem;
import org.drools.repository.PackageIterator;
import org.drools.repository.RulesRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is a one time class which will be used to migrate package header info for drools.
@@ -31,13 +33,14 @@
*/
public class MigrateDroolsPackage {
+ private final Logger log = LoggerFactory.getLogger(this.getClass());
public boolean needsMigration(RulesRepository repo) throws RepositoryException {
Node root = repo.getSession().getRootNode().getNode(RulesRepository.RULES_REPOSITORY_NAME);
return !root.hasNode("drools.package.migrated");
}
public void migrate(RulesRepository repo) throws RepositoryException {
- System.out.println("AUTO MIGRATION: Performing drools.package migration...");
+ log.info("AUTO MIGRATION: Performing drools.package migration...");
PackageIterator pkgs = repo.listPackages();
boolean performed = false;
while(pkgs.hasNext()) {
@@ -59,7 +62,7 @@
if (performed) {
repo.getSession().getRootNode().getNode(RulesRepository.RULES_REPOSITORY_NAME).addNode("drools.package.migrated", "nt:folder");
repo.save();
- System.out.println("AUTO MIGRATION: drools.package migration completed.");
+ log.info("AUTO MIGRATION: drools.package migration completed.");
}
}
Copied: labs/jbossrules/trunk/drools-repo/drools-repository/src/test/resources/log4j.xml (from rev 35774, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/drools-repository/src/test/resources/log4j.xml)
===================================================================
--- labs/jbossrules/trunk/drools-repo/drools-repository/src/test/resources/log4j.xml (rev 0)
+++ labs/jbossrules/trunk/drools-repo/drools-repository/src/test/resources/log4j.xml 2010-12-09 05:36:38 UTC (rev 36290)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+<!-- $Id: log4j.xml,v 1.8 2006/04/26 17:29:10 gavin Exp $ -->
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L) \t %m%n"/>
+ </layout>
+ </appender>
+ <logger name="org.drools">
+ <level value="WARN"/>
+ </logger>
+ <root>
+ <priority value="ERROR"/>
+ <appender-ref ref="CONSOLE"/>
+ </root>
+</log4j:configuration>
More information about the jboss-svn-commits
mailing list