syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [4/4] syncope git commit: Maven-compliant site generation + fix javadocs
Date Tue, 11 Apr 2017 14:41:30 GMT
Maven-compliant site generation + fix javadocs


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7a08dc65
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7a08dc65
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7a08dc65

Branch: refs/heads/master
Commit: 7a08dc65ac9eb22708fab32c30ba9a36e6b81b7b
Parents: cd8b72d
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Tue Apr 11 16:20:01 2017 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Tue Apr 11 16:41:18 2017 +0200

----------------------------------------------------------------------
 .../resources/WorkflowDefGETResource.java       |   2 +-
 .../resources/WorkflowDefPUTResource.java       |   2 +-
 .../common/lib/search/SyncopeProperty.java      |  37 ++++-
 .../core/spring/security/AuthDataAccessor.java  |   5 +-
 pom.xml                                         | 149 +++++++++++--------
 5 files changed, 126 insertions(+), 69 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/7a08dc65/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
index 18cbb6a..5b1bece 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
@@ -28,7 +28,7 @@ import org.apache.wicket.util.io.IOUtils;
 /**
  * Mirror REST resource for obtaining user workflow definition in JSON (used by Activiti
Modeler).
  *
- * @see org.apache.syncope.common.rest.api.service.WorkflowService#exportDefinition
+ * @see org.apache.syncope.common.rest.api.service.WorkflowService#get
  */
 public class WorkflowDefGETResource extends AbstractWorkflowResource {
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/7a08dc65/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java
b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java
index 5223dc0..efef6d1 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java
@@ -29,7 +29,7 @@ import org.apache.wicket.util.io.IOUtils;
 /**
  * Mirror REST resource for putting user workflow definition in JSON (used by Activiti Modeler).
  *
- * @see org.apache.syncope.common.rest.api.service.WorkflowService#importDefinition
+ * @see org.apache.syncope.common.rest.api.service.WorkflowService#set
  */
 public class WorkflowDefPUTResource extends AbstractWorkflowResource {
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/7a08dc65/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
index 2f560c1..0d06c5b 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
@@ -27,22 +27,47 @@ import org.apache.cxf.jaxrs.ext.search.client.Property;
  */
 public interface SyncopeProperty extends Property {
 
-    /** Is textual property equal to (ignoring case) given literal or matching given pattern?
*/
+    /** Is textual property equal to (ignoring case) given literal or matching given pattern?
+     *
+     * @param value first value
+     * @param moreValues more values
+     * @return updated condition
+     */
     CompleteCondition equalToIgnoreCase(String value, String... moreValues);
 
-    /** Is textual property different (ignoring case) than given literal or not matching
given pattern? */
+    /** Is textual property different (ignoring case) than given literal or not matching
given pattern?
+     *
+     * @param literalOrPattern
+     * @return updated condition
+     */
     CompleteCondition notEqualTolIgnoreCase(String literalOrPattern);
 
-    /** Is property null? */
+    /** Is property null?
+     *
+     * @return updated condition
+     */
     CompleteCondition nullValue();
 
-    /** Is property not null? */
+    /** Is property not null?
+     *
+     * @return updated condition
+     */
     CompleteCondition notNullValue();
 
-    /** Is user, group or any object owning given resource(s)? */
+    /** Is user, group or any object owning given resource(s)?
+     *
+     * @param resource first resource
+     * @param moreResources more resources
+     * @return updated condition
+     */
     CompleteCondition hasResources(String resource, String... moreResources);
 
-    /** Is user, group or any object not owning given resource(s)? */
+    /** Is user, group or any object not owning given resource(s)?
+     *
+     * @param resource first resource
+     * @param moreResources more resources
+     * @return updated condition
+     */
     CompleteCondition hasNotResources(String resource, String... moreResources);
 
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/7a08dc65/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
----------------------------------------------------------------------
diff --git a/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
b/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
index 616f3e7..b54d756 100644
--- a/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
+++ b/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
@@ -74,9 +74,10 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
- * Domain-sensible (via {@code @Transactional} access to authentication / authorization data.
+ * Domain-sensible (via {@code @Transactional}) access to authentication / authorization
data.
  *
- * @see SyncopeAuthenticationProvider
+ * @see JWTAuthenticationProvider
+ * @see UsernamePasswordAuthenticationProvider
  * @see SyncopeAuthenticationDetails
  */
 public class AuthDataAccessor {

http://git-wip-us.apache.org/repos/asf/syncope/blob/7a08dc65/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 678a035..91360cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -342,10 +342,6 @@ under the License.
     </contributor>
   </contributors>
 
-  <prerequisites>
-    <maven>[3.0.3,)</maven>
-  </prerequisites>
-
   <properties>
     <syncope.version>${project.version}</syncope.version>
 
@@ -381,7 +377,7 @@ under the License.
     <camel.version>2.18.3</camel.version>	
 
     <slf4j.version>1.7.25</slf4j.version>
-    <opensaml.version>3.2.0</opensaml.version>
+    <opensaml.version>3.3.0</opensaml.version>
 
     <log4j.version>2.8.2</log4j.version>
     <disruptor.version>3.3.6</disruptor.version>
@@ -1712,7 +1708,28 @@ under the License.
       </plugins>
     </pluginManagement>
 
-    <plugins>     
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.4.1</version>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>3.0</version>
+                </requireMavenVersion>
+              </rules>    
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.gaul</groupId>
         <artifactId>modernizer-maven-plugin</artifactId>
@@ -1916,6 +1933,73 @@ under the License.
     
   </build>
 
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.9</version>
+        <configuration>
+          <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>index</report>
+              <report>project-team</report>
+              <report>issue-tracking</report>
+              <report>license</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.10.4</version>
+        <configuration>
+          <destDir>apidocs/2.0</destDir>
+          <isOffline>false</isOffline>
+          <detectLinks>true</detectLinks>
+          <detectJavaApiLink>true</detectJavaApiLink>
+          <links>
+            <link>http://docs.oracle.com/javaee/7/api/</link>
+            <link>http://www.slf4j.org/api/</link>
+            <link>http://connid.tirasa.net/apidocs/1.4/</link>
+            <link>http://cxf.apache.org/javadoc/latest-3.1.x/</link>
+            <link>http://fasterxml.github.io/jackson-core/javadoc/2.8/</link>
+            <link>http://fasterxml.github.io/jackson-databind/javadoc/2.8/</link>
+            <link>http://fasterxml.github.io/jackson-annotations/javadoc/2.8/</link>
+            <link>http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.8/</link>
+            <link>http://fasterxml.github.io/jackson-dataformat-yaml/javadoc/2.8/</link>
+            <link>http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.8/</link>
+            <link>http://www.javadoc.io/doc/org.apache.camel/camel-core/2.18.3/</link>
+            <link>http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.18.3/</link>
+            <link>https://ci.apache.org/projects/wicket/apidocs/7.x/</link>
+            <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
+            <link>https://commons.apache.org/proper/commons-io/javadocs/api-2.5/</link>
+            <link>https://commons.apache.org/proper/commons-jexl/apidocs/</link>
+            <link>https://commons.apache.org/proper/commons-collections/javadocs/api-release/</link>
+            <link>http://docs.spring.io/spring/docs/4.3.x/javadoc-api/</link>
+            <link>http://docs.spring.io/spring-security/site/docs/4.2.x/apidocs/</link>
+            <link>http://activiti.org/javadocs/</link>
+            <link>http://www.flowable.org/docs/javadocs/</link>
+            <link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-saml-api/3.3.0/opensaml-saml-api-3.3.0-javadoc.jar/!/index.html</link>
+            <link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-core/3.3.0/opensaml-core-3.3.0-javadoc.jar/!/index.html</link>
+          </links>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>aggregate</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
   <profiles>
 
     <profile>
@@ -2095,59 +2179,6 @@ under the License.
             <configuration>
               <locales>en</locales>
               <generateProjectInfo>false</generateProjectInfo>
-              <reportPlugins>
-                <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-project-info-reports-plugin</artifactId>
-                  <version>2.9</version>
-                  <configuration>
-                    <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-                  </configuration>
-                  <reports>
-                    <report>index</report>
-                    <report>project-team</report>
-                    <report>issue-tracking</report>
-                    <report>license</report>
-                  </reports>
-                </plugin>
-                <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-javadoc-plugin</artifactId>
-                  <version>2.10.4</version>
-                  <configuration>
-                    <destDir>apidocs/2.0</destDir>
-                    <isOffline>false</isOffline>
-                    <detectLinks>true</detectLinks>
-                    <detectJavaApiLink>true</detectJavaApiLink>
-                    <links>
-                      <link>http://docs.oracle.com/javaee/7/api/</link>
-                      <link>http://www.slf4j.org/api/</link>
-                      <link>http://connid.tirasa.net/apidocs/1.4/</link>
-                      <link>http://cxf.apache.org/javadoc/latest-3.1.x/</link>
-                      <link>http://fasterxml.github.io/jackson-core/javadoc/2.8/</link>
-                      <link>http://fasterxml.github.io/jackson-databind/javadoc/2.8/</link>
-                      <link>http://fasterxml.github.io/jackson-annotations/javadoc/2.8/</link>
-                      <link>http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.8/</link>
-                      <link>http://fasterxml.github.io/jackson-dataformat-yaml/javadoc/2.8/</link>
-                      <link>http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.8/</link>
-                      <link>http://www.javadoc.io/doc/org.apache.camel/camel-core/2.17.5</link>
-                      <link>http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.17.5</link>
-                      <link>https://ci.apache.org/projects/wicket/apidocs/7.x/</link>
-                      <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
-                      <link>https://commons.apache.org/proper/commons-io/javadocs/api-2.5/</link>
-                      <link>https://commons.apache.org/proper/commons-jexl/apidocs/</link>
-                      <link>https://commons.apache.org/proper/commons-collections/javadocs/</link>
-                      <link>http://docs.spring.io/spring/docs/4.3.x/javadoc-api/</link>
-                      <link>http://docs.spring.io/spring-security/site/docs/4.2.x/apidocs/</link>
-                      <link>http://activiti.org/javadocs/</link>
-                    </links>
-                  </configuration>
-                  <reports>
-                    <report>aggregate</report>
-                  </reports>
-                </plugin>
-              </reportPlugins>
             </configuration>
           </plugin>
           


Mime
View raw message