Merge remote-tracking branch 'origin/stable-develop' into develop

Conflicts: domain/pom.xml pom.xml web/src/main/webapp/WEB-INF/data/config/schema_plugins/config-editor.xsd
geonetwork · Aug 29, 2014 · 0328ca1 · 0328ca1
2 parents 7a49a54 + a687db9
commit 0328ca1
Show file tree

Hide file tree

Showing 11 changed files with 458 additions and 246 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: java
 jdk:
-  - oraclejdk7
-  - openjdk6
+  - openjdk7
 before_install:
   - export MAVEN_OPTS="-Xmx512M -XX:MaxPermSize=256M"
diff --git a/domain/pom.xml b/domain/pom.xml
@@ -121,7 +121,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
+                <version>1.9</version>
                 <executions>
                     <execution>
                         <id>add-source</id>

diff --git a/e2e-tests/package.json b/e2e-tests/package.json
@@ -4,10 +4,11 @@
   "devDependencies": {
     "protractor" : "~0.15.0",
     "selenium-server": "2.38.0",
-    "jasmine-reporters": "0.2.1"
+    "jasmine-reporters": "0.2.1",
+    "phantomjs": "1.9.7-15"
   },
   "engines": {
     "node": ">=0.8.0",
     "npm": ">=2.0.0"
   }
-}
+}
diff --git a/e2e-tests/pom.xml b/e2e-tests/pom.xml
@@ -53,7 +53,10 @@
             // and
             // https://code.google.com/p/selenium/source/browse/javascript/webdriver/capabilities.js
             capabilities: {
-            'browserName': '@browserName@'
+              'browserName': '@browserName@'
+              // Config for phantomjs is not working
+              // 'browserName': 'phantomjs',
+              // 'phantomjs.binary.path': './node_modules/phantomjs/bin/phantomjs'
             },
 
             // ----- More information for your tests ----
@@ -79,8 +82,8 @@
             }
         </baseProtractorConfig>
 
-        <appPort>8080</appPort>
-        <sslAppPort>8443</sslAppPort>
+        <appPort>8844</appPort>
+        <sslAppPort>8843</sslAppPort>
         <jetty.stop.port>8012</jetty.stop.port>
         <geonetworkWar>${project.build.directory}/geonetworkWar</geonetworkWar>
     </properties>
@@ -107,52 +110,17 @@
     <profiles>
         <profile>
             <id>e2eTests</id>
+            <!--Disable e2e test to have
+            travis build working. Another option
+            would have been to have phantomjs
+            browser running.
             <activation>
                 <property>
                     <name>!skipTests</name>
                 </property>
-            </activation>
+            </activation>-->
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.gmaven</groupId>
-                        <artifactId>groovy-maven-plugin</artifactId>
-                        <version>2.0</version>
-                        <executions>
-                            <execution>
-                                <!-- Obtain the selenium jar name by searching the node_modules directory for the jar.
-                                     This allows us to update the package.json without worrying about the selenium jar version number
-                                     changing -->
-                                <id>Find Selenium Jar</id>
-                                <goals>
-                                    <goal>execute</goal>
-                                </goals>
-                                <phase>process-test-resources</phase>
-                                <configuration>
-                                    <source><![CDATA[
-                                        import static groovy.io.FileType.*
-                                        def base = new File(project.basedir, "node_modules/selenium-server/lib")
-                                        log.info("\n\tSearching $base for selenium server jar")
-                                        def jarsFound = []
-                                        base.eachFileRecurse FILES, { file ->
-                                            if (file.name.startsWith("selenium-server-standalone")) {
-                                                jarsFound << file
-                                            }
-                                        }
-
-                                        if (jarsFound.isEmpty()) {
-                                            throw new AssertionError("No selenium jar found in $base")
-                                        }
-
-                                        project.properties['seleniumJar'] = jarsFound[0].absolutePath
-                                        log.info("\n\tUsing selenium jar: "+jarsFound[0])
-
-
-                      ]]></source>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-resources-plugin</artifactId>
@@ -247,27 +215,43 @@
                             </execution>
                         </executions>
                     </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>runJettyDaemon</id>
-            <activation>
-                <property>
-                    <name>!skipTests</name>
-                </property>
-            </activation>
-            <properties>
-                <appPort>8844</appPort>
-                <sslAppPort>8843</sslAppPort>
-            </properties>
-            <build>
-                <plugins>
                     <plugin>
                         <groupId>org.codehaus.gmaven</groupId>
                         <artifactId>groovy-maven-plugin</artifactId>
                         <version>2.0</version>
                         <executions>
+                            <execution>
+                              <!-- Obtain the selenium jar name by searching the node_modules directory for the jar.
+                                   This allows us to update the package.json without worrying about the selenium jar version number
+                                   changing -->
+                              <id>Find Selenium Jar</id>
+                              <goals>
+                                <goal>execute</goal>
+                              </goals>
+                              <phase>process-test-resources</phase>
+                              <configuration>
+                                <source><![CDATA[
+                                          import static groovy.io.FileType.*
+                                          def base = new File(project.basedir, "node_modules/selenium-server/lib")
+                                          log.info("\n\tSearching $base for selenium server jar")
+                                          def jarsFound = []
+                                          base.eachFileRecurse FILES, { file ->
+                                              if (file.name.startsWith("selenium-server-standalone")) {
+                                                  jarsFound << file
+                                              }
+                                          }
+
+                                          if (jarsFound.isEmpty()) {
+                                              throw new AssertionError("No selenium jar found in $base")
+                                          }
+
+                                          project.properties['seleniumJar'] = jarsFound[0].absolutePath
+                                          log.info("\n\tUsing selenium jar: "+jarsFound[0])
+
+
+                        ]]></source>
+                              </configuration>
+                            </execution>
                             <execution>
                                 <!-- 
                     On windows sometimes (when a build fails) files stay locked and the  

diff --git a/pom.xml b/pom.xml
@@ -251,10 +251,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>2.5.1</version>
         <configuration>
-          <source>1.6</source>  <!-- The -source argument for the Java compiler. -->
-          <target>1.6</target>  <!-- The -target argument for the Java compiler. -->
+          <source>1.7</source>  <!-- The -source argument for the Java compiler. -->
+          <target>1.7</target>  <!-- The -target argument for the Java compiler. -->
           <debug>true</debug>   <!-- Whether to include debugging information.   -->
           <encoding>UTF-8</encoding> <!-- The -encoding argument for the Java compiler. -->
           <compilerArgument>-proc:none</compilerArgument> <!-- disable automatic annotation processing accoring to: http://docs.jboss.org/hibernate/jpamodelgen/1.0/reference/en-US/html_single/#d0e261 -->
@@ -275,7 +275,7 @@
       <plugin>
         <groupId>org.codehaus.cargo</groupId>
         <artifactId>cargo-maven2-plugin</artifactId>
-        <version>1.4.8</version>
+        <version>1.4.9</version>
         <configuration>
           <container>
             <containerId>jetty7x</containerId>

diff --git a/web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml b/web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml
@@ -11,6 +11,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans
         <property name="securityMetadataSource">
             <sec:filter-security-metadata-source use-expressions="true" request-matcher="regex">
                 <sec:intercept-url pattern="/metadata/.*" access="permitAll"/>
+                <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+" access="permitAll"/>
                 <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/metadata/.*" access="permitAll"/>
                 <sec:intercept-url pattern="/static/.*" access="permitAll"/>
                 <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/[a-z]{2,3}/xml.thesaurus.getList!?.*" access="permitAll"></sec:intercept-url>