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

correctly set tccl during sisu init 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134351 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-06-10 15:38:09 +00:00
parent 45b308aab0
commit 3d2bbcff6c
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/PlexusSisuBridge.java
View File

@ -93,13 +93,18 @@ public class PlexusSisuBridge
//conf.setClassWorld( classWorld ); //conf.setClassWorld( classWorld );
ClassLoader ori = Thread.currentThread().getContextClassLoader();
try try
{ {
Thread.currentThread().setContextClassLoader( classRealm );
plexusContainer = new DefaultPlexusContainer( conf ); plexusContainer = new DefaultPlexusContainer( conf );
} }
catch ( PlexusContainerException e ) catch ( PlexusContainerException e )
{ {
throw new PlexusSisuBridgeException( e.getMessage(), e ); throw new PlexusSisuBridgeException( e.getMessage(), e );
} finally {
Thread.currentThread().setContextClassLoader( ori );
} }
} }

4
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
View File

@ -85,9 +85,9 @@ public class ArchivaIndexingTaskExecutor
artifactContextProducer = new DefaultArtifactContextProducer(); artifactContextProducer = new DefaultArtifactContextProducer();
indexerEngine = plexusSisuBridge.lookup( IndexerEngine.class ); indexerEngine = plexusSisuBridge.lookup( IndexerEngine.class, "default" );
indexPacker = plexusSisuBridge.lookup( IndexPacker.class ); indexPacker = plexusSisuBridge.lookup( IndexPacker.class, "default" );
} }
public void executeTask( Task task ) public void executeTask( Task task )

4
archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
View File

@ -24,9 +24,11 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd"> http://www.springframework.org/schema/context/spring-context-3.0.xsd"
default-lazy-init="true">
<context:annotation-config/> <context:annotation-config/>
<context:component-scan base-package="org.apache.maven.archiva.web"/> <context:component-scan base-package="org.apache.maven.archiva.web"/>
</beans> </beans>

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

@ -161,6 +161,18 @@
</bean> </bean>
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
<prop key="org.quartz.threadPool.class">org.quartz.simpl.SimpleThreadPool</prop>
<prop key="org.quartz.threadPool.threadCount">1</prop>
<prop key="org.quartz.threadPool.threadPriority">4</prop>
<prop key="org.quartz.jobStore.class">org.quartz.simpl.RAMJobStore</prop>
</props>
</property>
</bean>
<!-- <component> <!-- <component>

4
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
View File

@ -144,8 +144,8 @@ public class DefaultDependencyTreeBuilder
public void initialize() public void initialize()
throws PlexusSisuBridgeException throws PlexusSisuBridgeException
{ {
//factory = plexusSisuBridge.lookup( ArtifactFactory.class , "default" ); factory = plexusSisuBridge.lookup( ArtifactFactory.class , "default" );
//collector = plexusSisuBridge.lookup( ArtifactCollector.class , "default" ); collector = plexusSisuBridge.lookup( ArtifactCollector.class , "default" );
DefaultModelBuilderFactory defaultModelBuilderFactory = new DefaultModelBuilderFactory(); DefaultModelBuilderFactory defaultModelBuilderFactory = new DefaultModelBuilderFactory();