February 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r5724 - stack/native/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-19 03:08:39 -0500 (Tue, 19 Feb 2008) New Revision: 5724 Modified: stack/native/trunk/src/main/distro/Install.txt stack/native/trunk/src/main/distro/ant.properties.example Log: removed support for jboss405 Modified: stack/native/trunk/src/main/distro/Install.txt =================================================================== --- stack/native/trunk/src/main/distro/Install.txt 2008-02-19 01:35:32 UTC (rev 5723) +++ stack/native/trunk/src/main/distro/Install.txt 2008-02-19 08:08:39 UTC (rev 5724) @@ -13,9 +13,10 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss50 - ant deploy-jboss42 - ant deploy-jboss40 + ant deploy-jboss421 + ant deploy-jboss422 + ant deploy-jboss423 + ant deploy-jboss500 Please consult the wiki for detailed up to date install instructions http://labs.jboss.com/portal/jbossws/ Modified: stack/native/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/native/trunk/src/main/distro/ant.properties.example 2008-02-19 01:35:32 UTC (rev 5723) +++ stack/native/trunk/src/main/distro/ant.properties.example 2008-02-19 08:08:39 UTC (rev 5724) @@ -4,13 +4,12 @@ # $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ # Optional JBoss Home -jboss405.home=(a)jboss405.home@ jboss421.home=(a)jboss421.home@ jboss422.home=(a)jboss422.home@ jboss423.home=(a)jboss423.home@ jboss500.home=(a)jboss500.home@ -# The JBoss server under test. This can be [jboss405|jboss405.no.ejb3|jboss421|jboss422|jboss423|jboss500] +# The JBoss server under test. This can be [jboss421|jboss422|jboss423|jboss500] jbossws.integration.target=jboss422 # The JBoss settings

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5723 - framework/trunk/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-02-18 20:35:32 -0500 (Mon, 18 Feb 2008) New Revision: 5723 Modified: framework/trunk/src/test/ant-import/build-testsuite.xml Log: [JBWS-1891] New target for creating the testsuite eclipse project Modified: framework/trunk/src/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/src/test/ant-import/build-testsuite.xml 2008-02-19 01:34:32 UTC (rev 5722) +++ framework/trunk/src/test/ant-import/build-testsuite.xml 2008-02-19 01:35:32 UTC (rev 5723) @@ -497,4 +497,36 @@ <delete dir="${tests.output.dir}"/> </target> +  +  +  + + <target name="eclipse" depends="tests-jars" description="Generates the JBossWS Testsuite Eclipse project"> + <fail message="Sorry, this target is for src/binary distribution only."> + <condition> + <not><isset property="build.dir"/></not> + </condition> + </fail> + <path id="tests.eclipse.classpath"> + <path refid="tests.client.classpath"/> + <path refid="tests.javac.classpath"/> + </path> + <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="ws.stack.classpath"/> + <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="ws.stack.classpath"/> + <taskdef name="eclipseJUnitTestGenerator" classname="org.jboss.ws.tools.ant.EclipseJUnitTestsTask" classpathref="ws.stack.classpath"/> + <eclipseClasspathGenerator pathId="tests.eclipse.classpath" excludesFile="${excludesfile}" /> + <eclipseProjectGenerator projectName="JBossWS Testsuite" /> + <eclipseJUnitTestGenerator projectName="JBossWS Testsuite" + projectWorkingDir="${tests.output.dir}" + srcDir="${tests.dir}/java" + integrationTarget="${jbossws.integration.target}" + endorsedDir="${jboss.lib}/endorsed" + jbossHome="${jboss.home}" + namingProviderUrl="${node0.jndi.url}" + securityPolicy="${tests.output.dir}/classes/tst.policy" + > + <fileset dir="${tests.output.dir}/classes" includes="org/jboss/test/ws/**/*TestCase.class" excludes="exclude.wildcard"/> + </eclipseJUnitTestGenerator> + </target> + </project>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5722 - stack/native/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-02-18 20:34:32 -0500 (Mon, 18 Feb 2008) New Revision: 5722 Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml Log: [JBWS-1891] Adding junit.jar to classpath Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-19 01:33:46 UTC (rev 5721) +++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-19 01:34:32 UTC (rev 5722) @@ -138,6 +138,7 @@ <pathelement location="${thirdparty.dir}/policy.jar"/> <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> <pathelement location="${thirdparty.dir}/wstx.jar"/> + <pathelement location="${basedir}/tools/lib/junit.jar"/> </path> </target>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5721 - stack/metro/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-02-18 20:33:46 -0500 (Mon, 18 Feb 2008) New Revision: 5721 Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml Log: [JBWS-1891] Adding junit.jar to classpath Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-19 01:24:06 UTC (rev 5720) +++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-19 01:33:46 UTC (rev 5721) @@ -141,6 +141,7 @@ <pathelement location="${lib.dir}/jbossws-metro-client.jar"/> <pathelement location="${lib.dir}/jbossws-framework.jar"/> <pathelement location="${lib.dir}/jaxws-tools.jar"/> + <pathelement location="${basedir}/tools/lib/junit.jar"/> </path> </target>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5720 - in common/trunk: ant-import and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-02-18 20:24:06 -0500 (Mon, 18 Feb 2008) New Revision: 5720 Added: common/trunk/src/main/java/org/jboss/ws/ common/trunk/src/main/java/org/jboss/ws/tools/ common/trunk/src/main/java/org/jboss/ws/tools/ant/ common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseProjectTask.java Modified: common/trunk/.classpath common/trunk/ant-import/build-thirdparty.xml common/trunk/build.xml common/trunk/version.properties Log: [JBWS-1891] Adding Ant tasks Modified: common/trunk/.classpath =================================================================== --- common/trunk/.classpath 2008-02-18 12:28:29 UTC (rev 5719) +++ common/trunk/.classpath 2008-02-19 01:24:06 UTC (rev 5720) @@ -14,5 +14,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="thirdparty/ant.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: common/trunk/ant-import/build-thirdparty.xml =================================================================== --- common/trunk/ant-import/build-thirdparty.xml 2008-02-18 12:28:29 UTC (rev 5719) +++ common/trunk/ant-import/build-thirdparty.xml 2008-02-19 01:24:06 UTC (rev 5720) @@ -48,6 +48,7 @@ <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> Modified: common/trunk/build.xml =================================================================== --- common/trunk/build.xml 2008-02-18 12:28:29 UTC (rev 5719) +++ common/trunk/build.xml 2008-02-19 01:24:06 UTC (rev 5720) @@ -61,6 +61,7 @@ <javac srcdir="${common.java.dir}" sourcepath="" destdir="${common.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5"> <include name="org/jboss/wsf/**"/> + <include name="org/jboss/ws/**"/> <classpath refid="common.thirdparty.classpath"/> </javac> </target> @@ -102,6 +103,7 @@ <jar jarfile="${common.output.lib.dir}/jbossws-common.jar" manifest="${common.output.etc.dir}/default.mf"> <fileset dir="${common.output.classes.dir}"> <include name="org/jboss/wsf/**"/> + <include name="org/jboss/ws/**"/> </fileset> </jar> Added: common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java 2008-02-19 01:24:06 UTC (rev 5720) @@ -0,0 +1,147 @@ +/* + * 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.jboss.ws.tools.ant; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.Path; + +/** + * An Ant task creating a simple Eclipse .classpath file using the provided + * Ant's path id. + * + * @author alessio.soldano(a)jboss.com + * @since 15-Feb-2008 + */ +public class EclipseClasspathTask extends Task +{ + private String pathId; + private String excludesFile; + + @Override + public void execute() throws BuildException + { + Project project = getProject(); + Path path = (Path)project.getReference(pathId); + String[] pathElements = path.list(); + try + { + List<String> excludes = getExcludes(); + StringBuffer sb = new StringBuffer(); + generateContent(sb, excludes, pathElements); + BufferedWriter out = new BufferedWriter(new FileWriter(new File(getProject().getBaseDir(), ".classpath"))); + out.write(sb.toString()); + out.close(); + } + catch (Exception e) + { + e.printStackTrace(); + throw new BuildException(e); + } + } + + private void generateContent(StringBuffer sb, List<String> excludes, String[] libs) + { + sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); + sb.append("<classpath>\n"); + if (excludes != null && !excludes.isEmpty()) + { + sb.append("<classpathentry excluding=\""); + for (Iterator<String> it = excludes.iterator(); it.hasNext();) + { + sb.append(it.next()); + if (it.hasNext()) + sb.append("|"); + } + sb.append("\" kind=\"src\" path=\"tests/java\"/>\n"); + } + 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()) + { + sb.append("<classpathentry kind=\"lib\" path=\""); + sb.append(absoluteToRelativePath(libs[i])); + sb.append("\"/>\n"); + } + } + sb.append("<classpathentry kind=\"output\" path=\"bin\"/>\n"); + sb.append("</classpath>"); + } + + private List<String> getExcludes() throws IOException + { + List<String> excludes = new LinkedList<String>(); + BufferedReader in = null; + try + { + in = new BufferedReader(new FileReader(excludesFile)); + String str; + while ((str = in.readLine()) != null) + { + if (str.length() > 0 & !str.startsWith("#")) + excludes.add(str); + } + } + finally + { + if (in != null) + in.close(); + } + return excludes; + } + + private String absoluteToRelativePath(String absolutePath) + { + String baseDir = getProject().getBaseDir().toString(); + String result = absolutePath; + if (absolutePath.startsWith(baseDir)) + { + result = absolutePath.substring(baseDir.length()); + if (result.startsWith("\\") || result.startsWith("/")) + result = result.substring(1); + } + return result; + } + + public void setPathId(String pathId) + { + this.pathId = pathId; + } + + public void setExcludesFile(String excludesFile) + { + this.excludesFile = excludesFile; + } + +} Property changes on: common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java 2008-02-19 01:24:06 UTC (rev 5720) @@ -0,0 +1,249 @@ +/* + * 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.jboss.ws.tools.ant; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.FileSet; + +/** + * An Ant task creating Eclipse's launch configuration files for the JUnit tests + * of the test-suite. + * + * @author alessio.soldano(a)jboss.com + * @since 18-Feb-2008 + */ +public class EclipseJUnitTestsTask extends Task +{ + private String projectName; + private String projectWorkingDir; // the Eclipse project working dir, i.e. the output dir + private String srcDir; // the tests src dir + private String integrationTarget; + private String jbossHome; + private String endorsedDir; + private String namingProviderUrl; + private String securityPolicy; + private FileSet fileset; + + @Override + public void execute() throws BuildException + { + try + { + DirectoryScanner dsc = fileset.getDirectoryScanner(getProject()); + String[] classes = dsc.getIncludedFiles(); + for (int i = 0; i < classes.length; i++) + { + String clazz = classes[i]; + File file = new File(getProject().getBaseDir(), pathToClassName(clazz) + ".launch"); + BufferedWriter out = new BufferedWriter(new FileWriter(file)); + out.write(getSingleTestConf(clazz).toString()); + out.close(); + } + } + catch (Exception e) + { + e.printStackTrace(); + throw new BuildException(e); + } + } + + public FileSet createFileset() + { + this.fileset = new FileSet(); + return fileset; + } + + private static String pathToFullClassName(String path) + { + // remove ".class" and replace slashes and backslashes with a dot + return path.substring(0, path.length() - 6).replaceAll("\\\\", ".").replaceAll("/", "."); + } + + private static String pathToClassName(String path) + { + String fullClassName = pathToFullClassName(path); + return fullClassName.substring(fullClassName.lastIndexOf(".") + 1); + } + + private LaunchConfiguration getSingleTestConf(String clazz) + { + LaunchConfiguration conf = new LaunchConfiguration(); + conf.addEntryToListAttribute("org.eclipse.debug.core.MAPPED_RESOURCE_PATHS", "/" + projectName + "/" + absoluteToRelativePath(srcDir) + "/" + + clazz.substring(0, clazz.length() - 6) + ".java"); + conf.addEntryToListAttribute("org.eclipse.debug.core.MAPPED_RESOURCE_TYPES", "1"); + conf.putBooleanAttribute("org.eclipse.debug.core.appendEnvironmentVariables", true); + conf.putBooleanAttribute("org.eclipse.jdt.junit.KEEPRUNNING_ATTR", false); + conf.putStringAttribute("org.eclipse.jdt.junit.CONTAINER", ""); + conf.putStringAttribute("org.eclipse.jdt.junit.TESTNAME", ""); + conf.putStringAttribute("org.eclipse.jdt.junit.TEST_KIND", "org.eclipse.jdt.junit.loader.junit3"); + conf.putStringAttribute("org.eclipse.jdt.launching.MAIN_TYPE", pathToFullClassName(clazz)); + 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)); + conf.putStringAttribute("org.eclipse.jdt.launching.WORKING_DIRECTORY", userDir); + return conf; + } + + private String getVMArguments(String userDir) + { + StringBuffer sb = new StringBuffer(); + sb.append("-Djbossws.integration.target=").append(integrationTarget); + sb.append("
-ea
"); + sb.append("-Dtest.execution.dir=").append(userDir); + sb.append("
-Djava.endorsed.dirs=").append(endorsedDir); + sb.append("
"); + sb.append("-Djava.naming.provider.url=").append(namingProviderUrl); + sb.append("
-Djava.protocol.handler.pkgs=org.jboss.virtual.protocol
"); + sb.append("-Djava.security.policy=").append(absoluteToRelativePath(securityPolicy)); + sb.append("
-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
"); + sb.append("-Duser.dir=").append(userDir); + sb.append("
-Djboss.home=").append(jbossHome); + sb.append("
-Djdk.home=${env_var:JAVA_HOME}"); + return sb.toString(); + } + + private String absoluteToRelativePath(String absolutePath) + { + String baseDir = getProject().getBaseDir().toString(); + if (!absolutePath.startsWith(baseDir)) + throw new IllegalArgumentException("The provided absolute path is outside the current basedir: " + baseDir); + return absolutePath.substring(baseDir.length() + 1); + } + + public void setSrcDir(String srcDir) + { + this.srcDir = srcDir; + } + + public void setProjectName(String projectName) + { + this.projectName = projectName; + } + + public void setProjectWorkingDir(String projectWorkingDir) + { + this.projectWorkingDir = projectWorkingDir; + } + + public void setIntegrationTarget(String integrationTarget) + { + this.integrationTarget = integrationTarget; + } + + public void setJbossHome(String jbossHome) + { + this.jbossHome = jbossHome; + } + + public void setNamingProviderUrl(String namingProviderUrl) + { + this.namingProviderUrl = namingProviderUrl; + } + + public void setSecurityPolicy(String securityPolicy) + { + this.securityPolicy = securityPolicy; + } + + public void setEndorsedDir(String endorsedDir) + { + this.endorsedDir = endorsedDir; + } + + private class LaunchConfiguration + { + private Map<String, String> booleanAttributes = new LinkedHashMap<String, String>(); + private Map<String, String> stringAttributes = new LinkedHashMap<String, String>(); + private Map<String, List<String>> listAttributes = new LinkedHashMap<String, List<String>>(); + + public String toString() + { + StringBuffer sb = new StringBuffer(); + sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); + sb.append("<launchConfiguration type=\"org.eclipse.jdt.junit.launchconfig\">\n"); + for (String key : listAttributes.keySet()) + { + sb.append("<listAttribute key=\"").append(key).append("\">\n"); + for (String value : listAttributes.get(key)) + { + sb.append("<listEntry value=\"").append(value).append("\"/>\n"); + } + sb.append("</listAttribute>\n"); + } + for (String key : booleanAttributes.keySet()) + { + sb.append("<booleanAttribute key=\"").append(key); + sb.append("\" value=\"").append(booleanAttributes.get(key)).append("\"/>\n"); + } + for (String key : stringAttributes.keySet()) + { + sb.append("<stringAttribute key=\"").append(key); + sb.append("\" value=\"").append(stringAttributes.get(key)).append("\"/>\n"); + } + sb.append("</launchConfiguration>"); + return sb.toString(); + } + + public Map<String, String> getBooleanAttributes() + { + return booleanAttributes; + } + + public void putBooleanAttribute(String name, boolean value) + { + this.booleanAttributes.put(name, String.valueOf(value)); + } + + public Map<String, String> getStringAttributes() + { + return stringAttributes; + } + + public void putStringAttribute(String name, String value) + { + this.stringAttributes.put(name, value); + } + + public Map<String, List<String>> getListAttributes() + { + return listAttributes; + } + + public void addEntryToListAttribute(String attribute, String entryValue) + { + if (!listAttributes.containsKey(attribute)) + listAttributes.put(attribute, new LinkedList<String>()); + listAttributes.get(attribute).add(entryValue); + } + } +} Property changes on: common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseProjectTask.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseProjectTask.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseProjectTask.java 2008-02-19 01:24:06 UTC (rev 5720) @@ -0,0 +1,85 @@ +/* + * 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.jboss.ws.tools.ant; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; + +/** + * An Ant task creating a simple Eclipse .project file using the provided project name. + * + * @author alessio.soldano(a)jboss.com + * @since 18-Feb-2008 + */ +public class EclipseProjectTask extends Task +{ + private String projectName; + + @Override + public void execute() throws BuildException + { + try + { + StringBuffer sb = new StringBuffer(); + generateContent(sb); + BufferedWriter out = new BufferedWriter(new FileWriter(new File(getProject().getBaseDir(), ".project"))); + out.write(sb.toString()); + out.close(); + } + catch (Exception e) + { + e.printStackTrace(); + throw new BuildException(e); + } + } + + private void generateContent(StringBuffer sb) + { + sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); + sb.append("<projectDescription>\n <name>"); + sb.append(projectName); + sb.append("</name>\n" + + " <comment></comment>\n" + + " <projects>\n" + + " </projects>\n" + + " <buildSpec>\n" + + " <buildCommand>\n" + + " <name>org.eclipse.jdt.core.javabuilder</name>\n" + + " <arguments>\n" + + " </arguments>\n" + + " </buildCommand>\n" + + " </buildSpec>\n" + + " <natures>\n" + + " <nature>org.eclipse.jdt.core.javanature</nature>\n" + + " </natures>\n" + + "</projectDescription>"); + } + + public void setProjectName(String projectName) + { + this.projectName = projectName; + } +} Property changes on: common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseProjectTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: common/trunk/version.properties =================================================================== --- common/trunk/version.properties 2008-02-18 12:28:29 UTC (rev 5719) +++ common/trunk/version.properties 2008-02-19 01:24:06 UTC (rev 5720) @@ -19,6 +19,7 @@ jboss-common-logging-spi=2.0.2.GA jboss-javaee=5.0.0.Beta3Update1 jboss-microcontainer=2.0.0.Beta3 +apache-ant=1.6.5 junit=3.8.1 sun-jaf=1.1 sun-jaxb=2.1.4

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5719 - stack/metro/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-18 07:28:29 -0500 (Mon, 18 Feb 2008) New Revision: 5719 Modified: stack/metro/trunk/ant-import/build-release.xml Log: [JBWS-1994] fixing release of bin and src distribution + added check for externals Modified: stack/metro/trunk/ant-import/build-release.xml =================================================================== --- stack/metro/trunk/ant-import/build-release.xml 2008-02-18 10:31:00 UTC (rev 5718) +++ stack/metro/trunk/ant-import/build-release.xml 2008-02-18 12:28:29 UTC (rev 5719) @@ -13,8 +13,30 @@ <project> -  - <target name="release" depends="jars" description="Release to jboss.local.repository"> + <target name="release" depends="release-to-repository,release-to-portal" description="Release JBossWS/Metro"> + <echo message="*********************************************"/> + <echo message="* Released: jbossws-${version.id}"/> + <echo message="*"/> + <echo message="* Almost there, please do these steps manually"/> + <echo message="*"/> + <echo message="* - Create SVN tag: jbossws-${version.id}"/> + <echo message="* - Release the jbossws-${version.id} version in JIRA"/> + <echo message="* - Update portal-content/project.xml"/> + <echo message="* - Update portal-content/counter.xml"/> + <echo message="* - Update news in portal-content/freezone/projectDescription.html"/> + <echo message="* - Verify release notes and install instructions"/> + <echo message="* - Publish the interop endpoints"/> + <echo message="* - Commit the portal-content"/> + <echo message="* - Commit the repository jars"/> + <echo message="* - Write a sticky post on the user forum"/> + <echo message="* - Post a message to jbossws-announce(a)lists.jboss.org"/> + <echo message="* - Post a message to thecore(a)jboss.org"/> + <echo message="*"/> + <echo message="*********************************************"/> + </target> + + <target name="release-to-repository" depends="jars,check-svn-externals,warn-svn-externals" + description="Release to jboss.local.repository">  <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> @@ -27,10 +49,77 @@ </copy> <copy tofile="${jboss.repository.dir}/jbossws-metro50/${repository.id}/component-info.xml" file="${metro.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> <filterset> - <filtersfile file="${build.dir}/version.properties"/> + <filtersfile file="${basedir}/version.properties"/> </filterset> </copy> </target> + <target name="check-svn-externals" depends="init"> + <exec dir="${basedir}/src/test-framework" executable="svn" failonerror="true" output="${basedir}/output/svn-info.xml"> + <arg line="info"/> + <arg line="--xml"/> + </exec> + <xmlproperty file="${basedir}/output/svn-info.xml"/> + <condition property="framework.externals.ok"> + <or> + <contains string="${info.entry.url}" substring="jbossws/framework/tags"/> + <equals arg1="${repository.id}" arg2="snapshot"/> + </or> + </condition> + </target> + <target name="warn-svn-externals" depends="init" unless="framework.externals.ok"> + <echo> + *********************************************** + * External link to framework is not tagged! * + * Run: svn pe svn:externals src * + *********************************************** + </echo> + </target> + +  + <target name="release-to-portal" depends="check-portal-content,build-src-dist,build-bin-dist" + description="Release to portal-content" if="jbossws.portal.content.available"> + + <property name="portal.freezone" value="${jbossws.portal.content}/freezone"/> + <property name="portal.userguide" value="${portal.freezone}/user-guide"/> + <property name="portal.downloads" value="${jbossws.portal.content}/downloads"/> + +  + <copy todir="${portal.downloads}" overwrite="true"> + <fileset dir="${basedir}/output"> + <include name="jbossws-${version.id}-src.zip"/> + <include name="jbossws-${version.id}.zip"/> + </fileset> + </copy> + +  + <copy tofile="${portal.downloads}/ReleaseNotes-${version.id}.txt" file="${basedir}/output/jbossws-${version.id}/docs/ReleaseNotes.txt" overwrite="true"/> + <copy tofile="${portal.downloads}/Install-${version.id}.txt" file="${basedir}/output/jbossws-${version.id}/docs/Install.txt" overwrite="true"/> + </target> + + <target name="check-portal-content" depends="prepare" unless="jbossws.portal.content.available"> + <echo message="*********************************************"/> + <echo message="* Not available: ${jbossws.portal.content}"/> + <echo message="*********************************************"/> + </target> + +  + <target name="build-src-dist" description="Build the source distribution"> + <property name="build.src.dist" value="${basedir}/output/src-dist"/> + <delete dir="${build.src.dist}/jbossws-${version.id}-src"/> + <mkdir dir="${build.src.dist}/jbossws-${version.id}-src"/> + <copy todir="${build.src.dist}/jbossws-${version.id}-src"> + <fileset dir="${basedir}"> + <exclude name="**/*.md5"/> + <exclude name="**/output*/**"/> + <exclude name="**/thirdparty/**"/> + <exclude name="mergeinfo.txt"/> + <exclude name="glassfish-metro/**"/> + </fileset> + </copy> + <zip destfile="${basedir}/output/jbossws-${version.id}-src.zip" basedir="${build.src.dist}" + includes="jbossws-${version.id}-src/**"/> + </target> + </project>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5718 - stack/metro/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-18 05:31:00 -0500 (Mon, 18 Feb 2008) New Revision: 5718 Modified: stack/metro/trunk/ant-import/metro-build-adapter.xml Log: [JBWS-1994] fix Modified: stack/metro/trunk/ant-import/metro-build-adapter.xml =================================================================== --- stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-02-18 10:29:38 UTC (rev 5717) +++ stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-02-18 10:31:00 UTC (rev 5718) @@ -16,7 +16,7 @@ Creates the core metro extension jar: 'rt/build/wsit-rt.jar' --> - <target name="-metro.runtime.jar" depends="WSIT.main"> + <target name="-metro.runtime.jar" depends="main"> <ant dir="." target="create-wsit-runtime-jar"/> <mkdir dir="${rt.dir}/build/jboss-tmp"/> <unzip src="${rt.dir}/build/wsit-rt.jar" dest="${rt.dir}/build/jboss-tmp/"/>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5717 - stack/metro/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-18 05:29:38 -0500 (Mon, 18 Feb 2008) New Revision: 5717 Modified: stack/metro/trunk/ant-import/build-metro.xml Log: fix ant based build failure + redundant metro builds Modified: stack/metro/trunk/ant-import/build-metro.xml =================================================================== --- stack/metro/trunk/ant-import/build-metro.xml 2008-02-17 17:23:37 UTC (rev 5716) +++ stack/metro/trunk/ant-import/build-metro.xml 2008-02-18 10:29:38 UTC (rev 5717) @@ -73,11 +73,19 @@ <delete dir="${cvs.dir}"/> </target> - <target name="build.metro" depends="checkout, -install.adapter, clean.metro"> + <target name="check.metro"> + <available file="glassfish-metro/metro.build.marker" property="metro.build.exists"/> + </target> + + <target name="build.metro" depends="check.metro" unless="metro.build.exists"> + <antcall target="checkout"/> + <antcall target="-install.adapter"/> + <antcall target="clean.metro"/> <antbridge target="copy-binaries" file="metro-build-adapter.xml"/> <echo>*********************************</echo> <echo>The metro binaries have been copied to 'glassfish-metro/output'</echo> <echo>*********************************</echo> + <touch file="glassfish-metro/metro.build.marker"/> </target> </project> \ No newline at end of file

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5716 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-17 12:23:37 -0500 (Sun, 17 Feb 2008) New Revision: 5716 Modified: stack/cxf/trunk/version.properties Log: jbossws-common=snapshot Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2008-02-17 17:17:30 UTC (rev 5715) +++ stack/cxf/trunk/version.properties 2008-02-17 17:23:37 UTC (rev 5716) @@ -35,7 +35,7 @@ # Thirdparty library versions jbossws-spi=1.0.1.GA -jbossws-common=1.0.3.GA +jbossws-common=snapshot jbossws-framework=snapshot jbossws-jboss42=4.2.1.GA

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5715 - framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-17 12:17:30 -0500 (Sun, 17 Feb 2008) New Revision: 5715 Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml Log: Remove metro, cxf for AS421 Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2008-02-15 17:25:53 UTC (rev 5714) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2008-02-17 17:17:30 UTC (rev 5715) @@ -11,8 +11,6 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native -STACKMETRO=$WORKSPACE/stack-metro -STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@ ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss421 -Djboss421.home=$JBOSS_INSTANCE" @@ -23,20 +21,6 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # -# undeploy stack-metro -# -cd $STACKMETRO -cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss501 - -# -# undeploy stack-cxf -# -cd $STACKCXF -cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss501 - -# # build and deploy # cd $STACKNATIVE @@ -103,14 +87,6 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> - <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.metro.url@</remote> - <local>stack-metro</local> - </hudson.scm.SubversionSCM-ModuleLocation> - <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.cxf.url@</remote> - <local>stack-cxf</local> - </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN">

16 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2008