Author: olamy
Date: Sun Nov 27 00:18:06 2011
New Revision: 1206647
URL: http://svn.apache.org/viewvc?rev=1206647&view=rev
Log:
some debug
Modified:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/CreatePatchMojo.java
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/UpdatePatchMojo.java
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/PatchTracker.java
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTracker.java
Modified:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/CreatePatchMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/CreatePatchMojo.java?rev=1206647&r1=1206646&r2=1206647&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/CreatePatchMojo.java
(original)
+++
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/CreatePatchMojo.java
Sun Nov 27 00:18:06 2011
@@ -54,7 +54,7 @@ public class CreatePatchMojo
try
{
PatchTracker patchTracker = getPatchTracker();
- PatchTrackerResult result = patchTracker.createPatch(
patchTrackerRequest );
+ PatchTrackerResult result = patchTracker.createPatch(
patchTrackerRequest, getLog() );
getLog().info( "issue created with id:" + result.getPatchId() + ",
url:" + result.getPatchUrl() );
}
catch ( ComponentLookupException e )
Modified:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java?rev=1206647&r1=1206646&r2=1206647&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java
(original)
+++
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java
Sun Nov 27 00:18:06 2011
@@ -100,7 +100,7 @@ public class PatchToIssueMojo
PatchTracker patchTracker = getPatchTracker();
- PatchTrackerResult patchTrackerResult = patchTracker.createPatch(
patchTrackerRequest );
+ PatchTrackerResult patchTrackerResult = patchTracker.createPatch(
patchTrackerRequest, getLog() );
getLog().info( "issue created with id:" +
patchTrackerResult.getPatchId() + ", url:"
+ patchTrackerResult.getPatchUrl() );
Modified:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/UpdatePatchMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/UpdatePatchMojo.java?rev=1206647&r1=1206646&r2=1206647&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/UpdatePatchMojo.java
(original)
+++
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/UpdatePatchMojo.java
Sun Nov 27 00:18:06 2011
@@ -62,7 +62,7 @@ public class UpdatePatchMojo
getLog().debug( patchTrackerRequest.toString() );
PatchTracker patchTracker = getPatchTracker();
- PatchTrackerResult result = patchTracker.updatePatch(
patchTrackerRequest );
+ PatchTrackerResult result = patchTracker.updatePatch(
patchTrackerRequest, getLog() );
getLog().info( "issue updated with id:" + result.getPatchId() + ",
url:" + result.getPatchUrl() );
}
catch ( ComponentLookupException e )
Modified:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/PatchTracker.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/PatchTracker.java?rev=1206647&r1=1206646&r2=1206647&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/PatchTracker.java
(original)
+++
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/PatchTracker.java
Sun Nov 27 00:18:06 2011
@@ -19,6 +19,8 @@ package org.apache.maven.plugins.patchtr
* under the License.
*/
+import org.apache.maven.plugin.logging.Log;
+
/**
* provide some services around a patch tracker.
* A patch tracker can be an issue tracker (jira) or a patch reviewer
(reviewboar)
@@ -30,20 +32,22 @@ public interface PatchTracker
/**
* create a new entry in the patch tracker
+ *
* @param patchTrackerRequest
* @return
* @throws PatchTrackerException
*/
- PatchTrackerResult createPatch( PatchTrackerRequest patchTrackerRequest )
+ PatchTrackerResult createPatch( PatchTrackerRequest patchTrackerRequest,
Log log )
throws PatchTrackerException;
/**
* update a patch entry in the patch tracker
* <b>patchTrackerRequest.patchId is mandatory!</b>
+ *
* @param patchTrackerRequest
* @return
* @throws PatchTrackerException
*/
- PatchTrackerResult updatePatch( PatchTrackerRequest patchTrackerRequest )
+ PatchTrackerResult updatePatch( PatchTrackerRequest patchTrackerRequest,
Log log )
throws PatchTrackerException;
}
Modified:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTracker.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTracker.java?rev=1206647&r1=1206646&r2=1206647&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTracker.java
(original)
+++
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTracker.java
Sun Nov 27 00:18:06 2011
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.patchtr
*/
import org.apache.commons.lang.StringUtils;
+import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugins.patchtracker.tracking.PatchTracker;
import org.apache.maven.plugins.patchtracker.tracking.PatchTrackerException;
import org.apache.maven.plugins.patchtracker.tracking.PatchTrackerRequest;
@@ -43,11 +44,11 @@ import java.util.List;
public class JiraPatchTracker
implements PatchTracker
{
- public PatchTrackerResult createPatch( PatchTrackerRequest
patchTrackerRequest )
+ public PatchTrackerResult createPatch( PatchTrackerRequest
patchTrackerRequest, Log log )
throws PatchTrackerException
{
- JiraSession jiraSession = createSession( patchTrackerRequest );
+ JiraSession jiraSession = createSession( patchTrackerRequest, log );
try
{
RemoteIssue remoteIssue = new RemoteIssue();
@@ -99,11 +100,11 @@ public class JiraPatchTracker
}
}
- public PatchTrackerResult updatePatch( PatchTrackerRequest
patchTrackerRequest )
+ public PatchTrackerResult updatePatch( PatchTrackerRequest
patchTrackerRequest, Log log )
throws PatchTrackerException
{
- JiraSession jiraSession = createSession( patchTrackerRequest );
+ JiraSession jiraSession = createSession( patchTrackerRequest, log );
try
{
RemoteIssue remoteIssue = jiraSession.findRemoteIssue(
patchTrackerRequest.getPatchId() );
@@ -137,7 +138,7 @@ public class JiraPatchTracker
}
}
- public JiraSession createSession( PatchTrackerRequest patchTrackerRequest )
+ public JiraSession createSession( PatchTrackerRequest patchTrackerRequest,
Log log )
throws PatchTrackerException
{
if ( StringUtils.isEmpty( patchTrackerRequest.getUserName() ) ||
StringUtils.isEmpty(
@@ -149,9 +150,10 @@ public class JiraPatchTracker
JiraSoapServiceService jiraSoapServiceGetter = new
JiraSoapServiceServiceLocator();
try
{
+ URL baseUrl = extractBaseUrlAsUrl( patchTrackerRequest.getUrl() );
+ log.debug( "baseUrl:" + baseUrl.toExternalForm() );
org.apache.maven.plugins.patchtracker.tracking.jira.soap.JiraSoapService
service =
- jiraSoapServiceGetter.getJirasoapserviceV2(
- new URL( extractBaseUrlAsUrl( patchTrackerRequest.getUrl()
), "rpc/soap/jirasoapservice-v2" ) );
+ jiraSoapServiceGetter.getJirasoapserviceV2( new URL( baseUrl,
"/rpc/soap/jirasoapservice-v2" ) );
return new JiraSession( service, service.login(
patchTrackerRequest.getUserName(),
patchTrackerRequest.getPassword() ),
extractProjectKey(
patchTrackerRequest.getUrl() ) );
