/*
 * Copyright (c) 2008-2011 Ivan Khalopik.
 *
 * 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.
 */

package org.greatage.tapestry.internal;

import org.apache.tapestry5.TapestryFilter;
import org.apache.tapestry5.ioc.def.ModuleDef;

import javax.servlet.ServletContext;

/**
 * @author Ivan Khalopik
 * @since 1.0
 */
public class GreatAgeTapestryFilter extends TapestryFilter {

	@Override
	protected ModuleDef[] provideExtraModuleDefs(final ServletContext context) {
		return new ModuleDef[]{
				new GreatAgeModuleDef(context.getInitParameter("greatage.module"))
		};
	}
}

@@ -812,17 +812,17 @@
 since 1.
-0
+1
 %0A */%0Apub
@@ -969,16 +969,89 @@
 text) %7B%0A
+%09%09final String moduleName = context.getInitParameter(%22greatage.module%22);%0A
 %09%09return
@@ -1098,51 +1098,18 @@
 Def(
-context.getInitParameter(%22greatage.
 module
-%22)
+Name
 )%0A%09%09

test git merge