From: Olivier Lamy <olamy@apache.org>
Date: Wed, 21 Nov 2012 22:51:18 +0000 (+0000)
Subject: remove non used commented declaration test last compiler snapshot
X-Git-Tag: archiva-1.4-M4~611
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a4dbea758e5c0b05e46b9204e1c58768e4b68776;p=archiva.git

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
---

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
index ee4d2cf75..9a123e45e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
@@ -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>
-    -->
+
 
     
     <!-- 
diff --git a/pom.xml b/pom.xml
index f9d723770..09434a5b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1678,6 +1678,11 @@
     </plugins>
     <pluginManagement>
       <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>