[jbpm-commits] JBoss JBPM SVN: r5043 - in jbpm4/branches/tbaeyens/modules: pvm/src/main/java/org/jbpm/pvm/internal/cmd and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Jun 16 15:08:56 EDT 2009
Author: tom.baeyens at jboss.com
Date: 2009-06-16 15:08:55 -0400 (Tue, 16 Jun 2009)
New Revision: 5043
Removed:
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/SerializableByteArrayInputStream.java
Modified:
jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentClassLoader.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/RepositorySession.java
Log:
fixed test-db test suite for integration run
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java 2009-06-16 16:15:35 UTC (rev 5042)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java 2009-06-16 19:08:55 UTC (rev 5043)
@@ -21,6 +21,7 @@
*/
package org.jbpm.jpdl.internal.repository;
+import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.List;
@@ -51,7 +52,8 @@
for (String resourceName: deployment.getResourceNames()) {
if (resourceName.endsWith(".jpdl.xml")) {
- InputStream inputStream = deployment.getResourceAsStream(resourceName);
+ byte[] bytes = deployment.getBytes(resourceName);
+ InputStream inputStream = new ByteArrayInputStream(bytes);
Parse parse = jpdlParser.createParse();
parse.setProblems(deployment.getProblems());
parse.setInputStream(inputStream);
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java 2009-06-16 16:15:35 UTC (rev 5042)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java 2009-06-16 19:08:55 UTC (rev 5043)
@@ -30,7 +30,7 @@
/**
* @author Tom Baeyens
*/
-public class GetResourceAsStreamCmd extends AbstractCommand<InputStream> {
+public class GetResourceAsStreamCmd extends AbstractCommand<byte[]> {
private static final long serialVersionUID = 1L;
@@ -42,8 +42,8 @@
this.resourceName = resourceName;
}
- public InputStream execute(Environment environment) {
+ public byte[] execute(Environment environment) {
RepositorySession repositorySession = environment.get(RepositorySession.class);
- return repositorySession.getResourceAsStream(deploymentDbid, resourceName);
+ return repositorySession.getBytes(deploymentDbid, resourceName);
}
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentClassLoader.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentClassLoader.java 2009-06-16 16:15:35 UTC (rev 5042)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentClassLoader.java 2009-06-16 19:08:55 UTC (rev 5043)
@@ -21,6 +21,7 @@
*/
package org.jbpm.pvm.internal.repository;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -46,8 +47,9 @@
public URL findResource(String name) {
URL url = null;
- InputStream inputStream = deployment.getResourceAsStream(name);
- if (inputStream!=null) {
+ byte[] bytes = deployment.getBytes(name);
+ if (bytes!=null) {
+ InputStream inputStream = new ByteArrayInputStream(bytes);
try {
url = new URL(null, "jbpm://"+deployment.getDbid()+"/"+name, new BytesUrlStreamHandler(inputStream));
} catch (MalformedURLException e) {
@@ -84,9 +86,10 @@
Class clazz = null;
String fileName = name.replace( '.', '/' ) + ".class";
- InputStream inputStream = deployment.getResourceAsStream(fileName);
- if (inputStream!=null) {
+ byte[] bytes = deployment.getBytes(fileName);
+ if (bytes!=null) {
try {
+ InputStream inputStream = new ByteArrayInputStream(bytes);
byte[] classBytes = IoUtil.readBytes(inputStream);
clazz = defineClass(name, classBytes, 0, classBytes.length);
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-06-16 16:15:35 UTC (rev 5042)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-06-16 19:08:55 UTC (rev 5043)
@@ -154,12 +154,11 @@
return resources.keySet();
}
- public InputStream getResourceAsStream(String resourceName) {
+ public byte[] getBytes(String resourceName) {
if (resources!=null) {
Lob lob = resources.get(resourceName);
if (lob!=null) {
- byte[] bytes = lob.extractBytes();
- return new SerializableByteArrayInputStream(bytes);
+ return lob.extractBytes();
}
}
return null;
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java 2009-06-16 16:15:35 UTC (rev 5042)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java 2009-06-16 19:08:55 UTC (rev 5043)
@@ -21,6 +21,7 @@
*/
package org.jbpm.pvm.internal.repository;
+import java.io.ByteArrayInputStream;
import java.io.InputStream;
import org.jbpm.api.Deployment;
@@ -64,7 +65,11 @@
}
public InputStream getResourceAsStream(long deploymentDbid, String resource) {
- return commandService.execute(new GetResourceAsStreamCmd(deploymentDbid, resource));
+ byte[] bytes = commandService.execute(new GetResourceAsStreamCmd(deploymentDbid, resource));
+ if (bytes!=null) {
+ return new ByteArrayInputStream(bytes);
+ }
+ return null;
}
public ProcessDefinitionQuery createProcessDefinitionQuery() {
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java 2009-06-16 16:15:35 UTC (rev 5042)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java 2009-06-16 19:08:55 UTC (rev 5043)
@@ -139,12 +139,12 @@
return object;
}
- public InputStream getResourceAsStream(long deploymentDbid, String resourceName) {
+ public byte[] getBytes(long deploymentDbid, String resourceName) {
DeploymentImpl deployment = getDeployment(deploymentDbid);
if (deployment==null) {
return null;
}
- return deployment.getResourceAsStream(resourceName);
+ return deployment.getBytes(resourceName);
}
// queries //////////////////////////////////////////////////////////////////
Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/SerializableByteArrayInputStream.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/SerializableByteArrayInputStream.java 2009-06-16 16:15:35 UTC (rev 5042)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/SerializableByteArrayInputStream.java 2009-06-16 19:08:55 UTC (rev 5043)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.internal.repository;
-
-import java.io.ByteArrayInputStream;
-import java.io.Serializable;
-
-
-/**
- * @author Tom Baeyens
- */
-public class SerializableByteArrayInputStream extends ByteArrayInputStream implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public SerializableByteArrayInputStream(byte[] buf) {
- super(buf);
- }
-
- Object readResolve() {
- return new ByteArrayInputStream(buf);
- }
-}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/RepositorySession.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/RepositorySession.java 2009-06-16 16:15:35 UTC (rev 5042)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/RepositorySession.java 2009-06-16 19:08:55 UTC (rev 5043)
@@ -21,8 +21,6 @@
*/
package org.jbpm.pvm.internal.session;
-import java.io.InputStream;
-
import org.jbpm.api.Deployment;
import org.jbpm.api.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.query.ProcessDefinitionQueryImpl;
@@ -37,7 +35,7 @@
Object getObject(long deploymentDbid, String objectName);
- InputStream getResourceAsStream(long deploymentDbid, String resourceName);
+ byte[] getBytes(long deploymentDbid, String resourceName);
/** create a process definition query */
ProcessDefinitionQueryImpl createProcessDefinitionQuery();
More information about the jbpm-commits
mailing list