From d127a0aaa219e5000c0ac8f2e1c3f045d8129dd1 Mon Sep 17 00:00:00 2001 From: Sanjay Dalal Date: Wed, 25 Nov 2009 22:55:43 +0000 Subject: [PATCH] CSPACE-259 CSpaceDBLoginModule now can obtain datasource. Requires #971. test: authentication service tested by enabling security on the service side --- .../client/AuthenticationServiceTest.java | 706 +++++++++--------- services/authentication/service/build.xml | 1 - .../authentication/CSpaceDBLoginModule.java | 185 ++--- .../resources/config/jboss-login-config.xml | 2 +- .../main/resources/db/mysql/test_authn.sql | 3 +- 5 files changed, 439 insertions(+), 458 deletions(-) diff --git a/services/authentication/client/src/test/java/org/collectionspace/services/authentication/client/AuthenticationServiceTest.java b/services/authentication/client/src/test/java/org/collectionspace/services/authentication/client/AuthenticationServiceTest.java index 460b6af62..2ca1edb11 100644 --- a/services/authentication/client/src/test/java/org/collectionspace/services/authentication/client/AuthenticationServiceTest.java +++ b/services/authentication/client/src/test/java/org/collectionspace/services/authentication/client/AuthenticationServiceTest.java @@ -46,416 +46,390 @@ import org.slf4j.LoggerFactory; */ public class AuthenticationServiceTest extends AbstractServiceTest { - /** The known resource id. */ - private String knownResourceId = null; - - /** The logger. */ - final Logger logger = LoggerFactory - .getLogger(AuthenticationServiceTest.class); + /** The known resource id. */ + private String knownResourceId = null; + /** The logger. */ + final Logger logger = LoggerFactory.getLogger(AuthenticationServiceTest.class); - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#getServicePathComponent() - */ + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#getServicePathComponent() + */ @Override - protected String getServicePathComponent() { - // no need to return anything but null since no auth resources are - // accessed - return null; - } + protected String getServicePathComponent() { + // no need to return anything but null since no auth resources are + // accessed + return null; + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#create() - */ - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class) - @Override - public void create(String testName) { - CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); - String identifier = this.createIdentifier(); - MultipartOutput multipart = createCollectionObjectInstance( - collectionObjectClient.getCommonPartName(), identifier); + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#create() + */ + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class) + @Override + public void create(String testName) { + CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); + String identifier = this.createIdentifier(); + MultipartOutput multipart = createCollectionObjectInstance( + collectionObjectClient.getCommonPartName(), identifier); - if (!collectionObjectClient.isServerSecure()) { - logger.warn("set -Dcspace.server.secure=true to run security tests"); - return; - } - collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, - "true"); - collectionObjectClient.setProperty(CollectionSpaceClient.USER_PROPERTY, - "test"); - collectionObjectClient.setProperty( - CollectionSpaceClient.PASSWORD_PROPERTY, "test"); - try { - collectionObjectClient.setupHttpClient(); - collectionObjectClient.setProxy(); - } catch (Exception e) { - logger.error("create: caught " + e.getMessage()); - return; - } - ClientResponse res = collectionObjectClient.create(multipart); - if(logger.isDebugEnabled()){ + if (!collectionObjectClient.isServerSecure()) { + logger.warn("set -Dcspace.server.secure=true to run security tests"); + return; + } + collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, + "true"); + collectionObjectClient.setProperty(CollectionSpaceClient.USER_PROPERTY, + "test"); + collectionObjectClient.setProperty( + CollectionSpaceClient.PASSWORD_PROPERTY, "test"); + try { + collectionObjectClient.setupHttpClient(); + collectionObjectClient.setProxy(); + } catch (Exception e) { + logger.error("create: caught " + e.getMessage()); + return; + } + ClientResponse res = collectionObjectClient.create(multipart); + if (logger.isDebugEnabled()) { logger.debug("create: status = " + res.getStatus()); } - Assert.assertEquals(res.getStatus(), Response.Status.CREATED - .getStatusCode(), "expected " - + Response.Status.CREATED.getStatusCode()); + Assert.assertEquals(res.getStatus(), Response.Status.CREATED.getStatusCode(), "expected " + Response.Status.CREATED.getStatusCode()); - // Store the ID returned from this create operation for additional tests - // below. - knownResourceId = extractId(res); - } + // Store the ID returned from this create operation for additional tests + // below. + knownResourceId = extractId(res); + } - /** - * Creates the collection object instance without user. - */ - @Test(dependsOnMethods = { "create" }) - public void createWithoutUser() { - CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); - String identifier = this.createIdentifier(); - MultipartOutput multipart = createCollectionObjectInstance( - collectionObjectClient.getCommonPartName(), identifier); - if (!collectionObjectClient.isServerSecure()) { - logger - .warn("set -Dcspace.server.secure=true to run security tests"); - return; - } - collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, - "true"); - collectionObjectClient - .removeProperty(CollectionSpaceClient.USER_PROPERTY); - collectionObjectClient.setProperty( - CollectionSpaceClient.PASSWORD_PROPERTY, "test"); - try { - collectionObjectClient.setupHttpClient(); - collectionObjectClient.setProxy(); - } catch (Exception e) { - logger.error("createWithoutUser: caught " + e.getMessage()); - return; - } - ClientResponse res = collectionObjectClient.create(multipart); - if(logger.isDebugEnabled()){ + /** + * Creates the collection object instance without user. + */ + @Test(dependsOnMethods = {"create"}) + public void createWithoutUser() { + CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); + String identifier = this.createIdentifier(); + MultipartOutput multipart = createCollectionObjectInstance( + collectionObjectClient.getCommonPartName(), identifier); + if (!collectionObjectClient.isServerSecure()) { + logger.warn("set -Dcspace.server.secure=true to run security tests"); + return; + } + collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, + "true"); + collectionObjectClient.removeProperty(CollectionSpaceClient.USER_PROPERTY); + collectionObjectClient.setProperty( + CollectionSpaceClient.PASSWORD_PROPERTY, "test"); + try { + collectionObjectClient.setupHttpClient(); + collectionObjectClient.setProxy(); + } catch (Exception e) { + logger.error("createWithoutUser: caught " + e.getMessage()); + return; + } + ClientResponse res = collectionObjectClient.create(multipart); + if (logger.isDebugEnabled()) { logger.debug("createWithoutUser: status = " + res.getStatus()); } - Assert.assertEquals(res.getStatus(), Response.Status.UNAUTHORIZED - .getStatusCode(), "expected " - + Response.Status.UNAUTHORIZED.getStatusCode()); - } + Assert.assertEquals(res.getStatus(), Response.Status.UNAUTHORIZED.getStatusCode(), "expected " + Response.Status.UNAUTHORIZED.getStatusCode()); + } - /** - * Creates the collection object instance without password. - */ - @Test(dependsOnMethods = { "createWithoutUser" }) - public void createWithoutPassword() { - CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); - String identifier = this.createIdentifier(); - MultipartOutput multipart = createCollectionObjectInstance( - collectionObjectClient.getCommonPartName(), identifier); - if (!collectionObjectClient.isServerSecure()) { - logger - .warn("set -Dcspace.server.secure=true to run security tests"); - return; - } - collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, - "true"); - collectionObjectClient.setProperty(CollectionSpaceClient.USER_PROPERTY, - "test"); - collectionObjectClient - .removeProperty(CollectionSpaceClient.PASSWORD_PROPERTY); - try { - collectionObjectClient.setupHttpClient(); - collectionObjectClient.setProxy(); - } catch (Exception e) { - logger.error("createWithoutPassword: caught " + e.getMessage()); - return; - } - ClientResponse res = collectionObjectClient.create(multipart); - if(logger.isDebugEnabled()){ + /** + * Creates the collection object instance without password. + */ + @Test(dependsOnMethods = {"createWithoutUser"}) + public void createWithoutPassword() { + CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); + String identifier = this.createIdentifier(); + MultipartOutput multipart = createCollectionObjectInstance( + collectionObjectClient.getCommonPartName(), identifier); + if (!collectionObjectClient.isServerSecure()) { + logger.warn("set -Dcspace.server.secure=true to run security tests"); + return; + } + collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, + "true"); + collectionObjectClient.setProperty(CollectionSpaceClient.USER_PROPERTY, + "test"); + collectionObjectClient.removeProperty(CollectionSpaceClient.PASSWORD_PROPERTY); + try { + collectionObjectClient.setupHttpClient(); + collectionObjectClient.setProxy(); + } catch (Exception e) { + logger.error("createWithoutPassword: caught " + e.getMessage()); + return; + } + ClientResponse res = collectionObjectClient.create(multipart); + if (logger.isDebugEnabled()) { logger.debug("createWithoutPassword: status = " + res.getStatus()); } - Assert.assertEquals(res.getStatus(), Response.Status.UNAUTHORIZED - .getStatusCode(), "expected " - + Response.Status.UNAUTHORIZED.getStatusCode()); - } + Assert.assertEquals(res.getStatus(), Response.Status.UNAUTHORIZED.getStatusCode(), "expected " + Response.Status.UNAUTHORIZED.getStatusCode()); + } - /** - * Creates the collection object instance with incorrect password. - */ - @Test(dependsOnMethods = { "createWithoutPassword" }) - public void createWithIncorrectPassword() { - CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); - String identifier = this.createIdentifier(); - MultipartOutput multipart = createCollectionObjectInstance( - collectionObjectClient.getCommonPartName(), identifier); - if (!collectionObjectClient.isServerSecure()) { - logger - .warn("set -Dcspace.server.secure=true to run security tests"); - return; - } - collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, - "true"); - collectionObjectClient.setProperty(CollectionSpaceClient.USER_PROPERTY, - "test"); - collectionObjectClient.setProperty( - CollectionSpaceClient.PASSWORD_PROPERTY, "bar"); - try { - collectionObjectClient.setupHttpClient(); - collectionObjectClient.setProxy(); - } catch (Exception e) { - logger.error("createWithIncorrectPassword: caught " - + e.getMessage()); - return; - } - ClientResponse res = collectionObjectClient.create(multipart); - if(logger.isDebugEnabled()){ + /** + * Creates the collection object instance with incorrect password. + */ + @Test(dependsOnMethods = {"createWithoutPassword"}) + public void createWithIncorrectPassword() { + CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); + String identifier = this.createIdentifier(); + MultipartOutput multipart = createCollectionObjectInstance( + collectionObjectClient.getCommonPartName(), identifier); + if (!collectionObjectClient.isServerSecure()) { + logger.warn("set -Dcspace.server.secure=true to run security tests"); + return; + } + collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, + "true"); + collectionObjectClient.setProperty(CollectionSpaceClient.USER_PROPERTY, + "test"); + collectionObjectClient.setProperty( + CollectionSpaceClient.PASSWORD_PROPERTY, "bar"); + try { + collectionObjectClient.setupHttpClient(); + collectionObjectClient.setProxy(); + } catch (Exception e) { + logger.error("createWithIncorrectPassword: caught " + e.getMessage()); + return; + } + ClientResponse res = collectionObjectClient.create(multipart); + if (logger.isDebugEnabled()) { logger.debug("createWithIncorrectPassword: status = " + res.getStatus()); } - Assert.assertEquals(res.getStatus(), Response.Status.UNAUTHORIZED - .getStatusCode(), "expected " - + Response.Status.UNAUTHORIZED.getStatusCode()); - } + Assert.assertEquals(res.getStatus(), Response.Status.UNAUTHORIZED.getStatusCode(), "expected " + Response.Status.UNAUTHORIZED.getStatusCode()); + } - /** - * Creates the collection object instance without user password. - */ - @Test(dependsOnMethods = { "createWithoutPassword" }) - public void createWithoutUserPassword() { - CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); - String identifier = this.createIdentifier(); - MultipartOutput multipart = createCollectionObjectInstance( - collectionObjectClient.getCommonPartName(), identifier); - if (!collectionObjectClient.isServerSecure()) { - logger.warn("set -Dcspace.server.secure=true to run security tests"); - return; - } - collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, - "true"); - collectionObjectClient - .removeProperty(CollectionSpaceClient.USER_PROPERTY); - collectionObjectClient - .removeProperty(CollectionSpaceClient.PASSWORD_PROPERTY); - try { - collectionObjectClient.setupHttpClient(); - collectionObjectClient.setProxy(); - } catch (Exception e) { - logger.error("createWithoutUserPassword: caught " + e.getMessage()); - return; - } - ClientResponse res = collectionObjectClient.create(multipart); - if(logger.isDebugEnabled()){ + /** + * Creates the collection object instance without user password. + */ + @Test(dependsOnMethods = {"createWithoutPassword"}) + public void createWithoutUserPassword() { + CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); + String identifier = this.createIdentifier(); + MultipartOutput multipart = createCollectionObjectInstance( + collectionObjectClient.getCommonPartName(), identifier); + if (!collectionObjectClient.isServerSecure()) { + logger.warn("set -Dcspace.server.secure=true to run security tests"); + return; + } + collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, + "true"); + collectionObjectClient.removeProperty(CollectionSpaceClient.USER_PROPERTY); + collectionObjectClient.removeProperty(CollectionSpaceClient.PASSWORD_PROPERTY); + try { + collectionObjectClient.setupHttpClient(); + collectionObjectClient.setProxy(); + } catch (Exception e) { + logger.error("createWithoutUserPassword: caught " + e.getMessage()); + return; + } + ClientResponse res = collectionObjectClient.create(multipart); + if (logger.isDebugEnabled()) { logger.debug("createWithoutUserPassword: status = " + res.getStatus()); } - Assert.assertEquals(res.getStatus(), Response.Status.FORBIDDEN - .getStatusCode(), "expected " - + Response.Status.FORBIDDEN.getStatusCode()); - } + Assert.assertEquals(res.getStatus(), Response.Status.FORBIDDEN.getStatusCode(), "expected " + Response.Status.FORBIDDEN.getStatusCode()); + } - /** - * Creates the collection object instance with incorrect user password. - */ - @Test(dependsOnMethods = { "createWithoutPassword" }) - public void createWithIncorrectUserPassword() { - CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); - String identifier = this.createIdentifier(); - MultipartOutput multipart = createCollectionObjectInstance( - collectionObjectClient.getCommonPartName(), identifier); - if (!collectionObjectClient.isServerSecure()) { - logger.warn("set -Dcspace.server.secure=true to run security tests"); - return; - } - collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, - "true"); - collectionObjectClient.setProperty(CollectionSpaceClient.USER_PROPERTY, - "foo"); - collectionObjectClient.setProperty( - CollectionSpaceClient.PASSWORD_PROPERTY, "bar"); - try { - collectionObjectClient.setupHttpClient(); - collectionObjectClient.setProxy(); - } catch (Exception e) { - logger.error("createWithIncorrectUserPassword: caught " - + e.getMessage()); - return; - } - ClientResponse res = collectionObjectClient.create(multipart); - if(logger.isDebugEnabled()){ + /** + * Creates the collection object instance with incorrect user password. + */ + @Test(dependsOnMethods = {"createWithoutPassword"}) + public void createWithIncorrectUserPassword() { + CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); + String identifier = this.createIdentifier(); + MultipartOutput multipart = createCollectionObjectInstance( + collectionObjectClient.getCommonPartName(), identifier); + if (!collectionObjectClient.isServerSecure()) { + logger.warn("set -Dcspace.server.secure=true to run security tests"); + return; + } + collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, + "true"); + collectionObjectClient.setProperty(CollectionSpaceClient.USER_PROPERTY, + "foo"); + collectionObjectClient.setProperty( + CollectionSpaceClient.PASSWORD_PROPERTY, "bar"); + try { + collectionObjectClient.setupHttpClient(); + collectionObjectClient.setProxy(); + } catch (Exception e) { + logger.error("createWithIncorrectUserPassword: caught " + e.getMessage()); + return; + } + ClientResponse res = collectionObjectClient.create(multipart); + if (logger.isDebugEnabled()) { logger.debug("createWithIncorrectUserPassword: status = " + - res.getStatus()); + res.getStatus()); } - Assert.assertEquals(res.getStatus(), Response.Status.UNAUTHORIZED - .getStatusCode(), "expected " - + Response.Status.UNAUTHORIZED.getStatusCode()); - } + Assert.assertEquals(res.getStatus(), Response.Status.UNAUTHORIZED.getStatusCode(), "expected " + Response.Status.UNAUTHORIZED.getStatusCode()); + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#delete() - */ - @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, - dependsOnMethods = { "createWithIncorrectUserPassword" }) - public void delete(String testName) { - CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); - collectionObjectClient = new CollectionObjectClient(); - if (!collectionObjectClient.isServerSecure()) { - logger.warn("set -Dcspace.server.secure=true to run security tests"); - return; - } - collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, - "true"); - collectionObjectClient.setProperty(CollectionSpaceClient.USER_PROPERTY, - "test"); - collectionObjectClient.setProperty( - CollectionSpaceClient.PASSWORD_PROPERTY, "test"); - try { - collectionObjectClient.setupHttpClient(); - collectionObjectClient.setProxy(); - } catch (Exception e) { - logger.error("deleteCollectionObject: caught " + e.getMessage()); - return; - } - if(logger.isDebugEnabled()){ + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#delete() + */ + @Override + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + dependsOnMethods = {"createWithIncorrectUserPassword"}) + public void delete(String testName) { + CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); + collectionObjectClient = new CollectionObjectClient(); + if (!collectionObjectClient.isServerSecure()) { + logger.warn("set -Dcspace.server.secure=true to run security tests"); + return; + } + collectionObjectClient.setProperty(CollectionSpaceClient.AUTH_PROPERTY, + "true"); + collectionObjectClient.setProperty(CollectionSpaceClient.USER_PROPERTY, + "test"); + collectionObjectClient.setProperty( + CollectionSpaceClient.PASSWORD_PROPERTY, "test"); + try { + collectionObjectClient.setupHttpClient(); + collectionObjectClient.setProxy(); + } catch (Exception e) { + logger.error("deleteCollectionObject: caught " + e.getMessage()); + return; + } + if (logger.isDebugEnabled()) { logger.debug("Calling deleteCollectionObject:" + knownResourceId); } - ClientResponse res = collectionObjectClient - .delete(knownResourceId); - if(logger.isDebugEnabled()){ + ClientResponse res = collectionObjectClient.delete(knownResourceId); + if (logger.isDebugEnabled()) { logger.debug("deleteCollectionObject: status = " + res.getStatus()); } - Assert.assertEquals(res.getStatus(), - Response.Status.OK.getStatusCode(), "expected " - + Response.Status.OK.getStatusCode()); - } + Assert.assertEquals(res.getStatus(), + Response.Status.OK.getStatusCode(), "expected " + Response.Status.OK.getStatusCode()); + } - // --------------------------------------------------------------- - // Utility methods used by tests above - // --------------------------------------------------------------- - /** - * Creates the collection object instance. - * - * @param commonPartName the common part name - * @param identifier the identifier - * - * @return the multipart output - */ - private MultipartOutput createCollectionObjectInstance( - String commonPartName, String identifier) { - return createCollectionObjectInstance(commonPartName, "objectNumber-" - + identifier, "objectName-" + identifier); - } + // --------------------------------------------------------------- + // Utility methods used by tests above + // --------------------------------------------------------------- + /** + * Creates the collection object instance. + * + * @param commonPartName the common part name + * @param identifier the identifier + * + * @return the multipart output + */ + private MultipartOutput createCollectionObjectInstance( + String commonPartName, String identifier) { + return createCollectionObjectInstance(commonPartName, "objectNumber-" + identifier, "objectName-" + identifier); + } - /** - * Creates the collection object instance. - * - * @param commonPartName the common part name - * @param objectNumber the object number - * @param objectName the object name - * - * @return the multipart output - */ - private MultipartOutput createCollectionObjectInstance( - String commonPartName, String objectNumber, String objectName) { - CollectionobjectsCommon collectionObject = new CollectionobjectsCommon(); + /** + * Creates the collection object instance. + * + * @param commonPartName the common part name + * @param objectNumber the object number + * @param objectName the object name + * + * @return the multipart output + */ + private MultipartOutput createCollectionObjectInstance( + String commonPartName, String objectNumber, String objectName) { + CollectionobjectsCommon collectionObject = new CollectionobjectsCommon(); - collectionObject.setObjectNumber(objectNumber); - collectionObject.setObjectName(objectName); - MultipartOutput multipart = new MultipartOutput(); - OutputPart commonPart = multipart.addPart(collectionObject, - MediaType.APPLICATION_XML_TYPE); - commonPart.getHeaders().add("label", commonPartName); + collectionObject.setObjectNumber(objectNumber); + collectionObject.setObjectName(objectName); + MultipartOutput multipart = new MultipartOutput(); + OutputPart commonPart = multipart.addPart(collectionObject, + MediaType.APPLICATION_XML_TYPE); + commonPart.getHeaders().add("label", commonPartName); - if(logger.isDebugEnabled()){ + if (logger.isDebugEnabled()) { logger.debug("to be created, collectionobject common ", - collectionObject, CollectionobjectsCommon.class); + collectionObject, CollectionobjectsCommon.class); } - return multipart; - } + return multipart; + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#createList() - */ - @Override - public void createList(String testName) throws Exception { - } + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#createList() + */ + @Override + public void createList(String testName) throws Exception { + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#createWithEmptyEntityBody() - */ - @Override - public void createWithEmptyEntityBody(String testName) throws Exception { - } + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#createWithEmptyEntityBody() + */ + @Override + public void createWithEmptyEntityBody(String testName) throws Exception { + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#createWithMalformedXml() - */ - @Override - public void createWithMalformedXml(String testName) throws Exception { - } + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#createWithMalformedXml() + */ + @Override + public void createWithMalformedXml(String testName) throws Exception { + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#createWithWrongXmlSchema() - */ - @Override - public void createWithWrongXmlSchema(String testName) throws Exception { - } + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#createWithWrongXmlSchema() + */ + @Override + public void createWithWrongXmlSchema(String testName) throws Exception { + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#read() - */ - @Override - public void read(String testName) throws Exception { - } + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#read() + */ + @Override + public void read(String testName) throws Exception { + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#readNonExistent() - */ - @Override - public void readNonExistent(String testName) throws Exception { - } + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#readNonExistent() + */ + @Override + public void readNonExistent(String testName) throws Exception { + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#readList() - */ - @Override - public void readList(String testName) throws Exception { - } + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#readList() + */ + @Override + public void readList(String testName) throws Exception { + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#update() - */ - @Override - public void update(String testName) throws Exception { - } + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#update() + */ + @Override + public void update(String testName) throws Exception { + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#updateWithEmptyEntityBody() - */ - @Override - public void updateWithEmptyEntityBody(String testName) throws Exception { - } + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#updateWithEmptyEntityBody() + */ + @Override + public void updateWithEmptyEntityBody(String testName) throws Exception { + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#updateWithMalformedXml() - */ - @Override - public void updateWithMalformedXml(String testName) throws Exception { - } + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#updateWithMalformedXml() + */ + @Override + public void updateWithMalformedXml(String testName) throws Exception { + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#updateWithWrongXmlSchema() - */ - @Override - public void updateWithWrongXmlSchema(String testName) throws Exception { - } + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#updateWithWrongXmlSchema() + */ + @Override + public void updateWithWrongXmlSchema(String testName) throws Exception { + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#updateNonExistent() - */ - @Override - public void updateNonExistent(String testName) throws Exception { - } + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#updateNonExistent() + */ + @Override + public void updateNonExistent(String testName) throws Exception { + } - /* (non-Javadoc) - * @see org.collectionspace.services.client.test.AbstractServiceTest#deleteNonExistent() - */ - @Override - public void deleteNonExistent(String testName) throws Exception { - } + /* (non-Javadoc) + * @see org.collectionspace.services.client.test.AbstractServiceTest#deleteNonExistent() + */ + @Override + public void deleteNonExistent(String testName) throws Exception { + } } diff --git a/services/authentication/service/build.xml b/services/authentication/service/build.xml index 374b8c71f..5bbd99dd8 100644 --- a/services/authentication/service/build.xml +++ b/services/authentication/service/build.xml @@ -138,7 +138,6 @@ - - java:/CspaceDS + CspaceDS SHA-256 false diff --git a/services/authentication/service/src/main/resources/db/mysql/test_authn.sql b/services/authentication/service/src/main/resources/db/mysql/test_authn.sql index 9ee6e3fd6..ccdf60982 100644 --- a/services/authentication/service/src/main/resources/db/mysql/test_authn.sql +++ b/services/authentication/service/src/main/resources/db/mysql/test_authn.sql @@ -5,8 +5,7 @@ -- use cspace; -insert into users (username, passwd) values ('test', 'test'); -insert into users (username, passwd) values ('admin', 'admin'); +INSERT INTO `users` (`username`,`passwd`) VALUES ('test','n4bQgYhMfWWaL+qgxVrQFaO/TxsrC4Is0V1sFbDwCgg='); insert into roles (rolename, rolegroup) values ('collections_manager', 'collections'); insert into roles (rolename, rolegroup) values ('collections_registrar', 'collections'); -- 2.47.3