Skip to content

Elastic 5.4 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shroffk wants to merge 58 commits into
base: master
Choose a base branch
from
Open

Elastic 5.4 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
0dd2997
add init debian dir
May 9, 2016
109f6e0
change deb install file
May 9, 2016
005531b
dpkg: add glassfish home to defaults
May 9, 2016
ef42728
dpkg: add glassfish home to init
May 9, 2016
56fdecb
dpkg: escape : and = in defaults
May 9, 2016
8b0bb07
dpkg: add asadmin export
May 9, 2016
ae22575
dpkg: remove asadmin export
May 9, 2016
5b9ef20
dpkg: moved configure to init
May 10, 2016
b52ede7
dpkg: fix undeploy
May 10, 2016
4a09fad
release
May 10, 2016
d07b828
release
May 10, 2016
6d7fe0c
release
May 10, 2016
91df93c
release
May 10, 2016
9f2220b
dpkg: change single to double quotes
May 10, 2016
943462e
Merge branch 'master' of ssh://stash.nscl.msu.edu:7999/css/channelfinder
May 10, 2016
0b0f1a1
dpkg init script fixes
May 10, 2016
f8629eb
dpkg: add Elastic configuration file to war on start
May 11, 2016
91e24fc
Merge branch 'master' of ssh://stash.nscl.msu.edu:7999/css/channelfinder
May 11, 2016
e872e3d
release
May 11, 2016
ee9fbe4
Merge pull request #3 in CSS/channelfinder from github to master
Jul 26, 2016
65b51cf
Merge branch 'master' of https://github.com/ChannelFinder/ChannelFind…
Jul 26, 2016
2d96aba
Merge branch 'master' of ssh://stash.nscl.msu.edu:7999/css/channelfinder
Sep 6, 2016
860a1aa
added JACCUserManager
Sep 6, 2016
2ead96c
added JACCUserManager
Sep 6, 2016
1a36a8c
move to elastic 5.4 java api
May 17, 2017
e365ebf
Merge branch 'master' of https://github.com/ChannelFinder/ChannelFind…
May 17, 2017
e712b01
fix null pointer
May 19, 2017
6359d6f
changed settings to api, added new depends
May 19, 2017
da22751
update travis and readme to elastic 5.4
May 19, 2017
c094161
travis: url change
May 19, 2017
9948a3d
updated mapping_definitions to use text/keyword, then sort from keyword
May 22, 2017
06c6755
added base.dir to relative path in pom.xml
May 22, 2017
c141652
travis: use addon to install python-nose
May 22, 2017
d50047a
travis: add debug mvn
May 22, 2017
0941173
removing nosetests arg causing issue on travis
May 22, 2017
17dfb6b
travis: remove debug
May 22, 2017
624f343
refresh only on bulk requests, change property put to use XContentBui…
May 24, 2017
d19eb11
add exceptions to cover non existing channel for property resource
May 24, 2017
e796c10
remove script from TagsResource
May 25, 2017
d293561
updating to new script api
May 26, 2017
282641c
updating scripts
May 30, 2017
1f8a55f
updated scripts to use lambdas, and fixed the document missing tests …
Jun 2, 2017
67e911e
asadmin commands for integration tests
Jun 2, 2017
2aec369
running tests from payara micro
Jun 2, 2017
3a643ab
shorter wait for payara startup
berryma4 Jun 16, 2017
771ecd1
moved debian package to use payara and systemd
berryma4 Jun 19, 2017
9ad4f91
Merge pull request #6 in CSS/channelfinder from elastic_5.4 to master
Jun 19, 2017
09d2646
update to elastic 5.4, payara, and systemd
Jun 19, 2017
5f48a24
update debian packaging
berryma4 Jun 20, 2017
170e8fc
Merge remote-tracking branch 'stash/master' into elastic_5.4
berryma4 Jun 20, 2017
977e514
fix version
berryma4 Jun 20, 2017
13bb94d
Merge pull request #7 in CSS/channelfinder from elastic_5.4 to master
Jun 20, 2017
b1add60
update mapping file for deb package
berryma4 Jun 27, 2017
61fb439
add initialized settings, not empty settings
berryma4 Jun 27, 2017
8b3cfb6
Merge pull request #9 in CSS/channelfinder from elastic_5.4 to master
Jun 27, 2017
c559f3d
update settings
Jun 27, 2017
9f1e7be
release debian 1.0.2
berryma4 Jun 28, 2017
fdc70ec
ES multi field added to help searching null property values
berryma4 Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@ sudo: required
jdk:
- oraclejdk8

addons:
apt:
packages:
- python-nose

before_install:
- curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.7.3.deb && sudo dpkg -i --force-confnew elasticsearch-1.7.3.deb
- curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.4.0.deb && sudo dpkg -i --force-confnew elasticsearch-5.4.0.deb

install:
- sudo apt-get update
- sudo apt-get install python-nose

before_script:
- sleep 10
- 'echo "script.inline: on" | sudo tee -a /etc/elasticsearch/elasticsearch.yml'
- 'echo "script.inline: on" | sudo tee -a /etc/elasticsearch/indexed.yml'
- 'echo "script.inline: true" | sudo tee -a /etc/elasticsearch/elasticsearch.yml'
- 'echo "script.inline: true" | sudo tee -a /etc/elasticsearch/indexed.yml'
- sudo /etc/init.d/elasticsearch start
- sleep 25
- curl -XGET 'http://localhost:9200/_cluster/health?pretty'
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ in the web container.
```
################################# Scripting ###############################

script.inline: on
script.indexed: on
script.inline: true
script.stored: true
```


* For more information of how Index and mappings can be setup using any rest client as described here [create elastic index](https://www.elastic.co/guide/en/elasticsearch/reference/1.4/_create_an_index.html)
* For more information of how Index and mappings can be setup using any rest client as described here [create elastic index](https://www.elastic.co/guide/en/elasticsearch/reference/5.4/_create_an_index.html)


4. Authentication/Authorization
Expand Down
1 change: 0 additions & 1 deletion channelfinder/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
Expand Down
688 changes: 344 additions & 344 deletions channelfinder/LICENSE.txt
View file
Open in desktop

Large diffs are not rendered by default.

206 changes: 125 additions & 81 deletions channelfinder/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
</ciManagement>

<distributionManagement>
<!-- To be able to deploy, set login/passwd in your m2 settings.xml,
<!-- To be able to deploy, set login/passwd in your m2 settings.xml,
<servers> section (id values there should match ids below) -->
<repository>
<id>epics.releases</id>
Expand Down Expand Up @@ -141,36 +141,40 @@
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>1.5.2</version>
<version>5.4.0</version>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
<version>5.4.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>2.10.4</version>
<scope>provided</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>2.10.4</version>
<scope>provided</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.5.1</version>
<version>2.8.8</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.5.1</version>
<scope>provided</scope>
<version>2.8.8</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.5.1</version>
<scope>provided</scope>
<version>2.8.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand All @@ -183,6 +187,16 @@
<version>1.4.17</version>
<type>maven-plugin</type>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.7</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.7</version>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -235,16 +249,42 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.8</version>
</dependency>
</dependencies>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>copy-payara-micro</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<outputDirectory>target</outputDirectory>
<stripVersion>true</stripVersion>
<silent>true</silent>
<artifactItems>
<artifactItem>
<groupId>fish.payara.extras</groupId>
<artifactId>payara-micro</artifactId>
<version>5.181</version>
<type>jar</type>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.8</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Expand All @@ -262,18 +302,6 @@
<goal>single</goal>
</goals>
</execution>
<execution>
<id>cargo-config-filtering</id>
<phase>process-test-resources</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/cargo.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand All @@ -290,74 +318,90 @@
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>1.4.17</version>
<configuration>
<skip>${skipCargoAndRun}</skip>
<container>
<containerId>glassfish4x</containerId>
<zipUrlInstaller>
<url>http://download.java.net/glassfish/4.1.1/release/glassfish-4.1.1.zip</url>
</zipUrlInstaller>
</container>
<configuration>
<!--
<properties>
<cargo.servlet.port>${servlet.port}</cargo.servlet.port>
<cargo.glassfish.admin.port>5858</cargo.glassfish.admin.port>
<cargo.glassfish.jms.port>8686</cargo.glassfish.jms.port>
<cargo.hostname>localhost</cargo.hostname>
</properties>
-->
<configfiles>
<configfile>
<file>${project.build.directory}/ChannelFinder-cargo-inject/config</file>
<todir>cargo-domain/config</todir>
</configfile>
</configfiles>
</configuration>
</configuration>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<executions>
<execution>
<id>start-cargo</id>
<phase>pre-integration-test</phase>
<phase>integration-test</phase>
<goals>
<goal>start</goal>
<goal>exec</goal>
</goals>
<configuration>
<executable>nosetests</executable>
<workingDirectory>${project.basedir}/../test</workingDirectory>
<skip>${skipNoseTests}</skip>
<arguments>
<argument>-v</argument>
<argument>-s</argument>
<argument>--with-xunit</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>stop-cargo</id>
<phase>post-integration-test</phase>
<id>payara-uber-jar</id>
<phase>package</phase>
<goals>
<goal>stop</goal>
<goal>exec</goal>
</goals>
<configuration>
<executable>java</executable>
<arguments>
<argument>-jar</argument>
<argument>${basedir}/target/payara-micro.jar</argument>
<argument>--deploy</argument>
<argument>${basedir}/target/${project.build.finalName}.war</argument>
<argument>--outputUberJar</argument>
<argument>${basedir}/target/${project.build.finalName}.jar</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<groupId>com.bazaarvoice.maven.plugins</groupId>
<artifactId>process-exec-maven-plugin</artifactId>
<version>0.8</version>
<executions>
<!--Start process-->
<execution>
<phase>integration-test</phase>
<id>start-jar</id>
<phase>pre-integration-test</phase>
<goals>
<goal>exec</goal>
<goal>start</goal>
</goals>
<configuration>
<workingDir>${basedir}</workingDir>
<processLogFile>${basedir}/target/channelfinder.log</processLogFile>
<!-- <healthcheckUrl>http://localhost:8080/ChannelFinder/resources/channels</healthcheckUrl>-->
<waitAfterLaunch>60</waitAfterLaunch>
<arguments>
<argument>java</argument>
<argument>-Xmx4g</argument>
<argument>-jar</argument>
<argument>${basedir}/target/${project.build.finalName}.jar</argument>
<argument>--rootdir</argument>
<argument>${basedir}/src/test/serverresources/config</argument>
<argument>--sslPort</argument>
<argument>8181</argument>
<argument>--nocluster</argument>
<argument>true</argument>
<argument>--port</argument>
<argument>8080</argument>
<argument>--prebootcommandfile</argument>
<argument>${basedir}/../root/etc/channelfinder/asadmin_commands</argument>
</arguments>
</configuration>
</execution>
<!--Stop Process-->
<execution>
<id>stop-jar-process</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop-all</goal>
</goals>
</execution>
</executions>
<configuration>
<executable>nosetests</executable>
<workingDirectory>../test</workingDirectory>
<skip>${skipNoseTests}</skip>
<arguments>
<argument>-v</argument>
<argument>-s</argument>
<argument>--with-xunit</argument>
<argument>--xunit-file=${project.build.directory}/failsafe-reports/nosetests.xml</argument>
</arguments>
</configuration>
</plugin>
</plugins>
<finalName>ChannelFinder</finalName>
Expand Down
Loading