Update some Jahia references and URLs in order to push to Apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/1076064b Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/1076064b Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/1076064b Branch: refs/heads/master Commit: 1076064b4287ad981e03b0aea9b89a184b4c889a Parents: 81d6d69 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Nov 23 17:22:06 2015 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Nov 23 17:22:06 2015 +0100 ---------------------------------------------------------------------- README.md | 4 ++-- extensions/geonames/services/pom.xml | 18 +----------------- extensions/lists-extension/services/pom.xml | 18 +----------------- pom.xml | 6 ------ services/pom.xml | 16 ---------------- src/site/markdown/configuration.md | 4 ++-- 6 files changed, 6 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1076064b/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 9a796a9..9f1a4c8 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ A public project that implements the Context Server specification License ------- -The source code is available under the Apache License V2 and is copyrighted 2014-2015 Jahia Solutions +The source code is available under the Apache License V2 Requirements ------------ @@ -425,7 +425,7 @@ By default the Context Server limits to connections to port 9200 and 9300 to the - the current subnet (i.e., 192.168.1.0-192.168.1.255) (this is done using a custom plugin for Elasticsearch, that you may find here : -https://github.com/Jahia/unomi/tree/master/context-server/persistence-elasticsearch/plugins/security) +https://git-wip-us.apache.org/repos/asf/incubator-unomi/context-server/persistence-elasticsearch/plugins/security) You can adjust this setting by using the following setting in the $MY_KARAF_HOME/etc/elasticsearch.yml file : http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1076064b/extensions/geonames/services/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml index 26100ce..3f414f4 100644 --- a/extensions/geonames/services/pom.xml +++ b/extensions/geonames/services/pom.xml @@ -71,22 +71,6 @@ <build> <plugins> - <!--<plugin> - <groupId>org.jahia.server</groupId> - <artifactId>jahia-maven-plugin</artifactId> - <executions> - <execution> - <id>native2ascii</id> - <goals> - <goal>native2ascii</goal> - </goals> - <configuration> - <includes>messages*.properties</includes> - <defaultPropertiesFileLocale>en</defaultPropertiesFileLocale> - </configuration> - </execution> - </executions> - </plugin>--> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> @@ -128,4 +112,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1076064b/extensions/lists-extension/services/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml index 190d964..1ebe200 100644 --- a/extensions/lists-extension/services/pom.xml +++ b/extensions/lists-extension/services/pom.xml @@ -55,22 +55,6 @@ <build> <plugins> - <!--<plugin> - <groupId>org.jahia.server</groupId> - <artifactId>jahia-maven-plugin</artifactId> - <executions> - <execution> - <id>native2ascii</id> - <goals> - <goal>native2ascii</goal> - </goals> - <configuration> - <includes>messages*.properties</includes> - <defaultPropertiesFileLocale>en</defaultPropertiesFileLocale> - </configuration> - </execution> - </executions> - </plugin>--> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> @@ -87,4 +71,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1076064b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 24f6380..32d0562 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,6 @@ <version.jackson.jaxb>2.4.0</version.jackson.jaxb> <!-- version used by CXF --> <version.karaf>3.0.2</version.karaf> <version.pax.exam>4.4.0</version.pax.exam> - <jahia.plugin.version>4.3</jahia.plugin.version> </properties> <mailingLists> @@ -480,11 +479,6 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.jahia.server</groupId> - <artifactId>jahia-maven-plugin</artifactId> - <version>${jahia.plugin.version}</version> - </plugin> - <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <version>2.5.3</version> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1076064b/services/pom.xml ---------------------------------------------------------------------- diff --git a/services/pom.xml b/services/pom.xml index 1ccf738..5f4daf3 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -142,22 +142,6 @@ <build> <plugins> <plugin> - <groupId>org.jahia.server</groupId> - <artifactId>jahia-maven-plugin</artifactId> - <executions> - <execution> - <id>native2ascii</id> - <goals> - <goal>native2ascii</goal> - </goals> - <configuration> - <includes>messages*.properties</includes> - <defaultPropertiesFileLocale>en</defaultPropertiesFileLocale> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1076064b/src/site/markdown/configuration.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/configuration.md b/src/site/markdown/configuration.md index 5340d30..b925d48 100644 --- a/src/site/markdown/configuration.md +++ b/src/site/markdown/configuration.md @@ -170,7 +170,7 @@ By default the Context Server limits to connections to port 9200 and 9300 to the - the current subnet (i.e., 192.168.1.0-192.168.1.255) (this is done using a custom plugin for Elasticsearch, that you may find here : -https://github.com/Jahia/unomi/tree/master/context-server/persistence-elasticsearch/plugins/security) +https://git-wip-us.apache.org/repos/asf/incubator-unomi/context-server/persistence-elasticsearch/plugins/security) You can adjust this setting by using the following setting in the $MY_KARAF_HOME/etc/elasticsearch.yml file : @@ -270,4 +270,4 @@ common.conf: RewriteRule ^.* - [F,L] ProxyPass / http://localhost:8181/ connectiontimeout=20 timeout=300 ttl=120 - ProxyPassReverse / http://localhost:8181/ \ No newline at end of file + ProxyPassReverse / http://localhost:8181/
