From aee4ccff94e790912b0230b244cc9e46ec62463b Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 20 Mar 2009 10:09:15 +0000 Subject: Delete test trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@756398 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/monitor/DefaultMonitorFactory.java | 41 ------- .../org/apache/tuscany/sca/monitor/Monitor.java | 79 ------------ .../apache/tuscany/sca/monitor/MonitorFactory.java | 36 ------ .../org/apache/tuscany/sca/monitor/Problem.java | 49 -------- .../tuscany/sca/monitor/impl/MonitorImpl.java | 92 -------------- .../tuscany/sca/monitor/impl/ProblemImpl.java | 132 --------------------- .../org.apache.tuscany.sca.monitor.MonitorFactory | 18 --- .../tuscany/sca/monitor/MonitorTestCase.java | 92 -------------- .../tuscany-monitor-test-messages.properties | 24 ---- .../tuscany-monitor-test-messages_it.properties | 24 ---- 10 files changed, 587 deletions(-) delete mode 100644 sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java delete mode 100644 sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java delete mode 100644 sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java delete mode 100644 sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java delete mode 100644 sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java delete mode 100644 sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java delete mode 100644 sandbox/ant/sca/trunk/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory delete mode 100644 sandbox/ant/sca/trunk/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java delete mode 100644 sandbox/ant/sca/trunk/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties delete mode 100644 sandbox/ant/sca/trunk/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties (limited to 'sandbox/ant/sca/trunk/modules/monitor/src') diff --git a/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java b/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java deleted file mode 100644 index b38968caeb..0000000000 --- a/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.monitor; - -import org.apache.tuscany.sca.monitor.impl.MonitorImpl; - - -/** - * A factory for creating validation monitors - * - * @version $Rev$ $Date$ - */ -public class DefaultMonitorFactory implements MonitorFactory { - - private Monitor monitor = null; - - public Monitor createMonitor() { - if (monitor == null) { - monitor = new MonitorImpl(); - } - return monitor ; - } - -} diff --git a/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java b/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java deleted file mode 100644 index f0ac8a6dbb..0000000000 --- a/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.monitor; - -import java.util.List; - -import org.apache.tuscany.sca.monitor.Problem.Severity; - -/** - * A monitor for the watching for validation problems - * - * @version $Rev$ $Date$ - */ -public interface Monitor { - /** - * Reports a build problem. - * - * @param problem - */ - void problem(Problem problem); - - /** - * Returns a list of reported problems. - * - * @return the list of problems. The list may be empty - */ - List getProblems(); - - /** - * Returns the last logged problem. - * - * @return - */ - public Problem getLastProblem(); - - /** - * Create a new problem. - * - * @param sourceClassName the class name reporting the problem - * @param bundleName the name of the message bundle to use - * @param severity the severity of the problem - * @param problemObject the model object for which the problem is being reported - * @param messageId the id of the problem message - * @param cause the exception which caused the problem - * @return - */ - Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Exception cause); - - /** - * Create a new problem. - * - * @param sourceClassName the class name reporting the problem - * @param bundleName the name of the message bundle to use - * @param severity the severity of the problem - * @param problemObject the model object for which the problem is being reported - * @param messageId the id of the problem message - * @param messageParams the parameters of the problem message - * @return - */ - Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Object... messageParams ); - -} diff --git a/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java b/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java deleted file mode 100644 index 3384626958..0000000000 --- a/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.monitor; - - -/** - * A factory for validation monitors - * - * @version $Rev$ $Date$ - */ -public interface MonitorFactory { - - /** - * Create a new monitor. - * - * @return a new monitor - */ - Monitor createMonitor(); - -} diff --git a/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java b/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java deleted file mode 100644 index 83a2d63eae..0000000000 --- a/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.monitor; - - -/** - * Records an validation problem. - * - * @version $Rev$ $Date$ - */ -public interface Problem { - - public enum Severity { - INFO, - WARNING, - ERROR - } - - String getSourceClassName(); - - String getBundleName(); - - Severity getSeverity(); - - Object getProblemObject(); - - String getMessageId(); - - Exception getCause(); - - Object[] getMessageParams(); -} diff --git a/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java b/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java deleted file mode 100644 index fa562a5f23..0000000000 --- a/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.monitor.impl; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.Problem.Severity; - -/** - * A monitor for the watching for validation problems - * - * @version $Rev$ $Date$ - */ -public class MonitorImpl implements Monitor { - private static final Logger logger = Logger.getLogger(MonitorImpl.class.getName()); - - // Cache all the problem reported to monitor for further analysis - private List problemCache = new ArrayList(); - - public void problem(Problem problem) { - - Logger problemLogger = Logger.getLogger(problem.getSourceClassName(), problem.getBundleName()); - - if (problemLogger == null){ - logger.severe("Can't get logger " + problem.getSourceClassName()+ " with bundle " + problem.getBundleName()); - } - - if (problem.getSeverity() == Severity.INFO) { - problemCache.add(problem); - problemLogger.logp(Level.INFO, problem.getSourceClassName(), null, - problem.getMessageId(), problem.getMessageParams()); - } - else if (problem.getSeverity() == Severity.WARNING) { - problemCache.add(problem); - problemLogger.logp(Level.WARNING, problem.getSourceClassName(), null, - problem.getMessageId(), problem.getMessageParams()); - } - else if (problem.getSeverity() == Severity.ERROR) { - if (problem.getCause() != null) { - problemCache.add(problem); - problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), - null, problem.getMessageId(), problem.getCause().toString()); - - } else { - problemCache.add(problem); - problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), null, - problem.getMessageId(), problem.getMessageParams()); - } - } - } - - public List getProblems(){ - return problemCache; - } - - public Problem getLastProblem(){ - if (problemCache.isEmpty()) { - return null; - } - return problemCache.get(problemCache.size() - 1); - } - - public Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Exception cause) { - return new ProblemImpl(sourceClassName, bundleName, severity, problemObject, messageId, cause); - } - - public Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Object... messageParams) { - return new ProblemImpl(sourceClassName, bundleName, severity, problemObject, messageId, messageParams); - } -} diff --git a/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java b/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java deleted file mode 100644 index 5a0aaeddd0..0000000000 --- a/sandbox/ant/sca/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.monitor.impl; - -import java.util.logging.Formatter; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.Logger; -import java.util.logging.SimpleFormatter; - -import org.apache.tuscany.sca.monitor.Problem; - -/** - * Reports a composite assembly problem. - * - * @version $Rev$ $Date$ - */ -public class ProblemImpl implements Problem { - - private String sourceClassName; - private String bundleName; - private Severity severity; - private Object problemObject; - private String messageId; - private Object[] messageParams; - private Exception cause; - - /** - * Construct a new problem - * - * @param sourceClassName the class name reporting the problem - * @param bundleName the name of the message bundle to use - * @param severity the severity of the problem - * @param problemObject the model object for which the problem is being reported - * @param messageId the id of the problem message - * @param messageParams the parameters of the problem message - */ - public ProblemImpl(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Object... messageParams ) { - this.sourceClassName = sourceClassName; - this.bundleName = bundleName; - this.severity = severity; - this.problemObject = problemObject; - this.messageId = messageId; - this.messageParams = messageParams; - } - - /** - * Construct a new problem - * - * @param sourceClassName the class name reporting the problem - * @param bundleName the name of the message bundle to use - * @param severity the severity of the problem - * @param problemObject the model object for which the problem is being reported - * @param messageId the id of the problem message - * @param cause the exception which caused the problem - */ - public ProblemImpl(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Exception cause) { - this.sourceClassName = sourceClassName; - this.bundleName = bundleName; - this.severity = severity; - this.problemObject = problemObject; - this.messageId = messageId; - this.cause = cause; - } - - public String getSourceClassName() { - return sourceClassName; - } - - public String getBundleName() { - return bundleName; - } - - public Severity getSeverity() { - return severity; - } - - public Object getProblemObject() { - return problemObject; - } - - public String getMessageId() { - return messageId; - } - - public Object[] getMessageParams() { - return messageParams; - } - - public Exception getCause() { - return cause; - } - - @Override - public String toString() { - Logger logger = Logger.getLogger(sourceClassName, bundleName); - - LogRecord record = new LogRecord(Level.INFO, messageId); - - if (cause == null){ - record.setParameters(messageParams); - - } else { - Object[] params = new String[1]; - params[0] = cause.toString(); - record.setParameters(params); - } - record.setResourceBundle(logger.getResourceBundle()); - record.setSourceClassName(sourceClassName); - - Formatter formatter = new SimpleFormatter(); - - return formatter.formatMessage(record); - } -} diff --git a/sandbox/ant/sca/trunk/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory b/sandbox/ant/sca/trunk/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory deleted file mode 100644 index ae81aef136..0000000000 --- a/sandbox/ant/sca/trunk/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -org.apache.tuscany.sca.monitor.DefaultMonitorFactory diff --git a/sandbox/ant/sca/trunk/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java b/sandbox/ant/sca/trunk/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java deleted file mode 100644 index 4380e32f99..0000000000 --- a/sandbox/ant/sca/trunk/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.monitor; - -import org.apache.tuscany.sca.monitor.Problem.Severity; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Loads a monitor and adds some problems to it. - * - * @version $Rev$ $Date$ - */ -public class MonitorTestCase { - - private static MonitorFactory monitorFactory; - - @BeforeClass - public static void init() throws Exception { - monitorFactory = new DefaultMonitorFactory(); - } - - @AfterClass - public static void destroy() throws Exception { - monitorFactory = null; - } - - @Test - public void testCreateProblem() throws Exception { - String dummyModelObject = "DUMMY MODEL OBJECT"; - - Monitor monitor = monitorFactory.createMonitor(); - - Problem problem = null; - - problem = monitor.createProblem(this.getClass().getName(), - "tuscany-monitor-test-messages", - Severity.WARNING, - dummyModelObject, - "MESSAGE1" ); - monitor.problem(problem); - - String param = "Some Parameter"; - - problem = monitor.createProblem(this.getClass().getName(), - "tuscany-monitor-test-messages", - Severity.WARNING, - dummyModelObject, - "MESSAGE2", - param); - monitor.problem(problem); - - problem = monitor.createProblem(this.getClass().getName(), - "tuscany-monitor-test-messages", - Severity.WARNING, - dummyModelObject, - "MESSAGE3", - 8, - 9, - 4); - monitor.problem(problem); - - Exception ex = new IllegalStateException("TEST_MESSAGE"); - - problem = monitor.createProblem(this.getClass().getName(), - "tuscany-monitor-test-messages", - Severity.ERROR, - dummyModelObject, - "MESSAGE4", - ex); - monitor.problem(problem); - - } -} diff --git a/sandbox/ant/sca/trunk/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties b/sandbox/ant/sca/trunk/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties deleted file mode 100644 index 523263da40..0000000000 --- a/sandbox/ant/sca/trunk/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -MESSAGE1 = This is a test message with no params -MESSAGE2 = This is a test message with a string param {0} -MESSAGE3 = This is a test message with numbers {0}, {1}, {2} -MESSAGE4 = This is a test message with exception diff --git a/sandbox/ant/sca/trunk/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties b/sandbox/ant/sca/trunk/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties deleted file mode 100644 index 523263da40..0000000000 --- a/sandbox/ant/sca/trunk/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -MESSAGE1 = This is a test message with no params -MESSAGE2 = This is a test message with a string param {0} -MESSAGE3 = This is a test message with numbers {0}, {1}, {2} -MESSAGE4 = This is a test message with exception -- cgit v1.2.3