JBossWS SVN: r7550 - container.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-16 03:40:16 -0400 (Mon, 16 Jun 2008)
New Revision: 7550
Removed:
container/jboss421/
Log:
container integration naming
16 years, 7 months
JBossWS SVN: r7549 - in container: jboss421 and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-16 03:39:45 -0400 (Mon, 16 Jun 2008)
New Revision: 7549
Added:
container/jboss42/branches/jboss421/
Removed:
container/jboss421/trunk/
Log:
container integration naming
Copied: container/jboss42/branches/jboss421 (from rev 7548, container/jboss421/trunk)
16 years, 7 months
JBossWS SVN: r7548 - container/jboss42.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-16 03:38:41 -0400 (Mon, 16 Jun 2008)
New Revision: 7548
Added:
container/jboss42/branches/
Log:
container integration naming
16 years, 7 months
JBossWS SVN: r7547 - stack/metro/trunk/src/main/scripts.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-14 10:31:04 -0400 (Sat, 14 Jun 2008)
New Revision: 7547
Modified:
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2232] Adding junit.jar to the binary distro (required to run the testsuite from Eclipse)
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-14 14:28:26 UTC (rev 7546)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-14 14:31:04 UTC (rev 7547)
@@ -50,6 +50,7 @@
<include>*:xmldsig:jar</include>
<include>*:xmlsec:jar</include>
<include>*:xws-security:jar</include>
+ <include>*:junit:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -151,4 +152,4 @@
<destName>jbossws-metro-wsit-tools.jar</destName>
</file>
</files>
-</assembly>
\ No newline at end of file
+</assembly>
16 years, 7 months
JBossWS SVN: r7546 - stack/cxf/trunk/src/main/scripts.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-14 10:28:26 -0400 (Sat, 14 Jun 2008)
New Revision: 7546
Modified:
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2232] Adding junit.jar to the binary distro (required to run the testsuite from Eclipse)
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-14 14:25:35 UTC (rev 7545)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-14 14:28:26 UTC (rev 7546)
@@ -33,6 +33,7 @@
<include>*:jbossws-common:jar</include>
<include>*:jbossws-framework:jar</include>
<include>*:jbossws-spi:jar</include>
+ <include>*:junit:jar</include>
<include>*:neethi:jar</include>
<include>*:saaj-api:jar</include>
<include>*:saaj-impl:jar</include>
@@ -121,4 +122,4 @@
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
16 years, 7 months
JBossWS SVN: r7545 - stack/cxf/branches/jbossws-cxf-3.0.2/src/main/scripts.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-14 10:25:35 -0400 (Sat, 14 Jun 2008)
New Revision: 7545
Modified:
stack/cxf/branches/jbossws-cxf-3.0.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2232] Adding junit.jar to the binary distro (required to run the testsuite from Eclipse)
Modified: stack/cxf/branches/jbossws-cxf-3.0.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.0.2/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-14 14:14:23 UTC (rev 7544)
+++ stack/cxf/branches/jbossws-cxf-3.0.2/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-14 14:25:35 UTC (rev 7545)
@@ -33,6 +33,7 @@
<include>*:jbossws-common:jar</include>
<include>*:jbossws-framework:jar</include>
<include>*:jbossws-spi:jar</include>
+ <include>*:junit:jar</include>
<include>*:neethi:jar</include>
<include>*:saaj-api:jar</include>
<include>*:saaj-impl:jar</include>
@@ -121,4 +122,4 @@
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
16 years, 7 months
JBossWS SVN: r7544 - stack/metro/branches/jbossws-metro-3.0.2/src/main/scripts.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-14 10:14:23 -0400 (Sat, 14 Jun 2008)
New Revision: 7544
Modified:
stack/metro/branches/jbossws-metro-3.0.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2232] Adding junit.jar to the binary distro (required to run the testsuite from Eclipse)
Modified: stack/metro/branches/jbossws-metro-3.0.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/branches/jbossws-metro-3.0.2/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-14 13:04:59 UTC (rev 7543)
+++ stack/metro/branches/jbossws-metro-3.0.2/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-14 14:14:23 UTC (rev 7544)
@@ -50,6 +50,7 @@
<include>*:xmldsig:jar</include>
<include>*:xmlsec:jar</include>
<include>*:xws-security:jar</include>
+ <include>*:junit:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -151,4 +152,4 @@
<destName>jbossws-metro-wsit-tools.jar</destName>
</file>
</files>
-</assembly>
\ No newline at end of file
+</assembly>
16 years, 7 months
JBossWS SVN: r7543 - framework/trunk/testsuite/test/ant-import.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-14 09:04:59 -0400 (Sat, 14 Jun 2008)
New Revision: 7543
Modified:
framework/trunk/testsuite/test/ant-import/build-testsuite.xml
Log:
[JBWS-2232] Providing test-resources and test-libs dirs when calling the Eclipse launch file Ant task
Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-06-14 12:58:11 UTC (rev 7542)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-06-14 13:04:59 UTC (rev 7543)
@@ -534,9 +534,9 @@
<eclipseProjectGenerator projectName="JBossWS Testsuite"/>
<eclipseJUnitTestGenerator projectName="JBossWS Testsuite" projectWorkingDir="${tests.output.dir}" srcDir="${tests.dir}/test-java"
integrationTarget="${jbossws.integration.target}" endorsedDir="${jboss.lib}/endorsed" jbossHome="${jboss.home}" namingProviderUrl="${node0.jndi.url}"
- securityPolicy="${tests.output.dir}/test-classes/tst.policy">
+ securityPolicy="${tests.output.dir}/test-classes/tst.policy" testResourcesDir="${tests.output.dir}/test-resources" testLibsDir="${tests.output.dir}/test-libs">
<fileset dir="${tests.output.dir}/test-classes" includes="org/jboss/test/ws/**/*TestCase.class" excludes="exclude.wildcard"/>
</eclipseJUnitTestGenerator>
</target>
-</project>
\ No newline at end of file
+</project>
16 years, 7 months
JBossWS SVN: r7542 - common/trunk/src/main/java/org/jboss/ws/tools/ant.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-14 08:58:11 -0400 (Sat, 14 Jun 2008)
New Revision: 7542
Modified:
common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java
common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java
Log:
[JBWS-2232] Adding test.resources.directory and test.archive.directory parameters to Eclipse launch files + removing non-jar files from Eclipse .classpath file
Modified: common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java 2008-06-14 12:40:57 UTC (rev 7541)
+++ common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java 2008-06-14 12:58:11 UTC (rev 7542)
@@ -109,7 +109,7 @@
sb.append("<classpathentry kind=\"con\" path=\"org.eclipse.jdt.launching.JRE_CONTAINER\"/>\n");
for (int i = 0; i < libs.length; i++)
{
- if (new File(libs[i]).exists())
+ if (new File(libs[i]).exists() && libs[i].endsWith(".jar")) //jar files only can be used as lib entry
{
sb.append("<classpathentry kind=\"lib\" path=\"");
sb.append(absoluteToRelativePath(libs[i]));
Modified: common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java 2008-06-14 12:40:57 UTC (rev 7541)
+++ common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java 2008-06-14 12:58:11 UTC (rev 7542)
@@ -47,6 +47,8 @@
{
private String projectName;
private String projectWorkingDir; // the Eclipse project working dir, i.e. the output dir
+ private String testResourcesDir; //the dir containing the resources files
+ private String testLibsDir; //the dir containing the libs files
private String srcDir; // the tests src dir
private String integrationTarget;
private String jbossHome;
@@ -111,12 +113,14 @@
conf.putStringAttribute("org.eclipse.jdt.launching.PROJECT_ATTR", projectName);
// computing the userDir; please note we get the relative path since we use the Eclipse $workspace_loc variable
String userDir = "${workspace_loc:" + projectName + "}/" + absoluteToRelativePath(projectWorkingDir);
- conf.putStringAttribute("org.eclipse.jdt.launching.VM_ARGUMENTS", getVMArguments(userDir));
+ String resourcesDir = "${workspace_loc:" + projectName + "}/" + absoluteToRelativePath(testResourcesDir);
+ String libsDir = "${workspace_loc:" + projectName + "}/" + absoluteToRelativePath(testLibsDir);
+ conf.putStringAttribute("org.eclipse.jdt.launching.VM_ARGUMENTS", getVMArguments(userDir, resourcesDir, libsDir));
conf.putStringAttribute("org.eclipse.jdt.launching.WORKING_DIRECTORY", userDir);
return conf;
}
- private String getVMArguments(String userDir)
+ private String getVMArguments(String userDir, String resourcesDir, String libsDir)
{
StringBuffer sb = new StringBuffer();
sb.append("-Djbossws.integration.target=").append(integrationTarget);
@@ -131,6 +135,8 @@
sb.append("-Duser.dir=").append(userDir);
sb.append(" -Djboss.home=").append(jbossHome);
sb.append(" -Djdk.home=${env_var:JAVA_HOME}");
+ sb.append(" -Dtest.archive.directory=").append(libsDir);
+ sb.append(" -Dtest.resources.directory=").append(resourcesDir);
return sb.toString();
}
@@ -182,6 +188,16 @@
this.endorsedDir = endorsedDir;
}
+ public void setTestResourcesDir(String testResourcesDir)
+ {
+ this.testResourcesDir = testResourcesDir;
+ }
+
+ public void setTestLibsDir(String testLibsDir)
+ {
+ this.testLibsDir = testLibsDir;
+ }
+
private class LaunchConfiguration
{
private Map<String, String> booleanAttributes = new LinkedHashMap<String, String>();
16 years, 7 months
JBossWS SVN: r7541 - framework/branches/jbossws-framework-3.0.2/testsuite/test/ant-import.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-14 08:40:57 -0400 (Sat, 14 Jun 2008)
New Revision: 7541
Modified:
framework/branches/jbossws-framework-3.0.2/testsuite/test/ant-import/build-testsuite.xml
Log:
[JBWS-2232] Providing test-resources and test-libs dirs when calling the Eclipse launch file Ant task
Modified: framework/branches/jbossws-framework-3.0.2/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/branches/jbossws-framework-3.0.2/testsuite/test/ant-import/build-testsuite.xml 2008-06-14 12:37:37 UTC (rev 7540)
+++ framework/branches/jbossws-framework-3.0.2/testsuite/test/ant-import/build-testsuite.xml 2008-06-14 12:40:57 UTC (rev 7541)
@@ -534,9 +534,9 @@
<eclipseProjectGenerator projectName="JBossWS Testsuite"/>
<eclipseJUnitTestGenerator projectName="JBossWS Testsuite" projectWorkingDir="${tests.output.dir}" srcDir="${tests.dir}/test-java"
integrationTarget="${jbossws.integration.target}" endorsedDir="${jboss.lib}/endorsed" jbossHome="${jboss.home}" namingProviderUrl="${node0.jndi.url}"
- securityPolicy="${tests.output.dir}/test-classes/tst.policy">
+ securityPolicy="${tests.output.dir}/test-classes/tst.policy" testResourcesDir="${tests.output.dir}/test-resources" testLibsDir="${tests.output.dir}/test-libs">
<fileset dir="${tests.output.dir}/test-classes" includes="org/jboss/test/ws/**/*TestCase.class" excludes="exclude.wildcard"/>
</eclipseJUnitTestGenerator>
</target>
-</project>
\ No newline at end of file
+</project>
16 years, 7 months