You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by df...@apache.org on 2004/08/09 18:32:01 UTC
cvs commit: jakarta-slide/projector/src/java/org/apache/slide/projector/i18n MessageManager.java
dflorey 2004/08/09 09:32:01
Modified: projector/src/java/org/apache/slide/projector/processor/process
ResultConfiguration.java Process.java
projector/src/java/org/apache/slide/projector/engine
ProcessorManager.java Job.java Scheduler.java
ProcessServlet.java
projector/src/java/org/apache/slide/projector/application
ApplicationManager.java
projector/src/java/org/apache/slide/projector/i18n
MessageManager.java
Log:
Shifted INFO level to FINE...
Revision Changes Path
1.4 +1 -1 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/process/ResultConfiguration.java
Index: ResultConfiguration.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/process/ResultConfiguration.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResultConfiguration.java 3 Aug 2004 14:29:59 -0000 1.3
+++ ResultConfiguration.java 9 Aug 2004 16:32:00 -0000 1.4
@@ -69,7 +69,7 @@
if ( context instanceof HttpContext ) {
((HttpContext)context).setPresentableResource((StreamableValue)value);
} else {
- logger.log(Level.INFO, "Result can only be shown in http-context!");
+ logger.log(Level.FINE, "Result can only be shown in http-context!");
}
} else {
throw new ProcessException(new ErrorMessage("unpresentableValue"));
1.5 +1 -1 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/process/Process.java
Index: Process.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/process/Process.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Process.java 4 Aug 2004 15:22:51 -0000 1.4
+++ Process.java 9 Aug 2004 16:32:00 -0000 1.5
@@ -165,7 +165,7 @@
context.setStepStore(stepStore);
context.setInputParameters(parameter);
do {
- logger.log(Level.INFO, "Processing "+processorUri+", step=" + nextStep);
+ logger.log(Level.FINE, "Processing "+processorUri+", step=" + nextStep);
context.setStep(nextStep); // Remember current step in context
step = (Step)steps.get(nextStep);
if (step == null) throw new ProcessException(new ErrorMessage("stepNotFound", new String[]{nextStep}));
1.6 +7 -7 jakarta-slide/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java
Index: ProcessorManager.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProcessorManager.java 4 Aug 2004 11:35:34 -0000 1.5
+++ ProcessorManager.java 9 Aug 2004 16:32:00 -0000 1.6
@@ -96,7 +96,7 @@
}
private void install(URI applicationUri, URI configurationUri) {
- logger.log(Level.INFO, "Installing processors '"+configurationUri+"'");
+ logger.log(Level.FINE, "Installing processors '"+configurationUri+"'");
try {
InputStream configuration = ((StreamableValue)Projector.getRepository().getResource(configurationUri, Projector.getCredentials())).getInputStream();
SimpleImporter importer = new SimpleImporter();
@@ -120,7 +120,7 @@
}
public void uninstall(URI applicationUri, URI configurationUri) {
- logger.log(Level.INFO, "Uninstalling processors '"+configurationUri+"'");
+ logger.log(Level.FINE, "Uninstalling processors '"+configurationUri+"'");
List processors = (List)installedProcessors.get(configurationUri);
for ( Iterator j = processors.iterator(); j.hasNext(); ) {
URI processorUri = (URI)j.next();
@@ -141,7 +141,7 @@
configurationListeners.remove(processorConfiguration);
}
processorDescriptors.remove(processorUri);
- logger.log(Level.INFO, "Removing processor: "+processorUri);
+ logger.log(Level.FINE, "Removing processor: "+processorUri);
}
private void update(URI applicationUri, URI configurationUri) {
@@ -381,7 +381,7 @@
}
URI configurationUri = new URIValue(configURI);
if ( processorDescriptor.getConfiguration() == null || !processorDescriptor.getConfiguration().equals(configurationUri) ) {
- logger.log(Level.INFO, "Configuring processor with config-URI=" + configURI);
+ logger.log(Level.FINE, "Configuring processor with config-URI=" + configURI);
processorDescriptor.setConfiguration(configurationUri);
StreamableValue config = (StreamableValue)Projector.getRepository().getResource(configurationUri, Projector.getCredentials());
((ConfigurableProcessor)processor).configure(config);
@@ -394,11 +394,11 @@
}
}
if ( added ) {
- logger.log(Level.INFO, "Adding processor with URI=" + uri);
+ logger.log(Level.FINE, "Adding processor with URI=" + uri);
addedProcessors.add(uri);
}
if ( modified ) {
- logger.log(Level.INFO, "Updating processor with URI=" + uri);
+ logger.log(Level.FINE, "Updating processor with URI=" + uri);
processorMap.put(uri, processor);
processorDescriptors.put(uri, processorDescriptor);
}
@@ -421,7 +421,7 @@
public void notify(String uri, Map information) {
URI processorUri = new URIValue(uri);
Processor processor = (Processor)configuredProcessors.get(processorUri);
- logger.log(Level.INFO, "Reloading processor with configuration URI='"+uri+"'");
+ logger.log(Level.FINE, "Reloading processor with configuration URI='"+uri+"'");
try {
StreamableValue config = (StreamableValue)Projector.getRepository().getResource(processorUri, Projector.getCredentials());
((ConfigurableProcessor)processor).configure(config);
1.3 +1 -1 jakarta-slide/projector/src/java/org/apache/slide/projector/engine/Job.java
Index: Job.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/engine/Job.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Job.java 4 Aug 2004 15:22:51 -0000 1.2
+++ Job.java 9 Aug 2004 16:32:00 -0000 1.3
@@ -56,7 +56,7 @@
public void run() {
try {
- logger.log(Level.INFO, "Launching scheduled process '"+getProcessorUri()+"'");
+ logger.log(Level.FINE, "Launching scheduled process '"+getProcessorUri()+"'");
Context context = new SystemContext();
Scheduler.setContext(context);
ProcessorManager.getInstance().process(getProcessorUri(), getParameters(), context);
1.5 +5 -5 jakarta-slide/projector/src/java/org/apache/slide/projector/engine/Scheduler.java
Index: Scheduler.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/engine/Scheduler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Scheduler.java 3 Aug 2004 14:30:01 -0000 1.4
+++ Scheduler.java 9 Aug 2004 16:32:00 -0000 1.5
@@ -83,7 +83,7 @@
}
public void install(URI jobsUri, boolean restoreRunningJobs) {
- logger.log(Level.INFO, "Installing scheduled jobs of application '"+jobsUri+"'");
+ logger.log(Level.FINE, "Installing scheduled jobs of application '"+jobsUri+"'");
try {
List applicationJobs = new ArrayList();
StreamableValue jobsResource = (StreamableValue)Projector.getRepository().getResource(jobsUri, Projector.getCredentials());
@@ -129,7 +129,7 @@
}
}
} else {
- logger.log(Level.INFO, "Configured jobs resource '"+jobsUri+"' not found!");
+ logger.log(Level.FINE, "Configured jobs resource '"+jobsUri+"' not found!");
}
// FIXME: How to handle deinstallation of running jobs belonging to an application
installedJobs.put(jobsUri, applicationJobs);
@@ -139,12 +139,12 @@
}
public void uninstall(URI jobsUri) {
- logger.log(Level.INFO, "Uninstalling jobs '"+jobsUri+"'");
+ logger.log(Level.FINE, "Uninstalling jobs '"+jobsUri+"'");
Collection jobKeys = (Collection)installedJobs.get(jobs);
for ( Iterator i = jobKeys.iterator(); i.hasNext(); ) {
String jobKey = (String)i.next();
jobs.remove(jobKey);
- logger.log(Level.INFO, "Removing job '"+jobKey+"'");
+ logger.log(Level.FINE, "Removing job '"+jobKey+"'");
}
installedJobs.remove(jobsUri);
}
@@ -169,7 +169,7 @@
}
private void launchJob(Step job, Context context) throws Exception {
- logger.log(Level.INFO, "Launching job: '"+job.getName()+"'");
+ logger.log(Level.FINE, "Launching job: '"+job.getName()+"'");
Processor processor = ProcessorManager.getInstance().getProcessor(job.getProcessorURI());
Map processorParameters = Process.loadParameters(job, processor, context);
ProcessorManager.process(processor, processorParameters, context);
1.4 +5 -5 jakarta-slide/projector/src/java/org/apache/slide/projector/engine/ProcessServlet.java
Index: ProcessServlet.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/engine/ProcessServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProcessServlet.java 3 Aug 2004 14:30:01 -0000 1.3
+++ ProcessServlet.java 9 Aug 2004 16:32:00 -0000 1.4
@@ -43,15 +43,15 @@
ApplicationManager.getInstance();
boolean sessionCreated = request.getSession(false) == null;
Context context = new HttpContext(request, response);
- logger.log(Level.INFO, "Request uri=" + request.getRequestURI());
- logger.log(Level.INFO, "Context path=" + request.getContextPath());
- logger.log(Level.INFO, "Servlet path=" + request.getServletPath());
+ logger.log(Level.FINE, "Request uri=" + request.getRequestURI());
+ logger.log(Level.FINE, "Context path=" + request.getContextPath());
+ logger.log(Level.FINE, "Servlet path=" + request.getServletPath());
URI uri = new URIValue(request.getRequestURI().substring(request.getContextPath().length()+request.getServletPath().length()+1));
try {
Result result;
Processor processor;
try {
- logger.log(Level.INFO, "Processing started with URI=" + uri);
+ logger.log(Level.FINE, "Processing started with URI=" + uri);
Map requestParameters = request.getParameterMap();
if ( requestParameters.containsKey(Constants.PROCESS_ID_PARAMETER) ) {
context.setProcessId(requestParameters.get(Constants.PROCESS_ID_PARAMETER).toString());
@@ -93,7 +93,7 @@
response.setContentLength(((StreamableValue)presentableResource).getContentLength());
StreamHelper.copy(((StreamableValue)presentableResource).getInputStream(), response.getOutputStream());
if (!((StreamableValue)presentableResource).isDocument()) {
- logger.log(Level.WARNING, "You received a fragment on top level, no complete document!");
+ logger.log(Level.FINE, "You received a fragment on top level, no complete document!");
}
}
} else {
1.6 +12 -12 jakarta-slide/projector/src/java/org/apache/slide/projector/application/ApplicationManager.java
Index: ApplicationManager.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/application/ApplicationManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApplicationManager.java 4 Aug 2004 15:22:51 -0000 1.5
+++ ApplicationManager.java 9 Aug 2004 16:32:00 -0000 1.6
@@ -54,14 +54,14 @@
Projector.getRepository().subscribe("Update/newmember", new URIValue(Projector.getApplicationsDir()), 1,
new Subscriber() {
public void notify(String uri, Map information) {
- logger.log(Level.INFO, "Package manager received add event");
+ logger.log(Level.FINE, "Package manager received add event");
applicationManager.installApplications();
}
}, context.getCredentials());
Projector.getRepository().subscribe("Delete", new URIValue(Projector.getApplicationsDir()), 1,
new Subscriber() {
public void notify(String uri, Map information) {
- logger.log(Level.INFO, "Package manager received delete event");
+ logger.log(Level.FINE, "Package manager received delete event");
applicationManager.installApplications();
}
}, context.getCredentials());
@@ -95,7 +95,7 @@
applicationsToInstall.add(installedApplication);
}
} else {
- logger.log(Level.INFO, "Application '"+applicationUri+"' already installed");
+ logger.log(Level.FINE, "Application '"+applicationUri+"' already installed");
removedApplications.remove(applicationUri);
}
}
@@ -139,7 +139,7 @@
for ( Iterator i = applicationsToInstall.iterator(); i.hasNext(); ) {
Application application = (Application)i.next();
if ( !sortedApplications.contains(application) ) {
- logger.log(Level.INFO, "Try to install '"+application.getName()+"'");
+ logger.log(Level.FINE, "Try to install '"+application.getName()+"'");
addRequiredApplicationsFirst(sortedApplications, applicationsToInstall, application);
}
}
@@ -148,10 +148,10 @@
private void addRequiredApplicationsFirst(List sortedApplications, List applicationsToInstall, Application application) {
// FIXME: Check application versions
- logger.log(Level.INFO, "Checking for dependencies...");
+ logger.log(Level.FINE, "Checking for dependencies...");
for ( Iterator i = application.getDependencies().iterator(); i.hasNext(); ) {
Dependency dependency = (Dependency)i.next();
- logger.log(Level.INFO, "Dependency on application '"+dependency.getRequiredApplication()+"' found!");
+ logger.log(Level.FINE, "Dependency on application '"+dependency.getRequiredApplication()+"' found!");
Application requiredApplication = getApplicationByName(applicationsToInstall, dependency.getRequiredApplication());
if ( requiredApplication == null ) {
// check if application is already installed
@@ -161,12 +161,12 @@
logger.log(Level.SEVERE, "Required application '"+dependency.getRequiredApplication()+"' not found!");
}
} else {
- logger.log(Level.INFO, "Required application '"+requiredApplication.getName()+"' not installed but available, so install it first");
+ logger.log(Level.FINE, "Required application '"+requiredApplication.getName()+"' not installed but available, so install it first");
addRequiredApplicationsFirst(sortedApplications, applicationsToInstall, requiredApplication);
}
}
if ( !sortedApplications.contains(application) ) {
- logger.log(Level.INFO, "Adding '"+application.getName()+"' to installation process");
+ logger.log(Level.FINE, "Adding '"+application.getName()+"' to installation process");
sortedApplications.add(application);
}
}
@@ -215,7 +215,7 @@
private synchronized void updateApplication(String uri) {
URI applicationUri = new URIValue(uri);
- logger.log(Level.INFO, "Updating application '"+applicationUri+"'");
+ logger.log(Level.FINE, "Updating application '"+applicationUri+"'");
// Compare newly parsed application with previously installed and send diffs
Application installedApplication = (Application)installedApplications.get(applicationUri);
Application updatedApplication = parseApplication(applicationUri);
@@ -250,7 +250,7 @@
}
private void install(String type, Application application) {
- logger.log(Level.INFO, "Installing "+type+" of application '"+application.getUri()+"'");
+ logger.log(Level.FINE, "Installing "+type+" of application '"+application.getUri()+"'");
List contents = (List)application.getContent().get(type);
if ( contents != null ) {
for ( Iterator j = contents.iterator(); j.hasNext(); ) {
@@ -264,7 +264,7 @@
}
private void uninstall(String type, Application application) {
- logger.log(Level.INFO, "Uninstall "+type+" of application '"+application.getUri()+"'");
+ logger.log(Level.FINE, "Uninstall "+type+" of application '"+application.getUri()+"'");
for ( Iterator i = application.getContent().entrySet().iterator(); i.hasNext(); ) {
Map.Entry entry = (Map.Entry)i.next();
for ( Iterator j = ((List)entry.getValue()).iterator(); j.hasNext(); ) {
@@ -312,7 +312,7 @@
try {
ValueFactory descriptorFactory = (ValueFactory)factoryClassLoader.loadClass(clazz).getConstructor(new Class[0]).newInstance(new Object[0]);
ValueFactoryManager.getInstance().registerDescriptorFactory(descriptorFactory);
- logger.log(Level.INFO, "Successfully registered descriptor factory " + clazz);
+ logger.log(Level.FINE, "Successfully registered descriptor factory " + clazz);
} catch (Exception e) {
logger.log(Level.SEVERE, "Descriptor factory " + clazz + " could not loaded!", e);
}
1.4 +4 -4 jakarta-slide/projector/src/java/org/apache/slide/projector/i18n/MessageManager.java
Index: MessageManager.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/i18n/MessageManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MessageManager.java 23 Jul 2004 16:14:53 -0000 1.3
+++ MessageManager.java 9 Aug 2004 16:32:00 -0000 1.4
@@ -79,7 +79,7 @@
}
public void install(URI messagesUri) {
- logger.log(Level.INFO, "Installing messages '"+messagesUri+"'");
+ logger.log(Level.FINE, "Installing messages '"+messagesUri+"'");
try {
Map applicationMessages = new HashMap();
StreamableValue messagesResource = (StreamableValue)Projector.getRepository().getResource(messagesUri, Projector.getCredentials());
@@ -94,7 +94,7 @@
applicationMessages.putAll(parsedMessages);
Projector.getRepository().subscribe("Update", messagesUri, 0, this, Projector.getCredentials());
} else {
- logger.log(Level.INFO, "Configured messages resource '"+messagesUri+"' not found!");
+ logger.log(Level.FINE, "Configured messages resource '"+messagesUri+"' not found!");
}
messages.putAll(applicationMessages);
installedMessages.put(messagesUri, applicationMessages.keySet());
@@ -104,12 +104,12 @@
}
public void uninstall(URI messageUri) {
- logger.log(Level.INFO, "Uninstalling messages '"+messageUri+"'");
+ logger.log(Level.FINE, "Uninstalling messages '"+messageUri+"'");
Collection messageKeys = (Collection)installedMessages.get(messageUri);
for ( Iterator i = messageKeys.iterator(); i.hasNext(); ) {
String messageKey = (String)i.next();
messages.remove(messageKey);
- logger.log(Level.INFO, "Removing message with key '"+messageKey+"'");
+ logger.log(Level.FINE, "Removing message with key '"+messageKey+"'");
}
installedMessages.remove(messageUri);
Projector.getRepository().unsubscribe(messageUri, this, Projector.getCredentials());
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org