9:44 p.m.
Author: jim.ma
Date: 2009-07-06 22:44:50 -0400 (Mon, 06 Jul 2009)
New Revision: 5252
Added:
projects/jopr-integration/.classpath
projects/jopr-integration/.project
Removed:
projects/jopr-integration/src/main/resources/lib/
Modified:
projects/jopr-integration/pom.xml
projects/jopr-integration/src/main/java/org/jbosson/plugins/jbpm/JbpmInstanceComponent.java
projects/jopr-integration/src/main/java/org/jbosson/plugins/jbpm/JbpmInstanceDiscoveryComponent.java
projects/jopr-integration/src/main/java/org/jbosson/plugins/jbpm/JbpmProcessDefDiscoveryComponent.java
projects/jopr-integration/src/main/resources/META-INF/rhq-plugin.xml
Log:
cleaned up the previous jopr jbpm plugin
Added: projects/jopr-integration/.classpath
===================================================================
--- projects/jopr-integration/.classpath (rev 0)
+++ projects/jopr-integration/.classpath 2009-07-07 02:44:50 UTC (rev 5252)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes"
path="src/main/java"/>
+ <classpathentry excluding="**" kind="src"
output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
+ <classpathentry excluding="**" kind="src"
output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: projects/jopr-integration/.project
===================================================================
--- projects/jopr-integration/.project (rev 0)
+++ projects/jopr-integration/.project 2009-07-07 02:44:50 UTC (rev 5252)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>rhq-jbpm-plugin</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: projects/jopr-integration/pom.xml
===================================================================
--- projects/jopr-integration/pom.xml 2009-07-06 15:33:50 UTC (rev 5251)
+++ projects/jopr-integration/pom.xml 2009-07-07 02:44:50 UTC (rev 5252)
@@ -4,25 +4,24 @@
<parent>
<groupId>org.jboss.on</groupId>
- <!-- Bypass the jon-plugins-parent which can not have children. It must build
after the plugins in order to execute integration tests on them. -->
<artifactId>jon-parent</artifactId>
<version>2.1.2.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
- <artifactId>rhq-jbpm-plugin</artifactId>
+ <artifactId>jopr-jbpm-plugin</artifactId>
<packaging>jar</packaging>
- <name>JON JBossESB jbpm Plugin</name>
- <description>A plugin for managing JBossESB jbpm process</description>
+ <name>Jopr jbpm Plugin</name>
+ <description>A plugin for managing jbpm</description>
<scm>
-
<connection>scm:svn:http://svn.corp.jboss.com/repos/jon/trunk/jon/plugi...
-
<developerConnection>scm:svn:http://svn.corp.jboss.com/repos/jon/trunk/...
+
<connection>scm:svn:https://svn.jboss.org/repos/jbpm/projects/jopr-inte...
+
<developerConnection>scm:svn:https://svn.jboss.org/repos/jbpm/projects/...
</scm>
<properties>
- <scm.module.path>jon/plugins/jbossesb/</scm.module.path>
+ <scm.module.path>.</scm.module.path>
</properties>
<dependencies>
@@ -31,72 +30,23 @@
<artifactId>rhq-jbossas-plugin</artifactId>
<version>2.1.2.GA</version>
<scope>provided</scope>
- </dependency>
-</dependencies>
+ </dependency>
+
+ <!--enable copy the dependecies to the package, it does not need this dependency
-->
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-jpdl</artifactId>
+ <version>3.2.5.GA</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
<build>
- <plugins>
-
- <!-- Used to add dependencies to the plugin lib
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- <executions>
- <execution>
- <id>copy-postgres-jar</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.1-407.jdbc3</version>
- </artifactItem>
- </artifactItems>
-
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>-->
-
-
-
-
-<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <id>copy-res</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
- <resources>
- <resource>
- <directory>resources/lib</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
-
-
-
-
- <!--plugin>
+ <plugins>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
<executions>
@@ -104,23 +54,17 @@
<id>copy-dependencies</id>
<phase>process-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- <version>3.2.5.GA</version>
- </artifactItem>
- </artifactItems>
-
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
+
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
+ <includeScope>runtime</includeScope>
+
<excludeGroupIds>org.apache.jackrabbit</excludeGroupIds>
+
<excludeArtifactIds>xml-apis,xercesImpl,tm-extractors,poi,pdfbox,nekohtml,lucene-core,junit,jta,i18nlog,hibernate,derby,ehcache</excludeArtifactIds>
</configuration>
</execution>
</executions>
- </plugin-->
-
-
+ </plugin>
</plugins>
</build>
<profiles>
@@ -225,7 +169,9 @@
<profile>
<id>dev</id>
-
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
<properties>
<rhq.rootDir>../../..</rhq.rootDir>
<rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
Modified:
projects/jopr-integration/src/main/java/org/jbosson/plugins/jbpm/JbpmInstanceComponent.java
===================================================================
---
projects/jopr-integration/src/main/java/org/jbosson/plugins/jbpm/JbpmInstanceComponent.java 2009-07-06
15:33:50 UTC (rev 5251)
+++
projects/jopr-integration/src/main/java/org/jbosson/plugins/jbpm/JbpmInstanceComponent.java 2009-07-07
02:44:50 UTC (rev 5252)
@@ -99,11 +99,7 @@
if ("END".equals(operataion)) {
message = endInstance();
}
-
- if ("DELETE".equals(operataion)) {
- message = deleteInstance();
- }
-
+
if ("RESUME".equals(operataion)) {
message = resumeInstance();
}
@@ -137,16 +133,8 @@
operation.invoke(Long.parseLong(resourceContext.getResourceKey()));
return "Sucess";
}
-
- public String deleteInstance() {
- EmsConnection connection = getNewConnection();
- EmsBean bean = connection.getBean(this.JBPM_SERVICE);
- EmsOperation operation = bean.getOperation("deleteProcessInstance");
- operation.invoke(Long.parseLong(resourceContext.getResourceKey()));
- return "Sucess";
- }
-
-
+
+
/* implement the DeleteResourceFacet */
public void deleteResource() throws Exception {
EmsConnection connection = getNewConnection();
Modified:
projects/jopr-integration/src/main/java/org/jbosson/plugins/jbpm/JbpmInstanceDiscoveryComponent.java
===================================================================
---
projects/jopr-integration/src/main/java/org/jbosson/plugins/jbpm/JbpmInstanceDiscoveryComponent.java 2009-07-06
15:33:50 UTC (rev 5251)
+++
projects/jopr-integration/src/main/java/org/jbosson/plugins/jbpm/JbpmInstanceDiscoveryComponent.java 2009-07-07
02:44:50 UTC (rev 5252)
@@ -19,7 +19,6 @@
public Set<DiscoveredResourceDetails> discoverResources(
ResourceDiscoveryContext<JbpmProcessDefComponent> context) {
- System.out.println("Discover jbpm instance definition");
Set<DiscoveredResourceDetails> jbpmDefs = new
java.util.HashSet<DiscoveredResourceDetails>();
try {
Modified:
projects/jopr-integration/src/main/java/org/jbosson/plugins/jbpm/JbpmProcessDefDiscoveryComponent.java
===================================================================
---
projects/jopr-integration/src/main/java/org/jbosson/plugins/jbpm/JbpmProcessDefDiscoveryComponent.java 2009-07-06
15:33:50 UTC (rev 5251)
+++
projects/jopr-integration/src/main/java/org/jbosson/plugins/jbpm/JbpmProcessDefDiscoveryComponent.java 2009-07-07
02:44:50 UTC (rev 5252)
@@ -22,8 +22,6 @@
public Set<DiscoveredResourceDetails> discoverResources(
ResourceDiscoveryContext<JbpmServiceComponent> context) {
-
- System.out.println("Discover jbpm process definition");
Set<DiscoveredResourceDetails> jbpmDefs = new
java.util.HashSet<DiscoveredResourceDetails>();
try {
Modified: projects/jopr-integration/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- projects/jopr-integration/src/main/resources/META-INF/rhq-plugin.xml 2009-07-06
15:33:50 UTC (rev 5251)
+++ projects/jopr-integration/src/main/resources/META-INF/rhq-plugin.xml 2009-07-07
02:44:50 UTC (rev 5252)
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<plugin name="JBossESB-JBPM" displayName="JBossESB-JBPM"
+<plugin name="JBPM-Plugin" displayName="JBPM-Plugin"
package="org.jbosson.plugins.jbpm"
description="Provides monitoring of JBoss JBPM" version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
<depends plugin="JMX" />
- <depends plugin="Tomcat" />
<depends plugin="JBossAS" useClasses="true" />
<service name="JBPM Service"
discovery="org.jbosson.plugins.jbpm.JbpmServiceDiscoveryComponent"