Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 62102 invoked from network); 3 Mar 2007 23:22:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Mar 2007 23:22:07 -0000 Received: (qmail 66851 invoked by uid 500); 3 Mar 2007 23:22:16 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 66709 invoked by uid 500); 3 Mar 2007 23:22:15 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 66698 invoked by uid 99); 3 Mar 2007 23:22:15 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Mar 2007 15:22:15 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Mar 2007 15:22:06 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id CD84E1A981A; Sat, 3 Mar 2007 15:21:45 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r514266 - /geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ExpressionParser.java Date: Sat, 03 Mar 2007 23:21:44 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070303232145.CD84E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Sat Mar 3 15:21:39 2007 New Revision: 514266 URL: http://svn.apache.org/viewvc?view=rev&rev=514266 Log: (GERONIMO-2735) Bring ExpressionParser from genesis/plugin-support over to the server to support property expansion Added: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ExpressionParser.java - copied, changed from r514265, geronimo/genesis/tags/genesis-1.1/plugins/plugin-support/src/main/java/org/apache/geronimo/genesis/util/ExpressionParser.java Copied: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ExpressionParser.java (from r514265, geronimo/genesis/tags/genesis-1.1/plugins/plugin-support/src/main/java/org/apache/geronimo/genesis/util/ExpressionParser.java) URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ExpressionParser.java?view=diff&rev=514266&p1=geronimo/genesis/tags/genesis-1.1/plugins/plugin-support/src/main/java/org/apache/geronimo/genesis/util/ExpressionParser.java&r1=514265&p2=geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ExpressionParser.java&r2=514266 ============================================================================== --- geronimo/genesis/tags/genesis-1.1/plugins/plugin-support/src/main/java/org/apache/geronimo/genesis/util/ExpressionParser.java (original) +++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ExpressionParser.java Sat Mar 3 15:21:39 2007 @@ -1,23 +1,20 @@ -/* - * 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 +/** + * 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 + * 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. + * 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.geronimo.genesis.util; +package org.apache.geronimo.system.configuration.condition; import java.util.Map;