Skip to content

Commit

Permalink
Merge branch 'release-4.0.0'
Browse files Browse the repository at this point in the history 
Conflicts:
	pom.xml
	src/main/webapp/modules/time-slider.js
  • Loading branch information
Fernando González Cortés committed Dec 17, 2015
2 parents f0c15a7 + daa7680 commit f6d15dc
Show file tree
Hide file tree
Showing 448 changed files with 80,761 additions and 6,485 deletions.
17 changes: 17 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
tmp/
target/
.project
.classpath
.settings
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
mosaicStats/src/main/jaxb/
commons/src/main/jaxb/
.idea
*.iml
velocity.log
sample-areas.tiff
.externalToolBuilders/
1 change: 1 addition & 0 deletions argentina/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/main/webapp/optimized
250 changes: 250 additions & 0 deletions argentina/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,250 @@
<?xml version="1.0"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fao.unredd</groupId>
<artifactId>portal-root</artifactId>
<version>4.0.0</version>
</parent>
<packaging>war</packaging>
<artifactId>argentina</artifactId>
<name>argentina</name>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.fao.unredd</groupId>
<artifactId>core</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.fao.unredd</groupId>
<artifactId>base</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.fao.unredd</groupId>
<artifactId>feedback</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.fao.unredd</groupId>
<artifactId>layer-time-sliders</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.fao.unredd</groupId>
<artifactId>time-slider</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.fao.unredd</groupId>
<artifactId>tour</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>ec.gob.dnf.portal</groupId>
<artifactId>herramientas</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<!-- Other deployments may access other databases, so it is responsibility
of the application to include the necessary drivers -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.3-1102-jdbc4</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<build>
<finalName>unredd-portal</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<!-- copy-dependency plugin -->
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<versionRange>[2.8,)</versionRange>
<goals>
<goal>unpack-dependencies</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>com.github.bringking</groupId>
<artifactId>requirejs-maven-plugin</artifactId>
<versionRange>[2.0,)</versionRange>
<goals>
<goal>optimize</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>
<versionRange>[1.0,)</versionRange>
<goals>
<goal>run</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>optimize</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<executions>
<execution>
<id>unpack-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/requirejs</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.fao.unredd</groupId>
<artifactId>jwebclient-analyzer-maven-plugin</artifactId>
<version>4.0.0</version>
<executions>
<execution>
<id>generate-buildconfig</id>
<phase>prepare-package</phase>
<goals>
<goal>generate-buildconfig</goal>
</goals>
<configuration>
<mainTemplate>${project.build.directory}/requirejs/main.js</mainTemplate>
<webClientFolder>${project.build.directory}/requirejs</webClientFolder>
<buildconfigOutputPath>${project.build.directory}/buildconfig.js</buildconfigOutputPath>
<mainOutputPath>${project.build.directory}/requirejs/nfms/modules/main.js</mainOutputPath>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>
<version>1.7.6</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<configuration>
<wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
<extraConfigFile>${basedir}/src/main/config/wro.properties</extraConfigFile>
<targetGroups>portal-style</targetGroups>
<minimize>true</minimize>
<contextFolder>${basedir}/target/requirejs/nfms/</contextFolder>
<destinationFolder>${basedir}/src/main/webapp/optimized/</destinationFolder>
<wroFile>${basedir}/src/main/config/wro.xml</wroFile>
</configuration>
</plugin>
<plugin>
<groupId>com.github.bringking</groupId>
<artifactId>requirejs-maven-plugin</artifactId>
<version>2.0.4</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>optimize</goal>
</goals>
</execution>
</executions>
<configuration>
<!-- optional path to a nodejs executable -->
<!--<nodeExecutable> -->
<!--/opt/nodejs/node -->
<!--</nodeExecutable> -->
<!-- path to optimizer json config file -->
<configFile>${project.build.directory}/buildconfig.js</configFile>
<fillDepsFromFolder>${project.build.directory}/requirejs/nfms/modules</fillDepsFromFolder>
<!-- optional path to optimizer executable -->
<!--<optimizerFile> -->
<!--${basedir}/src/main/scripts/r.js -->
<!--</optimizerFile> -->
<!-- optional parameters to optimizer executable -->
<optimizerParameters>
<parameter>optimize=uglify</parameter>
<!--<parameter>baseUrl=${baseDir}</parameter> -->
</optimizerParameters>
<!-- Whether or not to process configFile with maven filters. If you
use this option, some options in your configFile must resolve to absolute
paths (see below) -->
<filterConfig>
true
</filterConfig>
<!-- Skip requirejs optimization if true -->
<skip>
false
</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
2 changes: 2 additions & 0 deletions argentina/src/main/config/wro.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
preProcessors=cssDataUri,cssImport,semicolonAppender,cssMinJawr
postProcessors=
11 changes: 11 additions & 0 deletions argentina/src/main/config/wro.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<groups xmlns="http://www.isdc.ro/wro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.isdc.ro/wro wro.xsd">

<group name="portal-style">
<css>/modules/**.css</css>
<css>/styles/**.css</css>
</group>

</groups>
39 changes: 39 additions & 0 deletions argentina/src/main/webapp/META-INF/context.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--><!-- The contents of this file will be loaded for each web application -->
<Context copyXML="true">

<!-- Default set of monitored resources -->
<WatchedResource>WEB-INF/web.xml</WatchedResource>

<!-- Uncomment this to disable session persistence across Tomcat restarts -->
<!--
<Manager pathname="" />
-->

<!-- Uncomment this to enable Comet connection tacking (provides events
on session expiration as well as webapp lifecycle) -->
<!--
<Valve className="org.apache.catalina.valves.CometConnectionManagerValve" />
-->

<Resource name="jdbc/unredd-portal" auth="Container" type="javax.sql.DataSource"
driverClassName="org.postgresql.Driver" url="jdbc:postgresql://127.0.0.1:5432/spatialdata"
username="spatial_user" password="unr3dd" maxActive="20" maxIdle="10"
maxWait="-1" />

</Context>
Loading

0 comments on commit f6d15dc

Please sign in to comment.