Repository: incubator-unomi Updated Branches: refs/heads/master 27301696c -> c58363029
UNOMI-85 Fix 404 errors Signed-off-by: Serge Huber <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/c5836302 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/c5836302 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/c5836302 Branch: refs/heads/master Commit: c58363029ee92a4743b2c1743b80c21de27659f6 Parents: 2730169 Author: Serge Huber <[email protected]> Authored: Tue Feb 21 21:39:02 2017 +0100 Committer: Serge Huber <[email protected]> Committed: Tue Feb 21 21:39:02 2017 +0100 ---------------------------------------------------------------------- pom.xml | 10 +++--- rest/pom.xml | 36 ++++++++++++++------ .../markdown/versions/master/configuration.md | 6 ++-- src/site/site.xml | 1 + 4 files changed, 35 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/c5836302/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 960c64b..7234fbb 100644 --- a/pom.xml +++ b/pom.xml @@ -894,7 +894,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> + <version>2.10.4</version> </plugin> <plugin> <groupId>org.apache.servicemix.tooling</groupId> @@ -953,7 +953,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-publish-plugin</artifactId> - <version>1.0-beta-2</version> + <version>1.1</version> <configuration> <checkinComment>[scm-publish] Updating Unomi website</checkinComment> <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/incubator/unomi/website/</pubScmUrl> @@ -962,7 +962,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.3</version> + <version>3.4</version> <dependencies> <dependency> <groupId>lt.velykis.maven.skins</groupId> @@ -985,7 +985,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> + <version>2.10.4</version> <configuration> <tags> <tag> @@ -1045,7 +1045,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.8.1</version> + <version>2.9</version> <configuration> <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/c5836302/rest/pom.xml ---------------------------------------------------------------------- diff --git a/rest/pom.xml b/rest/pom.xml index 9675d23..f91753e 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -33,14 +33,9 @@ <pluginRepositories> <pluginRepository> <id>miredot</id> - <name>MireDot Releases</name> + <name>Miredot Releases</name> <url>http://nexus.qmino.com/content/repositories/miredot</url> </pluginRepository> - <pluginRepository> - <id>miredot-snapshots</id> - <name>MireDot Releases</name> - <url>http://nexus.qmino.com/content/repositories/miredot-snapshots</url> - </pluginRepository> </pluginRepositories> <dependencies> @@ -163,7 +158,7 @@ <plugin> <groupId>com.qmino</groupId> <artifactId>miredot-plugin</artifactId> - <version>2.0</version> + <version>2.0.3</version> <executions> <execution> <goals> @@ -172,9 +167,7 @@ </execution> </executions> <configuration> - <license> - cHJvamVjdHxvcmcuYXBhY2hlLnVub21pLnVub21pLXJlc3R8MjAxNi0xMi0zMXx0cnVlfC0xI01Dd0NGRnI4UlhTSVNMdDdXck85ODRwcVo3MFhoY0d0QWhSTU1BNVJBUUNZTkNnVkFPRkpZNGxYeWNIM01RPT0= - </license> + <organizationId>c652adef-c7d3-41b5-a668-3a4d8fc2102e</organizationId> <output> <title>Documentation for Apache Unomi's RESTful API ${project.version}</title> <html> @@ -190,6 +183,29 @@ <item>src/main/resources/OSGI-INF/blueprint/blueprint.xml</item> </cxfServiceConfig> </restFramework> + <httpStatusCodes> + <httpStatusCode> + <httpCode>200</httpCode> + <document>always</document> + <defaultMessage>The service call has completed successfully.</defaultMessage> + </httpStatusCode> + <httpStatusCode> + <httpCode>401</httpCode> + <document>explicit: com.acme.exceptions.AuthorizationException</document> + <defaultMessage>The user is not authorized to use this service.</defaultMessage> + </httpStatusCode> + <httpStatusCode> + <httpCode>412</httpCode> + <document>put,post</document> + <defaultMessage>Invalid JSON/XML input.</defaultMessage> + </httpStatusCode> + <httpStatusCode> + <httpCode>500</httpCode> + <document>always</document> + <defaultMessage>The service call has not succeeded.</defaultMessage> + <sticky>true</sticky> <!-- Document always, even if there is an @statuscode tag --> + </httpStatusCode> + </httpStatusCodes> <externalSources> <sourceDirs> <sourceDir>../api/src/main/java</sourceDir> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/c5836302/src/site/markdown/versions/master/configuration.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/versions/master/configuration.md b/src/site/markdown/versions/master/configuration.md index 5880732..9d7efa0 100644 --- a/src/site/markdown/versions/master/configuration.md +++ b/src/site/markdown/versions/master/configuration.md @@ -58,9 +58,9 @@ If you need to secure some events, that will be sent only by a trusted third par Ususally, login events, which operate on profiles and do merge on protected properties, must be secured. For each trusted third party server, you need to add these 3 lines : -thirdparty.provider1.key=secret-key -thirdparty.provider1.ipAddresses=127.0.0.1,::1 -thirdparty.provider1.allowedEvents=login,download + thirdparty.provider1.key=secret-key + thirdparty.provider1.ipAddresses=127.0.0.1,::1 + thirdparty.provider1.allowedEvents=login,download The events set in allowedEvents will be secured and will only be accepted if the call comes from the specified IP address, and if the secret-key is passed in the X-Unomi-Peer header. http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/c5836302/src/site/site.xml ---------------------------------------------------------------------- diff --git a/src/site/site.xml b/src/site/site.xml index 185305e..ed12046 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -18,6 +18,7 @@ <project name="Apache Unomi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://maven.apache.org/DECORATION/1.7.0"; xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd";> + <skin> <groupId>lt.velykis.maven.skins</groupId> <artifactId>reflow-maven-skin</artifactId>
