[jbpm-commits] JBoss JBPM SVN: r3306 - in jbpm3/trunk/modules/enterprise: src/test/java/org/jbpm/enterprise/config and 1 other directory.
Author: thomas.diesler(a)jboss.com
Date: 2008-12-10 04:10:00 -0500 (Wed, 10 Dec 2008)
New Revision: 3306
Added:
jbpm3/trunk/modules/enterprise/.classpath
Modified:
jbpm3/trunk/modules/enterprise/.project
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java
Log:
Update ContainerProvidedJarsTest to work with mvn artefacts
Added: jbpm3/trunk/modules/enterprise/.classpath
===================================================================
--- jbpm3/trunk/modules/enterprise/.classpath (rev 0)
+++ jbpm3/trunk/modules/enterprise/.classpath 2008-12-10 09:10:00 UTC (rev 3306)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes"
path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
+ <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>
Modified: jbpm3/trunk/modules/enterprise/.project
===================================================================
--- jbpm3/trunk/modules/enterprise/.project 2008-12-10 07:18:34 UTC (rev 3305)
+++ jbpm3/trunk/modules/enterprise/.project 2008-12-10 09:10:00 UTC (rev 3306)
@@ -6,12 +6,18 @@
</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:
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java
===================================================================
---
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-12-10
07:18:34 UTC (rev 3305)
+++
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-12-10
09:10:00 UTC (rev 3306)
@@ -79,20 +79,21 @@
// Iterate over the known server provided jars
List<String> matchingJars = new ArrayList<String>();
BufferedReader br = new BufferedReader(new FileReader(jbossJars));
- String line = br.readLine();
- while (line != null)
+ String jbossJar = br.readLine();
+ while (jbossJar != null)
{
- if (line.length() == 0 || line.startsWith("#"))
+ if (jbossJar.length() == 0 || jbossJar.startsWith("#"))
{
- line = br.readLine();
+ jbossJar = br.readLine();
continue;
}
- if (deployedJars.contains(line))
+ for (String deployedJar : deployedJars)
{
- matchingJars.add(line);
+ if (deployedJar.startsWith(jbossJar))
+ matchingJars.add(jbossJar);
}
- line = br.readLine();
+ jbossJar = br.readLine();
}
assertEquals("Invalid deployed jars: " + matchingJars, 0,
matchingJars.size());
@@ -112,7 +113,6 @@
String fileName = file.getName();
if (fileName.endsWith(".jar"))
{
- fileName = fileName.substring(0, fileName.length() - 4);
deployedJars.add(fileName);
}
}