You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2016/11/14 16:25:59 UTC
[37/38] incubator-unomi git commit: Merge branch 'master' into
UNOMI-28-ES-2-X-UPGRADE
Merge branch 'master' into UNOMI-28-ES-2-X-UPGRADE
# Conflicts:
# package/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/f0bd45f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/f0bd45f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/f0bd45f5
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: f0bd45f522a56b8c36a7ac1e0174f689fca3b42b
Parents: e070823 ea1254f
Author: Serge Huber <sh...@apache.org>
Authored: Fri Nov 11 16:00:11 2016 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Fri Nov 11 16:00:11 2016 +0100
----------------------------------------------------------------------
KEYS | 58 ++
NOTICE | 1 -
api/pom.xml | 2 +-
.../unomi/api/services/ProfileService.java | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 +-
extensions/geonames/services/pom.xml | 8 +-
extensions/lists-extension/pom.xml | 4 +-
extensions/lists-extension/rest/pom.xml | 8 +-
extensions/lists-extension/services/pom.xml | 8 +-
extensions/pom.xml | 2 +-
extensions/privacy-extension/pom.xml | 4 +-
extensions/privacy-extension/rest/pom.xml | 8 +-
extensions/privacy-extension/services/pom.xml | 13 +-
.../privacy/internal/PrivacyServiceImpl.java | 8 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 1 +
itests/pom.xml | 8 +-
kar/pom.xml | 30 +-
package/pom.xml | 314 ++++-----
package/src/main/resources/LICENSE | 550 ++++++---------
package/src/main/resources/NOTICE | 669 +------------------
performance-tests/pom.xml | 4 +-
persistence-elasticsearch/core/pom.xml | 6 +-
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
persistence-elasticsearch/pom.xml | 2 +-
persistence-spi/pom.xml | 4 +-
plugins/baseplugin/pom.xml | 6 +-
.../baseplugin/actions/SetPropertyAction.java | 14 +-
.../META-INF/cxs/actions/setPropertyAction.json | 5 +
.../cxs/conditions/goalMatchCondition.json | 3 +-
plugins/hover-event/pom.xml | 4 +-
plugins/mail/pom.xml | 4 +-
plugins/optimization-test/pom.xml | 2 +-
plugins/past-event/pom.xml | 6 +-
plugins/pom.xml | 4 +-
plugins/request/pom.xml | 6 +-
plugins/tracked-event/pom.xml | 6 +-
pom.xml | 47 +-
rest/pom.xml | 8 +-
.../unomi/rest/ProfileServiceEndPoint.java | 8 +-
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +-
services/pom.xml | 6 +-
.../services/services/ProfileServiceImpl.java | 45 +-
src/site/markdown/download.md | 10 +-
wab/pom.xml | 6 +-
47 files changed, 607 insertions(+), 1317 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f0bd45f5/itests/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f0bd45f5/package/pom.xml
----------------------------------------------------------------------
diff --cc package/pom.xml
index c55aed0,b3f7448..5de850b
--- a/package/pom.xml
+++ b/package/pom.xml
@@@ -299,6 -146,167 +149,166 @@@
</plugins>
</build>
</profile>
+ <profile>
+ <id>binary</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
- <id>unpack-sigar</id>
++ <id>unpack-deploy-by-query-plugin</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
++ <groupId>org.elasticsearch.plugin</groupId>
++ <artifactId>delete-by-query</artifactId>
++ <version>${elasticsearch.version}</version>
++ <type>zip</type>
++ <outputDirectory>${project.build.directory}/assembly/elasticsearch/plugins/delete-by-query</outputDirectory>
++ </artifactItem>
++ <artifactItem>
++ <groupId>org.elasticsearch.module</groupId>
++ <artifactId>lang-groovy</artifactId>
++ <version>${elasticsearch.version}</version>
++ <type>zip</type>
++ <outputDirectory>${project.build.directory}/assembly/elasticsearch/modules/lang-groovy</outputDirectory>
++ </artifactItem>
++ <artifactItem>
++ <groupId>org.elasticsearch.module</groupId>
++ <artifactId>lang-expression</artifactId>
+ <version>${elasticsearch.version}</version>
- <type>tar.gz</type>
- <includes>**/lib/sigar/**</includes>
- <outputDirectory>${project.build.directory}/unpack</outputDirectory>
++ <type>zip</type>
++ <outputDirectory>${project.build.directory}/assembly/elasticsearch/modules/lang-expression</outputDirectory>
++ </artifactItem>
++ <artifactItem>
++ <groupId>org.elasticsearch.module</groupId>
++ <artifactId>reindex</artifactId>
++ <version>${elasticsearch.version}</version>
++ <type>zip</type>
++ <outputDirectory>${project.build.directory}/assembly/elasticsearch/modules/reindex</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-wab</artifactId>
+ <version>${project.version}</version>
+ <classifier>unomicfg</classifier>
+ <type>cfg</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>org.apache.unomi.web.cfg</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-persistence-elasticsearch-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>elasticsearchcfg</classifier>
+ <type>cfg</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>org.apache.unomi.persistence.elasticsearch.cfg</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-persistence-elasticsearch-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>elasticsearchconfig</classifier>
+ <type>yml</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>elasticsearch.yml</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-plugins-request</artifactId>
+ <version>${project.version}</version>
+ <classifier>requestcfg</classifier>
+ <type>cfg</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>org.apache.unomi.plugins.request.cfg</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-plugins-mail</artifactId>
+ <version>${project.version}</version>
+ <classifier>mailcfg</classifier>
+ <type>cfg</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>org.apache.unomi.plugins.mail.cfg</destFileName>
+ </artifactItem>
+ </artifactItems>
+ <!-- other configurations here -->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-karaf</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <copy todir="${project.build.directory}/assembly/lib/sigar">
- <fileset dir="${project.build.directory}/unpack/elasticsearch-${elasticsearch.version}/lib/sigar" />
- </copy>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-kar</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>install-kars</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>package</id>
+ <goals>
+ <goal>instance-create-archive</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <installedFeatures>
+ <feature>wrapper</feature>
+ </installedFeatures>
+ <bootFeatures>
+ <feature>standard</feature>
+ <feature>management</feature>
+ <feature>ssh</feature>
+ <feature>config</feature>
+ <feature>region</feature>
+ <feature>package</feature>
+ <feature>kar</feature>
+ <feature>war</feature>
+ <feature>cxf</feature>
+ <feature>openwebbeans</feature>
+ <feature>pax-cdi-web-openwebbeans</feature>
+ <feature>unomi-kar</feature>
+ </bootFeatures>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- </profile>
</profiles>
++
</project>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f0bd45f5/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f0bd45f5/pom.xml
----------------------------------------------------------------------