Skip to content
Snippets Groups Projects
Commit 2223c939 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

- removing mustache compiler dependency

- add missing license header
- Add security rule on currency BEFORE starting block indexation
parent 359eaee7
No related branches found
No related tags found
No related merge requests found
Showing
with 186 additions and 6 deletions
package org.duniter.core.client.model.bma; package org.duniter.core.client.model.bma;
/*
* #%L
* Duniter4j :: Core Client API
* %%
* Copyright (C) 2014 - 2016 EIS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #L%
*/
/** /**
* Created by blavenie on 11/11/16. * Created by blavenie on 11/11/16.
*/ */
......
...@@ -85,11 +85,15 @@ ...@@ -85,11 +85,15 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!--
<dependency> <dependency>
<groupId>com.github.spullara.mustache.java</groupId> <groupId>com.github.spullara.mustache.java</groupId>
<artifactId>compiler</artifactId> <artifactId>compiler</artifactId>
<version>0.9.2</version> <version>0.8.13</version>
<scope>compile</scope>
</dependency> </dependency>
-->
<dependency> <dependency>
<groupId>org.glassfish.tyrus</groupId> <groupId>org.glassfish.tyrus</groupId>
......
package org.duniter.elasticsearch.action.security; package org.duniter.elasticsearch.action.security;
/*
* #%L
* Duniter4j :: ElasticSearch Plugin
* %%
* Copyright (C) 2014 - 2016 EIS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #L%
*/
import org.duniter.elasticsearch.PluginSettings; import org.duniter.elasticsearch.PluginSettings;
import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.component.AbstractLifecycleComponent;
import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Inject;
......
...@@ -132,15 +132,15 @@ public class DuniterNode extends AbstractLifecycleComponent<DuniterNode> { ...@@ -132,15 +132,15 @@ public class DuniterNode extends AbstractLifecycleComponent<DuniterNode> {
// Index (or refresh) node's currency // Index (or refresh) node's currency
Currency currency = injector.getInstance(RegistryService.class).indexCurrencyFromPeer(peer, true); Currency currency = injector.getInstance(RegistryService.class).indexCurrencyFromPeer(peer, true);
// Index blocks (and listen if new block appear)
injector.getInstance(BlockchainService.class)
.indexLastBlocks(peer)
.listenAndIndexNewBlock(peer);
// Add access to currency index // Add access to currency index
injector.getInstance(RestSecurityController.class).allowIndexType(RestRequest.Method.GET, injector.getInstance(RestSecurityController.class).allowIndexType(RestRequest.Method.GET,
currency.getCurrencyName(), currency.getCurrencyName(),
BlockchainService.BLOCK_TYPE); BlockchainService.BLOCK_TYPE);
// Index blocks (and listen if new block appear)
injector.getInstance(BlockchainService.class)
.indexLastBlocks(peer)
.listenAndIndexNewBlock(peer);
} }
if (pluginSettings.enableDataSync()) { if (pluginSettings.enableDataSync()) {
......
package org.duniter.elasticsearch.service.synchro; package org.duniter.elasticsearch.service.synchro;
/*
* #%L
* Duniter4j :: ElasticSearch Plugin
* %%
* Copyright (C) 2014 - 2016 EIS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #L%
*/
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
......
package org.duniter.elasticsearch.websocket; package org.duniter.elasticsearch.websocket;
/*
* #%L
* Duniter4j :: ElasticSearch Plugin
* %%
* Copyright (C) 2014 - 2016 EIS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #L%
*/
/* /*
Copyright 2015 ForgeRock AS Copyright 2015 ForgeRock AS
......
package org.duniter.elasticsearch.websocket; package org.duniter.elasticsearch.websocket;
/*
* #%L
* Duniter4j :: ElasticSearch Plugin
* %%
* Copyright (C) 2014 - 2016 EIS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #L%
*/
/* /*
Copyright 2015 ForgeRock AS Copyright 2015 ForgeRock AS
......
package org.duniter.elasticsearch.websocket; package org.duniter.elasticsearch.websocket;
/*
* #%L
* Duniter4j :: ElasticSearch Plugin
* %%
* Copyright (C) 2014 - 2016 EIS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #L%
*/
/* /*
Copyright 2015 ForgeRock AS Copyright 2015 ForgeRock AS
......
package org.duniter.elasticsearch.websocket; package org.duniter.elasticsearch.websocket;
/*
* #%L
* Duniter4j :: ElasticSearch Plugin
* %%
* Copyright (C) 2014 - 2016 EIS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #L%
*/
/* /*
Copyright 2015 ForgeRock AS Copyright 2015 ForgeRock AS
......
package org.duniter.elasticsearch.websocket; package org.duniter.elasticsearch.websocket;
/*
* #%L
* Duniter4j :: ElasticSearch Plugin
* %%
* Copyright (C) 2014 - 2016 EIS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #L%
*/
/* /*
Copyright 2015 ForgeRock AS Copyright 2015 ForgeRock AS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment