Author: olamy
Date: Wed Nov 21 22:51:18 2012
New Revision: 1412345
URL: http://svn.apache.org/viewvc?rev=1412345&view=rev
Log:
remove non used commented declaration test last compiler snapshot
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml?rev=1412345&r1=1412344&r2=1412345&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
Wed Nov 21 22:51:18 2012
@@ -27,9 +27,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://www.springframework.org/schema/task
- 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";>
+ http://www.springframework.org/schema/task/spring-task-3.0.xsd";>
<context:property-placeholder location="classpath:application.properties"/>
@@ -149,33 +147,6 @@
</configuration>
</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 -->
<!-- START SNIPPET: ldap -->
<!--
@@ -213,11 +184,11 @@
this component manages the connection to the ldap server
-->
- <!--
+
<bean name="ldapConnectionFactory"
class="org.apache.archiva.redback.common.ldap.connection.ConfigurableLdapConnectionFactory">
<property name="userConf" ref="userConfiguration"/>
</bean>
- -->
+
<!--
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1412345&r1=1412344&r2=1412345&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Nov 21 22:51:18 2012
@@ -1680,6 +1680,11 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<configuration>
