You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/09/04 08:32:42 UTC
svn commit: r439950 - in /incubator/activemq/trunk/activemq-core/src:
main/java/org/apache/activemq/store/ main/java/org/apache/activemq/util/
test/java/org/apache/activemq/config/
test/resources/org/apache/activemq/config/sample-conf/
Author: chirino
Date: Sun Sep 3 23:32:41 2006
New Revision: 439950
URL: http://svn.apache.org/viewvc?view=rev&rev=439950
Log:
Fix broken test case: ConfigTest
Added:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java?view=diff&rev=439950&r1=439949&r2=439950
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java Sun Sep 3 23:32:41 2006
@@ -83,7 +83,7 @@
}
/**
- * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor"
+ * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryIntPropertyEditor"
*/
public void setJournalLogFileSize(int journalLogFileSize) {
this.journalLogFileSize = journalLogFileSize;
Added: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java?view=auto&rev=439950
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java (added)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java Sun Sep 3 23:32:41 2006
@@ -0,0 +1,69 @@
+/**
+ *
+ * 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.activemq.util;
+
+import java.beans.PropertyEditorSupport;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Converts string values like "20 Mb", "1024kb", and "1g"
+ * to int values in bytes.
+ *
+ */
+public class MemoryIntPropertyEditor extends PropertyEditorSupport {
+ public void setAsText(String text) throws IllegalArgumentException {
+
+ Pattern p = Pattern.compile("^\\s*(\\d+)\\s*(b)?\\s*$",Pattern.CASE_INSENSITIVE);
+ Matcher m = p.matcher(text);
+ if (m.matches()) {
+ setValue(new Integer(Integer.parseInt(m.group(1))));
+ return;
+ }
+
+ p = Pattern.compile("^\\s*(\\d+)\\s*k(b)?\\s*$",Pattern.CASE_INSENSITIVE);
+ m = p.matcher(text);
+ if (m.matches()) {
+ setValue(new Integer(Integer.parseInt(m.group(1)) * 1024));
+ return;
+ }
+
+ p = Pattern.compile("^\\s*(\\d+)\\s*m(b)?\\s*$", Pattern.CASE_INSENSITIVE);
+ m = p.matcher(text);
+ if (m.matches()) {
+ setValue(new Integer(Integer.parseInt(m.group(1)) * 1024 * 1024 ));
+ return;
+ }
+
+ p = Pattern.compile("^\\s*(\\d+)\\s*g(b)?\\s*$", Pattern.CASE_INSENSITIVE);
+ m = p.matcher(text);
+ if (m.matches()) {
+ setValue(new Integer(Integer.parseInt(m.group(1)) * 1024 * 1024 * 1024 ));
+ return;
+ }
+
+ throw new IllegalArgumentException(
+ "Could convert not to a memory size: " + text);
+ }
+
+ public String getAsText() {
+ Integer value = (Integer) getValue();
+ return (value != null ? value.toString() : "");
+ }
+
+}
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java?view=diff&rev=439950&r1=439949&r2=439950
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java Sun Sep 3 23:32:41 2006
@@ -1,9 +1,31 @@
+/**
+ *
+ * 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.activemq.util;
import java.beans.PropertyEditorSupport;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+/**
+ * Converts string values like "20 Mb", "1024kb", and "1g"
+ * to long values in bytes.
+ *
+ */
public class MemoryPropertyEditor extends PropertyEditorSupport {
public void setAsText(String text) throws IllegalArgumentException {
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java?view=diff&rev=439950&r1=439949&r2=439950
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java Sun Sep 3 23:32:41 2006
@@ -174,7 +174,7 @@
// Check transport connectors list
System.out.print("Checking transport connectors... ");
List connectors = broker.getTransportConnectors();
- assertTrue("Should have created at least 4 connectors", (connectors.size() >= 4));
+ assertTrue("Should have created at least 3 connectors", (connectors.size() >= 3));
assertTrue ("1st connector should be TcpTransportServer", ((TransportConnector)connectors.get(0)).getServer() instanceof TcpTransportServer);
assertTrue ("2nd connector should be TcpTransportServer", ((TransportConnector)connectors.get(1)).getServer() instanceof TcpTransportServer);
assertTrue ("3rd connector should be TcpTransportServer", ((TransportConnector)connectors.get(2)).getServer() instanceof TcpTransportServer);
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml?view=diff&rev=439950&r1=439949&r2=439950
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml Sun Sep 3 23:32:41 2006
@@ -28,7 +28,7 @@
<property name="cleanupPeriod" value="60000"/>
<property name="dataSource" ref="embedded-ds"/>
<property name="wireFormat">
- <bean id="myWireFormat" class="org.apache.activeio.command.DefaultWireFormat"/>
+ <bean id="myWireFormat" class="org.apache.activemq.wireformat.ObjectStreamWireFormat"/>
</property>
</amq:jdbcPersistenceAdapter>
</amq:persistenceAdapter>