Author: sebb
Date: Fri Mar 9 14:38:51 2007
New Revision: 516591
URL: http://svn.apache.org/viewvc?view=rev&rev=516591
Log:
SQLConfigGUI has been deleted; add a dummy GUI element so
testplans don't cause errors
Added:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java
(with props)
Modified:
jakarta/jmeter/branches/rel-2-2/bin/upgrade.properties
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
Modified: jakarta/jmeter/branches/rel-2-2/bin/upgrade.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/bin/upgrade.properties?view=diff&rev=516591&r1=516590&r2=516591
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/bin/upgrade.properties (original)
+++ jakarta/jmeter/branches/rel-2-2/bin/upgrade.properties Fri Mar 9 14:38:51
2007
@@ -60,7 +60,6 @@
# SQL Config
org.apache.jmeter.config.ConfigTestElement/JDBCSampler.query=query
-
org.apache.jmeter.protocol.http.control.Header/TestElement.name=Header.name
# Upgrade AccessLogSampler
@@ -73,4 +72,7 @@
#filterClassName
org.apache.jmeter.protocol.http.sampler.AccessLogSampler/HTTPSampler.domain=domain
org.apache.jmeter.protocol.http.sampler.AccessLogSampler/AccessLogSampler.parser_class_name=parserClassName
-org.apache.jmeter.protocol.http.sampler.AccessLogSampler/HTTPSampler.image_parser=imageParsing
\ No newline at end of file
+org.apache.jmeter.protocol.http.sampler.AccessLogSampler/HTTPSampler.image_parser=imageParsing
+
+# This class has been deleted
+org.apache.jmeter.protocol.jdbc.config.gui.SqlConfigGui=org.apache.jmeter.config.gui.ObsoleteGui
\ No newline at end of file
Added:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java?view=auto&rev=516591
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java
(added)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java
Fri Mar 9 14:38:51 2007
@@ -0,0 +1,57 @@
+/*
+ * 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.jmeter.config.gui;
+
+import java.awt.BorderLayout;
+
+import javax.swing.JLabel;
+
+import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.util.JMeterUtils;
+
+/**
+ * Default config gui for Configuration Element.
+ */
+public class ObsoleteGui extends AbstractConfigGui {
+
+ private JLabel obsoleteMessage =
+ new JLabel(JMeterUtils.getResString("obsolete_test_element"));
// $NON-NLS-1$
+
+ public ObsoleteGui(){
+ init();
+ }
+
+ private void init() {
+ setLayout(new BorderLayout(0, 10));
+ setBorder(makeBorder());
+ add(makeTitlePanel(), BorderLayout.NORTH);
+ add(obsoleteMessage,BorderLayout.WEST);
+ }
+
+ public TestElement createTestElement() {
+ return null;
+ }
+
+ public void modifyTestElement(TestElement element) {
+ }
+
+ public String getLabelResource() {
+ return "obsolete_test_element"; // $NON-NLS-1$
+ }
+}
Propchange:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties?view=diff&rev=516591&r1=516590&r2=516591
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
Fri Mar 9 14:38:51 2007
@@ -459,6 +459,7 @@
newdn=New distinguished name
no=Norwegian
number_of_threads=Number of Threads (users)\:
+obsolete_test_element=This test element is obsolete
once_only_controller_title=Once Only Controller
opcode=opCode
open=Open...
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
