Merge branch 'master' of https://github.com/Evolveum/midpoint

build-system/pom.xml

@@ -57,9 +57,9 @@
         <quartz.version>2.1.3</quartz.version>
         <selenium.version>1.0.1</selenium.version>
         <slf4j.version>1.6.4</slf4j.version>
-        <spring.version>3.1.0.RELEASE</spring.version>
-        <spring.security.version>3.1.0.RELEASE</spring.security.version>
-        <testng.version>6.1.1</testng.version>
+        <spring.version>4.0.6.RELEASE</spring.version>
+        <spring.security.version>3.2.5.RELEASE</spring.security.version>
+        <testng.version>6.8.8</testng.version>
         <xml.resolver.version>1.2</xml.resolver.version>
         <cron4j.version>2.2.3</cron4j.version>
         <hibernate.version>4.1.12.Final</hibernate.version>
@@ -72,7 +72,7 @@
         <activiti-spring.version>5.15.1</activiti-spring.version>
         <commons-email.version>1.3</commons-email.version>
         <xmlsec.version>2.0.1</xmlsec.version>
-        <connid.version>1.4.0.0-SNAPSHOT</connid.version>
+        <connid.version>1.4.0.1-SNAPSHOT</connid.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -371,12 +371,12 @@
             </dependency>
             <!--  Identity conectors  -->
             <dependency>
-                <groupId>org.connid</groupId>
+                <groupId>net.tirasa.connid</groupId>
                 <artifactId>connector-framework</artifactId>
                 <version>${connid.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.connid</groupId>
+                <groupId>net.tirasa.connid</groupId>
                 <artifactId>connector-framework-internal</artifactId>
                 <version>${connid.version}</version>
             </dependency>
@@ -405,7 +405,7 @@
             <dependency>
                 <groupId>org.forgerock.openicf.connectors</groupId>
                 <artifactId>ldap-connector</artifactId>
-                <version>1.1.0.em2</version>
+                <version>1.1.1.em237</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.forgerock.openicf.framework</groupId>
@@ -593,7 +593,7 @@
       </repository>
       <snapshotRepository>
         <id>evolveum-nexus</id>
-        <name>Internal Releases</name>
+        <name>Internal Snapshots</name>
         <url>http://nexus.evolveum.com/nexus/content/repositories/snapshots/</url>
       </snapshotRepository>
     </distributionManagement>
@@ -736,9 +736,11 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.10</version>
+                        <version>2.17</version>
                         <configuration>
-                            <forkMode>once</forkMode>
+                        	<parallel>false</parallel>
+                        	<forkCount>1</forkCount>
+                      		<reuseForks>true</reuseForks>
                             <!-- 							<runOrder>alphabetical</runOrder> -->
                             <redirectTestOutputToFile>true</redirectTestOutputToFile>
                             <!-- 							<threadCount>1</threadCount> -->
@@ -748,6 +750,12 @@
                             <suiteXmlFiles>
                                 <suiteXmlFile>testng.xml</suiteXmlFile>
                             </suiteXmlFiles>
+                        	<properties>
+								<property>
+									<name>listener</name>
+									<value>com.evolveum.midpoint.tools.testng.TestListener</value>
+								</property>
+            				</properties>
                             <systemPropertyVariables>
                                 <midpoint.home>target/midpoint-home</midpoint.home>
                                 <java.util.logging.config.file>${project.build.directory}/test-classes/logging.properties</java.util.logging.config.file>
@@ -767,7 +775,7 @@
                             <dependency>
                                 <groupId>org.apache.maven.surefire</groupId>
                                 <artifactId>surefire-testng</artifactId>
-                                <version>2.9</version>
+                                <version>2.17</version>
                             </dependency>
                         </dependencies>
                     </plugin>

config/eclipse/codetemplates.xml

@@ -5,7 +5,7 @@
  */</template><template autoinsert="true" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/**
  * ${tags}
  */</template><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/**
- * Copyright (c) 2013 Evolveum
+ * Copyright (c) 2014 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

dist/pom.xml

@@ -69,6 +69,41 @@
     </dependencies>
     <build>
         <plugins>
+            <plugin>
+                <!-- Used to pull XSD files from the JAR -->
+                <groupId>com.evolveum.midpoint.tools</groupId>
+                <artifactId>schema-dist-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>schemadist-prism</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>schemadist</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>com.evolveum.midpoint.infra</groupId>
+                                    <artifactId>prism</artifactId>
+                                    <version>3.1-SNAPSHOT</version>
+                                    <type>jar</type>
+                                    <catalog>META-INF/catalog-runtime.xml</catalog>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.evolveum.midpoint.infra</groupId>
+                                    <artifactId>schema</artifactId>
+                                    <version>3.1-SNAPSHOT</version>
+                                    <type>jar</type>
+                                    <catalog>META-INF/jax-ws-catalog.xml</catalog>
+                                </artifactItem>
+                            </artifactItems>
+                            <includes>**/*.xsd,**/*.dtd,**/*.wsdl,META-INF/*</includes>
+                            <excludes>xml/ns/test/**,xml/ns/private/**,prism/**</excludes>
+                            <outputDirectory>${project.basedir}/target/schemadist</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
 		        <artifactId>maven-assembly-plugin</artifactId>
 		        <version>2.4</version>

dist/src/main/assembly/dist.xml

@@ -51,6 +51,18 @@
       	<exclude>**/*~</exclude>
       </excludes>
     </fileSet>
+    <fileSet>
+      <directory>target/schemadist</directory>
+      <outputDirectory>/schema</outputDirectory>
+      <excludes>
+      	<exclude>.project</exclude>
+      	<exclude>.classpath</exclude>
+      	<exclude>.settings/</exclude>
+      	<exclude>pom.xml</exclude>
+      	<exclude>*~</exclude>
+      	<exclude>**/*~</exclude>
+      </excludes>
+    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>

gui/admin-gui-tr-TR/.gitignore

@@ -0,0 +1 @@
+/target

gui/admin-gui-tr-TR/pom.xml

@@ -0,0 +1,46 @@
+<!--
+  ~ Copyright (c) 2010-2013 Evolveum
+  ~
+  ~ Licensed 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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <name>midPoint User Interface - admin web gui tr_TR</name>
+    <groupId>com.evolveum.midpoint.gui</groupId>
+    <artifactId>admin-gui-tr-TR</artifactId>
+    <packaging>jar</packaging>
+    <version>3.1-SNAPSHOT</version>
+    <parent>
+        <artifactId>gui</artifactId>
+        <groupId>com.evolveum.midpoint</groupId>
+        <version>3.1-SNAPSHOT</version>
+    </parent>
+    <build>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>com.evolveum.midpoint.tools</groupId>
+            <artifactId>test-ng</artifactId>
+            <version>3.1-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

gui/admin-gui-tr-TR/src/main/resources/Messages.localization

@@ -0,0 +1,3 @@
+name=Türkçe
+flag=tr
+locale=tr_TR

gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/BasicSearchPanel_tr_TR.utf8.properties

@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2010-2014 Evolveum
+#
+# Licensed 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.
+#
+
+BasicSearchPanel.search=Ara
+BasicSearchPanel.clear=Aramayı sil
+BasicSearchPanel.textPlaceholder=Ara

gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/assignment/ACAttributePanel_tr_TR.utf8.properties

@@ -0,0 +1,4 @@
+#Thu Dec 05 11:53:48 EET 2013
+ACAttributePanel.button.showExprEditor=İfadeyi göster
+ACAttributePanel.hasOutbound=Dış Kaynak
+ACAttributePanel.required=Zorunlu

gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/assignment/AssignableAuthActionsPopup_tr_TR.utf8.properties

@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2010-2013 Evolveum
+#
+# Licensed 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.
+#
+
+assignableAuthActionsPopup.label=İsim
+assignableAuthActionsPopup.description=Açıklama
+assignableAuthActionsPopup.actionURI=Eylem URI'si
+assignableAuthActionsPopup.button.add=Atama yap

gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel_tr_TR.utf8.properties

@@ -0,0 +1,15 @@
+#Thu Dec 05 11:53:48 EET 2013
+AssignmentEditorPanel.description=Açıklama
+AssignmentEditorPanel.target=Hedef
+AssignmentEditorPanel.resource=Kaynak
+AssignmentEditorPanel.browser.title=Tarayıcı
+AssignmentEditorPanel.attributes=Özellikler
+AssignmentEditorPanel.showEmpty=Boş olanları göster
+AssignmentEditorPanel.hideEmpty=Boş olanları gösterme
+AssignmentEditorPanel.enabledFrom={0},  {1,date,medium} tarihinden itibaren
+AssignmentEditorPanel.enabledFromTo={0},  {1,date,medium} tarihinden {2,date,medium} tarihine
+AssignmentEditorPanel.enabledTo={0},  {1,date,medium} tarihine kadar
+AssignmentEditorPanel.relation=İlişki
+AssignmentEditorPanel.resource=Kaynak
+
+

gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel_tr_TR.utf8.properties

@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2010-2013 Evolveum
+#
+# Licensed 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.
+#
+AssignmentTablePanel.menu.assign=Kaynak hesabı ata
+AssignmentTablePanel.menu.assignRole=Rol ata
+AssignmentTablePanel.menu.assignOrg=Org. ata
+AssignmentTablePanel.menu.unassign=Atamayı kaldır
+
+AssignmentTablePanel.modal.title.selectAssignment=Nesne(leri) seç
+AssignmentTablePanel.modal.title.confirmDeletion=Silmeyi onayla
+AssignmentTablePanel.modal.message.delete= {0} atama(ları) gerçekten kaldırmak istyor musunuz?
+
+AssignmentTablePanel.message.noAssignmentSelected=Hiç bir atama seçilmedi.
+AssignmentTablePanel.message.couldntAssignObject='{0}' nesne ataması yapılamadı, sebep: {1}.
+AssignmentTablePanel.message.illegalAssignmentState='{0}' geçersiz atama durumu.

gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/assignment/AutzActionsTablePanel_tr_TR.utf8.properties

@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2010-2013 Evolveum
+#
+# Licensed 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.
+#
+AutzActionsTablePanel.header.label=Yetkilendirmeler
+AutzActionsTablePanel.column.checkbox=Seçim
+AutzActionsTablePanel.column.aname=İsim
+AutzActionsTablePanel.column.aURI=Eylem URI'si
+
+
+
+AutzActionsTablePanel.menu.assign=Eylem ata
+AutzActionsTablePanel.menu.unassign=Eylem sil
+
+AutzActionsTablePanel.modal.title.selectActions=Eylem(leri) seç
+AutzActionsTablePanel.modal.title.confirmDeletion=Silmeyi onayla
+AutzActionsTablePanel.modal.message.delete= {0} eylemi gerçekten silmek istiyor musunuz?
+
+AutzActionsTablePanel.message.noAssignmentSelected=Hiç bir eylem seçilmedi.
+AutzActionsTablePanel.message.couldntAssignObject= '{0}' nesne ataması yapılamadı, sebep: {1}.
+AutzActionsTablePanel.message.illegalAssignmentState='{0}' geçersiz atama durumu.

gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/assignment/ResourceListPanel_tr_TR.utf8.properties

@@ -0,0 +1,5 @@
+#Thu Dec 05 11:53:48 EET 2013
+resourcePopup.bundle=Paket
+resourcePopup.button.add=Kaynak Ekle
+resourcePopup.name=İsim
+resourcePopup.version=Versiyon

gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/data/CountToolbar_tr_TR.utf8.properties

@@ -0,0 +1,3 @@
+#Thu Dec 05 11:53:48 EET 2013
+CountToolbar.label= {0,number,integer} 'den {1,number,integer} 'e kadar olan sonuçları gösteriyor. Toplam {2,number,integer} sonuç.
+CountToolbar.noFound=Eşleşen sonuç bulunamadı.

gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel_tr_TR.utf8.properties

@@ -0,0 +1,5 @@
+#Thu Dec 05 11:53:48 EET 2013
+NavigatorPanel.dots=...
+NavigatorPanel.first=1
+NavigatorPanel.next=Sonraki
+NavigatorPanel.previous=Önceki

gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/dialog/ConfirmationDialog_tr_TR.utf8.properties

@@ -0,0 +1,3 @@
+#Thu Dec 05 11:53:48 EET 2013
+confirmationDialog.no=Hayır
+confirmationDialog.yes=Evet

gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/dialog/UserBrowserDialog_tr_TR.utf8.properties

@@ -0,0 +1,11 @@
+#Thu Dec 05 11:53:48 EET 2013
+userBrowserDialog.button.cancelButton=Vazgeç
+userBrowserDialog.button.searchButton=Ara
+userBrowserDialog.email=Elektronik posta
+userBrowserDialog.familyName=Soyad
+userBrowserDialog.fullName=Tam ad
+userBrowserDialog.givenName=Ad
+userBrowserDialog.message.queryError=Arama sorgusu filtreye çevrilirken hata oluştu.
+userBrowserDialog.name=Ad
+userBrowserDialog.title=Kullanıcı seç
+userBrowserDialog.type=Tip

gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/input/DropDownChoicePanel_tr_TR.utf8.properties

@@ -0,0 +1,2 @@
+#Thu Dec 05 11:53:48 EET 2013
+DropDownChoicePanel.notDefined=Tanımsız

gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/input/PasswordPanel_tr_TR.utf8.properties

@@ -0,0 +1,2 @@
+#Thu Dec 05 11:53:48 EET 2013
+passwordPanel.error=Şifreler eşleşmiyor