Return-Path: X-Original-To: apmail-continuum-commits-archive@www.apache.org Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8C3C310030 for ; Sun, 25 Jan 2015 18:15:03 +0000 (UTC) Received: (qmail 81528 invoked by uid 500); 25 Jan 2015 18:15:03 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 81500 invoked by uid 500); 25 Jan 2015 18:15:03 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 81490 invoked by uid 99); 25 Jan 2015 18:15:03 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Jan 2015 18:15:03 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 9D4A4AC07BD; Sun, 25 Jan 2015 18:15:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1654677 - in /continuum/trunk/continuum-webapp: pom.xml src/main/java/org/apache/continuum/web/integration/ src/main/java/org/apache/continuum/web/integration/Struts2PlexusInSpringObjectFactory.java Date: Sun, 25 Jan 2015 18:15:03 -0000 To: commits@continuum.apache.org From: batkinson@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150125181503.9D4A4AC07BD@hades.apache.org> Author: batkinson Date: Sun Jan 25 18:15:03 2015 New Revision: 1654677 URL: http://svn.apache.org/r1654677 Log: Moved plexus/spring bridge into project, updated to work with latest api. Added: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/integration/ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/integration/Struts2PlexusInSpringObjectFactory.java Modified: continuum/trunk/continuum-webapp/pom.xml Modified: continuum/trunk/continuum-webapp/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/pom.xml?rev=1654677&r1=1654676&r2=1654677&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/pom.xml (original) +++ continuum/trunk/continuum-webapp/pom.xml Sun Jan 25 18:15:03 2015 @@ -584,7 +584,7 @@ org.apache.struts struts2-spring-plugin - runtime + compile javax.servlet Added: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/integration/Struts2PlexusInSpringObjectFactory.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/integration/Struts2PlexusInSpringObjectFactory.java?rev=1654677&view=auto ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/integration/Struts2PlexusInSpringObjectFactory.java (added) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/integration/Struts2PlexusInSpringObjectFactory.java Sun Jan 25 18:15:03 2015 @@ -0,0 +1,120 @@ +package org.apache.continuum.web.integration; + +/* + ~ 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 com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.Result; +import com.opensymphony.xwork2.inject.Container; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.interceptor.Interceptor; +import com.opensymphony.xwork2.validator.Validator; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.spring.StrutsSpringObjectFactory; +import org.codehaus.plexus.spring.PlexusToSpringUtils; + +import javax.servlet.ServletContext; +import java.util.Map; + +public class Struts2PlexusInSpringObjectFactory + extends StrutsSpringObjectFactory +{ + @Inject + public Struts2PlexusInSpringObjectFactory( + @Inject(value=StrutsConstants.STRUTS_OBJECTFACTORY_SPRING_AUTOWIRE,required=false) String autoWire, + @Inject(value=StrutsConstants.STRUTS_OBJECTFACTORY_SPRING_AUTOWIRE_ALWAYS_RESPECT,required=false) String alwaysAutoWire, + @Inject(value=StrutsConstants.STRUTS_OBJECTFACTORY_SPRING_USE_CLASS_CACHE,required=false) String useClassCacheStr, + @Inject(value=StrutsConstants.STRUTS_OBJECTFACTORY_SPRING_ENABLE_AOP_SUPPORT,required=false) String enableAopSupport, + @Inject ServletContext servletContext, + @Inject(StrutsConstants.STRUTS_DEVMODE) String devMode, + @Inject Container container) + { + super(autoWire, alwaysAutoWire, useClassCacheStr, enableAopSupport, servletContext, devMode, container); + } + + /** + * {@inheritDoc} + * + * @see com.opensymphony.xwork2.spring.SpringObjectFactory#buildBean(java.lang.String, java.util.Map) + */ + @Override + public Object buildBean( String name, Map map ) + throws Exception + { + String id = PlexusToSpringUtils.buildSpringId(Action.class, name); + if ( appContext.containsBean( id ) ) + { + return super.buildBean( id, map ); + } + + id = PlexusToSpringUtils.buildSpringId( Result.class, name ); + if ( appContext.containsBean( id ) ) + { + return super.buildBean( id, map ); + } + + id = PlexusToSpringUtils.buildSpringId( Interceptor.class, name ); + if ( appContext.containsBean( id ) ) + { + return super.buildBean( id, map ); + } + + id = PlexusToSpringUtils.buildSpringId( Validator.class, name ); + if ( appContext.containsBean( id ) ) + { + return super.buildBean( id, map ); + } + return super.buildBean( name, map ); + } + + public Validator buildValidator( String className, Map params, Map extraContext ) + throws Exception + { + String id = PlexusToSpringUtils.buildSpringId( Validator.class, className ); + if ( appContext.containsBean( id ) ) + { + return (Validator) appContext.getBean( id ); + } + return super.buildValidator( className, params, extraContext ); + } + + @Override + public Class getClassInstance( String className ) + throws ClassNotFoundException + { + String id = PlexusToSpringUtils.buildSpringId( Action.class, className ); + if ( appContext.containsBean( id ) ) + { + return appContext.getType( id ); + } + + id = PlexusToSpringUtils.buildSpringId( Result.class, className ); + if ( appContext.containsBean( id ) ) + { + return appContext.getType( id ); + } + + id = PlexusToSpringUtils.buildSpringId( Interceptor.class, className ); + if ( appContext.containsBean( id ) ) + { + return appContext.getType( id ); + } + id = PlexusToSpringUtils.buildSpringId( Validator.class, className ); + if ( appContext.containsBean( id ) ) + { + return appContext.getType( id ); + } + return super.getClassInstance( className ); + } +}