Preparing internal update 2.0 -> 2.1

diff --git a/eventListener_update210.xml b/eventListener_update210.xml
new file mode 100644 (file)
index 0000000..da3e538
--- /dev/null
+++ b/eventListener_update210.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/eventListener.xsd">
+       <import>
+               <eventlistener>
+                       <eventclassname>wcf\data\user\UserAction</eventclassname>
+                       <eventname>rename</eventname>
+                       <listenerclassname>wcf\system\event\listener\ConversationUserActionRenameListener</listenerclassname>
+                       <environment>user</environment>
+               </eventlistener>
+               <eventlistener>
+                       <eventclassname>wcf\data\user\UserAction</eventclassname>
+                       <eventname>rename</eventname>
+                       <listenerclassname>wcf\system\event\listener\ConversationUserActionRenameListener</listenerclassname>
+                       <environment>admin</environment>
+               </eventlistener>
+       </import>
+</data>

diff --git a/package.xml b/package.xml
index 028ddb980a366505bbac7212c7e732f5c4e12e19..bed6db76d1c110078cdc870e8f1d48afd759a2db 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -3,8 +3,8 @@
        <packageinformation>
                <packagename>User Conversation System</packagename>
                <packagedescription>Private conversations between multiple users</packagedescription>
-               <version>2.1.0 Beta 2</version>
-               <date>2015-01-09</date>
+               <version>2.1.0 Beta 3</version>
+               <date>2015-01-23</date>
        </packageinformation>
        
        <authorinformation>
@@ -13,7 +13,7 @@
        </authorinformation>
        
        <requiredpackages>
-               <requiredpackage minversion="2.1.0 Beta 3">com.woltlab.wcf</requiredpackage>
+               <requiredpackage minversion="2.1.0 Beta 4">com.woltlab.wcf</requiredpackage>
        </requiredpackages>
        
        <excludedpackages>
@@ -37,27 +37,25 @@
                <instruction type="script">acp/install_com.woltlab.wcf.conversation_2.0.0.php</instruction>
        </instructions>
        
-       <!--
        <instructions type="update" fromversion="2.0.9">
-               <instruction type="file" run="standalone">files_update.tar</instruction>
-               <instruction type="template" run="standalone">templates_update.tar</instruction>
+               <instruction type="file" run="standalone">files.tar</instruction>
+               <instruction type="template" run="standalone">templates.tar</instruction>
                
                <instruction type="language" run="standalone">language/*.xml</instruction>
                
-               <instruction type="sql" run="standalone">update1_2.1.0_alpha_1.sql</instruction>
-               <instruction type="sql" run="standalone">update2_2.1.0_alpha_1.sql</instruction>
-               <instruction type="sql" run="standalone">update3_2.1.0_alpha_1.sql</instruction>
+               <instruction type="sql" run="standalone">update1_210.sql</instruction>
+               <instruction type="sql" run="standalone">update2_210.sql</instruction>
+               <instruction type="sql" run="standalone">update3_210.sql</instruction>
                
                <instruction type="clipboardAction">clipboardAction.xml</instruction>
-               <instruction type="eventListener">eventListener.xml</instruction>
+               <instruction type="eventListener">eventListener_update210.xml</instruction>
                <instruction type="objectType">objectType.xml</instruction>
                <instruction type="option">option.xml</instruction>
                <instruction type="userGroupOption">userGroupOption.xml</instruction>
                <instruction type="userOption">userOption.xml</instruction>
        </instructions>
-       -->
        
-       <instructions type="update" fromversion="2.1.0 Beta 1">
+       <instructions type="update" fromversion="2.1.0 Beta 2">
                <instruction type="file">files_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>
        </instructions>

diff --git a/update1_2.1.0_alpha_1.sql b/update1_2.1.0_alpha_1.sql
deleted file mode 100644 (file)
index 4447a60..0000000
--- a/update1_2.1.0_alpha_1.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE wcf1_conversation_message ADD lastEditTime INT(10) NOT NULL DEFAULT 0;

diff --git a/update1_210.sql b/update1_210.sql
new file mode 100644 (file)
index 0000000..4447a60
--- /dev/null
+++ b/update1_210.sql
@@ -0,0 +1 @@
+ALTER TABLE wcf1_conversation_message ADD lastEditTime INT(10) NOT NULL DEFAULT 0;

diff --git a/update2_2.1.0_alpha_1.sql b/update2_2.1.0_alpha_1.sql
deleted file mode 100644 (file)
index 0cde8a4..0000000
--- a/update2_2.1.0_alpha_1.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE wcf1_conversation_message ADD editCount MEDIUMINT(7) NOT NULL DEFAULT 0;

diff --git a/update2_210.sql b/update2_210.sql
new file mode 100644 (file)
index 0000000..0cde8a4
--- /dev/null
+++ b/update2_210.sql
@@ -0,0 +1 @@
+ALTER TABLE wcf1_conversation_message ADD editCount MEDIUMINT(7) NOT NULL DEFAULT 0;

diff --git a/update3_2.1.0_alpha_1.sql b/update3_2.1.0_alpha_1.sql
deleted file mode 100644 (file)
index b40c128..0000000
--- a/update3_2.1.0_alpha_1.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE wcf1_conversation_message ADD hasEmbeddedObjects TINYINT(1) NOT NULL DEFAULT 0;

diff --git a/update3_210.sql b/update3_210.sql
new file mode 100644 (file)
index 0000000..b40c128
--- /dev/null
+++ b/update3_210.sql
@@ -0,0 +1 @@
+ALTER TABLE wcf1_conversation_message ADD hasEmbeddedObjects TINYINT(1) NOT NULL DEFAULT 0;