Commit ec7b5b31 authored by Francesco Chicchiricco's avatar Francesco Chicchiricco
Browse files

Aligning with latest Apache Syncope development

parent a4845077
......@@ -48,10 +48,6 @@ under the License.
<asyncLogger name="org.apache.wicket" additivity="false" level="ERROR">
<appender-ref ref="main"/>
</asyncLogger>
<asyncLogger name="org.springframework" additivity="false" level="ERROR">
<appender-ref ref="main"/>
</asyncLogger>
<asyncLogger name="org.apache.cxf" additivity="false" level="ERROR">
<appender-ref ref="main"/>
......
......@@ -312,31 +312,6 @@ under the License.
</attributes>
</entity>
<entity class="org.apache.syncope.core.persistence.jpa.entity.anyobject.JPAADerAttr">
<attributes>
<id name="id">
<generated-value generator="SEQ_ADerAttr" strategy="TABLE"/>
<table-generator name="SEQ_ADerAttr" pk-column-value="SEQ_ADerAttr" initial-value="1000"/>
</id>
</attributes>
</entity>
<entity class="org.apache.syncope.core.persistence.jpa.entity.user.JPAUDerAttr">
<attributes>
<id name="id">
<generated-value generator="SEQ_UDerAttr" strategy="TABLE"/>
<table-generator name="SEQ_UDerAttr" pk-column-value="SEQ_UDerAttr" initial-value="1000"/>
</id>
</attributes>
</entity>
<entity class="org.apache.syncope.core.persistence.jpa.entity.group.JPAGDerAttr">
<attributes>
<id name="id">
<generated-value generator="SEQ_GDerAttr" strategy="TABLE"/>
<table-generator name="SEQ_GDerAttr" pk-column-value="SEQ_GDerAttr" initial-value="1000"/>
</id>
</attributes>
</entity>
<entity class="org.apache.syncope.core.persistence.jpa.entity.JPAAnyTemplateRealm">
<attributes>
<id name="id">
......
......@@ -312,31 +312,6 @@ under the License.
</attributes>
</entity>
<entity class="org.apache.syncope.core.persistence.jpa.entity.anyobject.JPAADerAttr">
<attributes>
<id name="id">
<generated-value generator="SEQ_ADerAttr" strategy="TABLE"/>
<table-generator name="SEQ_ADerAttr" pk-column-value="SEQ_ADerAttr" initial-value="1000"/>
</id>
</attributes>
</entity>
<entity class="org.apache.syncope.core.persistence.jpa.entity.user.JPAUDerAttr">
<attributes>
<id name="id">
<generated-value generator="SEQ_UDerAttr" strategy="TABLE"/>
<table-generator name="SEQ_UDerAttr" pk-column-value="SEQ_UDerAttr" initial-value="1000"/>
</id>
</attributes>
</entity>
<entity class="org.apache.syncope.core.persistence.jpa.entity.group.JPAGDerAttr">
<attributes>
<id name="id">
<generated-value generator="SEQ_GDerAttr" strategy="TABLE"/>
<table-generator name="SEQ_GDerAttr" pk-column-value="SEQ_GDerAttr" initial-value="1000"/>
</id>
</attributes>
</entity>
<entity class="org.apache.syncope.core.persistence.jpa.entity.JPAAnyTemplateRealm">
<attributes>
<id name="id">
......
......@@ -359,31 +359,6 @@ under the License.
</id>
</attributes>
</entity>
<entity class="org.apache.syncope.core.persistence.jpa.entity.anyobject.JPAADerAttr">
<attributes>
<id name="id">
<generated-value generator="SEQ_ADerAttr" strategy="TABLE"/>
<table-generator name="SEQ_ADerAttr" pk-column-value="SEQ_ADerAttr" initial-value="1000"/>
</id>
</attributes>
</entity>
<entity class="org.apache.syncope.core.persistence.jpa.entity.user.JPAUDerAttr">
<attributes>
<id name="id">
<generated-value generator="SEQ_UDerAttr" strategy="TABLE"/>
<table-generator name="SEQ_UDerAttr" pk-column-value="SEQ_UDerAttr" initial-value="1000"/>
</id>
</attributes>
</entity>
<entity class="org.apache.syncope.core.persistence.jpa.entity.group.JPAGDerAttr">
<attributes>
<id name="id">
<generated-value generator="SEQ_GDerAttr" strategy="TABLE"/>
<table-generator name="SEQ_GDerAttr" pk-column-value="SEQ_GDerAttr" initial-value="1000"/>
</id>
</attributes>
</entity>
<entity class="org.apache.syncope.core.persistence.jpa.entity.JPAAnyTemplateRealm">
<attributes>
......
......@@ -64,9 +64,5 @@ under the License.
<entry key="GPlainAttr_owner_id_index">CREATE INDEX GPlainAttr_owner_id_index on GPlainAttr(owner_id)</entry>
<entry key="APlainAttr_owner_id_index">CREATE INDEX APlainAttr_owner_id_index on APlainAttr(owner_id)</entry>
<entry key="UDerAttr_owner_id_index">CREATE INDEX UDerAttr_owner_id_index on UDerAttr(owner_id)</entry>
<entry key="GDerAttr_owner_id_index">CREATE INDEX GDerAttr_owner_id_index on GDerAttr(owner_id)</entry>
<entry key="ADerAttr_owner_id_index">CREATE INDEX ADerAttr_owner_id_index on ADerAttr(owner_id)</entry>
<entry key="Task_executedIndex">CREATE INDEX Task_executedIndex ON Task(executed)</entry>
</properties>
......@@ -331,6 +331,7 @@ under the License.
<DerSchema name="csvuserid" expression="firstname + ',' + surname" anyTypeClass_name="csv"/>
<DerSchema name="cn" expression="surname + ', ' + firstname" anyTypeClass_name="minimal user"/>
<DerSchema name="noschema" expression="surname + ', ' + notfound" anyTypeClass_name="other"/>
<DerSchema name="info" expression="username + ' - ' + creationDate + '[' + failedLogins + ']'" anyTypeClass_name="minimal user"/>
<PlainSchema name="icon" type="String" anyTypeClass_name="minimal group"
mandatoryCondition="false" multivalue="0" uniqueConstraint="0" readonly="0"/>
......@@ -443,10 +444,7 @@ under the License.
<UPlainAttrValue id="36" attribute_id="125" stringValue="vivaldi@syncope.org"/>
<UPlainAttr id="126" owner_id="3" schema_name="type"/>
<UPlainAttrValue id="37" attribute_id="126" stringValue="F"/>
<UDerAttr id="100" schema_name="cn" owner_id="3"/>
<UDerAttr id="101" schema_name="cn" owner_id="1"/>
<GPlainAttr id="600" owner_id="1" schema_name="icon"/>
<GPlainAttrValue attribute_id="600" id="40" stringValue="niceIcon"/>
......@@ -474,14 +472,6 @@ under the License.
<GPlainAttr id="995" owner_id="13" schema_name="title"/>
<GPlainAttrValue attribute_id="995" id="95" stringValue="r13"/>
<GDerAttr id="100" owner_id="1" schema_name="rderiveddata"/>
<GDerAttr id="101" owner_id="1" schema_name="displayProperty"/>
<GDerAttr id="102" owner_id="4" schema_name="displayProperty"/>
<GDerAttr id="103" owner_id="1" schema_name="rderToBePropagated"/>
<ConnInstance id="100" displayName="ConnInstance100"
location="${connid.location}"
bundleName="net.tirasa.connid.bundles.soap"
......@@ -765,7 +755,7 @@ under the License.
connObjectKey="0" password="0" purpose="PROPAGATION"/>
<MappingItem id="111" extAttrName="fullname" mapping_id="1"
intAttrName="cn" intMappingType="UserDerivedSchema" mandatoryCondition="true"
connObjectKey="0" password="0" purpose="BOTH"/>
connObjectKey="0" password="0" purpose="PROPAGATION"/>
<Provision id="2" resource_name="ws-target-resource-update" anyType_name="USER" objectClass="__ACCOUNT__"/>
<Mapping id="2" provision_id="2"/>
......@@ -846,7 +836,7 @@ under the License.
connObjectKey="0" password="0" purpose="SYNCHRONIZATION"/>
<MappingItem id="207" extAttrName="__NAME__" mapping_id="9"
intAttrName="csvuserid" intMappingType="UserDerivedSchema" mandatoryCondition="true"
connObjectKey="1" password="0" purpose="BOTH"/>
connObjectKey="1" password="0" purpose="PROPAGATION"/>
<MappingItem id="208" extAttrName="theirgroup" mapping_id="9"
intAttrName="rderToBePropagated" intMappingType="GroupDerivedSchema" mandatoryCondition="false"
connObjectKey="0" password="0" purpose="PROPAGATION"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eu.chorevolution</groupId>
<artifactId>syncope</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
<name>Apache Syncope sample project - Enduser</name>
<groupId>eu.chorevolution</groupId>
<artifactId>enduser</artifactId>
<packaging>war</packaging>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
<groupId>eu.chorevolution</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.syncope.client</groupId>
<artifactId>syncope-client-enduser</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
</dependencies>
<build>
<finalName>syncope-enduser</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>
</build>
<profiles>
<profile>
<id>embedded</id>
<properties>
<conf.directory>${project.build.directory}/test-classes</conf.directory>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.syncope.fit</groupId>
<artifactId>syncope-fit-build-tools</artifactId>
<version>${syncope.version}</version>
<type>war</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.tirasa.connid.bundles.soap</groupId>
<artifactId>wssample</artifactId>
<type>war</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<defaultGoal>clean verify cargo:run</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>true</inherited>
<executions>
<execution>
<id>setupEmbeddedConf</id>
<phase>package</phase>
<configuration>
<target>
<delete dir="../core/target/syncope/WEB-INF/classes/domains"/>
<copy todir="../core/target/syncope/WEB-INF/classes/domains">
<fileset dir="../core/target/test-classes/domains"/>
</copy>
<copy file="../core/target/test-classes/connid.properties"
todir="../core/target/syncope/WEB-INF/classes"
overwrite="true"/>
<copy file="../core/target/test-classes/db.jsp"
todir="../core/target/syncope"
overwrite="true"/>
<copy file="${project.build.directory}/test-classes/enduser.properties"
todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"
overwrite="true"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<container>
<dependencies>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
</dependencies>
</container>
<configuration>
<type>standalone</type>
<properties>
<cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
<cargo.tomcat.ajp.port>${cargo.tomcat.ajp.port}</cargo.tomcat.ajp.port>
<cargo.rmi.port>${cargo.rmi.port}</cargo.rmi.port>
<cargo.jvmargs>-noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=256m</cargo.jvmargs>
</properties>
</configuration>
<deployables>
<deployable>
<groupId>net.tirasa.connid.bundles.soap</groupId>
<artifactId>wssample</artifactId>
<type>war</type>
<properties>
<context>wssample</context>
</properties>
</deployable>
<deployable>
<groupId>org.apache.syncope.fit</groupId>
<artifactId>syncope-fit-build-tools</artifactId>
<type>war</type>
<properties>
<context>syncope-fit-build-tools</context>
</properties>
</deployable>
<deployable>
<location>../core/target/syncope</location>
<properties>
<context>syncope</context>
</properties>
</deployable>
<deployable>
<location>${project.build.directory}/${project.build.finalName}</location>
<properties>
<context>syncope-enduser</context>
</properties>
</deployable>
</deployables>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
# 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.
enduser.directory=${conf.directory}
version=${syncope.version}
site=${project.parent.url}
license=${licenseUrl}
anonymousUser=${anonymousUser}
anonymousKey=${anonymousKey}
scheme=http
host=localhost
port=8080
rootPath=/syncope/rest/
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<configuration status="WARN">
<appenders>
<RollingRandomAccessFile name="main" fileName="${log.directory}/enduser.log"
filePattern="${log.directory}/enduser-%d{yyyy-MM-dd}.log.gz"
immediateFlush="false" append="true">
<PatternLayout>
<pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy/>
<SizeBasedTriggeringPolicy size="250 MB"/>
</Policies>
</RollingRandomAccessFile>
</appenders>
<loggers>
<asyncLogger name="org.apache.syncope.client.lib" additivity="false" level="OFF">
<appender-ref ref="main"/>
</asyncLogger>
<asyncLogger name="org.apache.syncope.client.enduser" additivity="false" level="ERROR">
<appender-ref ref="main"/>
</asyncLogger>
<asyncLogger name="org.apache.wicket" additivity="false" level="ERROR">
<appender-ref ref="main"/>
</asyncLogger>
<asyncLogger name="org.apache.cxf" additivity="false" level="ERROR">
<appender-ref ref="main"/>
</asyncLogger>
<root level="ERROR">
<appender-ref ref="main"/>
</root>
</loggers>
</configuration>
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD
GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
<glassfish-web-app error-url="">
<class-loader delegate="false"/>
</glassfish-web-app>
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
<deployment>
<exclude-subsystems>
<subsystem name="webservices"/>
<subsystem name="jaxrs"/>
</exclude-subsystems>
<dependencies>
<module name="org.apache.xalan"/>
</dependencies>
<exclusions>
<module name="javax.ws.rs.api"/>
<module name="org.apache.cxf"/>
<module name="org.apache.cxf.impl"/>
<module name="org.slf4j"/>
<module name="org.slf4j.impl"/>
</exclusions>
</deployment>
</jboss-deployment-structure>
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<weblogic-web-app xmlns="http://xmlns.oracle.com/weblogic/weblogic-web-app"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.oracle.com/weblogic/weblogic-web-app
http://xmlns.oracle.com/weblogic/weblogic-web-app/1.4/weblogic-web-app.xsd">
<context-root>syncope-console</context-root>
<container-descriptor>
<prefer-application-packages>
<package-name>org.apache.commons.*</package-name>
<package-name>org.slf4j.*</package-name>
<package-name>com.fasterxml.jackson.*</package-name>
</prefer-application-packages>
</container-descriptor>
</weblogic-web-app>
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file