clover.license src/main/java/org/agilos/jira/service/UserServiceImpl.java @@ -16,26 +16,32 @@ <name>Zendesk JIRA plugin</name> <description>Plugin for JIRA providing Zendesk integration</description> <url>http://agilos.org/display/zen/ZenDesk+JIRA+plugin</url> - - <licenses> + + <licenses> <license> <name>Apache License V2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> </licenses> - + <scm> <connection>http://svn.agilos.org/svn/public/zendesk-jira-plugin/</connection> <developerConnection>http://svn.agilos.org/svn/public/zendesk-jira-plugin/</developerConnection> <url>http://fisheye.agilos.org/browse/Agilos/zendesk-jira-plugin</url> </scm> - + <issueManagement> <system>JIRA</system> <url>http://jira.agilos.org/browse/ZEN</url> </issueManagement> + <organization> + <name>Agilos</name> + <url>http://agilos.org</url> + </organization> + + <developers> <developer> <name>Mikis Seth Sørensen</name> @@ -91,23 +97,57 @@ <historyDir>${user.home}/history/${project.artifact}</historyDir> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>axistools-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>wsdl2java</goal> - </goals> - <configuration> - <packageSpace>org.agilos.jira.soapclient</packageSpace> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>axistools-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>wsdl2java</goal> + </goals> + <configuration> + <packageSpace>org.agilos.jira.soapclient</packageSpace> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy-plugin-artifact</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="${project.artifact.file}" todir="${tmp.webapp.dir}/WEB-INF/lib/"/> + <echo file="${project.build.directory}/test-classes/localtest.properties"> + jira.protocol=http + jira.host=localhost + jira.context=/jira + jira.tmp=target/test-tmp/ + jira.xml.data.location=src/test/xml/ + jira.port=${http.port} + jira.edition=enterprise + </echo> + </tasks> + </configuration> + </execution> + <execution> + <id>post-integration-test-user-ant-tasks</id> + <configuration> + <tasks> + <echo message="Ant task _after_ integration tests." /> + </tasks> + </configuration> + </execution> + </executions> +</plugin> </plugins> </build> <properties> - <jira.start>false</jira.start> + <jira.start>true</jira.start> </properties> </project> pom.xml @@ -1,5 +1,9 @@ package org.agilos.jira.service; +import com.atlassian.jira.notification.type.RemoteUser; + public interface UserService { + RemoteUser[] getAssignableUsers(String projectKey); + } src/main/java/org/agilos/jira/service/UserService.java @@ -1,13 +1,13 @@ package org.agilos.jira.ws; -import org.agilos.jira.soapclient.RemoteAuthenticationException; -import org.agilos.jira.soapclient.RemoteException; -import org.agilos.jira.soapclient.RemotePermissionException; -import org.agilos.jira.soapclient.RemoteUser; +import com.atlassian.jira.notification.type.RemoteUser; +import com.atlassian.jira.rpc.exception.RemoteAuthenticationException; +import com.atlassian.jira.rpc.exception.RemoteException; +import com.atlassian.jira.rpc.exception.RemotePermissionException; public interface AgilosSoapService { /** - * Returns an array of all user which can be assigned to a project. + * Returns an array of all users which can be assigned to a project. * * @param token the SOAP authentication token. * @param projectKey the key of the requested project src/main/java/org/agilos/jira/ws/AgilosSoapService.java @@ -1,15 +1,16 @@ package org.agilos.jira.ws; import org.agilos.jira.service.UserService; -import org.agilos.jira.soapclient.RemoteAuthenticationException; -import org.agilos.jira.soapclient.RemoteException; -import org.agilos.jira.soapclient.RemotePermissionException; -import org.agilos.jira.soapclient.RemoteUser; +import com.atlassian.jira.notification.type.RemoteUser; import com.atlassian.jira.rpc.auth.TokenManager; +import com.atlassian.jira.rpc.exception.RemoteAuthenticationException; +import com.atlassian.jira.rpc.exception.RemoteException; +import com.atlassian.jira.rpc.exception.RemotePermissionException; +import com.opensymphony.user.User; public class AgilosSoapServiceImpl implements AgilosSoapService { - private TokenManager tokenManager; + private TokenManager tokenManager; // The TokenManager functionality is very much inspired by the com.atlassian.jira.rpc.auth.TokenManager private UserService userService; public AgilosSoapServiceImpl(TokenManager tokenManager, UserService userService) @@ -17,11 +18,48 @@ public class AgilosSoapServiceImpl implements AgilosSoapService { this.tokenManager = tokenManager; this.userService = userService; } - public RemoteUser[] getAssignableUsers(String token, String projectKey) - throws RemotePermissionException, RemoteAuthenticationException, - RemoteException { - // TODO Auto-generated method stub - return null; - } + public void setTokenManager(TokenManager tokenManager) + { + this.tokenManager = tokenManager; + } + + /** + * This ability to resolve a token into a user name is used by the JIRA logging and is not exposed on the SOAP + * service interface itself. + * + * @param token the given out previously via {@link @#login} + * @return the user name behind that token or null if the token is not valid + * @throws RemotePermissionException + * @throws RemoteAuthenticationException + */ + public String resolveTokenToUserName(final String token) throws RemoteAuthenticationException, RemotePermissionException + { + User user = tokenManager.retrieveUserNoPermissionCheck(token); + return user == null ? null : user.getName(); + } + + /** + * This is called to work out which parameter the token is given a method name + * + * @param operationName the name of the SOAP operation + * @return the parameter index of the user token + */ + public int getTokenParameterIndex(final String operationName) + { + return 0; + } + + public String login(String username, String password) throws RemoteException, com.atlassian.jira.rpc.exception.RemoteAuthenticationException, com.atlassian.jira.rpc.exception.RemoteException + { + return tokenManager.login(username, password); + } + public boolean logout(String token) + { + return tokenManager.logout(token); + } + + public RemoteUser[] getAssignableUsers(String token, String projectKey) { + return userService.getAssignableUsers(projectKey); + } } src/main/java/org/agilos/jira/ws/AgilosSoapServiceImpl.java @@ -16,9 +16,9 @@ <interface>org.agilos.jira.service.UserService</interface> </component> - <rpc-soap key="soap" name="Zendesk SOAP Services" class="org.agilos.jira.ws.JiraSoapServiceImpl"> + <rpc-soap key="soap" name="Zendesk SOAP Services" class="org.agilos.jira.ws.AgilosSoapServiceImpl"> <description>The Zendesk JIRA SOAP services.</description> <service-path>agilossoapservice-v1</service-path> - <published-interface>org.agilos.jira.ws.JiraSoapService</published-interface> + <published-interface>org.agilos.jira.ws.AgilosSoapService</published-interface> </rpc-soap> </atlassian-plugin> src/main/resources/atlassian-plugin.xml @@ -6,7 +6,12 @@ import java.util.Set; import javax.xml.rpc.ServiceException; -import org.agilos.jira.soapclient.*; +import org.agilos.jira.soapclient.JiraSoapService; +import org.agilos.jira.soapclient.JiraSoapServiceService; +import org.agilos.jira.soapclient.JiraSoapServiceServiceLocator; +import org.agilos.jira.soapclient.RemotePermissionScheme; +import org.agilos.jira.soapclient.RemoteProject; +import org.agilos.jira.soapclient.RemoteProjectRole; import org.apache.commons.lang.NotImplementedException; public class WebserviceFixture { @@ -23,9 +28,7 @@ public class WebserviceFixture { static final String PROJECT_DESCRIPTION = "This is a Zendesk JIRA plugin integrationtest project " + new Date(); static final String PROJECT_LEAD = "bamboo"; - public WebserviceFixture() throws ServiceException, - RemoteAuthenticationException, - org.agilos.jira.soapclient.RemoteException, RemoteException { + public WebserviceFixture() throws ServiceException, RemoteException { JiraSoapServiceService jiraSoapServiceGetter = new JiraSoapServiceServiceLocator(); jiraSoapService = jiraSoapServiceGetter.getJirasoapserviceV2(); token = jiraSoapService.login(LOGIN_NAME, LOGIN_PASSWORD); src/test/java/org/agilos/zendesk_jira_plugin/integrationtest/WebserviceFixture.java src/main/java/org/agilos/zendesk_jira_plugin/integrationtest/ClientConstants.java 369040f12d77b7f43dd8f9f8665d20cffe0a9740 mikis mikis@f5b5b895-cfb1-4645-b906-73037d8a9abe http://github.com/zendesk/zendesk-jira-plugin/commit/9bb4b7b8196b1d881a3df4eef2148f65652aa199 9bb4b7b8196b1d881a3df4eef2148f65652aa199 2009-04-01T12:15:52-07:00 2009-04-01T12:15:52-07:00 ZEN-6: Assignable users WS, Bit of cleaning up dc6d3bd83e50baf7c7299a0c49627fbaab8f0bb5 mikis mikis@f5b5b895-cfb1-4645-b906-73037d8a9abe