Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow to run in jetty:run again 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@921646 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2010-03-11 00:29:49 +00:00
parent 4fed1a6fc5
commit 956d8d45d3
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/spring/DummyProfileActivator.java Normal file
View File

@ -0,0 +1,34 @@
package org.apache.archiva.web.spring;
/*
* 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
*
* 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 org.apache.maven.model.Profile;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.profile.ProfileActivationContext;
import org.apache.maven.model.profile.activation.ProfileActivator;
public class DummyProfileActivator
implements ProfileActivator
{
public boolean isActive( Profile profile, ProfileActivationContext context, ModelProblemCollector problems )
{
return false;
}
}

7
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
View File

@ -81,5 +81,10 @@
<bean name="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
<property name="session" ref="mailSession"/>
</bean>
</bean>
<!-- This is used to prevent the old profile activator being loaded from the running instance of Maven in jetty:run -->
<bean name="profileActivator#jdk-prefix" class="org.apache.archiva.web.spring.DummyProfileActivator" />
<bean name="profileActivator#system-property" class="org.apache.archiva.web.spring.DummyProfileActivator" />
<bean name="profileActivator#always-on" class="org.apache.archiva.web.spring.DummyProfileActivator" />
</beans>