[2/2] syncope git commit: [SYNCOPE-1069] Fix typo
[SYNCOPE-1069] Fix typo Signed-off-by: Francesco ChicchiriccòProject: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/51ae1d5e Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/51ae1d5e Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/51ae1d5e Branch: refs/heads/master Commit: 51ae1d5ef0e1055f9789cc36bd85bbf28cd6413f Parents: dd034ef Author: Francesco Chicchiriccò Authored: Thu Apr 20 16:55:35 2017 +0200 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 16:55:47 2017 +0200 -- .../systemadministration/highavailability.adoc | 2 +- .../systemadministration/javaeecontainer.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/51ae1d5e/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc index 37a1dd5..5f5484d 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc @@ -43,7 +43,7 @@ classpath*:/coreContext.xml classpath*:/securityContext.xml classpath*:/logicContext.xml classpath*:/restCXFContext.xml -classpath*:persistenceContext.xml +classpath:/persistenceContext.xml classpath*:/provisioning*Context.xml classpath*:/workflow*Context.xml http://git-wip-us.apache.org/repos/asf/syncope/blob/51ae1d5e/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc index 865045c..4111342 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc @@ -151,7 +151,7 @@ with classpath*:/coreContext.xml classpath*:/securityContext.xml classpath*:/logicContext.xml -classpath*:restCXFContext.xml +classpath:/restCXFContext.xml classpath*:/persistenceContext.xml classpath*:/provisioning*Context.xml classpath*:/workflow*Context.xml
[1/2] syncope git commit: [SYNCOPE-1069] Fix typo
Repository: syncope Updated Branches: refs/heads/2_0_X 3c873ebd8 -> bbbd0295d refs/heads/master dd034efbe -> 51ae1d5ef [SYNCOPE-1069] Fix typo Signed-off-by: Francesco ChicchiriccòProject: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bbbd0295 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bbbd0295 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bbbd0295 Branch: refs/heads/2_0_X Commit: bbbd0295d80a9de3331d03c750111d8d6dccc45c Parents: 3c873eb Author: Francesco Chicchiriccò Authored: Thu Apr 20 16:55:35 2017 +0200 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 16:55:35 2017 +0200 -- .../systemadministration/highavailability.adoc | 2 +- .../systemadministration/javaeecontainer.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/bbbd0295/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc index bcbb589..b7d53e7 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc @@ -43,7 +43,7 @@ classpath*:/coreContext.xml classpath*:/securityContext.xml classpath*:/logicContext.xml classpath*:/restCXFContext.xml -classpath*:persistenceContext.xml +classpath:/persistenceContext.xml classpath*:/provisioning*Context.xml classpath*:/workflow*Context.xml http://git-wip-us.apache.org/repos/asf/syncope/blob/bbbd0295/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc index f5cc084..58c4b59 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc @@ -153,7 +153,7 @@ with classpath*:/coreContext.xml classpath*:/securityContext.xml classpath*:/logicContext.xml -classpath*:restCXFContext.xml +classpath:/restCXFContext.xml classpath*:/persistenceContext.xml classpath*:/provisioning*Context.xml classpath*:/workflow*Context.xml
[2/2] syncope git commit: [SYNCOPE-1069] Fixing docs
[SYNCOPE-1069] Fixing docs Signed-off-by: Francesco ChicchiriccòProject: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/dd034efb Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/dd034efb Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/dd034efb Branch: refs/heads/master Commit: dd034efbed63740853de1335a12a17de73547ea9 Parents: d76ed3e Author: Francesco Chicchiriccò Authored: Thu Apr 20 16:43:23 2017 +0200 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 16:44:41 2017 +0200 -- archetype/pom.xml | 1 + .../src/main/resources/jboss/restCXFContext.xml | 2 + .../src/main/resources/jboss/web.xml| 9 +++- .../src/main/webapp/WEB-INF/web.xml | 8 ++- .../workingwithapachesyncope/customization.adoc | 14 -- .../systemadministration/highavailability.adoc | 51 ++-- .../systemadministration/javaeecontainer.adoc | 17 +-- 7 files changed, 88 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/dd034efb/archetype/pom.xml -- diff --git a/archetype/pom.xml b/archetype/pom.xml index 3441d61..0833550 100644 --- a/archetype/pom.xml +++ b/archetype/pom.xml @@ -137,6 +137,7 @@ under the License. ../core/persistence-jpa/src/main/resources *Context.xml + domains.xml META-INF/spring-persistence.xml ${project.build.outputDirectory}/archetype-resources/core/src/main/resources http://git-wip-us.apache.org/repos/asf/syncope/blob/dd034efb/fit/core-reference/src/main/resources/jboss/restCXFContext.xml -- diff --git a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml index dd6c88c..ad9306d 100644 --- a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml +++ b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml @@ -99,6 +99,7 @@ under the License. /WEB-INF/lib/syncope-common-rest-api-${syncope.version}-javadoc.jar /WEB-INF/lib/syncope-ext-camel-rest-api-${syncope.version}-javadoc.jar + /WEB-INF/lib/syncope-ext-saml2sp-rest-api-${syncope.version}-javadoc.jar @@ -110,6 +111,7 @@ under the License. /WEB-INF/lib/syncope-common-rest-api-${syncope.version}-javadoc.jar /WEB-INF/lib/syncope-ext-camel-rest-api-${syncope.version}-javadoc.jar + /WEB-INF/lib/syncope-ext-saml2sp-rest-api-${syncope.version}-javadoc.jar http://git-wip-us.apache.org/repos/asf/syncope/blob/dd034efb/fit/core-reference/src/main/resources/jboss/web.xml -- diff --git a/fit/core-reference/src/main/resources/jboss/web.xml b/fit/core-reference/src/main/resources/jboss/web.xml index 25bc692..bc6f1fd 100644 --- a/fit/core-reference/src/main/resources/jboss/web.xml +++ b/fit/core-reference/src/main/resources/jboss/web.xml @@ -28,8 +28,13 @@ under the License. contextConfigLocation - classpath*:/*Context.xml - /WEB-INF/classes/restCXFContext.xml + classpath*:/coreContext.xml + classpath*:/securityContext.xml + classpath*:/logicContext.xml + classpath:/restCXFContext.xml + classpath*:/persistenceContext.xml + classpath*:/provisioning*Context.xml + classpath*:/workflow*Context.xml http://git-wip-us.apache.org/repos/asf/syncope/blob/dd034efb/fit/core-reference/src/main/webapp/WEB-INF/web.xml -- diff --git a/fit/core-reference/src/main/webapp/WEB-INF/web.xml b/fit/core-reference/src/main/webapp/WEB-INF/web.xml index b358a27..49a82fe 100644 --- a/fit/core-reference/src/main/webapp/WEB-INF/web.xml +++ b/fit/core-reference/src/main/webapp/WEB-INF/web.xml @@ -28,7 +28,13 @@ under the License. contextConfigLocation - classpath*:/*Context.xml + classpath*:/coreContext.xml + classpath*:/securityContext.xml + classpath*:/logicContext.xml + classpath*:/restCXFContext.xml + classpath*:/persistenceContext.xml + classpath*:/provisioning*Context.xml + classpath*:/workflow*Context.xml http://git-wip-us.apache.org/repos/asf/syncope/blob/dd034efb/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
[1/2] syncope git commit: [SYNCOPE-1069] Fixing docs
Repository: syncope Updated Branches: refs/heads/2_0_X 69657ca44 -> 3c873ebd8 refs/heads/master d76ed3e8b -> dd034efbe [SYNCOPE-1069] Fixing docs Signed-off-by: Francesco ChicchiriccòProject: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3c873ebd Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3c873ebd Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3c873ebd Branch: refs/heads/2_0_X Commit: 3c873ebd8b28f697bc9c2a535f81f82d8ff6bf75 Parents: 69657ca Author: Francesco Chicchiriccò Authored: Thu Apr 20 16:43:23 2017 +0200 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 16:43:23 2017 +0200 -- archetype/pom.xml | 1 + .../src/main/resources/jboss/restCXFContext.xml | 2 + .../src/main/resources/jboss/web.xml| 9 +++- .../src/main/webapp/WEB-INF/web.xml | 8 ++- .../workingwithapachesyncope/customization.adoc | 14 -- .../systemadministration/highavailability.adoc | 51 ++-- .../systemadministration/javaeecontainer.adoc | 17 +-- 7 files changed, 88 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/3c873ebd/archetype/pom.xml -- diff --git a/archetype/pom.xml b/archetype/pom.xml index fa3c478..3f0c270 100644 --- a/archetype/pom.xml +++ b/archetype/pom.xml @@ -137,6 +137,7 @@ under the License. ../core/persistence-jpa/src/main/resources *Context.xml + domains.xml META-INF/spring-persistence.xml ${project.build.outputDirectory}/archetype-resources/core/src/main/resources http://git-wip-us.apache.org/repos/asf/syncope/blob/3c873ebd/fit/core-reference/src/main/resources/jboss/restCXFContext.xml -- diff --git a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml index dd6c88c..ad9306d 100644 --- a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml +++ b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml @@ -99,6 +99,7 @@ under the License. /WEB-INF/lib/syncope-common-rest-api-${syncope.version}-javadoc.jar /WEB-INF/lib/syncope-ext-camel-rest-api-${syncope.version}-javadoc.jar + /WEB-INF/lib/syncope-ext-saml2sp-rest-api-${syncope.version}-javadoc.jar @@ -110,6 +111,7 @@ under the License. /WEB-INF/lib/syncope-common-rest-api-${syncope.version}-javadoc.jar /WEB-INF/lib/syncope-ext-camel-rest-api-${syncope.version}-javadoc.jar + /WEB-INF/lib/syncope-ext-saml2sp-rest-api-${syncope.version}-javadoc.jar http://git-wip-us.apache.org/repos/asf/syncope/blob/3c873ebd/fit/core-reference/src/main/resources/jboss/web.xml -- diff --git a/fit/core-reference/src/main/resources/jboss/web.xml b/fit/core-reference/src/main/resources/jboss/web.xml index 25bc692..bc6f1fd 100644 --- a/fit/core-reference/src/main/resources/jboss/web.xml +++ b/fit/core-reference/src/main/resources/jboss/web.xml @@ -28,8 +28,13 @@ under the License. contextConfigLocation - classpath*:/*Context.xml - /WEB-INF/classes/restCXFContext.xml + classpath*:/coreContext.xml + classpath*:/securityContext.xml + classpath*:/logicContext.xml + classpath:/restCXFContext.xml + classpath*:/persistenceContext.xml + classpath*:/provisioning*Context.xml + classpath*:/workflow*Context.xml http://git-wip-us.apache.org/repos/asf/syncope/blob/3c873ebd/fit/core-reference/src/main/webapp/WEB-INF/web.xml -- diff --git a/fit/core-reference/src/main/webapp/WEB-INF/web.xml b/fit/core-reference/src/main/webapp/WEB-INF/web.xml index b358a27..49a82fe 100644 --- a/fit/core-reference/src/main/webapp/WEB-INF/web.xml +++ b/fit/core-reference/src/main/webapp/WEB-INF/web.xml @@ -28,7 +28,13 @@ under the License. contextConfigLocation - classpath*:/*Context.xml + classpath*:/coreContext.xml + classpath*:/securityContext.xml + classpath*:/logicContext.xml + classpath*:/restCXFContext.xml + classpath*:/persistenceContext.xml + classpath*:/provisioning*Context.xml + classpath*:/workflow*Context.xml http://git-wip-us.apache.org/repos/asf/syncope/blob/3c873ebd/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
[1/2] syncope git commit: [SYNCOPE-808] Clearing up the root pom.xml after merge
Repository: syncope Updated Branches: refs/heads/2_0_X a31ce3c6d -> 69657ca44 refs/heads/master b03947a33 -> d76ed3e8b [SYNCOPE-808] Clearing up the root pom.xml after merge Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d76ed3e8 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d76ed3e8 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d76ed3e8 Branch: refs/heads/master Commit: d76ed3e8b73a5947d286077208f22f741f4f3561 Parents: b03947a Author: Francesco ChicchiriccòAuthored: Thu Apr 20 16:11:25 2017 +0200 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 16:11:25 2017 +0200 -- ide/netbeans/pom.xml | 21 - pom.xml | 42 -- 2 files changed, 28 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/d76ed3e8/ide/netbeans/pom.xml -- diff --git a/ide/netbeans/pom.xml b/ide/netbeans/pom.xml index abaa216..c12edb9 100644 --- a/ide/netbeans/pom.xml +++ b/ide/netbeans/pom.xml @@ -20,7 +20,7 @@ under the License. org.apache.syncope syncope-ide -2.0.4-SNAPSHOT +2.1.0-SNAPSHOT Apache Syncope IDE Netbeans @@ -36,6 +36,17 @@ under the License. + org.apache.syncope.common + syncope-common-lib + ${project.version} + + + org.apache.syncope.client + syncope-client-lib + ${project.version} + + + org.netbeans.api org-netbeans-api-annotations-common @@ -64,14 +75,6 @@ under the License. org-netbeans-modules-settings - org.apache.syncope.common - syncope-common-lib - - - org.apache.syncope.client - syncope-client-lib - - org.netbeans.api org-openide-io http://git-wip-us.apache.org/repos/asf/syncope/blob/d76ed3e8/pom.xml -- diff --git a/pom.xml b/pom.xml index 794144e..d669fe8 100644 --- a/pom.xml +++ b/pom.xml @@ -442,7 +442,7 @@ under the License. 1.0-alpha-1 3.0.0 -1.0.0 +1.0.0 RELEASE82 1389 @@ -567,10 +567,10 @@ under the License. ${cxf.version} - org.apache.cxf - cxf-rt-rs-security-sso-saml - ${cxf.version} - +org.apache.cxf +cxf-rt-rs-security-sso-saml +${cxf.version} + org.opensaml opensaml-xacml-impl @@ -579,26 +579,26 @@ under the License. org.opensaml opensaml-xacml-saml-impl - + org.apache.wss4j wss4j-ws-security-dom - - + + - org.apache.wss4j +org.apache.wss4j wss4j-ws-security-dom - 2.1.9 - - - org.jasypt - jasypt - +2.1.9 + + +org.jasypt +jasypt + org.apache.geronimo.specs geronimo-javamail_1.4_spec - + @@ -1458,16 +1458,6 @@ under the License. ${netbeans.version} -org.apache.syncope.common -syncope-common-lib -${project.version} - - -org.apache.syncope.client -syncope-client-lib -${project.version} - - org.netbeans.api org-openide-io ${netbeans.version}
[2/2] syncope git commit: [SYNCOPE-808] Clearing up the root pom.xml after merge
[SYNCOPE-808] Clearing up the root pom.xml after merge Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/69657ca4 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/69657ca4 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/69657ca4 Branch: refs/heads/2_0_X Commit: 69657ca44cdfc24461e247960b4f65a7076e827e Parents: a31ce3c Author: Francesco ChicchiriccòAuthored: Thu Apr 20 16:16:41 2017 +0200 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 16:16:41 2017 +0200 -- ide/netbeans/pom.xml | 19 +++ pom.xml | 28 2 files changed, 11 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/69657ca4/ide/netbeans/pom.xml -- diff --git a/ide/netbeans/pom.xml b/ide/netbeans/pom.xml index abaa216..4e791ed 100644 --- a/ide/netbeans/pom.xml +++ b/ide/netbeans/pom.xml @@ -36,6 +36,17 @@ under the License. + org.apache.syncope.common + syncope-common-lib + ${project.version} + + + org.apache.syncope.client + syncope-client-lib + ${project.version} + + + org.netbeans.api org-netbeans-api-annotations-common @@ -64,14 +75,6 @@ under the License. org-netbeans-modules-settings - org.apache.syncope.common - syncope-common-lib - - - org.apache.syncope.client - syncope-client-lib - - org.netbeans.api org-openide-io http://git-wip-us.apache.org/repos/asf/syncope/blob/69657ca4/pom.xml -- diff --git a/pom.xml b/pom.xml index 286d8c5..677bee6 100644 --- a/pom.xml +++ b/pom.xml @@ -447,24 +447,6 @@ under the License. 0.23.1 RELEASE82 -RELEASE802 -RELEASE82 -1.0-alpha-1 -3.0.0 - -0.23.1 -RELEASE82 - -RELEASE802 -RELEASE82 -1.0-alpha-1 -3.0.0 - -RELEASE802 -RELEASE82 -1.0-alpha-1 -3.0.0 - 1389 9082 @@ -1531,16 +1513,6 @@ under the License. ${netbeans.version} -org.apache.syncope.common -syncope-common-lib -${project.version} - - -org.apache.syncope.client -syncope-client-lib -${project.version} - - org.netbeans.api org-openide-io ${netbeans.version}
[08/10] syncope git commit: [SYNCOPE-808] Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup
http://git-wip-us.apache.org/repos/asf/syncope/blob/218674e7/ide/netbeans/pom.xml -- diff --git a/ide/netbeans/pom.xml b/ide/netbeans/pom.xml index c594e04..abaa216 100644 --- a/ide/netbeans/pom.xml +++ b/ide/netbeans/pom.xml @@ -16,157 +16,191 @@ specific language governing permissions and limitations under the License. --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> -4.0.0 - - org.apache.syncope - syncope-ide - 2.0.2-SNAPSHOT - + 4.0.0 + +org.apache.syncope +syncope-ide +2.0.4-SNAPSHOT + -Apache Syncope IDE Netbeans -Apache Syncope IDE Netbeans -org.apache.syncope.ide -syncope-ide-netbeans + Apache Syncope IDE Netbeans + Apache Syncope IDE Netbeans + org.apache.syncope.ide + syncope-ide-netbeans -nbm + nbm - - ${basedir}/../.. - + +${basedir}/../.. + - - - -src/main/resources/META-INF/ - - + + + org.netbeans.api + org-netbeans-api-annotations-common + + + org.netbeans.api + org-openide-windows + + + org.netbeans.api + org-openide-util + + + org.netbeans.api + org-openide-util-ui + + + org.netbeans.api + org-openide-util-lookup + + + org.netbeans.api + org-openide-awt + + + org.netbeans.api + org-netbeans-modules-settings + + + org.apache.syncope.common + syncope-common-lib + + + org.apache.syncope.client + syncope-client-lib + + + org.netbeans.api + org-openide-io + + + org.netbeans.api + org-openide-nodes + + + org.netbeans.api + org-openide-text + + + org.netbeans.api + org-openide-filesystems + + + org.netbeans.api + org-openide-loaders + + + commons-io + commons-io + + + org.netbeans.api + org-netbeans-core-multiview + jar + + + org.netbeans.api + org-netbeans-modules-editor-lib2 + jar + + + org.netbeans.api + org-netbeans-api-progress + + + org.netbeans.api + org-netbeans-api-progress-nb + + + org.netbeans.external + asm-all-5.0.1 + + + + + + +org.codehaus.mojo +nbm-maven-plugin +true + + false + + + + +org.apache.maven.plugins +maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + +org.apache.maven.plugins +maven-antrun-plugin + + +package + + + + + + + + + run + + + + + + +org.apache.maven.plugins +maven-checkstyle-plugin + + + + + +${basedir} +META-INF + + LICENSE + NOTICE + + + + + + + + apache-release + + - -org.codehaus.mojo -nbm-maven-plugin -true - -false - - -src/main/resources/META-INF -../META-INF - - - - - -org.apache.maven.plugins -maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - -maven-antrun-plugin -1.7 - - -package - - - - - - - - - run - - - - + +org.apache.maven.plugins +maven-deploy-plugin + + true + + + +org.apache.maven.plugins +maven-source-plugin +false + + true + + - - - - -org.netbeans.api -org-netbeans-api-annotations-common - - -
[03/10] syncope git commit: [SYNCOPE-808] Added netbeans to syncope/ide
[SYNCOPE-808] Added netbeans to syncope/ide Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/20501b8e Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/20501b8e Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/20501b8e Branch: refs/heads/master Commit: 20501b8e6a16862462bbe3df19e6588e7ad88b06 Parents: 822ad87 Author: TusharAuthored: Tue Jan 3 15:36:07 2017 +0530 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 15:43:31 2017 +0200 -- ide/netbeans/nb-configuration.xml | 36 + ide/netbeans/pom.xml| 144 +++ .../plugin/connector/ResourceConnector.java | 76 ++ .../plugin/constants/PluginConstants.java | 33 + .../netbeans/plugin/entity/UserProperties.java | 78 ++ .../service/MailTemplateManagerService.java | 68 ++ .../service/ReportTemplateManagerService.java | 68 ++ .../view/ResourceExplorerTopComponent.form | 68 ++ .../view/ResourceExplorerTopComponent.java | 553 .../netbeans/plugin/view/ServerDetailsView.form | 161 .../netbeans/plugin/view/ServerDetailsView.java | 218 + ide/netbeans/src/main/nbm/MANIFEST.MF | 3 + .../src/main/resources/META-INF/LICENSE | 896 +++ ide/netbeans/src/main/resources/META-INF/NOTICE | 80 ++ .../resources/org/apache/syncope/checkstyle.xml | 223 + .../org/apache/syncope/java-formatter.xml | 309 +++ .../netbeans/plugin/view/Bundle.properties | 28 + ide/pom.xml | 5 +- pom.xml | 104 ++- 19 files changed, 3147 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/20501b8e/ide/netbeans/nb-configuration.xml -- diff --git a/ide/netbeans/nb-configuration.xml b/ide/netbeans/nb-configuration.xml new file mode 100644 index 000..ec22826 --- /dev/null +++ b/ide/netbeans/nb-configuration.xml @@ -0,0 +1,36 @@ + + + + +http://www.netbeans.org/ns/maven-properties-data/1;> + + true + + http://git-wip-us.apache.org/repos/asf/syncope/blob/20501b8e/ide/netbeans/pom.xml -- diff --git a/ide/netbeans/pom.xml b/ide/netbeans/pom.xml new file mode 100644 index 000..1afbb88 --- /dev/null +++ b/ide/netbeans/pom.xml @@ -0,0 +1,144 @@ + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +4.0.0 + + org.apache.syncope + syncope-ide + 2.0.2-SNAPSHOT + + +Apache Syncope IDE Netbeans +Apache Syncope IDE Netbeans +org.apache.syncope.ide +syncope-ide-netbeans + +nbm + + + ${basedir}/../.. + + + + + +src/main/resources/META-INF/ + + + + +org.codehaus.mojo +nbm-maven-plugin +true + +false + + + +org.apache.maven.plugins +maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + + + +org.netbeans.api +org-netbeans-api-annotations-common + + +org.netbeans.api +org-openide-windows + + +org.netbeans.api +org-openide-util + + +org.netbeans.api +org-openide-util-ui + + +org.netbeans.api +org-openide-util-lookup + + +org.netbeans.api +org-openide-awt + + +org.netbeans.api +org-netbeans-modules-settings + + +org.apache.syncope.common +syncope-common-lib + + +org.apache.syncope.client +syncope-client-lib + + +org.netbeans.api +org-openide-io + + +org.netbeans.api +org-openide-nodes + + +org.netbeans.api +org-openide-text + + +org.netbeans.api +org-openide-filesystems + + +org.netbeans.api +org-openide-loaders + + +commons-io +commons-io +
[10/10] syncope git commit: [SYNCOPE-808] fixed problems about bundle not found, fixed some editor bugs and added validation - This closes #43 / This closes #27
[SYNCOPE-808] fixed problems about bundle not found, fixed some editor bugs and added validation - This closes #43 / This closes #27 Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b03947a3 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b03947a3 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b03947a3 Branch: refs/heads/master Commit: b03947a33a3ee3dced1cac6a863856824a4ae158 Parents: 218674e Author: Andrea PatricelliAuthored: Thu Apr 20 11:46:12 2017 +0200 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 15:50:44 2017 +0200 -- .../syncope/ide/netbeans/ConnectionParams.java | 122 +++ .../syncope/ide/netbeans/ResourceConnector.java | 41 ++-- .../syncope/ide/netbeans/UserProperties.java| 79 --- .../view/ResourceExplorerTopComponent.form | 1 + .../view/ResourceExplorerTopComponent.java | 211 --- .../ide/netbeans/view/ServerDetailsView.form| 132 +++- .../ide/netbeans/view/ServerDetailsView.java| 175 ++- pom.xml | 11 - 8 files changed, 477 insertions(+), 295 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/b03947a3/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java new file mode 100644 index 000..13bbd69 --- /dev/null +++ b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java @@ -0,0 +1,122 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.syncope.ide.netbeans; + +public final class ConnectionParams { + +private String url; + +private String username; + +private String password; + +public static final class Builder { + +private String scheme; +private String host; +private String port; + +private String username; + +private String password; + +private Builder() { +} + +public Builder scheme(final String value) { +this.scheme = value; +return this; +} +public Builder host(final String value) { +this.host = value; +return this; +} +public Builder port(final String value) { +this.port = value; +return this; +} + +public Builder username(final String value) { +this.username = value; +return this; +} + +public Builder password(final String value) { +this.password = value; +return this; +} + +public ConnectionParams build() { +return new ConnectionParams(scheme + "://" + host + ":" + port + "/syncope/rest", username, password); +} +} + +public static ConnectionParams.Builder builder() { +return new ConnectionParams.Builder(); +} + +private ConnectionParams( +final String url, +final String userName, +final String password) { +this.url = url; +this.username = userName; +this.password = password; +} + +public String getUrl() { +return url; +} + +public void setUrl(final String url) { +this.url = url; +} + +public String getUsername() { +return username; +} + +public void setUsername(final String username) { +this.username = username; +} + +public String getPassword() { +return password; +} + +public void setPassword(final String password) { +this.password = password; +} + +public ConnectionParams port(final String value) { +this.url = value; +return this; +} + +public ConnectionParams
[07/10] syncope git commit: [SYNCOPE-808] Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup
http://git-wip-us.apache.org/repos/asf/syncope/blob/218674e7/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java deleted file mode 100644 index e56b24b..000 --- a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.syncope.netbeans.plugin.service; - -import java.io.InputStream; -import java.util.List; -import javax.ws.rs.core.Response; -import org.apache.syncope.client.lib.SyncopeClient; -import org.apache.syncope.client.lib.SyncopeClientFactoryBean; -import org.apache.syncope.common.lib.to.ReportTemplateTO; -import org.apache.syncope.common.lib.types.ReportTemplateFormat; -import org.apache.syncope.common.rest.api.service.ReportTemplateService; - -public class ReportTemplateManagerService { - -private ReportTemplateService service; - -public ReportTemplateManagerService(final String url, final String userName, final String password) { -SyncopeClient syncopeClient = new SyncopeClientFactoryBean().setAddress(url).create(userName, password); -service = syncopeClient.getService(ReportTemplateService.class); -} - -public List list() { -return service.list(); -} - -public boolean create(final ReportTemplateTO reportTemplateTO) { -return Response.Status.CREATED.getStatusCode() == service.create(reportTemplateTO).getStatus(); -} - -public ReportTemplateTO read(final String key) { -return service.read(key); -} - -public boolean delete(final String key) { -service.delete(key); -return true; -} - -public Object getFormat(final String key, final ReportTemplateFormat format) { -return service.getFormat(key, format).getEntity(); -} - -public void setFormat(final String key, final ReportTemplateFormat format, final InputStream templateIn) { -service.setFormat(key, format, templateIn); -} - -public boolean removeFormat(final String key, final ReportTemplateFormat format) { -return false; -} - -} http://git-wip-us.apache.org/repos/asf/syncope/blob/218674e7/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form deleted file mode 100644 index 79458db..000 --- a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/syncope/blob/218674e7/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java deleted file mode 100644 index 4c91ec5..000 --- a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java +++ /dev/null @@ -1,553 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more
[syncope] Git Push Summary
Repository: syncope Updated Branches: refs/heads/SYNCOPE-808 [deleted] 39b719809
[02/10] syncope git commit: [SYNCOPE-808] Added netbeans to syncope/ide
http://git-wip-us.apache.org/repos/asf/syncope/blob/20501b8e/ide/netbeans/src/main/resources/META-INF/LICENSE -- diff --git a/ide/netbeans/src/main/resources/META-INF/LICENSE b/ide/netbeans/src/main/resources/META-INF/LICENSE new file mode 100644 index 000..f34bfd3 --- /dev/null +++ b/ide/netbeans/src/main/resources/META-INF/LICENSE @@ -0,0 +1,896 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) +
[04/10] syncope git commit: [SYNCOPE-808] Antrun plugin to add LICENSE and PlUGIN to nbm archive
http://git-wip-us.apache.org/repos/asf/syncope/blob/9c744a98/ide/netbeans/src/main/resources/META-INF/LICENSE -- diff --git a/ide/netbeans/src/main/resources/META-INF/LICENSE b/ide/netbeans/src/main/resources/META-INF/LICENSE deleted file mode 100644 index f34bfd3..000 --- a/ide/netbeans/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,896 +0,0 @@ - - Apache License - Version 2.0, January 2004 -http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s)
[01/10] syncope git commit: [SYNCOPE-808] Added netbeans to syncope/ide
Repository: syncope Updated Branches: refs/heads/master 822ad873c -> b03947a33 http://git-wip-us.apache.org/repos/asf/syncope/blob/20501b8e/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties -- diff --git a/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties b/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties new file mode 100644 index 000..17de78d --- /dev/null +++ b/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties @@ -0,0 +1,28 @@ +#Licensed to the Apache Software Foundation (ASF) under one +#or more contributor license agreements. See the NOTICE file +#distributed with this work for additional information +#regarding copyright ownership. The ASF licenses this file +#to you under the Apache License, Version 2.0 (the +#"License"); you may not use this file except in compliance +#with the License. You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +#Unless required by applicable law or agreed to in writing, +#software distributed under the License is distributed on an +#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +#KIND, either express or implied. See the License for the +#specific language governing permissions and limitations +#under the License. + +TemplateViewTopComponent.jPanel1.TabConstraints.tabTitle=TEXT +TemplateViewTopComponent.jPanel2.TabConstraints.tabTitle=XML + +ServerDetailsView.jLabel1.text=URL +ServerDetailsView.jLabel4.text=Apache Syncope +ServerDetailsView.okButton.text=OK +ServerDetailsView.passwordTxt.text= +ServerDetailsView.userNameTxt.text= +ServerDetailsView.urlTxt.text= +ServerDetailsView.jLabel3.text=Password +ServerDetailsView.jLabel2.text=User Name http://git-wip-us.apache.org/repos/asf/syncope/blob/20501b8e/ide/pom.xml -- diff --git a/ide/pom.xml b/ide/pom.xml index 12ac601..37eb9b7 100644 --- a/ide/pom.xml +++ b/ide/pom.xml @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -39,6 +37,7 @@ under the License. eclipse +netbeans @@ -105,4 +104,4 @@ under the License. - + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/20501b8e/pom.xml -- diff --git a/pom.xml b/pom.xml index 2eed4c1..bb3d44b 100644 --- a/pom.xml +++ b/pom.xml @@ -441,6 +441,11 @@ under the License. 3.0.0 1.0.0 +RELEASE802 +RELEASE82 +1.0-alpha-1 +3.0.0 + 1389 9082 @@ -1417,7 +1422,100 @@ under the License. httpmime ${httpclient.version} - + + +org.netbeans.api +org-netbeans-api-annotations-common +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-windows +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-util +${org-netbeans-version} + + +org.netbeans.api +org-openide-util-ui +${org-netbeans-version} + + +org.netbeans.api +org-openide-util-lookup +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-awt +${org-netbeans-api-version} + + +org.netbeans.api +org-netbeans-modules-settings +${org-netbeans-api-version} + + +org.apache.syncope.common +syncope-common-lib +${project.version} + + +org.apache.syncope.client +syncope-client-lib +${project.version} + + +org.netbeans.api +org-openide-io +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-nodes +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-text +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-filesystems +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-loaders +
[09/10] syncope git commit: [SYNCOPE-808] Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup
[SYNCOPE-808] Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/218674e7 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/218674e7 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/218674e7 Branch: refs/heads/master Commit: 218674e75e669127cd677f1d199984973b005b41 Parents: 9c744a9 Author: Francesco ChicchiriccòAuthored: Mon Jan 9 18:32:44 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 15:49:07 2017 +0200 -- ide/netbeans/LICENSE| 677 ++ ide/netbeans/NOTICE | 50 ++ ide/netbeans/legal/META-INF/LICENSE | 896 --- ide/netbeans/legal/META-INF/NOTICE | 80 -- ide/netbeans/nb-configuration.xml | 28 +- ide/netbeans/pom.xml| 330 --- .../syncope/ide/netbeans/PluginConstants.java | 43 + .../syncope/ide/netbeans/ResourceConnector.java | 77 ++ .../syncope/ide/netbeans/UserProperties.java| 79 ++ .../service/MailTemplateManagerService.java | 68 ++ .../service/ReportTemplateManagerService.java | 68 ++ .../view/ResourceExplorerTopComponent.form | 68 ++ .../view/ResourceExplorerTopComponent.java | 546 +++ .../ide/netbeans/view/ServerDetailsView.form| 161 .../ide/netbeans/view/ServerDetailsView.java| 183 .../plugin/connector/ResourceConnector.java | 76 -- .../plugin/constants/PluginConstants.java | 33 - .../netbeans/plugin/entity/UserProperties.java | 78 -- .../service/MailTemplateManagerService.java | 68 -- .../service/ReportTemplateManagerService.java | 68 -- .../view/ResourceExplorerTopComponent.form | 68 -- .../view/ResourceExplorerTopComponent.java | 553 .../netbeans/plugin/view/ServerDetailsView.form | 161 .../netbeans/plugin/view/ServerDetailsView.java | 218 - .../resources/org/apache/syncope/checkstyle.xml | 223 - .../syncope/ide/netbeans/view/Bundle.properties | 28 + .../org/apache/syncope/java-formatter.xml | 309 --- .../netbeans/plugin/view/Bundle.properties | 28 - pom.xml | 221 ++--- .../resources/org/apache/syncope/checkstyle.xml | 5 +- 30 files changed, 2369 insertions(+), 3122 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/218674e7/ide/netbeans/LICENSE -- diff --git a/ide/netbeans/LICENSE b/ide/netbeans/LICENSE new file mode 100644 index 000..876156c --- /dev/null +++ b/ide/netbeans/LICENSE @@ -0,0 +1,677 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and
[03/10] syncope git commit: [SYNCOPE-808] Antrun plugin to add LICENSE and PlUGIN to nbm archive
[SYNCOPE-808] Antrun plugin to add LICENSE and PlUGIN to nbm archive Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f63aedd6 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f63aedd6 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f63aedd6 Branch: refs/heads/2_0_X Commit: f63aedd6247f2a737872844a9ae1618f17cc6af7 Parents: f26e203 Author: TusharAuthored: Mon Jan 9 18:07:06 2017 +0530 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 15:39:45 2017 +0200 -- ide/netbeans/legal/META-INF/LICENSE | 896 +++ ide/netbeans/legal/META-INF/NOTICE | 80 ++ ide/netbeans/pom.xml| 28 + .../src/main/resources/META-INF/LICENSE | 896 --- ide/netbeans/src/main/resources/META-INF/NOTICE | 80 -- pom.xml | 7 + 6 files changed, 1011 insertions(+), 976 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/f63aedd6/ide/netbeans/legal/META-INF/LICENSE -- diff --git a/ide/netbeans/legal/META-INF/LICENSE b/ide/netbeans/legal/META-INF/LICENSE new file mode 100644 index 000..f34bfd3 --- /dev/null +++ b/ide/netbeans/legal/META-INF/LICENSE @@ -0,0 +1,896 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal
[09/10] syncope git commit: [SYNCOPE-808] Added netbeans to syncope/ide
http://git-wip-us.apache.org/repos/asf/syncope/blob/f26e2030/ide/netbeans/src/main/resources/META-INF/LICENSE -- diff --git a/ide/netbeans/src/main/resources/META-INF/LICENSE b/ide/netbeans/src/main/resources/META-INF/LICENSE new file mode 100644 index 000..f34bfd3 --- /dev/null +++ b/ide/netbeans/src/main/resources/META-INF/LICENSE @@ -0,0 +1,896 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) +
[10/10] syncope git commit: [SYNCOPE-808] Added netbeans to syncope/ide
[SYNCOPE-808] Added netbeans to syncope/ide Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f26e2030 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f26e2030 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f26e2030 Branch: refs/heads/2_0_X Commit: f26e20302c0d1398c18969c5f80d409287b760e3 Parents: 3881018 Author: TusharAuthored: Tue Jan 3 15:36:07 2017 +0530 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 15:39:45 2017 +0200 -- ide/netbeans/nb-configuration.xml | 36 + ide/netbeans/pom.xml| 144 +++ .../plugin/connector/ResourceConnector.java | 76 ++ .../plugin/constants/PluginConstants.java | 33 + .../netbeans/plugin/entity/UserProperties.java | 78 ++ .../service/MailTemplateManagerService.java | 68 ++ .../service/ReportTemplateManagerService.java | 68 ++ .../view/ResourceExplorerTopComponent.form | 68 ++ .../view/ResourceExplorerTopComponent.java | 553 .../netbeans/plugin/view/ServerDetailsView.form | 161 .../netbeans/plugin/view/ServerDetailsView.java | 218 + ide/netbeans/src/main/nbm/MANIFEST.MF | 3 + .../src/main/resources/META-INF/LICENSE | 896 +++ ide/netbeans/src/main/resources/META-INF/NOTICE | 80 ++ .../resources/org/apache/syncope/checkstyle.xml | 223 + .../org/apache/syncope/java-formatter.xml | 309 +++ .../netbeans/plugin/view/Bundle.properties | 28 + ide/pom.xml | 5 +- pom.xml | 104 ++- 19 files changed, 3147 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/f26e2030/ide/netbeans/nb-configuration.xml -- diff --git a/ide/netbeans/nb-configuration.xml b/ide/netbeans/nb-configuration.xml new file mode 100644 index 000..ec22826 --- /dev/null +++ b/ide/netbeans/nb-configuration.xml @@ -0,0 +1,36 @@ + + + + +http://www.netbeans.org/ns/maven-properties-data/1;> + + true + + http://git-wip-us.apache.org/repos/asf/syncope/blob/f26e2030/ide/netbeans/pom.xml -- diff --git a/ide/netbeans/pom.xml b/ide/netbeans/pom.xml new file mode 100644 index 000..1afbb88 --- /dev/null +++ b/ide/netbeans/pom.xml @@ -0,0 +1,144 @@ + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +4.0.0 + + org.apache.syncope + syncope-ide + 2.0.2-SNAPSHOT + + +Apache Syncope IDE Netbeans +Apache Syncope IDE Netbeans +org.apache.syncope.ide +syncope-ide-netbeans + +nbm + + + ${basedir}/../.. + + + + + +src/main/resources/META-INF/ + + + + +org.codehaus.mojo +nbm-maven-plugin +true + +false + + + +org.apache.maven.plugins +maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + + + +org.netbeans.api +org-netbeans-api-annotations-common + + +org.netbeans.api +org-openide-windows + + +org.netbeans.api +org-openide-util + + +org.netbeans.api +org-openide-util-ui + + +org.netbeans.api +org-openide-util-lookup + + +org.netbeans.api +org-openide-awt + + +org.netbeans.api +org-netbeans-modules-settings + + +org.apache.syncope.common +syncope-common-lib + + +org.apache.syncope.client +syncope-client-lib + + +org.netbeans.api +org-openide-io + + +org.netbeans.api +org-openide-nodes + + +org.netbeans.api +org-openide-text + + +org.netbeans.api +org-openide-filesystems + + +org.netbeans.api +org-openide-loaders + + +commons-io +commons-io +
[02/10] syncope git commit: [SYNCOPE-808] Antrun plugin to add LICENSE and PlUGIN to nbm archive
http://git-wip-us.apache.org/repos/asf/syncope/blob/f63aedd6/ide/netbeans/src/main/resources/META-INF/LICENSE -- diff --git a/ide/netbeans/src/main/resources/META-INF/LICENSE b/ide/netbeans/src/main/resources/META-INF/LICENSE deleted file mode 100644 index f34bfd3..000 --- a/ide/netbeans/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,896 +0,0 @@ - - Apache License - Version 2.0, January 2004 -http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s)
[05/10] syncope git commit: [SYNCOPE-808] Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup
http://git-wip-us.apache.org/repos/asf/syncope/blob/28f7795a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java deleted file mode 100644 index e56b24b..000 --- a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.syncope.netbeans.plugin.service; - -import java.io.InputStream; -import java.util.List; -import javax.ws.rs.core.Response; -import org.apache.syncope.client.lib.SyncopeClient; -import org.apache.syncope.client.lib.SyncopeClientFactoryBean; -import org.apache.syncope.common.lib.to.ReportTemplateTO; -import org.apache.syncope.common.lib.types.ReportTemplateFormat; -import org.apache.syncope.common.rest.api.service.ReportTemplateService; - -public class ReportTemplateManagerService { - -private ReportTemplateService service; - -public ReportTemplateManagerService(final String url, final String userName, final String password) { -SyncopeClient syncopeClient = new SyncopeClientFactoryBean().setAddress(url).create(userName, password); -service = syncopeClient.getService(ReportTemplateService.class); -} - -public List list() { -return service.list(); -} - -public boolean create(final ReportTemplateTO reportTemplateTO) { -return Response.Status.CREATED.getStatusCode() == service.create(reportTemplateTO).getStatus(); -} - -public ReportTemplateTO read(final String key) { -return service.read(key); -} - -public boolean delete(final String key) { -service.delete(key); -return true; -} - -public Object getFormat(final String key, final ReportTemplateFormat format) { -return service.getFormat(key, format).getEntity(); -} - -public void setFormat(final String key, final ReportTemplateFormat format, final InputStream templateIn) { -service.setFormat(key, format, templateIn); -} - -public boolean removeFormat(final String key, final ReportTemplateFormat format) { -return false; -} - -} http://git-wip-us.apache.org/repos/asf/syncope/blob/28f7795a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form deleted file mode 100644 index 79458db..000 --- a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/syncope/blob/28f7795a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java deleted file mode 100644 index 4c91ec5..000 --- a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java +++ /dev/null @@ -1,553 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more
[01/10] syncope git commit: [SYNCOPE-808] fixed problems about bundle not found, fixed some editor bugs and added validation
Repository: syncope Updated Branches: refs/heads/2_0_X 388101802 -> a31ce3c6d [SYNCOPE-808] fixed problems about bundle not found, fixed some editor bugs and added validation Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a31ce3c6 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a31ce3c6 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a31ce3c6 Branch: refs/heads/2_0_X Commit: a31ce3c6dc79cdafe0d48a834664e4d3964c0c8c Parents: 28f7795 Author: Andrea PatricelliAuthored: Thu Apr 20 11:46:12 2017 +0200 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 15:39:45 2017 +0200 -- .../syncope/ide/netbeans/ConnectionParams.java | 122 +++ .../syncope/ide/netbeans/ResourceConnector.java | 41 ++-- .../syncope/ide/netbeans/UserProperties.java| 79 --- .../view/ResourceExplorerTopComponent.form | 1 + .../view/ResourceExplorerTopComponent.java | 211 --- .../ide/netbeans/view/ServerDetailsView.form| 132 +++- .../ide/netbeans/view/ServerDetailsView.java| 175 ++- pom.xml | 11 - 8 files changed, 477 insertions(+), 295 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/a31ce3c6/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java new file mode 100644 index 000..13bbd69 --- /dev/null +++ b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java @@ -0,0 +1,122 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.syncope.ide.netbeans; + +public final class ConnectionParams { + +private String url; + +private String username; + +private String password; + +public static final class Builder { + +private String scheme; +private String host; +private String port; + +private String username; + +private String password; + +private Builder() { +} + +public Builder scheme(final String value) { +this.scheme = value; +return this; +} +public Builder host(final String value) { +this.host = value; +return this; +} +public Builder port(final String value) { +this.port = value; +return this; +} + +public Builder username(final String value) { +this.username = value; +return this; +} + +public Builder password(final String value) { +this.password = value; +return this; +} + +public ConnectionParams build() { +return new ConnectionParams(scheme + "://" + host + ":" + port + "/syncope/rest", username, password); +} +} + +public static ConnectionParams.Builder builder() { +return new ConnectionParams.Builder(); +} + +private ConnectionParams( +final String url, +final String userName, +final String password) { +this.url = url; +this.username = userName; +this.password = password; +} + +public String getUrl() { +return url; +} + +public void setUrl(final String url) { +this.url = url; +} + +public String getUsername() { +return username; +} + +public void setUsername(final String username) { +this.username = username; +} + +public String getPassword() { +return password; +} + +public void setPassword(final String password) { +this.password = password; +} + +public ConnectionParams port(final String value) { +this.url = value; +return
[04/10] syncope git commit: [SYNCOPE-808] Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup
http://git-wip-us.apache.org/repos/asf/syncope/blob/28f7795a/ide/netbeans/src/main/resources/org/apache/syncope/java-formatter.xml -- diff --git a/ide/netbeans/src/main/resources/org/apache/syncope/java-formatter.xml b/ide/netbeans/src/main/resources/org/apache/syncope/java-formatter.xml deleted file mode 100644 index 07961a6..000 --- a/ide/netbeans/src/main/resources/org/apache/syncope/java-formatter.xml +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/syncope/blob/28f7795a/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties -- diff --git a/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties b/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties deleted file mode 100644 index 17de78d..000 --- a/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties +++ /dev/null @@ -1,28 +0,0 @@ -#Licensed to the Apache Software Foundation (ASF) under one -#or more contributor license agreements. See the NOTICE file -#distributed with this work for additional information -#regarding copyright ownership. The ASF licenses this file -#to you under the Apache License, Version 2.0 (the -#"License"); you may not use this file except in compliance -#with the License. You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -#Unless required by applicable law or agreed to in writing, -#software distributed under the License is distributed on an -#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -#KIND, either express or implied. See the License for the -#specific language governing permissions and limitations -#under the License. - -TemplateViewTopComponent.jPanel1.TabConstraints.tabTitle=TEXT -TemplateViewTopComponent.jPanel2.TabConstraints.tabTitle=XML - -ServerDetailsView.jLabel1.text=URL -ServerDetailsView.jLabel4.text=Apache Syncope -ServerDetailsView.okButton.text=OK -ServerDetailsView.passwordTxt.text= -ServerDetailsView.userNameTxt.text= -ServerDetailsView.urlTxt.text= -ServerDetailsView.jLabel3.text=Password -ServerDetailsView.jLabel2.text=User Name http://git-wip-us.apache.org/repos/asf/syncope/blob/28f7795a/pom.xml -- diff --git a/pom.xml b/pom.xml index 44fa6c5..74bcaaa 100644 --- a/pom.xml +++ b/pom.xml @@ -441,7 +441,24 @@ under the License. 5.1.0 4.3.6 3.0.0 -0.23.1 +1.0-alpha-1 +3.0.0 + +0.23.1 +RELEASE82 + +RELEASE802 +RELEASE82 +1.0-alpha-1 +3.0.0 + +0.23.1 +RELEASE82 + +RELEASE802 +RELEASE82 +1.0-alpha-1 +3.0.0 RELEASE802 RELEASE82 @@ -1479,97 +1496,102 @@ under the License. -org.netbeans.api -org-netbeans-api-annotations-common -${org-netbeans-api-version} - - -org.netbeans.api -org-openide-windows -${org-netbeans-api-version} - - -org.netbeans.api -
[06/10] syncope git commit: [SYNCOPE-808] Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup
http://git-wip-us.apache.org/repos/asf/syncope/blob/28f7795a/ide/netbeans/pom.xml -- diff --git a/ide/netbeans/pom.xml b/ide/netbeans/pom.xml index c594e04..abaa216 100644 --- a/ide/netbeans/pom.xml +++ b/ide/netbeans/pom.xml @@ -16,157 +16,191 @@ specific language governing permissions and limitations under the License. --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> -4.0.0 - - org.apache.syncope - syncope-ide - 2.0.2-SNAPSHOT - + 4.0.0 + +org.apache.syncope +syncope-ide +2.0.4-SNAPSHOT + -Apache Syncope IDE Netbeans -Apache Syncope IDE Netbeans -org.apache.syncope.ide -syncope-ide-netbeans + Apache Syncope IDE Netbeans + Apache Syncope IDE Netbeans + org.apache.syncope.ide + syncope-ide-netbeans -nbm + nbm - - ${basedir}/../.. - + +${basedir}/../.. + - - - -src/main/resources/META-INF/ - - + + + org.netbeans.api + org-netbeans-api-annotations-common + + + org.netbeans.api + org-openide-windows + + + org.netbeans.api + org-openide-util + + + org.netbeans.api + org-openide-util-ui + + + org.netbeans.api + org-openide-util-lookup + + + org.netbeans.api + org-openide-awt + + + org.netbeans.api + org-netbeans-modules-settings + + + org.apache.syncope.common + syncope-common-lib + + + org.apache.syncope.client + syncope-client-lib + + + org.netbeans.api + org-openide-io + + + org.netbeans.api + org-openide-nodes + + + org.netbeans.api + org-openide-text + + + org.netbeans.api + org-openide-filesystems + + + org.netbeans.api + org-openide-loaders + + + commons-io + commons-io + + + org.netbeans.api + org-netbeans-core-multiview + jar + + + org.netbeans.api + org-netbeans-modules-editor-lib2 + jar + + + org.netbeans.api + org-netbeans-api-progress + + + org.netbeans.api + org-netbeans-api-progress-nb + + + org.netbeans.external + asm-all-5.0.1 + + + + + + +org.codehaus.mojo +nbm-maven-plugin +true + + false + + + + +org.apache.maven.plugins +maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + +org.apache.maven.plugins +maven-antrun-plugin + + +package + + + + + + + + + run + + + + + + +org.apache.maven.plugins +maven-checkstyle-plugin + + + + + +${basedir} +META-INF + + LICENSE + NOTICE + + + + + + + + apache-release + + - -org.codehaus.mojo -nbm-maven-plugin -true - -false - - -src/main/resources/META-INF -../META-INF - - - - - -org.apache.maven.plugins -maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - -maven-antrun-plugin -1.7 - - -package - - - - - - - - - run - - - - + +org.apache.maven.plugins +maven-deploy-plugin + + true + + + +org.apache.maven.plugins +maven-source-plugin +false + + true + + - - - - -org.netbeans.api -org-netbeans-api-annotations-common - - -
[07/10] syncope git commit: [SYNCOPE-808] Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup
[SYNCOPE-808] Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/28f7795a Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/28f7795a Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/28f7795a Branch: refs/heads/2_0_X Commit: 28f7795af302914539140fbf76c8d1f086be6545 Parents: f63aedd Author: Francesco ChicchiriccòAuthored: Mon Jan 9 18:32:44 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 15:39:45 2017 +0200 -- ide/netbeans/LICENSE| 677 ++ ide/netbeans/NOTICE | 50 ++ ide/netbeans/legal/META-INF/LICENSE | 896 --- ide/netbeans/legal/META-INF/NOTICE | 80 -- ide/netbeans/nb-configuration.xml | 28 +- ide/netbeans/pom.xml| 330 --- .../syncope/ide/netbeans/PluginConstants.java | 43 + .../syncope/ide/netbeans/ResourceConnector.java | 77 ++ .../syncope/ide/netbeans/UserProperties.java| 79 ++ .../service/MailTemplateManagerService.java | 68 ++ .../service/ReportTemplateManagerService.java | 68 ++ .../view/ResourceExplorerTopComponent.form | 68 ++ .../view/ResourceExplorerTopComponent.java | 546 +++ .../ide/netbeans/view/ServerDetailsView.form| 161 .../ide/netbeans/view/ServerDetailsView.java| 183 .../plugin/connector/ResourceConnector.java | 76 -- .../plugin/constants/PluginConstants.java | 33 - .../netbeans/plugin/entity/UserProperties.java | 78 -- .../service/MailTemplateManagerService.java | 68 -- .../service/ReportTemplateManagerService.java | 68 -- .../view/ResourceExplorerTopComponent.form | 68 -- .../view/ResourceExplorerTopComponent.java | 553 .../netbeans/plugin/view/ServerDetailsView.form | 161 .../netbeans/plugin/view/ServerDetailsView.java | 218 - .../resources/org/apache/syncope/checkstyle.xml | 223 - .../syncope/ide/netbeans/view/Bundle.properties | 28 + .../org/apache/syncope/java-formatter.xml | 309 --- .../netbeans/plugin/view/Bundle.properties | 28 - pom.xml | 233 +++-- .../resources/org/apache/syncope/checkstyle.xml | 5 +- 30 files changed, 2384 insertions(+), 3119 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/28f7795a/ide/netbeans/LICENSE -- diff --git a/ide/netbeans/LICENSE b/ide/netbeans/LICENSE new file mode 100644 index 000..876156c --- /dev/null +++ b/ide/netbeans/LICENSE @@ -0,0 +1,677 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for
[01/12] syncope git commit: Upgrading the maven-archetype-plugin
Repository: syncope Updated Branches: refs/heads/SYNCOPE-808 06fd9e371 -> 39b719809 Upgrading the maven-archetype-plugin Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8f303782 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8f303782 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8f303782 Branch: refs/heads/SYNCOPE-808 Commit: 8f30378233595ebc03930302cbab98b19d3fc331 Parents: 3da6a04 Author: Francesco ChicchiriccòAuthored: Wed Apr 19 15:53:23 2017 +0200 Committer: Francesco Chicchiriccò Committed: Wed Apr 19 15:53:23 2017 +0200 -- archetype/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/8f303782/archetype/pom.xml -- diff --git a/archetype/pom.xml b/archetype/pom.xml index d691f03..fa3c478 100644 --- a/archetype/pom.xml +++ b/archetype/pom.xml @@ -42,7 +42,7 @@ under the License. org.apache.maven.archetype archetype-packaging -2.4 +3.0.1 @@ -51,7 +51,7 @@ under the License. org.apache.maven.plugins maven-archetype-plugin - 2.4 + 3.0.1 true
[04/12] syncope git commit: [SYNCOPE-808] Added netbeans to syncope/ide
[SYNCOPE-808] Added netbeans to syncope/ide Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1e2fa36f Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1e2fa36f Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1e2fa36f Branch: refs/heads/SYNCOPE-808 Commit: 1e2fa36f3ecc218d2786067fd8a1641e0068b15e Parents: 8f30378 Author: TusharAuthored: Tue Jan 3 15:36:07 2017 +0530 Committer: Andrea Patricelli Committed: Thu Apr 20 13:57:02 2017 +0200 -- ide/netbeans/nb-configuration.xml | 36 + ide/netbeans/pom.xml| 144 +++ .../plugin/connector/ResourceConnector.java | 76 ++ .../plugin/constants/PluginConstants.java | 33 + .../netbeans/plugin/entity/UserProperties.java | 78 ++ .../service/MailTemplateManagerService.java | 68 ++ .../service/ReportTemplateManagerService.java | 68 ++ .../view/ResourceExplorerTopComponent.form | 68 ++ .../view/ResourceExplorerTopComponent.java | 553 .../netbeans/plugin/view/ServerDetailsView.form | 161 .../netbeans/plugin/view/ServerDetailsView.java | 218 + ide/netbeans/src/main/nbm/MANIFEST.MF | 3 + .../src/main/resources/META-INF/LICENSE | 896 +++ ide/netbeans/src/main/resources/META-INF/NOTICE | 80 ++ .../resources/org/apache/syncope/checkstyle.xml | 223 + .../org/apache/syncope/java-formatter.xml | 309 +++ .../netbeans/plugin/view/Bundle.properties | 28 + ide/pom.xml | 5 +- pom.xml | 104 ++- 19 files changed, 3147 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/1e2fa36f/ide/netbeans/nb-configuration.xml -- diff --git a/ide/netbeans/nb-configuration.xml b/ide/netbeans/nb-configuration.xml new file mode 100644 index 000..ec22826 --- /dev/null +++ b/ide/netbeans/nb-configuration.xml @@ -0,0 +1,36 @@ + + + + +http://www.netbeans.org/ns/maven-properties-data/1;> + + true + + http://git-wip-us.apache.org/repos/asf/syncope/blob/1e2fa36f/ide/netbeans/pom.xml -- diff --git a/ide/netbeans/pom.xml b/ide/netbeans/pom.xml new file mode 100644 index 000..1afbb88 --- /dev/null +++ b/ide/netbeans/pom.xml @@ -0,0 +1,144 @@ + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +4.0.0 + + org.apache.syncope + syncope-ide + 2.0.2-SNAPSHOT + + +Apache Syncope IDE Netbeans +Apache Syncope IDE Netbeans +org.apache.syncope.ide +syncope-ide-netbeans + +nbm + + + ${basedir}/../.. + + + + + +src/main/resources/META-INF/ + + + + +org.codehaus.mojo +nbm-maven-plugin +true + +false + + + +org.apache.maven.plugins +maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + + + +org.netbeans.api +org-netbeans-api-annotations-common + + +org.netbeans.api +org-openide-windows + + +org.netbeans.api +org-openide-util + + +org.netbeans.api +org-openide-util-ui + + +org.netbeans.api +org-openide-util-lookup + + +org.netbeans.api +org-openide-awt + + +org.netbeans.api +org-netbeans-modules-settings + + +org.apache.syncope.common +syncope-common-lib + + +org.apache.syncope.client +syncope-client-lib + + +org.netbeans.api +org-openide-io + + +org.netbeans.api +org-openide-nodes + + +org.netbeans.api +org-openide-text + + +org.netbeans.api +org-openide-filesystems + + +org.netbeans.api +org-openide-loaders + + +commons-io +
[12/12] syncope git commit: Merge branch 'SYNCOPE-808' of https://git-wip-us.apache.org/repos/asf/syncope into SYNCOPE-808
Merge branch 'SYNCOPE-808' of https://git-wip-us.apache.org/repos/asf/syncope into SYNCOPE-808 Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/39b71980 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/39b71980 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/39b71980 Branch: refs/heads/SYNCOPE-808 Commit: 39b7198098a49179c3fdfa246ae8e5a94dc5f59c Parents: eb1e4f1 06fd9e3 Author: Andrea PatricelliAuthored: Thu Apr 20 14:45:50 2017 +0200 Committer: Andrea Patricelli Committed: Thu Apr 20 14:45:50 2017 +0200 -- .../syncope/ide/netbeans/UserProperties.java| 79 .../ide/netbeans/view/ServerDetailsView.form| 7 +- .../ide/netbeans/view/ServerDetailsView.java| 6 +- 3 files changed, 85 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/39b71980/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ServerDetailsView.form -- diff --cc ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ServerDetailsView.form index 7cb27e1,d6ba1d7..0a80e96 --- a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ServerDetailsView.form +++ b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ServerDetailsView.form @@@ -65,9 -61,13 +65,9 @@@ under the License - - - - - - + - ++ @@@ -78,25 -78,15 +78,25 @@@ - + - + - - + + - + + + + + + + + + + - ++ @@@ -139,43 -137,25 +139,42 @@@ - - - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + - ++ + http://git-wip-us.apache.org/repos/asf/syncope/blob/39b71980/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ServerDetailsView.java -- diff --cc ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ServerDetailsView.java index f4177ac,07aedf9..e851615 --- a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ServerDetailsView.java +++ b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ServerDetailsView.java @@@ -105,27 -84,26 +105,27 @@@ public class ServerDetailsView extends layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() +.addGap(41, 41, 41) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) -.addGroup(layout.createSequentialGroup() -.addGap(41, 41, 41) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) -.addComponent(okButton, javax.swing.GroupLayout.PREFERRED_SIZE, 74, javax.swing.GroupLayout.PREFERRED_SIZE) -.addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) -.addComponent(jLabel1) -.addComponent(jLabel2) -.addComponent(jLabel3)) -.addGap(39, 39, 39) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) -.addComponent(userNameTxt) -.addComponent(urlTxt) -
[02/12] syncope git commit: [SYNCOPE-808] Added netbeans to syncope/ide
http://git-wip-us.apache.org/repos/asf/syncope/blob/1e2fa36f/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties -- diff --git a/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties b/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties new file mode 100644 index 000..17de78d --- /dev/null +++ b/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties @@ -0,0 +1,28 @@ +#Licensed to the Apache Software Foundation (ASF) under one +#or more contributor license agreements. See the NOTICE file +#distributed with this work for additional information +#regarding copyright ownership. The ASF licenses this file +#to you under the Apache License, Version 2.0 (the +#"License"); you may not use this file except in compliance +#with the License. You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +#Unless required by applicable law or agreed to in writing, +#software distributed under the License is distributed on an +#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +#KIND, either express or implied. See the License for the +#specific language governing permissions and limitations +#under the License. + +TemplateViewTopComponent.jPanel1.TabConstraints.tabTitle=TEXT +TemplateViewTopComponent.jPanel2.TabConstraints.tabTitle=XML + +ServerDetailsView.jLabel1.text=URL +ServerDetailsView.jLabel4.text=Apache Syncope +ServerDetailsView.okButton.text=OK +ServerDetailsView.passwordTxt.text= +ServerDetailsView.userNameTxt.text= +ServerDetailsView.urlTxt.text= +ServerDetailsView.jLabel3.text=Password +ServerDetailsView.jLabel2.text=User Name http://git-wip-us.apache.org/repos/asf/syncope/blob/1e2fa36f/ide/pom.xml -- diff --git a/ide/pom.xml b/ide/pom.xml index dbd135f..fae2fae 100644 --- a/ide/pom.xml +++ b/ide/pom.xml @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -39,6 +37,7 @@ under the License. eclipse +netbeans @@ -105,4 +104,4 @@ under the License. - + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/1e2fa36f/pom.xml -- diff --git a/pom.xml b/pom.xml index cfa0ba0..3f39f2c 100644 --- a/pom.xml +++ b/pom.xml @@ -443,6 +443,11 @@ under the License. 3.0.0 0.23.1 +RELEASE802 +RELEASE82 +1.0-alpha-1 +3.0.0 + 1389 9082 @@ -1472,7 +1477,100 @@ under the License. httpmime ${httpclient.version} - + + +org.netbeans.api +org-netbeans-api-annotations-common +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-windows +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-util +${org-netbeans-version} + + +org.netbeans.api +org-openide-util-ui +${org-netbeans-version} + + +org.netbeans.api +org-openide-util-lookup +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-awt +${org-netbeans-api-version} + + +org.netbeans.api +org-netbeans-modules-settings +${org-netbeans-api-version} + + +org.apache.syncope.common +syncope-common-lib +${project.version} + + +org.apache.syncope.client +syncope-client-lib +${project.version} + + +org.netbeans.api +org-openide-io +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-nodes +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-text +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-filesystems +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-loaders +${org-netbeans-api-version} + + +org.netbeans.api +
[08/12] syncope git commit: [SYNCOPE-808] Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup
http://git-wip-us.apache.org/repos/asf/syncope/blob/22102eac/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java deleted file mode 100644 index e56b24b..000 --- a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.syncope.netbeans.plugin.service; - -import java.io.InputStream; -import java.util.List; -import javax.ws.rs.core.Response; -import org.apache.syncope.client.lib.SyncopeClient; -import org.apache.syncope.client.lib.SyncopeClientFactoryBean; -import org.apache.syncope.common.lib.to.ReportTemplateTO; -import org.apache.syncope.common.lib.types.ReportTemplateFormat; -import org.apache.syncope.common.rest.api.service.ReportTemplateService; - -public class ReportTemplateManagerService { - -private ReportTemplateService service; - -public ReportTemplateManagerService(final String url, final String userName, final String password) { -SyncopeClient syncopeClient = new SyncopeClientFactoryBean().setAddress(url).create(userName, password); -service = syncopeClient.getService(ReportTemplateService.class); -} - -public List list() { -return service.list(); -} - -public boolean create(final ReportTemplateTO reportTemplateTO) { -return Response.Status.CREATED.getStatusCode() == service.create(reportTemplateTO).getStatus(); -} - -public ReportTemplateTO read(final String key) { -return service.read(key); -} - -public boolean delete(final String key) { -service.delete(key); -return true; -} - -public Object getFormat(final String key, final ReportTemplateFormat format) { -return service.getFormat(key, format).getEntity(); -} - -public void setFormat(final String key, final ReportTemplateFormat format, final InputStream templateIn) { -service.setFormat(key, format, templateIn); -} - -public boolean removeFormat(final String key, final ReportTemplateFormat format) { -return false; -} - -} http://git-wip-us.apache.org/repos/asf/syncope/blob/22102eac/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form deleted file mode 100644 index 79458db..000 --- a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/syncope/blob/22102eac/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java deleted file mode 100644 index 4c91ec5..000 --- a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java +++ /dev/null @@ -1,553 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more
[06/12] syncope git commit: [SYNCOPE-808] Antrun plugin to add LICENSE and PlUGIN to nbm archive
[SYNCOPE-808] Antrun plugin to add LICENSE and PlUGIN to nbm archive Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/57f4893f Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/57f4893f Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/57f4893f Branch: refs/heads/SYNCOPE-808 Commit: 57f4893f33971f3b2e005725a79cb5bee698baf3 Parents: 1e2fa36 Author: TusharAuthored: Mon Jan 9 18:07:06 2017 +0530 Committer: Andrea Patricelli Committed: Thu Apr 20 13:57:10 2017 +0200 -- ide/netbeans/legal/META-INF/LICENSE | 896 +++ ide/netbeans/legal/META-INF/NOTICE | 80 ++ ide/netbeans/pom.xml| 28 + .../src/main/resources/META-INF/LICENSE | 896 --- ide/netbeans/src/main/resources/META-INF/NOTICE | 80 -- pom.xml | 7 + 6 files changed, 1011 insertions(+), 976 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/57f4893f/ide/netbeans/legal/META-INF/LICENSE -- diff --git a/ide/netbeans/legal/META-INF/LICENSE b/ide/netbeans/legal/META-INF/LICENSE new file mode 100644 index 000..f34bfd3 --- /dev/null +++ b/ide/netbeans/legal/META-INF/LICENSE @@ -0,0 +1,896 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or
[11/12] syncope git commit: [SYNCOPE-808] fixed problems about bundle not found, fixed some editor bugs and added validation
[SYNCOPE-808] fixed problems about bundle not found, fixed some editor bugs and added validation Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/eb1e4f1c Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/eb1e4f1c Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/eb1e4f1c Branch: refs/heads/SYNCOPE-808 Commit: eb1e4f1ce74f6a46af62c1012ef9cb64c2bb03e4 Parents: 22102ea Author: Andrea PatricelliAuthored: Thu Apr 20 11:46:12 2017 +0200 Committer: Andrea Patricelli Committed: Thu Apr 20 14:33:48 2017 +0200 -- .../syncope/ide/netbeans/ConnectionParams.java | 122 +++ .../syncope/ide/netbeans/ResourceConnector.java | 41 ++-- .../syncope/ide/netbeans/UserProperties.java| 79 --- .../view/ResourceExplorerTopComponent.form | 1 + .../view/ResourceExplorerTopComponent.java | 211 --- .../ide/netbeans/view/ServerDetailsView.form| 132 +++- .../ide/netbeans/view/ServerDetailsView.java| 175 ++- pom.xml | 11 - 8 files changed, 477 insertions(+), 295 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/eb1e4f1c/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java new file mode 100644 index 000..13bbd69 --- /dev/null +++ b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java @@ -0,0 +1,122 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.syncope.ide.netbeans; + +public final class ConnectionParams { + +private String url; + +private String username; + +private String password; + +public static final class Builder { + +private String scheme; +private String host; +private String port; + +private String username; + +private String password; + +private Builder() { +} + +public Builder scheme(final String value) { +this.scheme = value; +return this; +} +public Builder host(final String value) { +this.host = value; +return this; +} +public Builder port(final String value) { +this.port = value; +return this; +} + +public Builder username(final String value) { +this.username = value; +return this; +} + +public Builder password(final String value) { +this.password = value; +return this; +} + +public ConnectionParams build() { +return new ConnectionParams(scheme + "://" + host + ":" + port + "/syncope/rest", username, password); +} +} + +public static ConnectionParams.Builder builder() { +return new ConnectionParams.Builder(); +} + +private ConnectionParams( +final String url, +final String userName, +final String password) { +this.url = url; +this.username = userName; +this.password = password; +} + +public String getUrl() { +return url; +} + +public void setUrl(final String url) { +this.url = url; +} + +public String getUsername() { +return username; +} + +public void setUsername(final String username) { +this.username = username; +} + +public String getPassword() { +return password; +} + +public void setPassword(final String password) { +this.password = password; +} + +public ConnectionParams port(final String value) { +this.url = value; +return this; +} + +public ConnectionParams userName(final String value) { +
[09/12] syncope git commit: [SYNCOPE-808] Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup
http://git-wip-us.apache.org/repos/asf/syncope/blob/22102eac/ide/netbeans/pom.xml -- diff --git a/ide/netbeans/pom.xml b/ide/netbeans/pom.xml index c594e04..abaa216 100644 --- a/ide/netbeans/pom.xml +++ b/ide/netbeans/pom.xml @@ -16,157 +16,191 @@ specific language governing permissions and limitations under the License. --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> -4.0.0 - - org.apache.syncope - syncope-ide - 2.0.2-SNAPSHOT - + 4.0.0 + +org.apache.syncope +syncope-ide +2.0.4-SNAPSHOT + -Apache Syncope IDE Netbeans -Apache Syncope IDE Netbeans -org.apache.syncope.ide -syncope-ide-netbeans + Apache Syncope IDE Netbeans + Apache Syncope IDE Netbeans + org.apache.syncope.ide + syncope-ide-netbeans -nbm + nbm - - ${basedir}/../.. - + +${basedir}/../.. + - - - -src/main/resources/META-INF/ - - + + + org.netbeans.api + org-netbeans-api-annotations-common + + + org.netbeans.api + org-openide-windows + + + org.netbeans.api + org-openide-util + + + org.netbeans.api + org-openide-util-ui + + + org.netbeans.api + org-openide-util-lookup + + + org.netbeans.api + org-openide-awt + + + org.netbeans.api + org-netbeans-modules-settings + + + org.apache.syncope.common + syncope-common-lib + + + org.apache.syncope.client + syncope-client-lib + + + org.netbeans.api + org-openide-io + + + org.netbeans.api + org-openide-nodes + + + org.netbeans.api + org-openide-text + + + org.netbeans.api + org-openide-filesystems + + + org.netbeans.api + org-openide-loaders + + + commons-io + commons-io + + + org.netbeans.api + org-netbeans-core-multiview + jar + + + org.netbeans.api + org-netbeans-modules-editor-lib2 + jar + + + org.netbeans.api + org-netbeans-api-progress + + + org.netbeans.api + org-netbeans-api-progress-nb + + + org.netbeans.external + asm-all-5.0.1 + + + + + + +org.codehaus.mojo +nbm-maven-plugin +true + + false + + + + +org.apache.maven.plugins +maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + +org.apache.maven.plugins +maven-antrun-plugin + + +package + + + + + + + + + run + + + + + + +org.apache.maven.plugins +maven-checkstyle-plugin + + + + + +${basedir} +META-INF + + LICENSE + NOTICE + + + + + + + + apache-release + + - -org.codehaus.mojo -nbm-maven-plugin -true - -false - - -src/main/resources/META-INF -../META-INF - - - - - -org.apache.maven.plugins -maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - -maven-antrun-plugin -1.7 - - -package - - - - - - - - - run - - - - + +org.apache.maven.plugins +maven-deploy-plugin + + true + + + +org.apache.maven.plugins +maven-source-plugin +false + + true + + - - - - -org.netbeans.api -org-netbeans-api-annotations-common - - -
[05/12] syncope git commit: [SYNCOPE-808] Antrun plugin to add LICENSE and PlUGIN to nbm archive
http://git-wip-us.apache.org/repos/asf/syncope/blob/57f4893f/ide/netbeans/src/main/resources/META-INF/LICENSE -- diff --git a/ide/netbeans/src/main/resources/META-INF/LICENSE b/ide/netbeans/src/main/resources/META-INF/LICENSE deleted file mode 100644 index f34bfd3..000 --- a/ide/netbeans/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,896 +0,0 @@ - - Apache License - Version 2.0, January 2004 -http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s)
[03/12] syncope git commit: [SYNCOPE-808] Added netbeans to syncope/ide
http://git-wip-us.apache.org/repos/asf/syncope/blob/1e2fa36f/ide/netbeans/src/main/resources/META-INF/LICENSE -- diff --git a/ide/netbeans/src/main/resources/META-INF/LICENSE b/ide/netbeans/src/main/resources/META-INF/LICENSE new file mode 100644 index 000..f34bfd3 --- /dev/null +++ b/ide/netbeans/src/main/resources/META-INF/LICENSE @@ -0,0 +1,896 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) +
[4/4] syncope git commit: [SYNCOPE-1068] Using Wicket's CsrfPreventionRequestCycleListener, controlled via console.properties and enabled by default
[SYNCOPE-1068] Using Wicket's CsrfPreventionRequestCycleListener, controlled via console.properties and enabled by default Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/822ad873 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/822ad873 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/822ad873 Branch: refs/heads/master Commit: 822ad873cb7139ae81f76d4b685273851b7e79dc Parents: b81f9e4 Author: Francesco ChicchiriccòAuthored: Thu Apr 20 15:26:29 2017 +0200 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 15:26:47 2017 +0200 -- .../syncope/client/console/SyncopeConsoleApplication.java | 6 ++ client/console/src/main/resources/console.properties | 2 ++ .../src/main/resources/console.properties | 2 ++ .../apache/syncope/fit/console/AbstractConsoleITCase.java | 10 ++ .../org/apache/syncope/fit/console/AjaxBrowseITCase.java | 7 +-- fit/core-reference/src/test/resources/console.properties | 2 ++ 6 files changed, 27 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/822ad873/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java index 88a6965..4c44802 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java @@ -63,6 +63,7 @@ import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication; import org.apache.wicket.authroles.authentication.AuthenticatedWebSession; import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.protocol.http.CsrfPreventionRequestCycleListener; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.ResourceReference; @@ -174,6 +175,8 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication { useGZIPCompression = props.getProperty("useGZIPCompression"); Args.notNull(useGZIPCompression, ""); +String csrf = props.getProperty("csrf"); + // process page properties pageClasses = new HashMap<>(); populatePageClasses(props); @@ -205,6 +208,9 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication { getMarkupSettings().setStripWicketTags(true); getMarkupSettings().setCompressWhitespace(true); +if (BooleanUtils.toBoolean(csrf)) { +getRequestCycleListeners().add(new CsrfPreventionRequestCycleListener()); +} getRequestCycleListeners().add(new SyncopeConsoleRequestCycleListener()); mountPage("/login", getSignInPageClass()); http://git-wip-us.apache.org/repos/asf/syncope/blob/822ad873/client/console/src/main/resources/console.properties -- diff --git a/client/console/src/main/resources/console.properties b/client/console/src/main/resources/console.properties index 03326ff..a3c44f8 100644 --- a/client/console/src/main/resources/console.properties +++ b/client/console/src/main/resources/console.properties @@ -28,6 +28,8 @@ port=8080 rootPath=/syncope/rest/ useGZIPCompression=true +csrf=true + activitiModelerDirectory=${activiti-modeler.directory} reconciliationReportKey=c3520ad9-179f-49e7-b315-d684d216dd97 http://git-wip-us.apache.org/repos/asf/syncope/blob/822ad873/fit/console-reference/src/main/resources/console.properties -- diff --git a/fit/console-reference/src/main/resources/console.properties b/fit/console-reference/src/main/resources/console.properties index 00834e6..4ce2e9b 100644 --- a/fit/console-reference/src/main/resources/console.properties +++ b/fit/console-reference/src/main/resources/console.properties @@ -28,6 +28,8 @@ port=9080 rootPath=/syncope/rest/ useGZIPCompression=true +csrf=true + activitiModelerDirectory=${activiti-modeler.directory} reconciliationReportKey=c3520ad9-179f-49e7-b315-d684d216dd97 http://git-wip-us.apache.org/repos/asf/syncope/blob/822ad873/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractConsoleITCase.java
[3/4] syncope git commit: Upgrading Tomcat
Upgrading Tomcat Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b81f9e42 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b81f9e42 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b81f9e42 Branch: refs/heads/master Commit: b81f9e4283be396fd2e322d12d140a71c6ef0d33 Parents: 40f401c Author: Francesco ChicchiriccòAuthored: Thu Apr 20 15:24:41 2017 +0200 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 15:26:43 2017 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/b81f9e42/pom.xml -- diff --git a/pom.xml b/pom.xml index 532c0d4..2eed4c1 100644 --- a/pom.xml +++ b/pom.xml @@ -460,7 +460,7 @@ under the License. ${log.directory}/cargo.log ${log.directory}/cargo-output.log -8.5.12 +8.5.14 1.2.0 2.1.1
[2/4] syncope git commit: [SYNCOPE-1068] Using Wicket's CsrfPreventionRequestCycleListener, controlled via console.properties and enabled by default
[SYNCOPE-1068] Using Wicket's CsrfPreventionRequestCycleListener, controlled via console.properties and enabled by default Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/38810180 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/38810180 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/38810180 Branch: refs/heads/2_0_X Commit: 38810180276e55965547b0e9a78fa0efe8515902 Parents: abc5d00 Author: Francesco ChicchiriccòAuthored: Thu Apr 20 15:26:29 2017 +0200 Committer: Francesco Chicchiriccò Committed: Thu Apr 20 15:26:29 2017 +0200 -- .../syncope/client/console/SyncopeConsoleApplication.java | 6 ++ client/console/src/main/resources/console.properties | 2 ++ .../src/main/resources/console.properties | 2 ++ .../apache/syncope/fit/console/AbstractConsoleITCase.java | 10 ++ .../org/apache/syncope/fit/console/AjaxBrowseITCase.java | 7 +-- fit/core-reference/src/test/resources/console.properties | 2 ++ 6 files changed, 27 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/38810180/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java index 92c421c..1798dda 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java @@ -64,6 +64,7 @@ import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication; import org.apache.wicket.authroles.authentication.AuthenticatedWebSession; import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.protocol.http.CsrfPreventionRequestCycleListener; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.ResourceReference; @@ -175,6 +176,8 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication { useGZIPCompression = props.getProperty("useGZIPCompression"); Args.notNull(useGZIPCompression, ""); +String csrf = props.getProperty("csrf"); + // process page properties pageClasses = new HashMap<>(); populatePageClasses(props); @@ -206,6 +209,9 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication { getMarkupSettings().setStripWicketTags(true); getMarkupSettings().setCompressWhitespace(true); +if (BooleanUtils.toBoolean(csrf)) { +getRequestCycleListeners().add(new CsrfPreventionRequestCycleListener()); +} getRequestCycleListeners().add(new SyncopeConsoleRequestCycleListener()); mountPage("/login", getSignInPageClass()); http://git-wip-us.apache.org/repos/asf/syncope/blob/38810180/client/console/src/main/resources/console.properties -- diff --git a/client/console/src/main/resources/console.properties b/client/console/src/main/resources/console.properties index 0c086d4..854837f 100644 --- a/client/console/src/main/resources/console.properties +++ b/client/console/src/main/resources/console.properties @@ -28,6 +28,8 @@ port=8080 rootPath=/syncope/rest/ useGZIPCompression=true +csrf=true + activitiModelerDirectory=${activiti-modeler.directory} flowableModelerDirectory=${flowable-modeler.directory} http://git-wip-us.apache.org/repos/asf/syncope/blob/38810180/fit/console-reference/src/main/resources/console.properties -- diff --git a/fit/console-reference/src/main/resources/console.properties b/fit/console-reference/src/main/resources/console.properties index 3dbfac7..58b7c7c 100644 --- a/fit/console-reference/src/main/resources/console.properties +++ b/fit/console-reference/src/main/resources/console.properties @@ -28,6 +28,8 @@ port=9080 rootPath=/syncope/rest/ useGZIPCompression=true +csrf=true + activitiModelerDirectory=${activiti-modeler.directory} flowableModelerDirectory=${flowable-modeler.directory} http://git-wip-us.apache.org/repos/asf/syncope/blob/38810180/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractConsoleITCase.java