You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by pa...@apache.org on 2012/10/20 21:04:16 UTC
svn commit: r1400501 [1/5] - in /airavata/trunk: ./ modules/airavata-client/
modules/commons/gfac-schema/
modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/
modules/commons/provenance-registry/ modules/commons/utils/ modul...
Author: patanachai
Date: Sat Oct 20 19:04:07 2012
New Revision: 1400501
URL: http://svn.apache.org/viewvc?rev=1400501&view=rev
Log:
Revert commit 1400294
Modified:
airavata/trunk/modules/airavata-client/pom.xml
airavata/trunk/modules/commons/gfac-schema/pom.xml
airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGenerator.java
airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSPolicyGenerator.java
airavata/trunk/modules/commons/provenance-registry/pom.xml
airavata/trunk/modules/commons/utils/pom.xml
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/BrowserLauncher.java
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/IOUtil.java
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java
airavata/trunk/modules/commons/workflow-execution-context/pom.xml
airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java
airavata/trunk/modules/commons/workflow-tracking/pom.xml
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadCrosscutParametersUtil.java
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/XBeansUtil.java
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/LeadNotificationManager.java
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/Subscription.java
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/AbstractPublisher.java
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/Timer.java
airavata/trunk/modules/distribution/pom.xml
airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/gfac-axis2/pom.xml
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/WSDLUtil.java
airavata/trunk/modules/gfac-core/pom.xml
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/GSISecurityContext.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/utils/MyProxyManager.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/GridFtpOutputStaging.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/GridFtpInputStaging.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/HttpInputStaging.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/factory/AbstractServiceFactory.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DefaultNotifier.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/InputStreamToFileWriter.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GfacUtils.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GridFTPContactInfo.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/LogUtils.java
airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AiravataRegistryConnectionDataProviderImpl.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowDataResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
airavata/trunk/modules/registry/airavata-registry-service/pom.xml
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/ConnectionPool.java
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/DatabaseCreator.java
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/JdbcStorage.java
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
airavata/trunk/modules/registry/registry-api/pom.xml
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java
airavata/trunk/modules/test-suite/pom.xml
airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MessagePullerTest.java
airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MultipleSubscriptionForMessageBoxTest.java
airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/SubscriberThread.java
airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxClientRestartTest.java
airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxCreateThread.java
airavata/trunk/modules/workflow-interpreter/pom.xml
airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml
airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/WebComponentRegistry.java
airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponent.java
airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java
airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/GraphImpl.java
airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/NodeImpl.java
airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ConstantNode.java
airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java
airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java
airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java
airavata/trunk/modules/ws-messenger/client/pom.xml
airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/CommonMsgBrokerClient.java
airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntCreatePublishReg.java
airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsrfResourceStub.java
airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MessagePuller.java
airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/NotificationViewerFrame.java
airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/WsntViewerConsumerNotificationHandler.java
airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/CreateMsgBox.java
airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/DestroyMsgBox.java
airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/MsgBoxClient.java
airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/StoreMessage.java
airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/TakeMessages.java
airavata/trunk/modules/ws-messenger/commons/pom.xml
airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/ConnectionPool.java
airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java
airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/JdbcStorage.java
airavata/trunk/modules/ws-messenger/distribution/pom.xml
airavata/trunk/modules/ws-messenger/messagebox/pom.xml
airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceMessageReceiverInOut.java
airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java
airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java
airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java
airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/memory/InMemoryImpl.java
airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/StoreMessageHandler.java
airavata/trunk/modules/ws-messenger/messagebroker/pom.xml
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/ConsumerListManager.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/NotificationProcessor.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/handler/PublishedMessageHandler.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/CleanupThread.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionManager.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionState.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProcessingContextBuilder.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProtocolSupport.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEventingMsgReceiver.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNTProtocolSupport.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationMsgReceiver.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationProcessingContextBuilder.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/util/OMElementComparator.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/XPath/YFilterInfo.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/XPath/YFilterMessageMatcher.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/simpleTopic/DirectWsntMessageMatcher.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/ConsumerUrlManager.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/DeliveryProcessor.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/OutGoingQueue.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/SenderUtils.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/protocol/impl/Axis2Protocol.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ConsumerHandler.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/FixedParallelSender.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ParallelSender.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/SerialSender.java
airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/Subscription.java
airavata/trunk/modules/ws-messenger/pom.xml
airavata/trunk/modules/xbaya-gui/pom.xml
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/BPELFiler.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ImageFiler.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/JythonFiler.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ScuflFiler.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/WorkflowFiler.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/event/EventProducer.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gfac/SimpleWSClient.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/DoWhileHandler.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/SimpleInvoker.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/MyProxyClient.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCUtilTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MyProxyTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSDLTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaSecurityTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XppTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/AllServices.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderClient.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderImpl.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderService.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverClient.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverImpl.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverService.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderClient.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderImpl.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderService.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorClient.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorImpl.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorService.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoClient.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoImpl.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoService.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierImpl.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierService.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/AboutWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ErrorWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/GridChemRunnerWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/JythonRunnerWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/TextWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/WaitDialog.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/myproxy/MyProxyLoader.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/dynamic/DynamicNodeGUI.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/subworkflow/SubWorkflowNodeGUI.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WSNodeGUI.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WorkflowNodeGUI.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorStarter.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTrackingTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaClientTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaConsolidatedTestSuite.java
airavata/trunk/pom.xml
Modified: airavata/trunk/modules/airavata-client/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/pom.xml (original)
+++ airavata/trunk/modules/airavata-client/pom.xml Sat Oct 20 19:04:07 2012
@@ -53,11 +53,6 @@
<artifactId>airavata-jpa-registry</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
</dependencies>
</project>
Modified: airavata/trunk/modules/commons/gfac-schema/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/gfac-schema/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/gfac-schema/pom.xml (original)
+++ airavata/trunk/modules/commons/gfac-schema/pom.xml Sat Oct 20 19:04:07 2012
@@ -40,12 +40,8 @@
<version>1.1.4c</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<!-- Testing -->
<dependency>
@@ -53,6 +49,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGenerator.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGenerator.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGenerator.java (original)
+++ airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGenerator.java Sat Oct 20 19:04:07 2012
@@ -49,8 +49,8 @@ import org.apache.airavata.schemas.gfac.
import org.apache.airavata.schemas.gfac.OutputParameterType;
import org.apache.airavata.schemas.gfac.PortTypeType;
import org.apache.airavata.schemas.gfac.ServiceDescriptionType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.Comment;
import org.w3c.dom.DOMImplementation;
@@ -78,7 +78,7 @@ import com.ibm.wsdl.extensions.soap.SOAP
public class WSDLGenerator implements WSDLConstants {
public static final String WSA_PREFIX = "wsa";
- protected final Log log = LogFactory.getLog(this.getClass());
+ protected final Logger log = LoggerFactory.getLogger(this.getClass());
public Hashtable generateWSDL(String serviceLocation, QName wsdlQName_, String security,
ServiceDescriptionType serviceDesc, boolean abstractWSDL) throws GFacWSDLException {
Modified: airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSPolicyGenerator.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSPolicyGenerator.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSPolicyGenerator.java (original)
+++ airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSPolicyGenerator.java Sat Oct 20 19:04:07 2012
@@ -24,14 +24,14 @@ package org.apache.airavata.commons.gfac
import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
public class WSPolicyGenerator implements WSDLConstants {
- private static final Log log = LogFactory.getLog(WSPolicyGenerator.class);
+ protected final Logger log = LoggerFactory.getLogger(this.getClass());
public static UnknownExtensibilityElement createServiceLevelPolicy(DOMImplementation dImpl, String policyID) {
Document doc = dImpl.createDocument(WSP_NAMESPACE, "wsp:Policy", null);
Modified: airavata/trunk/modules/commons/provenance-registry/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/provenance-registry/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/provenance-registry/pom.xml (original)
+++ airavata/trunk/modules/commons/provenance-registry/pom.xml Sat Oct 20 19:04:07 2012
@@ -30,6 +30,10 @@
<version>${jcr.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-gfac-schema-utils</artifactId>
<version>${project.version}</version>
@@ -46,8 +50,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
Modified: airavata/trunk/modules/commons/utils/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/pom.xml (original)
+++ airavata/trunk/modules/commons/utils/pom.xml Sat Oct 20 19:04:07 2012
@@ -62,8 +62,8 @@
<!-- Logging -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<!-- Testing -->
@@ -72,6 +72,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/BrowserLauncher.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/BrowserLauncher.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/BrowserLauncher.java (original)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/BrowserLauncher.java Sat Oct 20 19:04:07 2012
@@ -27,8 +27,8 @@ import java.lang.reflect.Method;
import java.net.URL;
import org.apache.airavata.common.exception.UtilsException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Opens URLs with the OS-specific browser.
@@ -37,7 +37,7 @@ public class BrowserLauncher {
private static final String ERROR_MESSAGE = "Error while attempting to launch web browser";
- private static final Log logger = LogFactory.getLog(BrowserLauncher.class);
+ private static Logger logger = LoggerFactory.getLogger(BrowserLauncher.class);
/**
* Opens a specified URL with the browser.
Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/IOUtil.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/IOUtil.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/IOUtil.java (original)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/IOUtil.java Sat Oct 20 19:04:07 2012
@@ -33,12 +33,12 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.io.Writer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class IOUtil {
- private static final Log logger = LogFactory.getLog(IOUtil.class);
+ private static final Logger logger = LoggerFactory.getLogger(IOUtil.class);
/**
* @param path
Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java (original)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java Sat Oct 20 19:04:07 2012
@@ -32,11 +32,11 @@ import java.util.Properties;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.util.Utils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ServiceUtils {
- private static final Log log = LogFactory.getLog(ServiceUtils.class);
+ private static final Logger log = LoggerFactory.getLogger(ServiceUtils.class);
private static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
public static final String IP = "ip";
public static final String PORT = "port";
Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java (original)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java Sat Oct 20 19:04:07 2012
@@ -33,8 +33,8 @@ import java.util.List;
import javax.xml.namespace.QName;
import org.apache.airavata.common.exception.UtilsException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlAttribute;
import org.xmlpull.infoset.XmlBuilderException;
import org.xmlpull.infoset.XmlElement;
@@ -49,7 +49,7 @@ import xsul5.wsdl.WsdlUtil;
public class WSDLUtil {
- private static final Log logger = LogFactory.getLog(WSDLUtil.class);
+ private static final Logger logger = LoggerFactory.getLogger(WSDLUtil.class);
/**
* @param wsdlString
Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java (original)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java Sat Oct 20 19:04:07 2012
@@ -41,8 +41,8 @@ import org.apache.airavata.common.except
import org.apache.xmlbeans.XmlError;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.*;
import org.xml.sax.SAXException;
import org.xmlpull.infoset.XmlDocument;
@@ -65,7 +65,7 @@ public class XMLUtil {
public static final org.xmlpull.v1.builder.XmlInfosetBuilder BUILDER3 = org.xmlpull.v1.builder.XmlInfosetBuilder
.newInstance(new MXParserFactory());
- private static final Log logger = LogFactory.getLog(XMLUtil.class);
+ private static final Logger logger = LoggerFactory.getLogger(XMLUtil.class);
private final static String PROPERTY_SERIALIZER_INDENTATION = "http://xmlpull.org/v1/doc/properties.html#serializer-indentation";
Modified: airavata/trunk/modules/commons/workflow-execution-context/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-execution-context/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-execution-context/pom.xml (original)
+++ airavata/trunk/modules/commons/workflow-execution-context/pom.xml Sat Oct 20 19:04:07 2012
@@ -39,10 +39,7 @@
<artifactId>airavata-common-utils</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
+
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
Modified: airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java (original)
+++ airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java Sat Oct 20 19:04:07 2012
@@ -23,12 +23,12 @@ package org.apache.airavata.common.workf
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.schemas.wec.*;
import org.apache.xmlbeans.XmlException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
public class WorkflowContextHeaderBuilder {
- private static final Log log = LogFactory.getLog(WorkflowContextHeaderBuilder.class);
+ protected static final Logger log = LoggerFactory.getLogger(WorkflowContextHeaderBuilder.class);
private WorkflowMonitoringContextDocument.WorkflowMonitoringContext workflowMonitoringContext = null;
Modified: airavata/trunk/modules/commons/workflow-tracking/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/pom.xml (original)
+++ airavata/trunk/modules/commons/workflow-tracking/pom.xml Sat Oct 20 19:04:07 2012
@@ -84,12 +84,8 @@
<!-- Logging -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<!-- Testing -->
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java Sat Oct 20 19:04:07 2012
@@ -33,8 +33,8 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class LeadContextHeader {
@@ -286,7 +286,7 @@ public class LeadContextHeader {
return lookupStringValue(NS, "OUTPUT_DATA_FILES_SUFFIX");
}
- private static final Log logger = LogFactory.getLog(LeadContextHeader.class);
+ private static final Logger logger = LoggerFactory.getLogger(LeadContextHeader.class);
private static final OMFactory factory;
public static final String GFAC_NAMESPACE = "http://org.apache.airavata/namespaces/2004/01/gFac";
public static final QName TYPE;
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadCrosscutParametersUtil.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadCrosscutParametersUtil.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadCrosscutParametersUtil.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadCrosscutParametersUtil.java Sat Oct 20 19:04:07 2012
@@ -32,8 +32,8 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.xmlbeans.XmlObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class LeadCrosscutParametersUtil {
public LeadCrosscutParametersUtil(XmlObject xmlObjectToWrap) throws XMLStreamException {
@@ -280,7 +280,7 @@ public class LeadCrosscutParametersUtil
return Float.parseFloat(s);
}
- private static final Log logger = LogFactory.getLog(LeadCrosscutParametersUtil.class);
+ private static final Logger logger = LoggerFactory.getLogger(LeadCrosscutParametersUtil.class);
public static final String FORECAST_TIME = "fcst_time";
public static final String START_DATE = "start_date";
public static final String START_HOUR = "start_hour";
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/XBeansUtil.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/XBeansUtil.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/XBeansUtil.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/XBeansUtil.java Sat Oct 20 19:04:07 2012
@@ -28,11 +28,13 @@ import javax.xml.stream.XMLStreamExcepti
import org.apache.axiom.om.OMElement;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class XBeansUtil {
+ Logger logger = LoggerFactory.getLogger(XBeansUtil.class);
+
public XBeansUtil() {
}
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java Sat Oct 20 19:04:07 2012
@@ -41,11 +41,11 @@ import org.apache.airavata.workflow.trac
import org.apache.axis2.addressing.EndpointReference;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class AbstractNotifier {
- private static final Log log = LogFactory.getLog(AbstractNotifier.class);
+ protected static final Logger log = LoggerFactory.getLogger(AbstractNotifier.class);
private Map<EndpointReference, NotificationPublisher> publishermap = new ConcurrentHashMap<EndpointReference, NotificationPublisher>();
protected Date activityTimestamp = null;
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java Sat Oct 20 19:04:07 2012
@@ -24,8 +24,8 @@ package org.apache.airavata.workflow.tra
import org.apache.airavata.workflow.tracking.impl.GenericNotifierImpl;
import org.apache.airavata.workflow.tracking.impl.NotifierImpl;
import org.apache.airavata.workflow.tracking.impl.ProvenanceNotifierImpl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Create a Notifier instance.
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac
* This code was inspired by the listener agent factory in xmessages
*/
public class NotifierFactory {
- private static final Log logger = LogFactory.getLog(NotifierFactory.class);
+ private static final Logger logger = LoggerFactory.getLogger(NotifierFactory.class);
public static Notifier createNotifier() {
return new NotifierImpl();
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/LeadNotificationManager.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/LeadNotificationManager.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/LeadNotificationManager.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/LeadNotificationManager.java Sat Oct 20 19:04:07 2012
@@ -34,12 +34,12 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class LeadNotificationManager {
- private static final Log logger = LogFactory.getLog(LeadNotificationManager.class);
+ private final static Logger logger = LoggerFactory.getLogger(LeadNotificationManager.class);
/**
* THis API call could be used if the user created a Subscription in an earlier run and now the service is being
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/Subscription.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/Subscription.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/Subscription.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/Subscription.java Sat Oct 20 19:04:07 2012
@@ -28,12 +28,12 @@ import org.apache.airavata.wsmg.client.C
import org.apache.airavata.wsmg.client.MsgBrokerClientException;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Subscription {
- private static final Log logger = LogFactory.getLog(Subscription.class);
+ private static final Logger logger = LoggerFactory.getLogger(Subscription.class);
private String subscriptionID;
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java Sat Oct 20 19:04:07 2012
@@ -34,8 +34,8 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.workflow.tracking.types.LogInfoDocument;
import org.apache.airavata.workflow.tracking.types.LogWarningDocument;
import org.apache.airavata.workflow.tracking.types.PublishURLDocument;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* DOES NOT SUPPORT MULTI_THREADING -- PUBLISHER QUEUE, DATA CONSUMED/PRODUCED BATCHING
@@ -47,7 +47,7 @@ public class GenericNotifierImpl extends
// private AnnotationProps globalAnnotations;
- protected static final Log logger = LogFactory.getLog(GenericNotifierImpl.class);
+ protected static final Logger logger = LoggerFactory.getLogger(GenericNotifierImpl.class);
public GenericNotifierImpl() throws WorkflowTrackingException {
super();
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/AbstractPublisher.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/AbstractPublisher.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/AbstractPublisher.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/AbstractPublisher.java Sat Oct 20 19:04:07 2012
@@ -28,8 +28,8 @@ import java.util.concurrent.locks.Reentr
import org.apache.airavata.workflow.tracking.util.LinkedMessageQueue;
import org.apache.airavata.workflow.tracking.util.Timer;
import org.apache.xmlbeans.XmlObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Abstract method to publish messages in sync or async mode. In async mode, the messages are kept in an in-memory queue
@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
*/
public abstract class AbstractPublisher implements Runnable, NotificationPublisher {
- private static final Log logger = LogFactory.getLog(AbstractPublisher.class);
+ protected static final Logger logger = LoggerFactory.getLogger(AbstractPublisher.class);
protected static final boolean IS_LOG_FINEST = logger.isDebugEnabled();
private final LinkedMessageQueue<BrokerEntry> messageQueue;
protected static final boolean IS_TIMER = Boolean.getBoolean("ENABLE_TIMER");
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java Sat Oct 20 19:04:07 2012
@@ -35,8 +35,8 @@ import org.apache.airavata.wsmg.client.W
import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Publish WS-Eventing messages using WS-Messenger client API
@@ -48,7 +48,7 @@ public class WSMPublisher extends Abstra
protected final EndpointReference brokerEpr;
protected Properties configs = new Properties();
- private static final Log log = LogFactory.getLog(WSMPublisher.class);
+ private Logger log = LoggerFactory.getLogger(WSMPublisher.class);
public WSMPublisher(WorkflowTrackingContext context) {
this(10, context.isEnableAsyncPublishing(), context.getBrokerEpr());
@@ -103,7 +103,7 @@ public class WSMPublisher extends Abstra
if (isDeleted())
throw new RuntimeException("Publisher has been deleted!");
if (IS_LOG_FINEST) {
- log.debug("publishing notification to messenger broker: " + leadMessage);
+ logger.debug("publishing notification to messenger broker: " + leadMessage);
}
try {
OMElement msg = WorkFlowUtils.reader2OMElement(new StringReader(leadMessage));
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java Sat Oct 20 19:04:07 2012
@@ -37,8 +37,8 @@ import org.apache.axiom.soap.SOAPHeader;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Utility for clients to subscribe and receive Lead notifications using new message schema. The agent implements the
@@ -49,7 +49,7 @@ import org.apache.commons.logging.LogFac
*/
public class LeadNotificationHandler implements ConsumerNotificationHandler {
- private static final Log logger = LogFactory.getLog(LeadNotificationHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(LeadNotificationHandler.class);
private String topic;
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java Sat Oct 20 19:04:07 2012
@@ -41,12 +41,12 @@ import org.apache.axis2.addressing.Endpo
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageBoxNotificationHandler implements NotificationHandler {
- private static final Log logger = LogFactory.getLog(MessageBoxNotificationHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(MessageBoxNotificationHandler.class);
private String messageBoxUrl;
@@ -110,7 +110,7 @@ public class MessageBoxNotificationHandl
logger.info("Unsubscribing the messagebox that was destroyed," + " SubscriptionID:" + this.subscriptionId);
- msgboxHandler.deleteMsgBox(msgBoxEpr, 12000L);
+ msgboxHandler.deleteMsgBox(msgBoxEpr, 2000L);
} catch (MsgBrokerClientException e) {
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/Timer.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/Timer.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/Timer.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/Timer.java Sat Oct 20 19:04:07 2012
@@ -21,15 +21,15 @@
package org.apache.airavata.workflow.tracking.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* calculates simple timing information for instrumenting code
*/
public class Timer {
- private static final Log logger = LogFactory.getLog(Timer.class);
+ private static final Logger logger = LoggerFactory.getLogger(Timer.class);
private long start, end, total = 0, deltaStart, delta = 0;
private final String msg;
Modified: airavata/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/pom.xml (original)
+++ airavata/trunk/modules/distribution/pom.xml Sat Oct 20 19:04:07 2012
@@ -138,6 +138,19 @@
<version>1</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${org.slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+ <dependency>
<groupId>gpel</groupId>
<artifactId>gpel_client</artifactId>
<version>1.0.7-BETA</version>
@@ -250,11 +263,6 @@
<artifactId>commons-lang</artifactId>
<version>2.4</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
<dependency>
<groupId>globus</groupId>
<artifactId>transfer-api-client</artifactId>
@@ -271,10 +279,6 @@
<version>2.5</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-messenger-client</artifactId>
<version>${project.version}</version>
Modified: airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Sat Oct 20 19:04:07 2012
@@ -248,11 +248,13 @@
<!--<include>org.apache.derby:derbynet:jar</include>-->
<include>org.apache.jackrabbit:jackrabbit-core:jar</include>
<include>org.apache.jackrabbit:jackrabbit-jcr-rmi:jar</include>
+ <include>org.slf4j:log4j-over-slf4j:jar</include>
+ <include>org.slf4j:slf4j-api:jar</include>
+ <include>org.slf4j:slf4j-simple:jar</include>
<include>javax.jcr:jcr:jar</include>
<include>commons-collections:commons-collections</include>
<include>commons-configuration:commons-configuration</include>
<include>commons-lang:commons-lang</include>
- <include>commons-logging:commons-logging</include>
<include>xpp3:xpp3</include>
<include>gpel:gpel_client</include>
<include>xpp5:xpp5</include>
Modified: airavata/trunk/modules/gfac-axis2/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/pom.xml (original)
+++ airavata/trunk/modules/gfac-axis2/pom.xml Sat Oct 20 19:04:07 2012
@@ -50,12 +50,8 @@
</dependency>
<!-- Logging -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
Modified: airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java (original)
+++ airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java Sat Oct 20 19:04:07 2012
@@ -48,12 +48,12 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Phase;
import org.apache.axis2.engine.ServiceLifeCycle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GFacService implements ServiceLifeCycle {
- private static final Log log = LogFactory.getLog(GFacService.class);
+ private static final Logger log = LoggerFactory.getLogger(GFacService.class);
public static final String CONFIGURATION_CONTEXT_REGISTRY = "registry";
public static final String GFAC_URL = "GFacURL";
@@ -64,7 +64,7 @@ public class GFacService implements Serv
public static final int GFAC_URL_UPDATE_INTERVAL = 1000 * 60 * 60 * 3;
- public static final int JCR_AVAIALABILITY_WAIT_INTERVAL = 1000;
+ public static final int JCR_AVAIALABILITY_WAIT_INTERVAL = 1000 * 10;
public static final String REGISTRY_USER = "registry.user";
@@ -195,14 +195,13 @@ public class GFacService implements Serv
}
}catch (Exception e){
try {
- log.info("Thread is sleeping since registry database is not up");
Thread.sleep(JCR_AVAIALABILITY_WAIT_INTERVAL);
} catch (InterruptedException e1) {
e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
return;
}
-// log.error(e.getMessage());
-// log.error("Workflow Interpreter Service URL update thread is interrupted");
+ log.error(e.getMessage());
+ log.error("Workflow Interpreter Service URL update thread is interrupted");
}
}
}
Modified: airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java (original)
+++ airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java Sat Oct 20 19:04:07 2012
@@ -34,13 +34,13 @@ import org.apache.axis2.dispatchers.Abst
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.util.LoggingControl;
import org.apache.axis2.util.Utils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GFacURIBasedDispatcher extends AbstractServiceDispatcher {
public static final String NAME = "GFacURIBasedDispatcher";
- private static final Log log = LogFactory.getLog(GFacURIBasedDispatcher.class);
+ private static final Logger log = LoggerFactory.getLogger(GFacURIBasedDispatcher.class);
/*
* (non-Javadoc)
Modified: airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java (original)
+++ airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java Sat Oct 20 19:04:07 2012
@@ -68,12 +68,12 @@ import org.apache.axis2.engine.MessageRe
import org.apache.axis2.util.MessageContextBuilder;
import org.apache.axis2.util.Utils;
import org.apache.xmlbeans.XmlException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GFacMessageReciever implements MessageReceiver {
- private static Log log = LogFactory.getLog(GFacMessageReciever.class);
+ private static Logger log = LoggerFactory.getLogger(GFacMessageReciever.class);
public static final String TRUSTED_CERT_LOCATION = "trusted.cert.location";
public static final String MYPROXY_SERVER = "myproxy.server";
public static final String MYPROXY_USER = "myproxy.user";
@@ -103,7 +103,7 @@ public class GFacMessageReciever impleme
case INVOKE:
try {
ContextHeaderDocument document = ContextHeaderDocument.Factory.parse(getHeader(axisRequestMsgCtx).toStringWithConsume());
- log = LogFactory.getLog(GFacMessageReciever.class + "." + document.getContextHeader().getWorkflowMonitoringContext().getExperimentId());
+ log = LoggerFactory.getLogger(GFacMessageReciever.class + "." + document.getContextHeader().getWorkflowMonitoringContext().getExperimentId());
log.debug("invoking Invoke operation");
processInvokeOperation(axisRequestMsgCtx);
log.info(axisRequestMsgCtx.getEnvelope().getBody().getFirstElement().toString());
Modified: airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/WSDLUtil.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/WSDLUtil.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/WSDLUtil.java (original)
+++ airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/WSDLUtil.java Sat Oct 20 19:04:07 2012
@@ -48,8 +48,8 @@ import javax.xml.namespace.QName;
import org.apache.airavata.commons.gfac.wsdl.GFacWSDLException;
import org.apache.airavata.commons.gfac.wsdl.WSDLConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
@@ -61,7 +61,7 @@ import com.ibm.wsdl.extensions.soap.SOAP
public class WSDLUtil {
- private static final Log logger = LogFactory.getLog(WSDLUtil.class);
+ private static final Logger logger = LoggerFactory.getLogger(WSDLUtil.class);
private WSDLUtil() {
}
Modified: airavata/trunk/modules/gfac-core/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/pom.xml (original)
+++ airavata/trunk/modules/gfac-core/pom.xml Sat Oct 20 19:04:07 2012
@@ -70,12 +70,8 @@
<!-- Logging -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<!-- GFAC schemas -->
@@ -123,6 +119,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-common-registry-api</artifactId>
<version>${project.version}</version>
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java Sat Oct 20 19:04:07 2012
@@ -36,13 +36,13 @@ import org.apache.airavata.core.gfac.not
import org.apache.airavata.core.gfac.notification.impl.WorkflowTrackingNotification;
import org.apache.airavata.core.gfac.services.GenericService;
import org.apache.airavata.schemas.gfac.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.net.URI;
public class GfacAPI {
- private static final Log log = LogFactory.getLog(GfacAPI.class +
+ private static final Logger log = LoggerFactory.getLogger(GfacAPI.class +
"." + WorkflowContextHeaderBuilder.getCurrentContextHeader().getWorkflowMonitoringContext().getExperimentId());
public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/GSISecurityContext.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/GSISecurityContext.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/GSISecurityContext.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/GSISecurityContext.java Sat Oct 20 19:04:07 2012
@@ -26,12 +26,12 @@ import org.apache.airavata.core.gfac.con
import org.apache.airavata.core.gfac.exception.SecurityException;
import org.globus.tools.MyProxy;
import org.ietf.jgss.GSSCredential;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GSISecurityContext implements SecurityContext {
- private static final Log log = LogFactory.getLog(GSISecurityContext.class);
+ protected final Logger log = LoggerFactory.getLogger(this.getClass());
private MyProxyManager proxyRenewer;
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/utils/MyProxyManager.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/utils/MyProxyManager.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/utils/MyProxyManager.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/utils/MyProxyManager.java Sat Oct 20 19:04:07 2012
@@ -32,12 +32,12 @@ import org.globus.gsi.gssapi.GlobusGSSCr
import org.globus.myproxy.MyProxy;
import org.globus.myproxy.MyProxyException;
import org.ietf.jgss.GSSCredential;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MyProxyManager {
- private static final Log log = LogFactory.getLog(MyProxyManager.class);
+ private final Logger log = LoggerFactory.getLogger(this.getClass());
private final String username;
private final String password;
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/GridFtpOutputStaging.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/GridFtpOutputStaging.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/GridFtpOutputStaging.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/GridFtpOutputStaging.java Sat Oct 20 19:04:07 2012
@@ -43,15 +43,15 @@ import org.apache.airavata.schemas.gfac.
import org.apache.airavata.schemas.gfac.GlobusHostType;
import org.apache.airavata.schemas.gfac.HostDescriptionType;
import org.ietf.jgss.GSSCredential;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Output plugin to transfer file from GridFTP host to location given in output parameter
*/
public class GridFtpOutputStaging extends PostExecuteChain {
- private static final Log log = LogFactory.getLog(GridFtpOutputStaging.class);
+ public static final Logger log = LoggerFactory.getLogger(GridFtpOutputStaging.class);
public static final String MYPROXY_SECURITY_CONTEXT = "myproxy";
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java Sat Oct 20 19:04:07 2012
@@ -34,15 +34,15 @@ import org.apache.airavata.core.gfac.exc
import org.apache.airavata.core.gfac.extension.PostExecuteChain;
import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.DataRegistry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Register output to Registry
*/
public class OutputRegister extends PostExecuteChain {
- private static final Log log = LogFactory.getLog(OutputRegister.class);
+ private static final Logger log = LoggerFactory.getLogger(OutputRegister.class);
public boolean execute(InvocationContext context) throws ExtensionException {
// output context