You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2002/02/06 15:59:37 UTC
cvs commit: jakarta-turbine-stratum build.xml default.properties
mpoeschl 02/02/06 06:59:37
Modified: . build.xml default.properties
Added: src/java/org/apache/stratum/configuration
ConfigurationConverter.java
src/test/org/apache/stratum/configuration
TestConfigurationConverter.java
Log:
add ConfigurationConverter to convert Configuration <-> ExtendedPropeties
Revision Changes Path
1.1 jakarta-turbine-stratum/src/java/org/apache/stratum/configuration/ConfigurationConverter.java
Index: ConfigurationConverter.java
===================================================================
package org.apache.stratum.configuration;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import java.util.Iterator;
import org.apache.commons.collections.ExtendedProperties;
/**
* Configuration <-> ExtendedProperties converter
*
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
* @version $Id: ConfigurationConverter.java,v 1.1 2002/02/06 14:59:37 mpoeschl Exp $
*/
public class ConfigurationConverter
{
public static Configuration getConfiguration(ExtendedProperties ep)
{
Configuration config = (Configuration) new BaseConfiguration();
for (Iterator i = ep.getKeys() ; i.hasNext() ;)
{
String key = (String) i.next();
config.setProperty( key, ep.getProperty(key) );
}
return config;
}
public static ExtendedProperties getExtendedProperties(Configuration c)
{
ExtendedProperties props = new ExtendedProperties();
for (Iterator i = c.getKeys() ; i.hasNext() ;)
{
String key = (String) i.next();
props.setProperty( key, c.getProperty(key) );
}
return props;
}
}
1.1 jakarta-turbine-stratum/src/test/org/apache/stratum/configuration/TestConfigurationConverter.java
Index: TestConfigurationConverter.java
===================================================================
package org.apache.stratum.configuration;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.commons.collections.ExtendedProperties;
import java.util.Vector;
/**
* Tests the ConfigurationConverter class
*
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
* @version $Id: TestConfigurationConverter.java,v 1.1 2002/02/06 14:59:37 mpoeschl Exp $
*/
public class TestConfigurationConverter extends TestCase
{
protected Configuration config = (Configuration) new BaseConfiguration();
public TestConfigurationConverter(String testName)
{
super(testName);
}
public static Test suite()
{
return new TestSuite( TestConfigurationConverter.class );
}
public static void main(String args[])
{
String[] testCaseName = { TestConfigurationConverter.class.getName() };
junit.textui.TestRunner.main(testCaseName);
}
public void testConverter()
{
config.setProperty("string", "teststring");
config.setProperty("int", "123");
Vector vec = new Vector();
vec.add("item 1");
vec.add("item 2");
config.setProperty("vector", vec);
ExtendedProperties ep = ConfigurationConverter
.getExtendedProperties(config);
assertEquals("This returns 'teststring'", ep.getString("string"),
"teststring");
Vector v = ep.getVector("vector");
assertEquals("This returns 'item 1'", (String) v.get(0), "item 1");
assertEquals("This returns 123", ep.getInt("int"), 123);
Configuration c = ConfigurationConverter.getConfiguration(ep);
assertEquals("This returns 'teststring'", c.getString("string"),
"teststring");
Vector v1 = c.getVector("vector");
assertEquals("This returns 'item 1'", (String) v1.get(0), "item 1");
assertEquals("This returns 123", c.getInt("int"), 123);
}
}
1.14 +36 -35 jakarta-turbine-stratum/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 20 Jan 2002 01:48:06 -0000 1.13
+++ build.xml 6 Feb 2002 14:59:37 -0000 1.14
@@ -14,6 +14,7 @@
<pathelement location="${dom4j.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${commons-beanutils.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-util.jar}"/>
<pathelement location="${jgl.jar}"/>
<pathelement location="${jetty.jar}"/>
@@ -31,7 +32,7 @@
<pathelement location="${jaxp.jar}"/>
<pathelement location="${crimson.jar}"/>
<pathelement location="${build.dest}"/>
-
+
<!-- This is required to bootstrap the build -->
<pathelement location="tdk.jar"/>
</path>
@@ -42,30 +43,30 @@
<target
name="update-jars">
-
- <taskdef
- name="httpget"
+
+ <taskdef
+ name="httpget"
className="org.apache.tdk.task.Get">
<classpath refid="classpath"/>
</taskdef>
-
+
<!-- If you need proxy support you'll have to manually add:
-
+
proxyHost="x"
proxyPort="y"
-
+
We'll clean this up but it worked for a user behind a proxy.
-->
-
+
<httpget
baseUrl="http://jakarta.apache.org/turbine/jars/"
dest="${lib.repo}"
dependencyFile="deps.list"
/>
-
- </target>
+
+ </target>
<!-- ================================================================== -->
<!-- E N V I R O N M E N T -->
@@ -141,31 +142,31 @@
optimize="${optimize}">
<classpath refid="classpath"/>
</javac>
-
-
-
- <rmic
+
+
+
+ <rmic
base="${build.dest}"
classname="org.apache.stratum.jcs.auxiliary.remote.RemoteCacheListener"/>
-
- <rmic
+
+ <rmic
base="${build.dest}"
classname="org.apache.stratum.jcs.auxiliary.remote.server.RemoteCacheServerListener"/>
-
- <rmic
+
+ <rmic
base="${build.dest}"
classname="org.apache.stratum.jcs.auxiliary.remote.group.RemoteGroupCacheListener"/>
- <rmic
+ <rmic
base="${build.dest}"
classname="org.apache.stratum.jcs.auxiliary.remote.server.RemoteCacheServer"/>
- <rmic
+ <rmic
base="${build.dest}"
classname="org.apache.stratum.jcs.auxiliary.remote.RemoteCacheClientTest"/>
-
+
</target>
@@ -198,7 +199,7 @@
<filter token="lib.repo" value="${lib.repo}"/>
<filter token="lib.repo.f" value="${lib.repo.f}"/>
-
+
<filter filtersfile="jcs_filters.properties"/>
<copy todir="${build.dir}/scripts" filtering="true">
@@ -311,24 +312,24 @@
<target name="scrubABigMess"
depends="prepare">
- <taskdef name="scrub"
- classname="net.sourceforge.importscrubber.ant.ImportScrubberTask"/>
+ <taskdef name="scrub"
+ classname="net.sourceforge.importscrubber.ant.ImportScrubberTask"/>
- <javac
- deprecation="false"
- debug="true"
- optimize="false"
- srcdir="${src.dir}/java"
- destdir="${src.dir}/java">
+ <javac
+ deprecation="false"
+ debug="true"
+ optimize="false"
+ srcdir="${src.dir}/java"
+ destdir="${src.dir}/java">
<classpath refid="classpath"/>
</javac>
- <scrub root="${src.dir}/java/org/apache/stratum/jcs/" format="top" recurse="true"/>
+ <scrub root="${src.dir}/java/org/apache/stratum/jcs/" format="top" recurse="true"/>
- <delete>
- <fileset dir="${src.dir}" includes="**/*.class"/>
- </delete>
- </target>
+ <delete>
+ <fileset dir="${src.dir}" includes="**/*.class"/>
+ </delete>
+ </target>
</project>
1.11 +1 -0 jakarta-turbine-stratum/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/default.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- default.properties 5 Feb 2002 20:40:23 -0000 1.10
+++ default.properties 6 Feb 2002 14:59:37 -0000 1.11
@@ -31,6 +31,7 @@
test.reportsDirectory = test-reports
commons-beanutils.jar = ${lib.repo}/commons-beanutils.jar
+commons-collections.jar = ${lib.repo}/commons-collections.jar
commons-util.jar = ${lib.repo}/commons-util-0.1-dev.jar
dom4j.jar = ${lib.repo}/dom4j-1.1.jar
junit.jar = ${lib.repo}/junit-3.7.jar
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>