v1.1.0 pom/README

README.md

@@ -27,7 +27,7 @@ You can use it by defining a Javadoc plugin in your Activiti extension Maven JAR
 							<docletArtifact>
 								<groupId>com.inteligr8.activiti</groupId>
 								<artifactId>activiti-api-doclet</artifactId>
-								<version>1.1-SNAPSHOT</version>
+								<version>1.1.0</version>
 							</docletArtifact>
 							<useStandardDocletOptions>false</useStandardDocletOptions>
 							<additionalOptions>

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.inteligr8.activiti</groupId>
     <artifactId>activiti-api-doclet</artifactId>
     <packaging>jar</packaging>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.1.0</version>
     
     <name>Activiti Doclet</name>
     <description>JavaDoc Doclet for Activiti Extension APIs</description>

src/it/base/pom.xml

@@ -50,7 +50,8 @@
 								<version>@pom.version@</version>
 							</docletArtifact>
 							<useStandardDocletOptions>false</useStandardDocletOptions>
-							<outputDirectory>${basedir}</outputDirectory>
+							<destDir>apidocs</destDir>
+							<reportOutputDirectory>${basedir}</reportOutputDirectory>
 							<additionalOptions>
 								<additionalOption>--title 'Example Title'</additionalOption>
 								<additionalOption>--apiName '${project.name}'</additionalOption>

src/it/base/src/main/java/TestNamedTaskListenerBean.java

@@ -1,24 +0,0 @@
-
-import org.activiti.engine.delegate.DelegateTask;
-import org.activiti.engine.delegate.TaskListener;
-import org.springframework.stereotype.Component;
-
-/**
- * This is an example comment for the class TestNamedTaskListenerBean.
- * 
- * Here is a second line that happens
- * to span multiple lines.  This class does not have an author.
- */
-@Component("testTaskListener")
-public class TestNamedTaskListenerBean implements TaskListener {
-	
-	/**
-	 * This is an example method comment.
-	 * 
-	 * @param task A delegate task for access to the activity and process instance.
-	 */
-	@Override
-	public void notify(DelegateTask task) {
-	}
-
-}

src/main/java/com/inteligr8/activiti/doclet/ActivitiDocFilter.java

@@ -135,7 +135,7 @@ class ActivitiDocFilter {
 			}
 		}
 		
-		this.logger.info("delegates: {}: {}", beanId, delegateMethodElements);
+		this.logger.info("delegates: {}", delegateMethodElements);
 		
 		// getAllMembers() will get inherited methods
 		for (Element memberElement : this.docenv.getElementUtils().getAllMembers(classElement)) {

src/main/resources/templates/bean.md.ftl

@@ -30,11 +30,11 @@ ${r"${"}${beanId}${r"}"}
 
 <#if delegateMethod?? || executionListenerMethod?? || taskListenerMethod??>
 <#assign taskUses = [] />
-<#if delegateMethod??><#assign taskUses = taskUses + ["**Service Task**"] /><#assign _delegateMethod = delegateMethod /></#if>
-<#if executionListenerMethod??><#assign taskUses = taskUses + ["**Execution Listener**"] /><#assign _delegateMethod = executionListenerMethod /></#if>
-<#if taskListenerMethod??><#assign taskUses = taskUses + ["**Task Listener**"] /><#assign _delegateMethod = taskListenerMethod /></#if>
+<#if delegateMethod??><#assign taskUses = taskUses + ["**Service Task**"] /></#if>
+<#if executionListenerMethod??><#assign taskUses = taskUses + ["**Execution Listener**"] /></#if>
+<#if taskListenerMethod??><#assign taskUses = taskUses + ["**Task Listener**"] /></#if>
 You may use it in a ${taskUses?join(" or ")}.
-<@sigdoc sig=_delegateMethod showParams=false/>
+<@sigdoc sig=delegateMethod showParams=false/>
 </#if></#if><#if (methods?size > 0)>
 
 ## Expression Uses