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

remove non used commented declaration test last compiler snapshot 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1412345 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-11-21 22:51:18 +00:00
parent a06df0e7df
commit a4dbea758e
2 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,9 +27,7 @@
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
http://www.springframework.org/schema/task http://www.springframework.org/schema/task
http://www.springframework.org/schema/task/spring-task-3.0.xsd http://www.springframework.org/schema/task/spring-task-3.0.xsd">
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-3.0.xsd">
<context:property-placeholder location="classpath:application.properties"/> <context:property-placeholder location="classpath:application.properties"/>
@ -149,33 +147,6 @@
</configuration> </configuration>
</component> --> </component> -->
<!--
olamy TODO check if necessary !!
PLXREDBACK-81 bad role hint, redefining here until redback alpha-2 is released.
<component>
<role>org.apache.archiva.redback.system.check.EnvironmentCheck</role>
<role-hint>locked-admin-check</role-hint>
<implementation>org.apache.archiva.redback.integration.checks.security.LockedAdminEnvironmentCheck</implementation>
<description>LockedAdminEnvironmentCheck: checks if accounts marked as system administrator are locked
and unlocks them on startup.
</description>
<requirements>
<requirement>
<role>org.apache.archiva.redback.users.UserManager</role>
<role-hint>cached</role-hint>
<field-name>userManager</field-name>
</requirement>
<requirement>
<role>org.apache.archiva.redback.rbac.RBACManager</role>
<role-hint>cached</role-hint>
<field-name>rbacManager</field-name>
</requirement>
</requirements>
</component>
-->
<!-- TODO move to spring sample and test it --> <!-- TODO move to spring sample and test it -->
<!-- START SNIPPET: ldap --> <!-- START SNIPPET: ldap -->
<!-- <!--
@ -213,11 +184,11 @@
this component manages the connection to the ldap server this component manages the connection to the ldap server
--> -->
<!--
<bean name="ldapConnectionFactory" class="org.apache.archiva.redback.common.ldap.connection.ConfigurableLdapConnectionFactory"> <bean name="ldapConnectionFactory" class="org.apache.archiva.redback.common.ldap.connection.ConfigurableLdapConnectionFactory">
<property name="userConf" ref="userConfiguration"/> <property name="userConf" ref="userConfiguration"/>
</bean> </bean>
-->
<!-- <!--

5
pom.xml
View File

@ -1678,6 +1678,11 @@
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1-SNAPSHOT</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>