[SYNCOPE-1041] Deb support
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8f2e5ba7 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8f2e5ba7 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8f2e5ba7 Branch: refs/heads/2_0_X Commit: 8f2e5ba788f6a983e0e9489828d80cce2459b889 Parents: f2a12f5 Author: Francesco Chicchiriccò <[email protected]> Authored: Mon Mar 27 13:07:32 2017 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Fri Mar 31 15:25:11 2017 +0200 ---------------------------------------------------------------------- deb/console/pom.xml | 13 +++++++++++++ deb/console/src/deb/control/conffiles | 1 + deb/core/pom.xml | 28 +++++++++++++++++++++++++++- deb/core/src/deb/control/conffiles | 1 + deb/enduser/pom.xml | 13 +++++++++++++ deb/enduser/src/deb/control/conffiles | 1 + deb/enduser/src/deb/control/preinst | 3 ++- 7 files changed, 58 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/8f2e5ba7/deb/console/pom.xml ---------------------------------------------------------------------- diff --git a/deb/console/pom.xml b/deb/console/pom.xml index 8b1c639..0495dd3 100644 --- a/deb/console/pom.xml +++ b/deb/console/pom.xml @@ -44,6 +44,11 @@ under the License. <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.syncope.ext.saml2sp</groupId> + <artifactId>syncope-ext-saml2sp-client-console</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.syncope.client</groupId> <artifactId>syncope-client-console</artifactId> <version>${project.version}</version> @@ -97,6 +102,14 @@ under the License. <filtering>true</filtering> </resource> <resource> + <directory>${project.basedir}/../../ext/saml2sp/agent/src/main/resources</directory> + <includes> + <include>saml2sp-agent.properties</include> + </includes> + <targetPath>${project.build.directory}/etc</targetPath> + <filtering>true</filtering> + </resource> + <resource> <directory>${basedir}/../../fit/console-reference/src/main/resources</directory> <includes> <include>log4j2.xml</include> http://git-wip-us.apache.org/repos/asf/syncope/blob/8f2e5ba7/deb/console/src/deb/control/conffiles ---------------------------------------------------------------------- diff --git a/deb/console/src/deb/control/conffiles b/deb/console/src/deb/control/conffiles index f540c1e..47e5201 100644 --- a/deb/console/src/deb/control/conffiles +++ b/deb/console/src/deb/control/conffiles @@ -1,2 +1,3 @@ /etc/tomcat8/Catalina/localhost/syncope-console.xml /etc/apache-syncope/console.properties +/etc/apache-syncope/saml2sp-agent.properties http://git-wip-us.apache.org/repos/asf/syncope/blob/8f2e5ba7/deb/core/pom.xml ---------------------------------------------------------------------- diff --git a/deb/core/pom.xml b/deb/core/pom.xml index f32cc35..e52b286 100644 --- a/deb/core/pom.xml +++ b/deb/core/pom.xml @@ -75,6 +75,16 @@ under the License. <artifactId>syncope-ext-camel-provisioning</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.syncope.ext.saml2sp</groupId> + <artifactId>syncope-ext-saml2sp-rest-cxf</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.syncope.ext.saml2sp</groupId> + <artifactId>syncope-ext-saml2sp-persistence-jpa</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.syncope.ext</groupId> @@ -180,7 +190,23 @@ under the License. <targetPath>${project.build.directory}/etc</targetPath> <filtering>true</filtering> </resource> - + <resource> + <directory>${project.basedir}/../../ext/saml2sp/logic/src/main/resources</directory> + <includes> + <include>saml2sp-logic.properties</include> + </includes> + <targetPath>${project.build.directory}/etc</targetPath> + <filtering>true</filtering> + </resource> + <resource> + <directory>${basedir}/../../fit/core-reference/src/test/resources</directory> + <includes> + <include>keystore</include> + </includes> + <targetPath>${project.build.directory}/etc</targetPath> + <filtering>false</filtering> + </resource> + <resource> <directory>${project.build.directory}/etc</directory> <targetPath>${project.build.directory}/classes</targetPath> http://git-wip-us.apache.org/repos/asf/syncope/blob/8f2e5ba7/deb/core/src/deb/control/conffiles ---------------------------------------------------------------------- diff --git a/deb/core/src/deb/control/conffiles b/deb/core/src/deb/control/conffiles index ae391c2..1dc06a7 100644 --- a/deb/core/src/deb/control/conffiles +++ b/deb/core/src/deb/control/conffiles @@ -8,6 +8,7 @@ /etc/apache-syncope/persistence.properties /etc/apache-syncope/provisioning.properties /etc/apache-syncope/groupRoutes.xml +/etc/apache-syncope/saml2sp-logic.properties /etc/apache-syncope/security.properties /etc/apache-syncope/userRoutes.xml /etc/apache-syncope/userWorkflow.bpmn20.xml http://git-wip-us.apache.org/repos/asf/syncope/blob/8f2e5ba7/deb/enduser/pom.xml ---------------------------------------------------------------------- diff --git a/deb/enduser/pom.xml b/deb/enduser/pom.xml index f515295..ab75f01 100644 --- a/deb/enduser/pom.xml +++ b/deb/enduser/pom.xml @@ -39,6 +39,11 @@ under the License. <dependencies> <dependency> + <groupId>org.apache.syncope.ext.saml2sp</groupId> + <artifactId>syncope-ext-saml2sp-client-enduser</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.syncope.client</groupId> <artifactId>syncope-client-enduser</artifactId> <version>${project.version}</version> @@ -93,6 +98,14 @@ under the License. <filtering>true</filtering> </resource> <resource> + <directory>${project.basedir}/../../ext/saml2sp/agent/src/main/resources</directory> + <includes> + <include>saml2sp-agent.properties</include> + </includes> + <targetPath>${project.build.directory}/etc</targetPath> + <filtering>true</filtering> + </resource> + <resource> <directory>${basedir}/../../fit/enduser-reference/src/main/resources</directory> <includes> <include>log4j2.xml</include> http://git-wip-us.apache.org/repos/asf/syncope/blob/8f2e5ba7/deb/enduser/src/deb/control/conffiles ---------------------------------------------------------------------- diff --git a/deb/enduser/src/deb/control/conffiles b/deb/enduser/src/deb/control/conffiles index ee81e59..23cf86e 100644 --- a/deb/enduser/src/deb/control/conffiles +++ b/deb/enduser/src/deb/control/conffiles @@ -1,2 +1,3 @@ /etc/tomcat8/Catalina/localhost/syncope-enduser.xml /etc/apache-syncope/enduser.properties +/etc/apache-syncope/saml2sp-agent.properties http://git-wip-us.apache.org/repos/asf/syncope/blob/8f2e5ba7/deb/enduser/src/deb/control/preinst ---------------------------------------------------------------------- diff --git a/deb/enduser/src/deb/control/preinst b/deb/enduser/src/deb/control/preinst index 349f48c..afdca38 100644 --- a/deb/enduser/src/deb/control/preinst +++ b/deb/enduser/src/deb/control/preinst @@ -14,4 +14,5 @@ # "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. \ No newline at end of file +# under the License. +dpkg-divert --add --package apache-syncope-enduser --rename --divert /etc/apache-syncope/saml2sp-agent.properties.disabled /etc/apache-syncope/saml2sp-agent.properties
