You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/06/30 14:50:41 UTC
cvs commit: jakarta-turbine-fulcrum/configuration/impl merlin.properties
epugh 2004/06/30 05:50:41
Modified: configuration/impl/src/java/org/apache/fulcrum/configuration
DefaultConfigurationService.java
Added: configuration/impl merlin.properties
Log:
updates for merlin 3.3.0
Revision Changes Path
1.4 +18 -55 jakarta-turbine-fulcrum/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java
Index: DefaultConfigurationService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultConfigurationService.java 14 Feb 2004 14:22:00 -0000 1.3
+++ DefaultConfigurationService.java 30 Jun 2004 12:50:41 -0000 1.4
@@ -1,58 +1,19 @@
package org.apache.fulcrum.configuration;
-
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2001-2003 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/>.
- */
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
import java.io.File;
import java.util.Iterator;
import java.util.Properties;
@@ -77,6 +38,7 @@
* @version $Id$
* @avalon.component name="config" lifestyle="singleton"
* @avalon.service type="org.apache.commons.configuration.Configuration"
+ * @avalon.attribute key="urn:composition:deployment.timeout" value="0"
*/
public class DefaultConfigurationService
extends AbstractLogEnabled
@@ -485,6 +447,7 @@
/**
* @see org.apache.avalon.framework.context.Contextualizable
+ * @avalon.entry key="urn:avalon:home" type="java.io.File"
*/
public void contextualize(Context context) throws ContextException
{
1.1 jakarta-turbine-fulcrum/configuration/impl/merlin.properties
Index: merlin.properties
===================================================================
merlin.info = false
merlin.debug = false
merlin.audit = false
merlin.deployment = target/test-classes
merlin.override = conf/config.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org