Repository: openmeetings Updated Branches: refs/heads/master e2b0dddb0 -> d2a8e4003
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml index 2cca8a5..fdf141f 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml @@ -25,7 +25,6 @@ <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL"> <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> <class>org.apache.openmeetings.db.entity.basic.Configuration</class> - <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class> <class>org.apache.openmeetings.db.entity.server.LdapConfig</class> <class>org.apache.openmeetings.db.entity.basic.MailMessage</class> <class>org.apache.openmeetings.db.entity.basic.Naviglobal</class> @@ -52,7 +51,6 @@ <class>org.apache.openmeetings.db.entity.user.PrivateMessage</class> <class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class> <class>org.apache.openmeetings.db.entity.user.UserContact</class> - <class>org.apache.openmeetings.db.entity.user.Userdata</class> <class>org.apache.openmeetings.db.entity.user.User</class> <class>org.apache.openmeetings.db.entity.file.FileItem</class> <class>org.apache.openmeetings.db.entity.file.FileItemLog</class> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml index 0dd404b..b1827de 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml @@ -25,7 +25,6 @@ <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL"> <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> <class>org.apache.openmeetings.db.entity.basic.Configuration</class> - <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class> <class>org.apache.openmeetings.db.entity.server.LdapConfig</class> <class>org.apache.openmeetings.db.entity.basic.MailMessage</class> <class>org.apache.openmeetings.db.entity.basic.Naviglobal</class> @@ -52,7 +51,6 @@ <class>org.apache.openmeetings.db.entity.user.PrivateMessage</class> <class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class> <class>org.apache.openmeetings.db.entity.user.UserContact</class> - <class>org.apache.openmeetings.db.entity.user.Userdata</class> <class>org.apache.openmeetings.db.entity.user.User</class> <class>org.apache.openmeetings.db.entity.file.FileItem</class> <class>org.apache.openmeetings.db.entity.file.FileItemLog</class> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml index 397016e..da5f588 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml @@ -25,7 +25,6 @@ <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL"> <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> <class>org.apache.openmeetings.db.entity.basic.Configuration</class> - <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class> <class>org.apache.openmeetings.db.entity.server.LdapConfig</class> <class>org.apache.openmeetings.db.entity.basic.MailMessage</class> <class>org.apache.openmeetings.db.entity.basic.Naviglobal</class> @@ -52,7 +51,6 @@ <class>org.apache.openmeetings.db.entity.user.PrivateMessage</class> <class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class> <class>org.apache.openmeetings.db.entity.user.UserContact</class> - <class>org.apache.openmeetings.db.entity.user.Userdata</class> <class>org.apache.openmeetings.db.entity.user.User</class> <class>org.apache.openmeetings.db.entity.file.FileItem</class> <class>org.apache.openmeetings.db.entity.file.FileItemLog</class> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml index 10e4428..fc454eb 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml @@ -145,7 +145,6 @@ <bean id="invitationDao" class="org.apache.openmeetings.db.dao.room.InvitationDao" /> <bean id="groupDao" class="org.apache.openmeetings.db.dao.user.GroupDao" /> <bean id="groupUserDao" class="org.apache.openmeetings.db.dao.user.GroupUserDao" /> - <bean id="errorManagement" class="org.apache.openmeetings.db.dao.basic.ErrorDao" /> <bean id="navimanagement" class="org.apache.openmeetings.db.dao.basic.NavigationDao" /> <bean id="pollManagement" class="org.apache.openmeetings.db.dao.room.PollDao" /> <bean id="labelDao" class="org.apache.openmeetings.db.dao.label.LabelDao" /> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/languages/errorvalues.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/languages/errorvalues.xml b/openmeetings-web/src/main/webapp/languages/errorvalues.xml deleted file mode 100644 index b152faa..0000000 --- a/openmeetings-web/src/main/webapp/languages/errorvalues.xml +++ /dev/null @@ -1,391 +0,0 @@ -<?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. - ---> -<ROOT xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="errorvalues.xsd"> - <row> - <field name="errorvalues_id">1</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">334</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">10</field> - <field name="starttime">2017-05-18 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">335</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">13</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">103</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">14</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">338</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">15</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">105</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">16</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">107</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">17</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">106</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">18</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">236</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">19</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">339</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">20</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">340</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">21</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">341</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">22</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">342</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">23</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">343</field> - <field name="type">info</field> - </row> - <row> - <field name="errorvalues_id">24</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">345</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">25</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">346</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">26</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">347</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">27</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">358</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">28</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">357</field> - <field name="type">info</field> - </row> - <row> - <field name="errorvalues_id">29</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">358</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">30</field> - <field name="starttime">2007-12-06 19:01:07</field> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">403</field> - <field name="type">info</field> - </row> - <row> - <field name="errorvalues_id">31</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">533</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">32</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">534</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">33</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">535</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">34</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">538</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">35</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">276</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">36</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">664</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">37</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">665</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">38</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">663</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">39</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">666</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">40</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">674</field> - <field name="type">info</field> - </row> - <row> - <field name="errorvalues_id">41</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">673</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">42</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">787</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">43</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">920</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">44</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">1000</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">45</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">1195</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">46</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">1226</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">47</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">1227</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">48</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">1228</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">49</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">1231</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">50</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">1271</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">51</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">1309</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">52</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">1310</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">53</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">1416</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">54</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">1431</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">55</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">1540</field> - <field name="type">error</field> - </row> - <row> - <field name="errorvalues_id">56</field> - <field name="starttime" /> - <field name="updatetime" /> - <field name="deleted">false</field> - <field name="fieldvalues_id">1544</field> - <field name="type">error</field> - </row> -</ROOT> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/languages/errorvalues.xsd ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/languages/errorvalues.xsd b/openmeetings-web/src/main/webapp/languages/errorvalues.xsd deleted file mode 100644 index 5acb78a..0000000 --- a/openmeetings-web/src/main/webapp/languages/errorvalues.xsd +++ /dev/null @@ -1,41 +0,0 @@ -<?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. - ---> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified"> - <xs:element name="ROOT"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="row"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="row"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="field"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="field"> - <xs:complexType mixed="true"> - <xs:attribute name="name" use="required" type="xs:NCName"/> - </xs:complexType> - </xs:element> -</xs:schema> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java index 7613c77..6a90676 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java @@ -76,8 +76,8 @@ public abstract class AbstractTestDefaults extends AbstractSpringTest { // to diagnose the test issue public boolean doTearDownAfterTest = false; - public String getString(long id) { - return LabelDao.getString(id, getLanguageId()); + public String getString(String key) { + return LabelDao.getString(key, getLanguageId()); } /** http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java index 9da9a71..0716d81 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java @@ -46,7 +46,7 @@ public class TestSignUp extends AbstractTestDefaults { super.testIsInstalledAndDoInstallation(); WebElement signUpButton = SeleniumUtils.findElement(driver, - "//button[span[contains(text(), '" + getString(123) + "')]]", true, true); + "//button[span[contains(text(), '" + getString("123") + "')]]", true, true); signUpButton.click(); // ################################## @@ -55,7 +55,7 @@ public class TestSignUp extends AbstractTestDefaults { doSignUp("Hans","Muster", userName, "pw", "pw2", email); //Find Error label-id 232 "Please enter two identical passwords" - SeleniumUtils.findElement(driver, "//span[@class='feedbackPanelERROR'][contains(text(), '" + getString(232) + "')]", true, true); + SeleniumUtils.findElement(driver, "//span[@class='feedbackPanelERROR'][contains(text(), '" + getString("232") + "')]", true, true); // ################################## // Sign up with user and sign in @@ -63,8 +63,7 @@ public class TestSignUp extends AbstractTestDefaults { doSignUp("Hans","Muster", userName, pass, pass, email); //Check for popup with success message and email to check - //Labelid 674 - SeleniumUtils.findElement(driver, "//span[contains(text(), '" + getString(674) + "')]", true, true); + SeleniumUtils.findElement(driver, "//span[contains(text(), '" + getString("warn.notverified") + "')]", true, true); //click button to close popup WebElement signUpSucessPopUpOkButton = SeleniumUtils.findElement(driver, @@ -77,16 +76,16 @@ public class TestSignUp extends AbstractTestDefaults { //click labelid 112 "Sign In" WebElement signInButton = SeleniumUtils.findElement(driver, - "//button[span[contains(text(), '" + getString(112) + "')]]", true, true); + "//button[span[contains(text(), '" + getString("112") + "')]]", true, true); signInButton.click(); // check for some text in dashbaord, labelid 281, "Help and support" SeleniumUtils.elementExists(driver, - "//h3[contains(text(), '" + getString(281) + "')]", true); + "//h3[contains(text(), '" + getString("281") + "')]", true); //sign out WebElement signOutLink = SeleniumUtils.findElement(driver, - "//a[contains(text(), '" + getString(310) + "')]", true, true); + "//a[contains(text(), '" + getString("310") + "')]", true, true); signOutLink.click(); Alert alert = driver.switchTo().alert(); @@ -97,16 +96,14 @@ public class TestSignUp extends AbstractTestDefaults { // ################################## signUpButton = SeleniumUtils.findElement(driver, - "//button[span[contains(text(), '" + getString(123) + "')]]", true, true); + "//button[span[contains(text(), '" + getString("123") + "')]]", true, true); signUpButton.click(); doSignUp("Hans","Muster", userName, pass, pass, email); - //Find Error label-id 105, The username is already used - SeleniumUtils.findElement(driver, "//span[@class='feedbackPanelERROR'][contains(text(), '" + getString(105) + "')]", true, true); + SeleniumUtils.findElement(driver, "//span[@class='feedbackPanelERROR'][contains(text(), '" + getString("error.login.inuse") + "')]", true, true); - //Find Error label-id 1000, This email is already used by another user. - SeleniumUtils.findElement(driver, "//span[@class='feedbackPanelERROR'][contains(text(), '" + getString(1000) + "')]", true, true); + SeleniumUtils.findElement(driver, "//span[@class='feedbackPanelERROR'][contains(text(), '" + getString("error.email.inuse") + "')]", true, true); } catch (Exception e) { SeleniumUtils.makeScreenShot(this.getClass().getSimpleName(), e, driver); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java index 6a70378..341154f 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java @@ -28,9 +28,9 @@ import org.springframework.beans.factory.annotation.Autowired; public class TestSmokeBasic extends AbstractJUnitDefaults { @Autowired private UserDao userDao; - + @Test public void createErrorValueAndTest() { - assertNotNull(userDao.get(1L)); - } + assertNotNull(userDao.get(1L)); + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java index a7c36b6..9a46d95 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java @@ -90,7 +90,7 @@ public class TestUserGroup extends AbstractJUnitDefaults { checkEmptyGroup("dao.login()", userDao.login(u.getAddress().getEmail(), createPass())); fail("User with no Group is unable to login"); } catch (OmException e) { - assertTrue("Expected Om Exception", "No Group assigned to user".equals(e.getMessage())); + assertTrue("Expected Om Exception", "error.nogroup".equals(e.getKey())); } checkEmptyGroup("dao.getByLogin(user)", userDao.getByLogin(u.getLogin(), u.getType(), u.getDomainId())); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java index 8af988b..75839d8 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java @@ -87,7 +87,7 @@ public class TestCalendarService extends AbstractWebServiceTest { @Test public void testGetByPublicRoom() throws Exception { - actualTest(roomDao.get(5L)); //default public restricted room + actualTest(roomDao.get(5L)); //default public presentation room } private static JSONObject createAppointment() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java index 7ace9ee..729a243 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java @@ -42,7 +42,7 @@ public class TestGroupService extends AbstractWebServiceTest { @Test public void addRemoveTest() { ServiceResult r = login(); - long groupId = -1; + Long groupId = -1L; { Response resp = getClient(GROUP_SERVICE_URL) .path("/") @@ -51,7 +51,7 @@ public class TestGroupService extends AbstractWebServiceTest { assertEquals("Call should be successful", Response.Status.OK.getStatusCode(), resp.getStatus()); ServiceResult r1 = resp.readEntity(ServiceResult.class); assertEquals("OM Call should be successful", r1.getType(), Type.SUCCESS.name()); - groupId = r1.getCode(); + groupId = Long.valueOf(r1.getMessage()); } //delete group created { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java index 7d91c09..8bc95f3 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java @@ -35,7 +35,7 @@ public class TestRoomService extends AbstractWebServiceTest { public void testExternal() { ServiceResult sr = login(); String extId = UUID.randomUUID().toString(); - Room.Type type = Room.Type.restricted; + Room.Type type = Room.Type.presentation; String name = "Unit Test Ext Room"; String comment = "Unit Test Ext Room Comments"; long num = 666L; @@ -51,7 +51,7 @@ public class TestRoomService extends AbstractWebServiceTest { assertNotNull("Valid room should be returned", room); assertNotNull("Room ID should be not empty", room.getId()); - RoomDTO room1 = getClient(ROOM_SERVICE_URL).path(String.format("/%s/%s/%s", Room.Type.restricted, UNIT_TEST_EXT_TYPE, extId)).query("sid", sr.getMessage()) + RoomDTO room1 = getClient(ROOM_SERVICE_URL).path(String.format("/%s/%s/%s", Room.Type.presentation, UNIT_TEST_EXT_TYPE, extId)).query("sid", sr.getMessage()) .get(RoomDTO.class); assertNotNull("Valid room should be returned", room1); assertEquals("Same Room should be returned", room.getId(), room1.getId()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java index aca0b44..880d01a 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java @@ -20,6 +20,7 @@ package org.apache.openmeetings.webservice; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.apache.openmeetings.webservice.Constants.TNS; +import static org.apache.openmeetings.webservice.error.ServiceException.NO_PERMISSION; import java.util.Calendar; import java.util.Date; @@ -96,7 +97,7 @@ public class CalendarWebService extends BaseWebService { if (AuthLevelUtil.hasUserLevel(getRights(sd.getUserId()))) { return AppointmentDTO.list(getDao().getInRange(sd.getUserId(), start.getTime(), end.getTime())); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -135,7 +136,7 @@ public class CalendarWebService extends BaseWebService { if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) { return AppointmentDTO.list(getDao().getInRange(userid, start.getTime(), end.getTime())); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -162,7 +163,7 @@ public class CalendarWebService extends BaseWebService { Appointment a = getDao().getNext(sd.getUserId(), new Date()); return a == null ? null : new AppointmentDTO(a); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -191,7 +192,7 @@ public class CalendarWebService extends BaseWebService { Appointment a = getDao().getNext(userid, new Date()); return a == null ? null : new AppointmentDTO(a); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -221,7 +222,7 @@ public class CalendarWebService extends BaseWebService { return new AppointmentDTO(app); } } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -251,7 +252,7 @@ public class CalendarWebService extends BaseWebService { if (AuthLevelUtil.hasUserLevel(getRights(sd.getUserId()))) { return AppointmentDTO.list(getDao().searchAppointmentsByTitle(sd.getUserId(), title)); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -290,7 +291,7 @@ public class CalendarWebService extends BaseWebService { { //TODO maybe additional checks are required log.error("USER/Room modification as SOAP"); - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } //TODO check if objects passed with IDs are correct if (AuthLevelUtil.hasUserLevel(u.getRights())) { @@ -306,7 +307,7 @@ public class CalendarWebService extends BaseWebService { return new AppointmentDTO(dao.update(a, u.getId())); } else { log.error("save : wrong user level"); - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -354,7 +355,7 @@ public class CalendarWebService extends BaseWebService { } dao.delete(a, sd.getUserId()); - return new ServiceResult(id, "Deleted", Type.SUCCESS); + return new ServiceResult("Deleted", Type.SUCCESS); } catch (ServiceException err) { throw err; } catch (Exception err) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java index 87a00db..2366082 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java @@ -33,10 +33,9 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import org.apache.cxf.feature.Features; -import org.apache.openmeetings.db.dao.basic.ErrorDao; import org.apache.openmeetings.db.dao.label.LabelDao; import org.apache.openmeetings.db.dto.basic.ServiceResult; -import org.apache.openmeetings.db.entity.basic.ErrorValue; +import org.apache.openmeetings.db.dto.basic.ServiceResult.Type; import org.apache.openmeetings.db.entity.server.Sessiondata; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -61,8 +60,8 @@ public class ErrorWebService extends BaseWebService { * display/read the error-message. English has the Language-ID one, for * different one see the list of languages * - * @param id - * the error id (negative Value here!) + * @param key + * the error key for ex. `error.unknown` * @param lang * The id of the language * @@ -70,23 +69,11 @@ public class ErrorWebService extends BaseWebService { */ @WebMethod @GET - @Path("/{id}/{lang}") - public ServiceResult get(@WebParam(name="id") @PathParam("id") long id, @WebParam(name="lang") @PathParam("lang") long lang) { + @Path("/{key}/{lang}") + public ServiceResult get(@WebParam(name="key") @PathParam("key") String key, @WebParam(name="lang") @PathParam("lang") long lang) { try { - if (id < 0) { - ErrorValue eValues = getBean(ErrorDao.class).get(-1 * id); - if (eValues != null) { - log.debug("eValues.getLabelId() = " + eValues.getLabelId()); - log.debug("eValues.getErrorType() = " + eValues.getType()); - String eValue = LabelDao.getString(eValues.getLabelId(), lang); - String tValue = LabelDao.getString("error.type." + eValues.getType().name(), lang); - if (eValue != null) { - return new ServiceResult(id, eValue, tValue); - } - } - } else { - return new ServiceResult(id, "Error ... please check your input", "Error"); - } + String eValue = LabelDao.getString(key, lang); + return new ServiceResult(eValue, Type.SUCCESS); } catch (Exception err) { log.error("[get] ", err); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java index bcadbff..4536de0 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java @@ -95,7 +95,7 @@ public class FileWebService extends BaseWebService { FileExplorerItemDao dao = getDao(); FileExplorerItem f = dao.get(id); if (f == null) { - return new ServiceResult(-1L, "Bad id", Type.ERROR); + return new ServiceResult("Bad id", Type.ERROR); } Long userId = sd.getUserId(); Set<Right> rights = getRights(userId); @@ -103,7 +103,7 @@ public class FileWebService extends BaseWebService { || (AuthLevelUtil.hasUserLevel(rights) && userId.equals(f.getOwnerId()))) { dao.delete(f); - return new ServiceResult(id, "Deleted", Type.SUCCESS); + return new ServiceResult("Deleted", Type.SUCCESS); } else { return NO_PERMISSION; } @@ -138,7 +138,7 @@ public class FileWebService extends BaseWebService { FileExplorerItemDao dao = getDao(); FileExplorerItem f = dao.get(externalId, externalType); dao.delete(f); - return new ServiceResult(f.getId(), "Deleted", Type.SUCCESS); + return new ServiceResult("Deleted", Type.SUCCESS); } } catch (Exception err) { log.error("[deleteFileOrFolderByExternalIdAndType]", err); @@ -195,7 +195,7 @@ public class FileWebService extends BaseWebService { } return new FileExplorerItemDTO(f); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw ServiceException.NO_PERMISSION; } } catch (ServiceException e) { throw e; @@ -242,7 +242,7 @@ public class FileWebService extends BaseWebService { return fileExplorerObject; } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw ServiceException.NO_PERMISSION; } } catch (ServiceException e) { throw e; @@ -293,7 +293,7 @@ public class FileWebService extends BaseWebService { } return FileExplorerItemDTO.list(list); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw ServiceException.NO_PERMISSION; } } catch (ServiceException e) { throw e; @@ -331,7 +331,7 @@ public class FileWebService extends BaseWebService { FileExplorerItem f = getDao().rename(id, name); return f == null ? null : new FileExplorerItemDTO(f); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw ServiceException.NO_PERMISSION; } } catch (ServiceException e) { throw e; @@ -370,7 +370,7 @@ public class FileWebService extends BaseWebService { FileExplorerItem f = getDao().move(id, parentId, userId, roomId); return f == null ? null : new FileExplorerItemDTO(f); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw ServiceException.NO_PERMISSION; } } catch (ServiceException e) { throw e; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java index e7209a2..f54baa2 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java @@ -96,7 +96,7 @@ public class GroupWebService extends BaseWebService { if (AuthLevelUtil.hasWebServiceLevel(getRights(userId))) { Group o = new Group(); o.setName(name); - return new ServiceResult(getDao().update(o, userId).getId(), "Success", Type.SUCCESS); + return new ServiceResult("" + getDao().update(o, userId).getId(), Type.SUCCESS); } else { log.error("Could not create group"); return NO_PERMISSION; @@ -118,7 +118,7 @@ public class GroupWebService extends BaseWebService { return getDao().get(0, Integer.MAX_VALUE); } else { log.error("Insufficient permissions"); - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw ServiceException.NO_PERMISSION; } } @@ -152,7 +152,7 @@ public class GroupWebService extends BaseWebService { u.getGroupUsers().add(new GroupUser(getDao().get(id), u)); userDao.update(u, authUserId); } - return new ServiceResult(userid, "Success", Type.SUCCESS); + return new ServiceResult("" + userid, Type.SUCCESS); } else { return NO_PERMISSION; } @@ -197,7 +197,7 @@ public class GroupWebService extends BaseWebService { } userDao.update(u, authUserId); } - return new ServiceResult(userid, "Success", Type.SUCCESS); + return new ServiceResult("" + userid, Type.SUCCESS); } else { return NO_PERMISSION; } @@ -243,10 +243,10 @@ public class GroupWebService extends BaseWebService { if (!found) { r.getRoomGroups().add(new RoomGroup(getDao().get(id), r)); roomDao.update(r, userId); - return new ServiceResult(1L, "Success", Type.SUCCESS); + return new ServiceResult("Success", Type.SUCCESS); } } - return new ServiceResult(0L, "Not added", Type.SUCCESS); + return new ServiceResult("Not added", Type.ERROR); } else { return NO_PERMISSION; } @@ -297,7 +297,7 @@ public class GroupWebService extends BaseWebService { } } else { log.error("Need Administration Account"); - result.setErrorId(-26L); + result.setErrorKey(NO_PERMISSION.getMessage()); } return new UserSearchResult(result); } catch (Exception err) { @@ -328,7 +328,7 @@ public class GroupWebService extends BaseWebService { GroupDao dao = getDao(); dao.delete(dao.get(id), authUserId); - return new ServiceResult(id, "Deleted", Type.SUCCESS); + return new ServiceResult("Deleted", Type.SUCCESS); } else { return NO_PERMISSION; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java index 87c33c2..f51e473 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java @@ -78,7 +78,7 @@ public class RecordingWebService extends BaseWebService { if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) { RecordingDao dao = getDao(); dao.delete(dao.get(id)); - return new ServiceResult(id, "Deleted", Type.SUCCESS); + return new ServiceResult("Deleted", Type.SUCCESS); } else { throw new ServiceException("Not allowed to preform that action, Authenticate the SID first"); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java index 50595c5..36a1a89 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java @@ -20,6 +20,7 @@ package org.apache.openmeetings.webservice; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.apache.openmeetings.webservice.Constants.TNS; +import static org.apache.openmeetings.webservice.error.ServiceException.NO_PERMISSION; import java.util.ArrayList; import java.util.List; @@ -97,7 +98,7 @@ public class RoomWebService extends BaseWebService { if (AuthLevelUtil.hasUserLevel(getRights(sid))) { return RoomDTO.list(getRoomDao().getPublicRooms(Room.Type.valueOf(type))); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -122,7 +123,7 @@ public class RoomWebService extends BaseWebService { if (AuthLevelUtil.hasWebServiceLevel(rights) || AuthLevelUtil.hasUserLevel(rights)) { return new RoomDTO(getRoomDao().get(id)); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } @@ -174,7 +175,7 @@ public class RoomWebService extends BaseWebService { return new RoomDTO(r); } } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -207,7 +208,7 @@ public class RoomWebService extends BaseWebService { r = getRoomDao().update(r, userId); return new RoomDTO(r); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException e) { throw e; @@ -243,7 +244,7 @@ public class RoomWebService extends BaseWebService { r = roomDao.update(r, userId); return new RoomDTO(r); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -272,12 +273,12 @@ public class RoomWebService extends BaseWebService { Room r = roomDao.get(id); if (r != null) { roomDao.delete(r, userId); - return new ServiceResult(id, "Deleted", Type.SUCCESS); + return new ServiceResult("Deleted", Type.SUCCESS); } else { - return new ServiceResult(0, "Not found", Type.SUCCESS); + return new ServiceResult("Not found", Type.SUCCESS); } } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } @@ -314,9 +315,9 @@ public class RoomWebService extends BaseWebService { WebSocketHelper.sendRoom(new RoomMessage(room.getId(), userId, RoomMessage.Type.roomClosed)); - return new ServiceResult(1L, "Closed", Type.SUCCESS); + return new ServiceResult("Closed", Type.SUCCESS); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -357,9 +358,9 @@ public class RoomWebService extends BaseWebService { room.setClosed(false); roomDao.update(room, userId); - return new ServiceResult(1L, "Opened", Type.SUCCESS); + return new ServiceResult("Opened", Type.SUCCESS); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -388,9 +389,9 @@ public class RoomWebService extends BaseWebService { try { if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) { boolean result = getBean(IUserManager.class).kickUsersByRoomId(id); - return new ServiceResult(result ? 1L : 0L, "Kicked", Type.SUCCESS); + return new ServiceResult(result ? "Kicked" : "Not kicked", Type.SUCCESS); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -428,7 +429,7 @@ public class RoomWebService extends BaseWebService { roomBeans.add(rCountBean); } } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; @@ -467,12 +468,12 @@ public class RoomWebService extends BaseWebService { if (sendmail) { getBean(InvitationManager.class).sendInvitationLink(i, MessageType.Create, invite.getSubject(), invite.getMessage(), false); } - return new ServiceResult(1L, i.getHash(), Type.SUCCESS); + return new ServiceResult(i.getHash(), Type.SUCCESS); } else { - return new ServiceResult(0L, "Sys - Error", Type.ERROR); + return new ServiceResult("error.unknown", Type.ERROR); } } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw NO_PERMISSION; } } catch (ServiceException err) { throw err; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java index 80d4813..d2b1e3e 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.webservice; import static org.apache.openmeetings.db.dto.basic.ServiceResult.NO_PERMISSION; +import static org.apache.openmeetings.db.dto.basic.ServiceResult.UNKNOWN; import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.apache.openmeetings.webservice.Constants.TNS; @@ -102,17 +103,17 @@ public class UserWebService extends BaseWebService { log.debug("Login user"); User u = getUserDao().login(user, pass); if (u == null) { - return new ServiceResult(-1L, "Login failed", Type.ERROR); + return new ServiceResult("error.bad.credentials", Type.ERROR); } Sessiondata sd = getSessionDao().create(u.getId(), u.getLanguageId()); log.debug("Login user: {}", u.getId()); - return new ServiceResult(u.getId(), sd.getSessionId(), Type.SUCCESS); + return new ServiceResult(sd.getSessionId(), Type.SUCCESS); } catch (OmException oe) { - return new ServiceResult(oe.getCode() == null ? -1 : oe.getCode(), oe.getMessage(), Type.ERROR); + return oe.getKey() == null ? UNKNOWN : new ServiceResult(oe.getKey(), Type.ERROR); } catch (Exception err) { log.error("[login]", err); - return new ServiceResult(-1L, err.getMessage(), Type.ERROR); + return UNKNOWN; } } @@ -133,7 +134,7 @@ public class UserWebService extends BaseWebService { if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) { return UserDTO.list(getUserDao().getAllUsers()); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw ServiceException.NO_PERMISSION; } } catch (Exception err) { log.error("addNewUser", err); @@ -197,18 +198,18 @@ public class UserWebService extends BaseWebService { log.debug("addNewUser::weak password '{}', msg: {}", user.getPassword(), sb); throw new ServiceException(sb.toString()); } - Long userId = getBean(UserManager.class).registerUser(user.getLogin(), user.getPassword(), + Object _user = getBean(UserManager.class).registerUser(user.getLogin(), user.getPassword(), user.getLastname(), user.getFirstname(), user.getAddress().getEmail(), new Date(), user.getAddress().getStreet(), user.getAddress().getAdditionalname(), user.getAddress().getFax(), user.getAddress().getZip(), user.getAddress().getCountry() , user.getAddress().getTown(), user.getLanguageId(), "", false, true, // generate SIP Data if the config is enabled tz, confirm); - if (userId == null || userId < 0) { - throw new ServiceException("Unknown error"); + if (_user == null || _user instanceof String) { + throw new ServiceException(UNKNOWN.getMessage()); } - User u = userDao.get(userId); + User u = (User)_user; u.getRights().add(Right.Room); if (Strings.isEmpty(user.getExternalId()) && Strings.isEmpty(user.getExternalType())) { @@ -225,7 +226,7 @@ public class UserWebService extends BaseWebService { return new UserDTO(u); } else { - throw new ServiceException("Insufficient permissions"); //TODO code -26 + throw ServiceException.NO_PERMISSION; } } catch (Exception err) { log.error("addNewUser", err); @@ -257,7 +258,7 @@ public class UserWebService extends BaseWebService { UserDao userDao = getUserDao(); userDao.delete(userDao.get(id), sd.getUserId()); - return new ServiceResult(id, "Deleted", Type.SUCCESS); + return new ServiceResult("Deleted", Type.SUCCESS); } else { return NO_PERMISSION; } @@ -298,7 +299,7 @@ public class UserWebService extends BaseWebService { // Setting user deleted userDao.delete(user, sd.getUserId()); - return new ServiceResult(user.getId(), "Deleted", Type.SUCCESS); + return new ServiceResult("Deleted", Type.SUCCESS); } else { return NO_PERMISSION; } @@ -360,7 +361,7 @@ public class UserWebService extends BaseWebService { } sd.setXml(xmlString); getSessionDao().update(sd); - return new ServiceResult(0, hash, Type.SUCCESS); + return new ServiceResult(hash, Type.SUCCESS); } } else { return NO_PERMISSION; @@ -369,7 +370,7 @@ public class UserWebService extends BaseWebService { log.error("getRoomHash", err); throw new ServiceException(err.getMessage()); } - return new ServiceResult(-1L, "Unknown error", Type.ERROR); + return UNKNOWN; } /** @@ -388,7 +389,7 @@ public class UserWebService extends BaseWebService { if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) { boolean success = getBean(IUserManager.class).kickById(uid); - return new ServiceResult(Boolean.TRUE.equals(success) ? 1L : 0L, Boolean.TRUE.equals(success) ? "deleted" : "not deleted", Type.SUCCESS); + return new ServiceResult(Boolean.TRUE.equals(success) ? "kicked" : "not kicked", Type.SUCCESS); } else { return NO_PERMISSION; } @@ -412,7 +413,7 @@ public class UserWebService extends BaseWebService { public ServiceResult count(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="roomid") @PathParam("roomid") Long roomId) { if (AuthLevelUtil.hasUserLevel(getRights(sid))) { IApplication app = (IApplication)Application.get(OpenmeetingsVariables.wicketApplicationName); - return new ServiceResult(app.getOmRoomClients(roomId).size(), "count", Type.SUCCESS); + return new ServiceResult("" + app.getOmRoomClients(roomId).size(), Type.SUCCESS); } return NO_PERMISSION; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java index c8e0741..4b67a9b 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java @@ -20,9 +20,12 @@ package org.apache.openmeetings.webservice.error; import javax.xml.ws.WebFault; +import org.apache.openmeetings.db.dto.basic.ServiceResult; + @WebFault public class ServiceException extends Exception { private static final long serialVersionUID = 1L; + public static final ServiceException NO_PERMISSION = new ServiceException(ServiceResult.NO_PERMISSION.getMessage()); public ServiceException(String msg) { super(msg);
