You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/11/30 16:20:19 UTC
[1/2] syncope git commit: Adding support for CXF-6695
Repository: syncope
Updated Branches:
refs/heads/master b3d131dd9 -> 234819b6e
Adding support for CXF-6695
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/83a864f2
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/83a864f2
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/83a864f2
Branch: refs/heads/master
Commit: 83a864f2691b2a8a0699250e8e52cd2fe02539bc
Parents: b3d131d
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Nov 30 16:18:58 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Nov 30 16:18:58 2015 +0100
----------------------------------------------------------------------
.../common/rest/api/beans/TaskQuery.java | 2 ++
.../common/rest/api/service/TaskService.java | 2 +-
core/rest-cxf/pom.xml | 6 +++-
ext/swagger-ui/pom.xml | 37 ++++++++++++++++++++
pom.xml | 8 ++++-
5 files changed, 52 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/83a864f2/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/TaskQuery.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/TaskQuery.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/TaskQuery.java
index 523da53..145384e 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/TaskQuery.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/TaskQuery.java
@@ -19,6 +19,7 @@
package org.apache.syncope.common.rest.api.beans;
import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
import javax.ws.rs.MatrixParam;
import javax.ws.rs.QueryParam;
import org.apache.syncope.common.lib.types.AnyTypeKind;
@@ -78,6 +79,7 @@ public class TaskQuery extends AbstractQuery {
return type;
}
+ @NotNull
@MatrixParam("type")
public void setType(final TaskType type) {
this.type = type;
http://git-wip-us.apache.org/repos/asf/syncope/blob/83a864f2/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
index 0f2b8dd..5337d44 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
@@ -156,7 +156,7 @@ public interface TaskService extends JAXRSService {
@GET
@Path("jobs")
@Produces({ JAXRSService.APPLICATION_XML, MediaType.APPLICATION_JSON })
- List<TaskExecTO> listJobs(@MatrixParam("type") JobStatusType type);
+ List<TaskExecTO> listJobs(@NotNull @MatrixParam("type") JobStatusType type);
/**
* Executes an action on an existing task's job.
http://git-wip-us.apache.org/repos/asf/syncope/blob/83a864f2/core/rest-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest-cxf/pom.xml b/core/rest-cxf/pom.xml
index 808c7dd..5985ffc 100644
--- a/core/rest-cxf/pom.xml
+++ b/core/rest-cxf/pom.xml
@@ -110,7 +110,11 @@ under the License.
<groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-hibernate-validations</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.syncope.core</groupId>
<artifactId>syncope-core-logic</artifactId>
http://git-wip-us.apache.org/repos/asf/syncope/blob/83a864f2/ext/swagger-ui/pom.xml
----------------------------------------------------------------------
diff --git a/ext/swagger-ui/pom.xml b/ext/swagger-ui/pom.xml
index 0b6299b..a625099 100644
--- a/ext/swagger-ui/pom.xml
+++ b/ext/swagger-ui/pom.xml
@@ -83,6 +83,7 @@ under the License.
<directory>${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}</directory>
<excludes>
<exclude>index.html</exclude>
+ <exclude>swagger-ui.min.js</exclude>
</excludes>
</resource>
</resources>
@@ -93,6 +94,42 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>addMatrixParamSupport</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <replace file="${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/swagger-ui.js"
+ token="return url + requestUrl + querystring;"
+ value=" var matrixstring = '';
+ for (var i = 0; i < this.parameters.length; i++) {
+ var param = this.parameters[i];
+
+ if (param.in === 'matrix') {
+ matrixstring += ';' + this.encodeQueryParam(param.name) + '=' + this.encodeQueryParam(args[param.name]);
+ }
+ }
+
+ var url = this.scheme + '://' + this.host;
+
+ if (this.basePath !== '/') {
+ url += this.basePath;
+ }
+ return url + requestUrl + matrixstring + querystring;"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/syncope/blob/83a864f2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 10f35ea..ab1ed51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -371,6 +371,7 @@ under the License.
<log.directory>${project.build.directory}/log</log.directory>
<activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
+ <swagger-core.version>1.5.4</swagger-core.version>
<swagger-ui.version>2.1.3</swagger-ui.version>
<jquery.version>2.1.4</jquery.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
@@ -519,7 +520,7 @@ under the License.
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId>
- <version>1.5.4</version>
+ <version>${swagger-core.version}</version>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
@@ -527,6 +528,11 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-hibernate-validations</artifactId>
+ <version>${swagger-core.version}</version>
+ </dependency>
<!-- /CXF -->
<!-- Camel -->
[2/2] syncope git commit: Upgrading AngularJS
Posted by il...@apache.org.
Upgrading AngularJS
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/234819b6
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/234819b6
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/234819b6
Branch: refs/heads/master
Commit: 234819b6e9300d7f3923a4eb193ade3773461e46
Parents: 83a864f
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Nov 30 16:20:11 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Nov 30 16:20:11 2015 +0100
----------------------------------------------------------------------
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/234819b6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ab1ed51..fb26391 100644
--- a/pom.xml
+++ b/pom.xml
@@ -391,15 +391,15 @@ under the License.
<wicket.version>7.1.0</wicket.version>
<wicket-jqueryui.version>7.1.0</wicket-jqueryui.version>
- <angular.version>1.4.7</angular.version>
- <angular-route.version>1.4.7</angular-route.version>
- <angular-resource.version>1.4.7</angular-resource.version>
- <angular-cookies.version>1.4.7</angular-cookies.version>
- <angular-animate.version>1.4.7</angular-animate.version>
+ <angular.version>1.4.8</angular.version>
+ <angular-route.version>1.4.8</angular-route.version>
+ <angular-resource.version>1.4.8</angular-resource.version>
+ <angular-cookies.version>1.4.8</angular-cookies.version>
+ <angular-animate.version>1.4.8</angular-animate.version>
<angular-ui-router.version>0.2.15</angular-ui-router.version>
<angular-ui-bootstrap.version>0.14.0</angular-ui-bootstrap.version>
<angular-ui-select.version>0.13.1</angular-ui-select.version>
- <angular-sanitize.version>1.4.7</angular-sanitize.version>
+ <angular-sanitize.version>1.4.8</angular-sanitize.version>
<angular-growl-2.version>0.7.3</angular-growl-2.version>
<select2.version>3.4.8</select2.version>
<FileSaver.version>0.0.2</FileSaver.version>