[jboss-svn-commits] JBL Code SVN: r32020 - in labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor: src/main/java/org/drools/guvnor and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 10 12:07:12 EST 2010
Author: tsurdilovic
Date: 2010-03-10 12:07:11 -0500 (Wed, 10 Mar 2010)
New Revision: 32020
Modified:
labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/modules/plug-editors/src/org/drools/guvnor/Generator.java
labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/JettyLauncher.java
labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java
labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/gwtutil/AsyncInterfaceGenerator.java
labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/gwtutil/ServiceImplementationGenerator.java
labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/CategoryFilter.java
labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java
labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java
Log:
BRMS-240
Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/modules/plug-editors/src/org/drools/guvnor/Generator.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/modules/plug-editors/src/org/drools/guvnor/Generator.java 2010-03-10 15:44:10 UTC (rev 32019)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/modules/plug-editors/src/org/drools/guvnor/Generator.java 2010-03-10 17:07:11 UTC (rev 32020)
@@ -2,7 +2,9 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
+import org.apache.log4j.Logger;
+
import java.io.*;
import java.util.*;
@@ -11,6 +13,8 @@
*/
public abstract class Generator extends Task {
+ private static final Logger log = Logger.getLogger( org.drools.guvnor.Generator.class );
+
List<Object> configs = new ArrayList<Object>();
Set<String> imports = new TreeSet<String>();
@@ -59,34 +63,34 @@
}
public void execute() throws BuildException {
- System.out.println("--------- generating " + className + " ---------");
+ log.debug("--------- generating " + className + " ---------");
try {
- System.out.println("loading configuration: " + configuration);
+ log.debug("loading configuration: " + configuration);
loadEditorsConfig();
} catch (IOException e) {
e.printStackTrace();
throw new BuildException(e);
}
- System.out.println("collecting required imports");
+ log.debug("collecting required imports");
collectImports();
- System.out.println("generating the class source");
+ log.debug("generating the class source");
generate();
- System.out.println("new " + className + " is created in " + outPath);
- System.out.println("--------- " + className + " generated ---------");
+ log.debug("new " + className + " is created in " + outPath);
+ log.debug("--------- " + className + " generated ---------");
}
protected void generate() {
String source = generateClassSource();
try {
File file = new File(outPath, className + ".java");
- System.out.println("writing the new class to " + file.getAbsolutePath());
+ log.debug("writing the new class to " + file.getAbsolutePath());
FileWriter fileWriter = new FileWriter(file);
BufferedWriter buffWriter = new BufferedWriter(fileWriter);
buffWriter.write(source);
buffWriter.flush();
buffWriter.close();
- System.out.println("write complete");
+ log.debug("write complete");
} catch (IOException e) {
throw new BuildException(e);
}
Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/JettyLauncher.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/JettyLauncher.java 2010-03-10 15:44:10 UTC (rev 32019)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/JettyLauncher.java 2010-03-10 17:07:11 UTC (rev 32020)
@@ -3,11 +3,14 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.lang.reflect.Method;
+import org.apache.log4j.Logger;
/**
*
*/
public class JettyLauncher {
+
+ private static final Logger log = Logger.getLogger( JettyLauncher.class );
public void launch(String[] args) throws Exception {
File jettyConf;
@@ -34,12 +37,12 @@
private Class getJettyServerClassName() throws ClassNotFoundException {
try {
- System.out.println("starting jetty5...");
+ log.info("starting jetty5...");
return Class.forName("org.mortbay.jetty.Server"); // jetty 5
}
catch (ClassNotFoundException e) {
- System.err.println("jetty5 failed: " + e.getMessage());
- System.out.println("starting jetty4...");
+ log.error("jetty5 failed: " + e.getMessage());
+ log.info("starting jetty4...");
return Class.forName("org.mortbay.start.Main");// jetty 4 and early versions
}
Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java 2010-03-10 15:44:10 UTC (rev 32019)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java 2010-03-10 17:07:11 UTC (rev 32020)
@@ -19,6 +19,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.log4j.Logger;
import org.drools.guvnor.client.common.ErrorPopup;
import org.drools.guvnor.client.common.GenericCallback;
@@ -43,6 +44,7 @@
public class SuggestionCompletionCache {
private static SuggestionCompletionCache INSTANCE = null;
+ private static final Logger log = Logger.getLogger( SuggestionCompletionCache.class );
@@ -94,7 +96,7 @@
public void loadPackage(final String packageName, final Command command) {
- System.out.println("Loading package Suggestions..."); //NON-NLS
+ //log.debug("Loading package Suggestions..."); //NON-NLS
RepositoryServiceFactory.getService().loadSuggestionCompletionEngine( packageName, new GenericCallback<SuggestionCompletionEngine>() {
public void onSuccess(SuggestionCompletionEngine engine) {
cache.put( packageName, engine );
Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/gwtutil/AsyncInterfaceGenerator.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/gwtutil/AsyncInterfaceGenerator.java 2010-03-10 15:44:10 UTC (rev 32019)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/gwtutil/AsyncInterfaceGenerator.java 2010-03-10 17:07:11 UTC (rev 32020)
@@ -21,6 +21,8 @@
import org.drools.guvnor.client.rpc.RepositoryService;
+import org.apache.log4j.Logger;
+
/**
* This utility uses reflection to generate the async interface from the
* Service interface as per GWT standard.
@@ -29,6 +31,8 @@
*/
public class AsyncInterfaceGenerator {
+ private static final Logger log = Logger.getLogger( AsyncInterfaceGenerator.class );
+
public static void main(String[] args) throws Exception {
Class cls = RepositoryService.class;
String line = "";
@@ -67,10 +71,10 @@
line += ");\n";
}
}
- System.out.println("/** PLACE THE FOLLOWING IN RepositoryServiceAsync.java **/\n");
+ log.debug("/** PLACE THE FOLLOWING IN RepositoryServiceAsync.java **/\n");
- System.out.println("/** Generated by AsyncInterfaceGenerator hackery */");
- System.out.println(line);
+ log.debug("/** Generated by AsyncInterfaceGenerator hackery */");
+ log.debug(line);
}
public static String arrayIfy(String type) {
Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/gwtutil/ServiceImplementationGenerator.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/gwtutil/ServiceImplementationGenerator.java 2010-03-10 15:44:10 UTC (rev 32019)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/gwtutil/ServiceImplementationGenerator.java 2010-03-10 17:07:11 UTC (rev 32020)
@@ -20,6 +20,7 @@
import java.lang.reflect.Method;
import org.drools.guvnor.client.rpc.RepositoryService;
+import org.apache.log4j.Logger;
/**
* This utility uses reflection to generate servlet code for the service components.
@@ -27,6 +28,8 @@
* @author Michael Neale
*/
public class ServiceImplementationGenerator {
+
+ private static final Logger log = Logger.getLogger( ServiceImplementationGenerator.class );
public static void main(String[] args) throws Exception {
Class cls = RepositoryService.class;
@@ -67,9 +70,9 @@
line += "}\n";
}
}
- System.out.println("/** PLACE THE FOLLOWING IN RepositoryServiceServlet.java **/\n");
+ log.debug("/** PLACE THE FOLLOWING IN RepositoryServiceServlet.java **/\n");
- System.out.println(line);
+ log.debug(line);
}
private static String typeName(String type) {
Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/CategoryFilter.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/CategoryFilter.java 2010-03-10 15:44:10 UTC (rev 32019)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/CategoryFilter.java 2010-03-10 17:07:11 UTC (rev 32020)
@@ -16,6 +16,7 @@
*/
+import org.apache.log4j.Logger;
import org.drools.guvnor.server.security.CategoryPathType;
import org.drools.repository.RepositoryFilter;
@@ -23,6 +24,8 @@
import org.jboss.seam.security.Identity;
public class CategoryFilter implements RepositoryFilter {
+
+ private static final Logger log = Logger.getLogger( CategoryFilter.class );
public boolean accept(Object artifact, String action) {
if (!(artifact instanceof String))
@@ -40,7 +43,7 @@
if (!Contexts.isSessionContextActive()) {
return true;
} else {
- System.out.println("Checking access for : " + makePath(parentPath, child));
+ log.debug("Checking access for : " + makePath(parentPath, child));
return Identity.instance().hasPermission(new CategoryPathType(makePath(parentPath, child)), "navigate");
}
}
Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java 2010-03-10 15:44:10 UTC (rev 32019)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java 2010-03-10 17:07:11 UTC (rev 32020)
@@ -24,6 +24,8 @@
import java.util.Date;
import java.text.SimpleDateFormat;
+import org.apache.log4j.Logger;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -51,7 +53,8 @@
public static SimpleDateFormat RFC822DATEFORMAT = new SimpleDateFormat("EEE', 'dd' 'MMM' 'yyyy' 'HH:mm:ss' 'Z", Locale.US);
-
+ private static final Logger log = Logger.getLogger( PackageDeploymentServlet.class );
+
@Override
protected long getLastModified(HttpServletRequest request) {
PackageDeploymentURIHelper helper = null;
@@ -118,10 +121,10 @@
IOException {
PackageDeploymentURIHelper helper = new PackageDeploymentURIHelper(req.getRequestURI());
- System.out.println( "PackageName: " + helper.getPackageName() );
- System.out.println( "PackageVersion: " + helper.getVersion() );
- System.out.println( "PackageIsLatest: " + helper.isLatest() );
- System.out.println( "PackageIsSource: " + helper.isSource() );
+ log.debug( "PackageName: " + helper.getPackageName() );
+ log.debug( "PackageVersion: " + helper.getVersion() );
+ log.debug( "PackageIsLatest: " + helper.isLatest() );
+ log.debug( "PackageIsSource: " + helper.isSource() );
ByteArrayOutputStream out = new ByteArrayOutputStream();
FileManagerUtils fm = getFileManager();
Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java 2010-03-10 15:44:10 UTC (rev 32019)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java 2010-03-10 17:07:11 UTC (rev 32020)
@@ -24,6 +24,8 @@
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
+import org.apache.log4j.Logger;
+
import org.drools.repository.JCRRepositoryConfigurator;
import org.drools.repository.JackrabbitRepositoryConfigurator;
import org.drools.repository.RepositorySessionUtil;
@@ -36,7 +38,8 @@
*/
public class TestEnvironmentSessionHelper {
-
+ private static final Logger log = Logger.getLogger( TestEnvironmentSessionHelper.class );
+
public static Repository repository;
@@ -50,9 +53,9 @@
if (erase) {
File repoDir = new File("repository");
- System.out.println("DELETE test repo dir: " + repoDir.getAbsolutePath());
+ log.debug("DELETE test repo dir: " + repoDir.getAbsolutePath());
RepositorySessionUtil.deleteDir( repoDir );
- System.out.println("TEST repo dir deleted.");
+ log.debug("TEST repo dir deleted.");
}
JCRRepositoryConfigurator config = new JackrabbitRepositoryConfigurator();
More information about the jboss-svn-commits
mailing list