Author: brett
Date: Thu Mar 11 00:29:49 2010
New Revision: 921646
URL: http://svn.apache.org/viewvc?rev=921646&view=rev
Log:
allow to run in jetty:run again
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/spring/DummyProfileActivator.java
(with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/spring/DummyProfileActivator.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/spring/DummyProfileActivator.java?rev=921646&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/spring/DummyProfileActivator.java
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/spring/DummyProfileActivator.java
Thu Mar 11 00:29:49 2010
@@ -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;
+ }
+}
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/spring/DummyProfileActivator.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=921646&r1=921645&r2=921646&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Thu Mar 11 00:29:49 2010
@@ -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>
