NOJIRA renamed AnchorName to ScreenName

test: mvn test on account service

M    services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java
M    services/account/jaxb/src/main/resources/accounts_common.xsd
M    services/account/client/src/test/java/org/collectionspace/services/client/test/AccountTest.java
M    services/account/client/src/test/java/org/collectionspace/services/client/test/AccountServiceTest.java
M    services/account/client/src/main/resources/db/mysql/account.sql
M    services/account/client/pom.xml

diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml
index eb2b3786e87d8383bbfd0a5ba3ca14f97f9a73b4..3f6da54f16e52517ef48382790aafa5879cc95e1 100644 (file)
--- a/services/account/client/pom.xml
+++ b/services/account/client/pom.xml
@@ -127,6 +127,7 @@
                         <version>2.2</version>\r
                         <executions>\r
                             <execution>\r
+                                <phase>process-test-resources</phase>\r
                                 <goals>\r
                                     <goal>hbm2ddl</goal>\r
                                 </goals>\r
@@ -161,6 +162,7 @@
                         <artifactId>maven-antrun-plugin</artifactId>\r
                         <executions>\r
                             <execution>\r
+                                <phase>process-test-resources</phase>\r
                                 <configuration>\r
                                     <tasks>\r
                                         <copy file="${basedir}/target/hibernate3/sql/${sql.file}" tofile="${sql.dir}/${sql.file}"/>\r

diff --git a/services/account/client/src/main/resources/db/mysql/account.sql b/services/account/client/src/main/resources/db/mysql/account.sql
index 4ad2914614e5092870dfa502210bebfe1b7c11e0..dbecbbb4a82b86f945e12b8a47b9338c9252e524 100644 (file)
--- a/services/account/client/src/main/resources/db/mysql/account.sql
+++ b/services/account/client/src/main/resources/db/mysql/account.sql
@@ -1,2 +1,2 @@
 drop table if exists accounts_common;
-create table accounts_common (csid varchar(255) not null, anchor_name varchar(128) not null, email longtext not null, first_name longtext not null, last_name longtext not null, mi varchar(1), mobile varchar(15), phone varchar(15), primary key (csid));
+create table accounts_common (csid varchar(255) not null, email longtext not null, first_name longtext not null, last_name longtext not null, mi varchar(1), mobile varchar(15), phone varchar(15), screen_name varchar(128) not null, primary key (csid));

diff --git a/services/account/client/src/test/java/org/collectionspace/services/client/test/AccountServiceTest.java b/services/account/client/src/test/java/org/collectionspace/services/client/test/AccountServiceTest.java
index f009e76e1f8d9a2e2babf37325fb86f6d0793dab..95ec4e34f26528c85a629c579f54d5e73bce9655 100644 (file)
--- a/services/account/client/src/test/java/org/collectionspace/services/client/test/AccountServiceTest.java
+++ b/services/account/client/src/test/java/org/collectionspace/services/client/test/AccountServiceTest.java
@@ -215,8 +215,8 @@ public class AccountServiceTest extends AbstractServiceTest {
             for (AccountsCommonList.AccountListItem item : items) {
                 logger.debug(testName + ": list-item[" + i + "] csid=" +
                         item.getCsid());
-                logger.debug(testName + ": list-item[" + i + "] anchorName=" +
-                        item.getAnchorName());
+                logger.debug(testName + ": list-item[" + i + "] screenName=" +
+                        item.getScreenName());
                 logger.debug(testName + ": list-item[" + i + "] URI=" +
                         item.getUri());
                 i++;
@@ -406,14 +406,14 @@ public class AccountServiceTest extends AbstractServiceTest {
     // ---------------------------------------------------------------
     // Utility methods used by tests above
     // ---------------------------------------------------------------
-    private AccountsCommon createAccountInstance(String firstName, String lastName, String anchorName,
+    private AccountsCommon createAccountInstance(String firstName, String lastName, String screenName,
             String passwd, String email) {
 
         AccountsCommon account = new AccountsCommon();
         account.setFirstName(firstName);
         account.setLastName(lastName);
-        account.setAnchorName(anchorName);
-        account.setUserName(anchorName);
+        account.setScreenName(screenName);
+        account.setUserName(screenName);
         byte[] b64passwd = Base64.encodeBase64(passwd.getBytes());
         account.setPassword(b64passwd);
         account.setEmail(email);

diff --git a/services/account/client/src/test/java/org/collectionspace/services/client/test/AccountTest.java b/services/account/client/src/test/java/org/collectionspace/services/client/test/AccountTest.java
index e6b77b9f96d3cd881ae7a0931e3be418f197f497..2e3b06cc5937e7267a98b33b146f745fe75fb839 100644 (file)
--- a/services/account/client/src/test/java/org/collectionspace/services/client/test/AccountTest.java
+++ b/services/account/client/src/test/java/org/collectionspace/services/client/test/AccountTest.java
@@ -56,7 +56,7 @@ public class AccountTest {
     @Test(dataProvider = "testName", dataProviderClass = AccountTest.class)
     public void create(String testName) throws Exception {
         AccountsCommon account = new AccountsCommon();
-        account.setAnchorName("john");
+        account.setScreenName("john");
         account.setFirstName("John");
         account.setLastName("Doe");
         account.setEmail("john.doe@berkeley.edu");
@@ -85,9 +85,9 @@ public class AccountTest {
         }
     }
 
-    private AccountsCommon findAccount(String anchorName) throws Exception {
-        Query q = em.createQuery("select a from org.collectionspace.services.account.AccountsCommon a where a.anchorName = :anchorname");
-        q.setParameter("anchorname", anchorName);
+    private AccountsCommon findAccount(String screenName) throws Exception {
+        Query q = em.createQuery("select a from org.collectionspace.services.account.AccountsCommon a where a.screenName = :screenname");
+        q.setParameter("screenname", screenName);
         return (AccountsCommon) q.getSingleResult();
 
     }

diff --git a/services/account/jaxb/src/main/resources/accounts_common.xsd b/services/account/jaxb/src/main/resources/accounts_common.xsd
index 8eca84f96f07928d895271586c3a25b20485c895..4c8914f7c174ba862351d545977170b6b352eb9d 100644 (file)
--- a/services/account/jaxb/src/main/resources/accounts_common.xsd
+++ b/services/account/jaxb/src/main/resources/accounts_common.xsd
@@ -40,11 +40,11 @@
                 </xs:appinfo>
             </xs:annotation>
             <xs:sequence>
-                <xs:element name="anchorName" type="xs:string" minOccurs="1" maxOccurs="1">
+                <xs:element name="screenName" type="xs:string" minOccurs="1" maxOccurs="1">
                     <xs:annotation>
                         <xs:appinfo>
                             <hj:basic>
-                                <orm:column name="anchor_name" length="128" nullable="false"/>
+                                <orm:column name="screen_name" length="128" nullable="false"/>
                             </hj:basic>
                         </xs:appinfo>
                     </xs:annotation>
@@ -148,7 +148,7 @@
                             </xs:appinfo>
                         </xs:annotation>
                         <xs:sequence>
-                            <xs:element name="anchorName" type="xs:string" minOccurs="1"/>
+                            <xs:element name="screenName" type="xs:string" minOccurs="1"/>
                             <xs:element name="firstName" type="xs:string" minOccurs="1" />
                             <xs:element name="lastName" type="xs:string" minOccurs="1" />
                             <xs:element name="mi" type="xs:string"/>

diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java
index a42b50bbb8968d4b5e9159ec33415a356326a533..1273ad5b26556b782ad85498485db3352e2dffa6 100644 (file)
--- a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java
+++ b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java
@@ -91,7 +91,7 @@ public class AccountDocumentHandler
         for (Object obj : wrapDoc.getWrappedObject()) {
             AccountsCommon account = (AccountsCommon) obj;
             AccountListItem accListItem = new AccountListItem();
-            accListItem.setAnchorName(account.getAnchorName());
+            accListItem.setScreenName(account.getScreenName());
             accListItem.setEmail(account.getEmail());
             accListItem.setFirstName(account.getFirstName());
             accListItem.setLastName(account.getLastName());