[jboss-svn-commits] JBoss Common SVN: r2274 - in common-old/branches/Branch_1_0: .settings and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 9 16:21:22 EST 2007
Author: scott.stark at jboss.org
Date: 2007-02-09 16:21:22 -0500 (Fri, 09 Feb 2007)
New Revision: 2274
Added:
common-old/branches/Branch_1_0/.settings/
common-old/branches/Branch_1_0/.settings/org.eclipse.jdt.core.prefs
common-old/branches/Branch_1_0/.settings/org.eclipse.jdt.ui.prefs
common-old/branches/Branch_1_0/src/main/org/jboss/util/file/ArchiveBrowserFactory.java
common-old/branches/Branch_1_0/src/main/org/jboss/util/file/FileProtocolArchiveBrowserFactory.java
common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarProtocolArchiveBrowserFactory.java
common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarStreamBrowser.java
Removed:
common-old/branches/Branch_1_0/.cvsignore
common-old/branches/Branch_1_0/tools/etc/buildfragments/
common-old/branches/Branch_1_0/tools/etc/buildmagic/build-common.xml
common-old/branches/Branch_1_0/tools/etc/buildmagic/common.xml
common-old/branches/Branch_1_0/tools/etc/buildmagic/version-info.xml
Modified:
common-old/branches/Branch_1_0/src/main/org/jboss/util/file/ArchiveBrowser.java
common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarArchiveBrowser.java
common-old/branches/Branch_1_0/tools/etc/buildmagic/buildmagic.ent
Log:
Merge the ArchiveBrowser changes from 2.0.x and cleanup the buildmagic config
Deleted: common-old/branches/Branch_1_0/.cvsignore
===================================================================
--- common-old/branches/Branch_1_0/.cvsignore 2007-02-08 13:24:55 UTC (rev 2273)
+++ common-old/branches/Branch_1_0/.cvsignore 2007-02-09 21:21:22 UTC (rev 2274)
@@ -1,2 +0,0 @@
-output
-build.log
Added: common-old/branches/Branch_1_0/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- common-old/branches/Branch_1_0/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ common-old/branches/Branch_1_0/.settings/org.eclipse.jdt.core.prefs 2007-02-09 21:21:22 UTC (rev 2274)
@@ -0,0 +1,12 @@
+#Fri Feb 09 13:06:57 PST 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
Added: common-old/branches/Branch_1_0/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- common-old/branches/Branch_1_0/.settings/org.eclipse.jdt.ui.prefs (rev 0)
+++ common-old/branches/Branch_1_0/.settings/org.eclipse.jdt.ui.prefs 2007-02-09 21:21:22 UTC (rev 2274)
@@ -0,0 +1,3 @@
+#Fri Feb 09 13:06:57 PST 2007
+eclipse.preferences.version=1
+internal.default.compliance=default
Modified: common-old/branches/Branch_1_0/src/main/org/jboss/util/file/ArchiveBrowser.java
===================================================================
--- common-old/branches/Branch_1_0/src/main/org/jboss/util/file/ArchiveBrowser.java 2007-02-08 13:24:55 UTC (rev 2273)
+++ common-old/branches/Branch_1_0/src/main/org/jboss/util/file/ArchiveBrowser.java 2007-02-09 21:21:22 UTC (rev 2274)
@@ -1,33 +1,37 @@
/*
-* 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.
-*/
+ * 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.util.file;
-import java.io.File;
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+
import java.net.URL;
import java.util.Iterator;
+import java.util.Map;
/**
* Comment
*
+ * @deprecated
+ *
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
@@ -38,23 +42,18 @@
boolean accept(String filename);
}
+ public static Map factoryFinder = new ConcurrentReaderHashMap();
+
+ static
+ {
+ factoryFinder.put("file", new FileProtocolArchiveBrowserFactory());
+ factoryFinder.put("jar", new JarProtocolArchiveBrowserFactory());
+ }
+
public static Iterator getBrowser(URL url, Filter filter)
{
- if (url.getProtocol().equals("file"))
- {
- File f = new File(url.getFile());
- if (f.isDirectory())
- {
- return new DirectoryArchiveBrowser(f, filter);
- }
- else
- {
- return new JarArchiveBrowser(f, filter);
- }
- }
- else
- {
- throw new RuntimeException("NOT IMPLEMENTED");
- }
+ ArchiveBrowserFactory factory = (ArchiveBrowserFactory)factoryFinder.get(url.getProtocol());
+ if (factory == null) throw new RuntimeException("Archive browser cannot handle protocol: " + url);
+ return factory.create(url, filter);
}
}
Added: common-old/branches/Branch_1_0/src/main/org/jboss/util/file/ArchiveBrowserFactory.java
===================================================================
--- common-old/branches/Branch_1_0/src/main/org/jboss/util/file/ArchiveBrowserFactory.java (rev 0)
+++ common-old/branches/Branch_1_0/src/main/org/jboss/util/file/ArchiveBrowserFactory.java 2007-02-09 21:21:22 UTC (rev 2274)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * 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.util.file;
+
+import java.net.URL;
+import java.util.Iterator;
+
+/**
+ * comment
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface ArchiveBrowserFactory
+{
+ Iterator create(URL url, ArchiveBrowser.Filter filter);
+}
Property changes on: common-old/branches/Branch_1_0/src/main/org/jboss/util/file/ArchiveBrowserFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: common-old/branches/Branch_1_0/src/main/org/jboss/util/file/FileProtocolArchiveBrowserFactory.java
===================================================================
--- common-old/branches/Branch_1_0/src/main/org/jboss/util/file/FileProtocolArchiveBrowserFactory.java (rev 0)
+++ common-old/branches/Branch_1_0/src/main/org/jboss/util/file/FileProtocolArchiveBrowserFactory.java 2007-02-09 21:21:22 UTC (rev 2274)
@@ -0,0 +1,59 @@
+/*
+ * 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.util.file;
+
+import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.io.File;
+import java.util.Iterator;
+
+/**
+ * comment
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision$
+ */
+public class FileProtocolArchiveBrowserFactory implements ArchiveBrowserFactory
+{
+
+ public Iterator create(URL url, ArchiveBrowser.Filter filter)
+ {
+ File f = null;
+ try
+ {
+ f = new File(new URI(url.toString()));
+ }
+ catch (URISyntaxException e)
+ {
+ throw new RuntimeException("Not a valid URL: " + url, e);
+ }
+ if (f.isDirectory())
+ {
+ return new DirectoryArchiveBrowser(f, filter);
+ }
+ else
+ {
+ return new JarArchiveBrowser(f, filter);
+ }
+ }
+}
Property changes on: common-old/branches/Branch_1_0/src/main/org/jboss/util/file/FileProtocolArchiveBrowserFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarArchiveBrowser.java
===================================================================
--- common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarArchiveBrowser.java 2007-02-08 13:24:55 UTC (rev 2273)
+++ common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarArchiveBrowser.java 2007-02-09 21:21:22 UTC (rev 2274)
@@ -1,32 +1,36 @@
/*
-* 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.
-*/
+ * 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.util.file;
import java.util.Iterator;
import java.util.Enumeration;
+import java.util.jar.JarFile;
+import java.util.jar.JarEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipEntry;
import java.io.File;
import java.io.IOException;
+import java.net.URL;
+import java.net.JarURLConnection;
/**
* Comment
@@ -37,17 +41,32 @@
**/
public class JarArchiveBrowser implements Iterator
{
- ZipFile zip;
+ JarFile zip;
Enumeration entries;
- ZipEntry next;
+ JarEntry next;
ArchiveBrowser.Filter filter;
+ public JarArchiveBrowser(JarURLConnection url, ArchiveBrowser.Filter filter)
+ {
+ this.filter = filter;
+ try
+ {
+ zip = url.getJarFile();
+ entries = zip.entries();
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
+ }
+ setNext();
+ }
+
public JarArchiveBrowser(File f, ArchiveBrowser.Filter filter)
{
this.filter = filter;
try
{
- zip = new ZipFile(f);
+ zip = new JarFile(f);
entries = zip.entries();
}
catch (IOException e)
@@ -69,7 +88,7 @@
{
do
{
- next = (ZipEntry) entries.nextElement();
+ next = (JarEntry)entries.nextElement();
} while (entries.hasMoreElements() && next.isDirectory());
if (next.isDirectory()) next = null;
Added: common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarProtocolArchiveBrowserFactory.java
===================================================================
--- common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarProtocolArchiveBrowserFactory.java (rev 0)
+++ common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarProtocolArchiveBrowserFactory.java 2007-02-09 21:21:22 UTC (rev 2274)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * 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.util.file;
+
+import java.util.Iterator;
+import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.JarURLConnection;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * comment
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision$
+ */
+public class JarProtocolArchiveBrowserFactory implements ArchiveBrowserFactory
+{
+
+ public Iterator create(URL url, ArchiveBrowser.Filter filter)
+ {
+ if (url.toString().endsWith("!/"))
+ {
+ try
+ {
+ return new JarArchiveBrowser((JarURLConnection) url.openConnection(), filter);
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("Unable to browse url: " + url, e);
+ }
+ }
+ else
+ {
+ try
+ {
+ return new JarStreamBrowser(url.openStream(), filter);
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("Unable to browse url: " + url, e);
+ }
+ }
+ }
+}
Property changes on: common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarProtocolArchiveBrowserFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarStreamBrowser.java
===================================================================
--- common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarStreamBrowser.java (rev 0)
+++ common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarStreamBrowser.java 2007-02-09 21:21:22 UTC (rev 2274)
@@ -0,0 +1,119 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * 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.util.file;
+
+import java.util.Iterator;
+import java.util.jar.JarInputStream;
+import java.util.jar.JarEntry;
+import java.io.File;
+import java.io.IOException;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.ByteArrayInputStream;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class JarStreamBrowser implements Iterator
+{
+ JarInputStream jar;
+ JarEntry next;
+ ArchiveBrowser.Filter filter;
+
+ public JarStreamBrowser(File file, ArchiveBrowser.Filter filter) throws IOException
+ {
+ this(new FileInputStream(file), filter);
+ }
+
+ public JarStreamBrowser(InputStream is, ArchiveBrowser.Filter filter) throws IOException
+ {
+ this.filter = filter;
+ jar = new JarInputStream(is);
+ setNext();
+ }
+
+ public boolean hasNext()
+ {
+ return next != null;
+ }
+
+ private void setNext()
+ {
+ try
+ {
+ if (next != null) jar.closeEntry();
+ next = null;
+ do
+ {
+ next = jar.getNextJarEntry();
+ } while (next != null && (next.isDirectory() || !filter.accept(next.getName())));
+ if (next == null) jar.close();
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("failed to browse jar", e);
+ }
+ }
+
+ public Object next()
+ {
+ int size = (int) next.getSize();
+ byte[] buf = new byte[size];
+ int count = 0;
+ int current = 0;
+ try
+ {
+ while ((
+ (
+ current = jar.read(buf, count,
+ size - count)
+ ) != -1
+ ) && (count < size))
+ {
+ count += current;
+ }
+ ByteArrayInputStream bais = new ByteArrayInputStream(buf);
+ setNext();
+ return bais;
+ }
+ catch (IOException e)
+ {
+ try
+ {
+ jar.close();
+ }
+ catch (IOException ignored)
+ {
+
+ }
+ throw new RuntimeException(e);
+ }
+ }
+
+ public void remove()
+ {
+ throw new RuntimeException("Illegal operation on ArchiveBrowser");
+ }
+}
Property changes on: common-old/branches/Branch_1_0/src/main/org/jboss/util/file/JarStreamBrowser.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Deleted: common-old/branches/Branch_1_0/tools/etc/buildmagic/build-common.xml
===================================================================
--- common-old/branches/Branch_1_0/tools/etc/buildmagic/build-common.xml 2007-02-08 13:24:55 UTC (rev 2273)
+++ common-old/branches/Branch_1_0/tools/etc/buildmagic/build-common.xml 2007-02-09 21:21:22 UTC (rev 2274)
@@ -1,905 +0,0 @@
-<project name="common tasks">
-
- <!-- Make sure we have the right version of Ant -->
- <property name="buildmagic.ant16.baseversion" value="1.6"/>
-
- <!--
- | Add new conditions for other supported Ant versions when they
- | become avaialble.
- -->
-
- <condition property="buildmagic.ant.compatible">
- <or>
- <contains string="${ant.version}"
- substring="Ant version ${buildmagic.ant16.baseversion}"/>
- </or>
- </condition>
-
- <fail unless="buildmagic.ant.compatible">
- Unsupported Ant version:
- ${ant.version}
- Please install a version which is compatible with Ant ${buildmagic.ant16.baseversion}.
- </fail>
-
- <!-- JDK Detection -->
- <available classname="java.lang.StrictMath" property="HAVE_JDK_1.3"/>
- <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
- <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
-
- <fail unless="HAVE_JDK_1.4">
- Unsupported Java version: You need at least JDK1.4 to build JBoss5
- </fail>
-
- <!-- Define the environment varaible. This needs to be first. -->
- <property environment="env"/>
-
- <!-- Setup the project environment. -->
- <dirname property="project.root" file="${basedir}"/>
- <property name="project.build" value="${project.root}/build"/>
- <property name="project.tools" value="${project.root}/tools"/>
- <property name="project.thirdparty" value="${project.root}/thirdparty"/>
-
- <!-- Setup the module environment. -->
- <property name="module.root" value="${basedir}"/>
- <property file="${module.root}/local.properties"/>
- <property name="module.source" value="${module.root}/src"/>
- <property name="module.output" value="${module.root}/output"/>
- <property name="module.tools" value="${module.root}/tools"/>
- <property name="module.thirdparty" value="${module.root}/thirdparty"/>
-
- <!-- Load Buildmagic extention tasks. -->
- <property name="buildmagic.local.classpath" value="."/>
- <path id="buildmagic.task.classpath">
- <fileset dir="${project.tools}/lib">
- <include name="*"/>
- </fileset>
- <pathelement location="${project.tools}/lib"/>
- <pathelement location="${project.tools}/etc"/>
- <pathelement location="${project.tools}"/>
- <pathelement path="${buildmagic.local.classpath}"/>
- </path>
-
- <!-- Include user and project property overrides. -->
- <import file="version-info.xml" />
- <property file="${project.build}/local.properties"/>
-
- <available file="${module.root}/etc/local.properties-example"
- property="init.have-local-properties"/>
-
- <!-- Load common properties -->
- <property file="${project.tools}/etc/buildmagic/common.properties"/>
-
- <!-- Load common task properties -->
- <property file="${project.tools}/etc/buildmagic/task.properties"/>
-
- <!-- Marker to disable build -->
- <property name="build-bypass.marker" value="${module.output}/build-marker"/>
-
- <!-- Marker to disable mbeans -->
- <property name="mbean-bypass.marker" value="${module.output}/mbean-marker"/>
-
-
-<!-- Initialize the build.log -->
-<target name="_buildmagic:init:buildlog">
- <property name="buildlog.level" value="info"/>
- <record name="${basedir}/build.log" append="no" loglevel="${buildlog.level}"/>
- <property name="init-buildlog.disable" value="true" system="true"/>
-</target>
-
-<!-- Show the running environment if -Dinit.verbose=true -->
-<target name="_buildmagic:init:show-environment">
- <echo><![CDATA[
-project.root: ${project.root}
-module.root: ${module.root}
-user.home: ${user.home}
-build.compiler: ${build.compiler}
-java.home: ${java.home}
-java.class.path: ${java.class.path}
-java.version: ${java.version}
-java.vendor: ${java.vendor}
-java.vm.version: ${java.vm.version}
-java.vm.name: ${java.vm.name}
-java.vm.info: ${java.vm.info}
-os.name: ${os.name}
-os.arch: ${os.arch}
-os.version: ${os.version}
-]]></echo>
-</target>
-
-<!-- ================================================================== -->
-<!-- Build Bypass -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:build-bypass-checker" unless="build-bypass.disabled">
-
- <uptodate property="build-bypass.on" targetfile="${build-bypass.marker}">
- <srcfiles dir="${module.source}" includes="**/*"/>
- <srcfiles dir="${module.root}" includes="build.xml,local.properties"/>
- <srcfiles dir="${project.root}" includes="build/build.xml,build/local.properties"/>
- <srcfiles dir="${project.thirdparty}" includes="**/*"/>
- <srcfiles dir="${project.tools}" includes="**/*"/>
- </uptodate>
-
-</target>
-
-<target name="_buildmagic:build-bypass-notice" if="build-bypass.on">
- <echo>
-Build disabled because module is already built. To force the module
-to build define build-bypass.disabled=true.
- </echo>
-</target>
-
-<target name="_buildmagic:build-bypass-check" depends="_buildmagic:build-bypass-checker, _buildmagic:build-bypass-notice"/>
-
-
-<!-- ================================================================== -->
-<!-- Cleaning -->
-<!-- ================================================================== -->
-
-<!-- Clean up all build output -->
-<target name="_buildmagic:clean">
- <available file="${module.output}" property="module.output.present"/>
- <antcall target="_buildmagic:clean-internal"/>
-</target>
-
-<!-- Actuall cleanup, fails if ${module.output} is missing -->
-<target name="_buildmagic:clean-internal" if="module.output.present">
- <delete includeEmptyDirs="true">
- <fileset dir="${module.output}">
- <exclude name="eclipse-classes/**"/>
- </fileset>
- </delete>
-</target>
-
-<!-- Clean up all generated files -->
-<target name="_buildmagic:clobber">
- <delete file="${module.root}/local.properties"/>
- <delete dir="${module.output}"/>
-
- <!-- Try to stop the build log before we delete the file. -->
- <record name="${module.root}/build.log" action="stop"/>
-
- <!--
- | This file may be opened still due and fail to be removed on win32
- | systems, so lets just ignore those errors for now.
- -->
- <delete file="${module.root}/build.log" quiet="true" failonerror="false"/>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Help -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:help:standard">
- <projecthelp taskname="help">
- <header><![CDATA[
- The ${module.Name} module.
-]]></header>
- <footer><![CDATA[
- -projecthelp for all targets
- -help for full options
-]]></footer>
- </projecthelp>
-</target>
-
-<target name="_buildmagic:help:build">
- <projecthelp taskname="help">
- <header><![CDATA[
- The ${module.Name} module.
-]]></header>
- <footer><![CDATA[
- -Dgroups=<group>[(,<group>)*] Specify the module groups.
- -Dmodules=<module>[(,<module>)*] Specify the modules.
- (overrides groups).
- -projecthelp for all targets
- -help for full options
-]]></footer>
- </projecthelp>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Release -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:release:zip">
- <zip zipfile="${module.output}/${release.id}.zip">
- <fileset dir="${module.output}">
- <include name="${release.id}/**"/>
- </fileset>
- </zip>
-</target>
-
-<target name="_buildmagic:release:tar">
- <tar tarfile="${module.output}/${release.id}.tar" longfile="gnu"
- basedir="${module.output}"
- includes="${release.id}/**">
- </tar>
-</target>
-
-<target name="_buildmagic:release:tgz" depends="_buildmagic:release:tar">
- <gzip src="${module.output}/${release.id}.tar"
- zipfile="${module.output}/${release.id}.tgz"/>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Install -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:install:default">
- <!-- Copy the output directory to the install directory -->
- <mkdir dir="${install.root}"/>
- <copy todir="${install.root}" filtering="no">
- <fileset dir="${module.output}">
- <include name="**/*"/>
- <exclude name="${install.id}/**"/>
- </fileset>
- </copy>
-</target>
-
-<!-- ================================================================== -->
-<!-- Initialization -->
-<!-- ================================================================== -->
-
-<!-- ================================================================== -->
-<!-- Tasks -->
-<!-- ================================================================== -->
-
-<target name="_default:task-init">
-
- <!-- Where source files live -->
- <property name="source.java" value="${module.source}/main"/>
- <property name="source.etc" value="${module.source}/etc"/>
- <property name="source.bin" value="${module.source}/bin"/>
- <property name="source.docs" value="${module.source}/docs"/>
- <property name="source.resources" value="${module.source}/resources"/>
- <property name="source.examples" value="${module.source}/examples"/>
-
- <!-- Where build generated files will go -->
- <property name="build.classes" value="${module.output}/classes"/>
- <property name="build.lib" value="${module.output}/lib"/>
- <property name="build.api" value="${module.output}/api"/>
- <property name="build.etc" value="${module.output}/etc"/>
- <property name="build.bin" value="${module.output}/bin"/>
- <property name="build.docs" value="${module.output}/docs"/>
- <property name="build.parsers" value="${module.output}/gen-parsers"/>
- <property name="build.resources" value="${module.output}/resources"/>
- <property name="build.examples" value="${module.output}/examples"/>
- <property name="build.reports" value="${module.output}/reports"/>
- <property name="build.gen" value="${module.output}/gen"/>
- <property name="build.gen-src" value="${module.output}/gen-src"/>
- <property name="build.todo" value="${module.output}/todo"/>
-
- <!-- Install/Release structure -->
- <property name="install.id" value="${module.name}-${module.version}"/>
- <property name="release.id" value="${install.id}"/>
- <property name="install.root" value="${module.output}/${install.id}"/>
-
- <!-- The combined thirdparty classpath -->
- <path id="thirdparty.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- </path>
-
- <!-- This module is based on Java 1.4 -->
- <property name="javac.target" value="1.4"/>
- <property name="javac.source" value="1.4"/>
-
- <!-- RMIC should generate stubs compatible with Java 1.2+ -->
- <property name="rmic.stubVersion" value="1.2"/>
-
- <!-- classpath and local.classpath must have a value using with a path -->
- <property name="classpath" value=""/>
- <property name="local.classpath" value=""/>
-
- <!-- The classpath required to build classes. -->
- <path id="javac.classpath">
- <pathelement path="${classpath}"/>
- <pathelement path="${local.classpath}"/>
- <path refid="thirdparty.classpath"/>
- </path>
-
- <!-- The classpath required to build javadocs. -->
- <path id="javadoc.classpath">
- <path refid="javac.classpath"/>
- </path>
-
- <!-- The default prefix -->
- <property name="jar.prefix" value="jboss-${module.name}"/>
-
- <!-- The default server and client jar name -->
- <property name="jar.server.name" value="${jar.prefix}.jar"/>
- <property name="jar.client.name" value="${jar.prefix}-client.jar"/>
-
- <!-- Packages to include when generating api documentation -->
- <property name="javadoc.packages" value="org.jboss.*"/>
-</target>
-
-<!-- ================================================================== -->
-<!-- Compile -->
-<!-- ================================================================== -->
-
-<!-- Compile all class files -->
-<target name="_default:compile-classes" unless="compile.disable">
- <mkdir dir="${build.classes}"/>
-
- <!-- Hack, required to avoid duplicate javac targets -->
- <mkdir dir="${build.gen-src}"/>
-
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- source="${javac.source}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${source.java}:${build.gen-src}"/>
- <classpath refid="javac.classpath"/>
- <include name="${javac.includes}"/>
- <exclude name="${javac.excludes}"/>
- </javac>
-</target>
-
-<!--
- | Compile mbeans
- -->
-
-<target name="_buildmagic:mbean-bypass-checker" unless="mbean-bypass.disabled">
-
- <uptodate property="mbean-bypass.on" targetfile="${mbean-bypass.marker}">
- <srcfiles dir="${module.source}" includes="${mbean.includes}"/>
- </uptodate>
-
-</target>
-<target name="_default:compile-mbean-sources"
- depends="_buildmagic:mbean-bypass-checker"
- unless="mbean-bypass.on">
-
- <taskdef name="jmxdoclet"
- classname="xdoclet.modules.jmx.JMXDocletTask"
- classpathref="xdoclet.task.classpath"/>
-
- <mkdir dir="${build.gen-src}"/>
-
- <jmxdoclet destdir="${build.gen-src}"
- excludedtags="@version, at author">
- <fileset dir="${source.java}"
- includes="${mbean.includes}"/>
- <mbeaninterface mergedir="${project.tools}/etc/xdoclet/templates"/>
- </jmxdoclet>
-
- <touch file="${mbean-bypass.marker}"/>
-</target>
-
-<!-- Compile all module test class files -->
-<target name="_default:compile-test-classes" unless="compile.disable">
-
- <mkdir dir="${build.test}"/>
-
- <!-- Hack, required to avoid duplicate javac targets -->
- <mkdir dir="${build.gen.test}"/>
-
- <javac destdir="${build.test}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- source="${javac.source}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${source.test}:${build.gen.test}"/>
- <classpath>
- <path refid="javac.classpath"/>
- <pathelement location="${build.classes}"/>
- </classpath>
- <include name="${javac.includes}"/>
- <exclude name="${javac.excludes}"/>
- </javac>
-</target>
-
-<!-- Compile manifests -->
-<target name="_default:compile-etc" unless="compile.disable">
- <mkdir dir="${build.etc}"/>
- <copy todir="${build.etc}" filtering="yes">
- <fileset dir="${source.etc}">
- <include name="**"/>
- </fileset>
- </copy>
-</target>
-
-<!-- Compile resource files -->
-<target name="_default:compile-resources" unless="compile.disable">
- <mkdir dir="${build.resources}"/>
- <copy todir="${build.resources}" filtering="yes">
- <fileset dir="${source.resources}">
- <patternset refid="compile-resources.filter.pattern"/>
- </fileset>
- </copy>
- <copy todir="${build.resources}" filtering="no">
- <fileset dir="${source.resources}">
- <patternset refid="compile-resources.pattern"/>
- </fileset>
- </copy>
-</target>
-
-<patternset id="compile-resources.filter.pattern">
- <include name="**/*"/>
-</patternset>
-
-<patternset id="compile-resources.pattern">
- <exclude name="INVALID_FILE_DOES_NOT_EXISTS"/>
-</patternset>
-
-<!-- Compile stylesheets files -->
-<target name="_default:compile-stylesheets" unless="compile.disable">
- <mkdir dir="${build.stylesheets}"/>
- <copy todir="${build.stylesheets}" filtering="yes">
- <fileset dir="${source.stylesheets}">
- <include name="**/*"/>
- </fileset>
- </copy>
-</target>
-
-<!-- Compile bin scripts -->
-<target name="_default:compile-bin" unless="compile.disable">
- <mkdir dir="${build.bin}"/>
- <copy todir="${build.bin}" filtering="yes">
- <fileset dir="${source.bin}">
- <include name="**/*"/>
- </fileset>
- </copy>
-
-</target>
-
-<target name="_default:fix-bin">
- <fixcrlf srcdir="${build.bin}"
- eol="lf" eof="remove"
- includes="**/*.sh, **/*.conf"/>
-
- <fixcrlf srcdir="${build.bin}"
- eol="crlf" eof="remove"
- includes="**/*.bat, **/*.cmd"/>
-
- <chmod perm="+x">
- <fileset dir="${build.bin}">
- <include name="**/*.sh"/>
- </fileset>
- </chmod>
-</target>
-
-<target name="_default:compile-web" unless="compile.disable">
- <mkdir dir="${build.web}"/>
- <copy todir="${build.web}" filtering="yes">
- <fileset dir="${source.web}">
- <patternset refid="compile-web.filter.pattern"/>
- </fileset>
- </copy>
- <copy todir="${build.web}" filtering="no">
- <fileset dir="${source.web}">
- <patternset refid="compile-web.pattern"/>
- </fileset>
- </copy>
-</target>
-
-<patternset id="compile-web.pattern">
- <exclude name="INVALID_FILE_DOES_NOT_EXISTS"/>
-</patternset>
-
-<patternset id="compile-web.filter.pattern">
- <include name="**/*"/>
-</patternset>
-
-<target name="_default:compile-checksums" unless="compile.disable">
- <checksum>
- <fileset dir="${build.lib}">
- <include name="*.jar"/>
- <include name="*.zip"/>
- </fileset>
- </checksum>
-</target>
-
-<!-- Compile RMI stubs -->
-<target name="_default:compile-rmi" unless="compile.disable">
- <rmic base="${build.classes}"
- verify="${rmic.verify}"
- iiop="${rmic.iiop}"
- iiopopts="${rmic.iiopops}"
- idl="${rmic.idl}"
- idlopts="${rmic.idlops}"
- debug="${rmic.debug}"
- stubVersion="${rmic.stubVersion}">
- <classpath refid="javac.classpath"/>
- <patternset refid="compile-rmi.pattern"/>
- </rmic>
-</target>
-
-<patternset id="compile-rmi.pattern">
- <exclude name="INVALID_FILE_DOES_NOT_EXISTS"/>
-</patternset>
-
-<!-- ================================================================== -->
-<!-- Jars -->
-<!-- ================================================================== -->
-
-<target name="_default:server-client-jars">
-
- <!-- Build the server jar -->
- <jar jarfile="${build.lib}/${jar.server.name}"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}"
- includes="${jar.server.includes}"/>
- </jar>
-
- <!-- Build jbossmq-client.jar -->
- <jar jarfile="${build.lib}/${jar.client.name}"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}"
- includes="${jar.client.includes}"/>
- </jar>
-
-</target>
-
-<!-- ================================================================== -->
-<!-- Documents -->
-<!-- ================================================================== -->
-
-<target name="docs" description="Builds all documentation."
- depends="docs-api, docs-todo"/>
-
-<!-- ======== -->
-<!-- JavaDocs -->
-<!-- ======== -->
-
-
-<target name="docs-javadocs-check">
-
- <!-- if index.html is newer than the sources we are up to date -->
- <uptodate property="docs-javadocs.disable"
- targetfile="${build.api}/index.html">
- <srcfiles dir="${source.java}" includes="**/*.java"/>
- </uptodate>
-</target>
- <!-- Generate Javadoc if we are out of date -->
-<target name="docs-javadocs"
- depends="docs-javadocs-check"
- unless="docs-javadocs.disable">
-
- <mkdir dir="${build.api}"/>
- <mkdir dir="${module.output}/gen-src"/>
- <javadoc packagenames="${javadoc.packages}"
- sourcepath="${source.java}:${module.output}/gen-src"
- destdir="${build.api}"
- classpathref="javadoc.classpath"
- windowtitle="${javadoc.windowtitle}"
- splitindex="${javadoc.splitindex}"
- author="${javadoc.author}"
- version="${javadoc.version}"
- public="${javadoc.public}"
- package="${javadoc.package}"
- protected="${javadoc.protected}"
- private="${javadoc.private}"
- use="${javadoc.use}"
- verbose="${javadoc.verbose}">
- <doctitle><![CDATA[<h1>${module.Name} API Documentation</h1>]]></doctitle>
- <bottom><![CDATA[
- <i>
- <div align="center">
- <font size="-1">Copyright © 2002 JBoss Group, LLC. All Rights Reserved.</font>
- </div>
- </i>
- ]]></bottom>
-
- <!--
- <link href="http://java.sun.com/j2se/1.3/docs/api"/>
- -->
-
- <!-- Added links and tags by Yanik Crepeau <yanik at exScriptis.com> 2003-05-13 -->
- <!--Thes tag declarations will shut down the Unknown tag warning during the javadoc process -->
- <link href="http://java.sun.com/j2se/1.4.1/docs/api/"/>
- <tag name="ejb.interface-method" description="ejb interface method delcaration" enabled="false" />
- <tag name="ejb.persistence" description="ejb persistence declaration" enabled="false" />
- <tag name="ejb.pk-field" description="ejb primary-key field declaration" enabled="false" />
- <tag name="ejb.pk" description="ejb" enabled="false" />
- <tag name="ejb.bean" description="ejb" enabled="false" />
- <tag name="ejb.transaction" description="ejb" enabled="false" />
- <tag name="ejb.finder" description="ejb" enabled="false" />
- <tag name="ejb.relation" description="ejb" enabled="false" />
- <tag name="ejb.create-method" description="ejb" enabled="false" />
-
- <tag name="jboss.query" description="jboss" enabled="false" />
- <tag name="jboss.lazy-load-group" description="jboss" enabled="false" />
- <tag name="jboss.load-group" description="jboss" enabled="false" />
- <tag name="jboss.persistence" description="jboss" enabled="false" />
- <tag name="jboss.entity-command" description="jboss" enabled="false" />
- <tag name="jboss.method-attribute" description="jboss" enabled="false" />
- <tag name="jboss.relation" description="jboss" enabled="false" />
- <tag name="jboss.method-attribute" description="jboss" enabled="false" />
- <tag name="jboss.relation-read-ahead" description="jboss" enabled="false" />
- <tag name="jboss.relation-table" description="jboss" enabled="false" />
- <tag name="jboss.table-attribute" description="jboss" enabled="false" />
-
- <tag name="jmx.managed-attribute" description="jmx" enabled="false" />
- <tag name="jmx.managed-constructor" description="jmx" enabled="false" />
- <tag name="jboss.method-attributes" description="jboss" enabled="false" />
-
- </javadoc>
-</target>
-
-
-<target name="docs-api" depends="docs-javadocs"/>
-
-<target name="javadocs" depends="docs-javadocs"/>
-
-<!-- ========= -->
-<!-- TODO Docs -->
-<!-- ========= -->
-<target name="xdoclet-task-classpath-check" unless="xdoclet.task.classpath">
- <path id="xdoclet.task.classpath">
- <path refid="xdoclet.base.classpath"/>
- <path refid="apache.commons.classpath"/>
- <path refid="javac.classpath" />
- </path>
- <property name="xdoclet.task.classpath"
- refid="xdoclet.task.classpath"/>
-</target>
-
-<target name="docs-todo-check">
- <!-- if index.html is newer than the sources we are up to date -->
- <uptodate property="docs-todo.disable"
- targetfile="${build.todo}/index.html">
- <srcfiles dir="${source.java}" includes="**/*.java"/>
- </uptodate>
- </target>
-
- <!-- Generate TODO list from @todo tags -->
- <target name="docs-todo"
- depends="docs-todo-check"
- unless="docs-todo.disable">
-
- <taskdef name="todo"
- classname="xdoclet.modules.doc.DocumentDocletTask"
- classpath="${xdoclet.task.classpath}"/>
- <mkdir dir="${build.todo}"/>
- <todo destdir="${build.todo}">
- <fileset dir="${source.java}">
- <include name="**/*.java"/>
- </fileset>
-
- <info/>
- </todo>
-</target>
-
-<target name="todo" depends="docs-todo"/>
-
-<!-- ============== -->
-<!-- JMX MBean Docs -->
-<!-- ============== -->
-
- <target name="jmx-docs">
- <taskdef name="jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
-
- <mkdir dir="${build.jmx-doc}"/>
- <jmxdoclet
- destdir="${build.jmx-doc}"
- force="false"
- excludedtags="@version, at author">
- <fileset dir="${source.java}">
- <include name="**/*.java"/>
- </fileset>
- <jbossXmlDoc/>
- </jmxdoclet>
-
- </target>
-
- <!-- Generate the plain HTML jmx docs -->
- <target name="jmx-docs-html-plain" depends="jmx-docs">
-
-
- <!-- Force the use of SAXON XSLT -->
- <property system="true"
- name="javax.xml.transform.TransformerFactory"
- value="com.icl.saxon.TransformerFactoryImpl"/>
-
- <mkdir dir="${build.jmx-api}"/>
- <style style="${project.thirdparty}/oasis/docbook-xsl/html/docbook.xsl"
- processor="trax"
- extension=".html"
- basedir="${build.jmx-doc}"
- destdir="${build.jmx-api}">
- <include name="**/*.xml"/>
- <param name="quiet" expression="${oasis.docbook.xsl.chunker.quiet}"/>
- <param name="base.dir" expression="${build.jmx-api}${file.separator}"/>
- </style>
-
- </target>
-
-
-<!-- ================================================================== -->
-<!-- Cleaning -->
-<!-- ================================================================== -->
-
-<!-- Clean up all build output -->
-<target name="_default:clean"
- depends="_buildmagic:clean">
-</target>
-
-<!-- Clean up all generated files -->
-<target name="_default:clobber"
- depends="_buildmagic:clobber, clean">
-</target>
-
-<!-- ================================================================== -->
-<!-- Install & Release -->
-<!-- ================================================================== -->
-
- <!-- ================================================================== -->
- <!-- Project (build module) Targets -->
- <!-- ================================================================== -->
-
-<target name="configure-project" unless="configure-project.disable">
-
- <!-- Skip any missing modules and issue a warning -->
- <property name="executemodules.skipmissing" value="true"/>
-
- <!-- The header and footer displayed during each module execution -->
- <property name="executemodules.header"><![CDATA[
- ==============================================================
- ==
- == Executing '@TARGET@' in module '@MODULE@'...
- ==
- ==]]></property>
-
- <property name="executemodules.footer"><![CDATA[
- ==
- ==
- == Finished '@TARGET@' in module '@MODULE@'.
- ==
- ==============================================================
- ]]></property>
-
- <property name="executemodules.exportproperties">
- version.major,
- version.minor,
- version.revision,
- version.tag,
- version.name,
- version.cvstag,
-
- specification.title,
- specification.version,
- specification.vendor,
-
- implementation.title,
- implementation.version,
- implementation.vendor,
- implementation.vendor.id,
- implementation.url
- </property>
-
- <!-- Show the module configuration -->
- <echo>groups: ${groups}</echo>
- <echo>modules: ${modules}</echo>
-
- <property name="configure-project.disable" value="true" system="true"/>
-
-</target>
-
-<!-- ================================================================== -->
-<!-- Module Pass-through Targets -->
-<!-- ================================================================== -->
-
-<!-- Invoke the 'all' on all configured modules -->
-<target name="_buildmagic:modules:all">
- <execmodules target="all"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'most' on all configured modules -->
-<target name="_buildmagic:modules:most">
- <execmodules target="most"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'main' on all configured modules -->
-<target name="_buildmagic:modules:main">
- <execmodules target="main"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'release' on all configured modules -->
-<target name="_buildmagic:modules:release">
- <execmodules target="release"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'tests' on all configured modules -->
-<target name="_buildmagic:modules:tests">
- <execmodules target="tests"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- <property name="build.reports" value="${project.root}/testsuite/output/reports"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'clean' on all configured modules -->
-<target name="_buildmagic:modules:clean">
- <execmodules target="clean"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}">
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'clobber' on all configured modules -->
-<target name="_buildmagic:modules:clobber">
- <execmodules target="clobber"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}">
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-</project>
-
Modified: common-old/branches/Branch_1_0/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- common-old/branches/Branch_1_0/tools/etc/buildmagic/buildmagic.ent 2007-02-08 13:24:55 UTC (rev 2273)
+++ common-old/branches/Branch_1_0/tools/etc/buildmagic/buildmagic.ent 2007-02-09 21:21:22 UTC (rev 2274)
@@ -39,7 +39,7 @@
<available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
<fail unless="HAVE_JDK_1.4">
- Unsupported Java version: You need at least JDK1.4 to build JBoss5
+ Unsupported Java version: You need at least JDK1.4 to build JBossCommon
</fail>
<!-- Setup the project environment. -->
@@ -99,14 +99,14 @@
</tstamp>
<property name="build.id" value="${build.number}"/>
- <!-- Version identifiers for the server. -->
+ <!-- Version identifiers for the library. -->
<property name="version.major" value="1"/>
<property name="version.minor" value="0"/>
- <property name="version.revision" value="0"/>
+ <property name="version.revision" value="4"/>
<property name="version.tag" value="GA"/>
<property name="version.name" value="Zion"/>
- <!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="Branch_1_0"/>
+ <!-- This must be set to the SVN tag for any release -->
+ <property name="version.cvstag" value="https://svn.jboss.org/repos/common/common-old/branches/Branch_1_0/"/>
<!-- Manifest version info -->
<property name="specification.title" value="JBoss Common"/>
@@ -116,7 +116,7 @@
<property name="implementation.title" value="JBoss Common [${version.name}]"/>
<property name="implementation.url" value="http://www.jboss.org/"/>
<property name="implementation.version"
- value="${version.major}.${version.minor}.${version.revision}.${version.tag} (build: CVSTag=${version.cvstag} date=${build.id})"/>
+ value="${version.major}.${version.minor}.${version.revision}.${version.tag} (build: SVNTag=${version.cvstag} date=${build.id})"/>
<property name="implementation.vendor" value="JBoss.org"/>
<property name="implementation.vendor.id" value="${implementation.url}"/>
Deleted: common-old/branches/Branch_1_0/tools/etc/buildmagic/common.xml
===================================================================
--- common-old/branches/Branch_1_0/tools/etc/buildmagic/common.xml 2007-02-08 13:24:55 UTC (rev 2273)
+++ common-old/branches/Branch_1_0/tools/etc/buildmagic/common.xml 2007-02-09 21:21:22 UTC (rev 2274)
@@ -1,324 +0,0 @@
-<!-- $Id: common.xml,v 1.7 2004/11/24 02:07:36 starksm Exp $ -->
-
-<!-- ================================================================== -->
-<!-- Initialization -->
-<!-- ================================================================== -->
-
-<!-- Load Buildmagic extention tasks. -->
-<taskdef resource="org/jboss/tools/buildmagic/task/autoload.properties"/>
-<taskdef name="property" classname="org.jboss.tools.buildmagic.task.Property"/>
-
-<!-- Initialize the build system. -->
-<target name="_buildmagic:init">
- <!-- fail unless we have been started from the build script -->
- <require property="build.script">
-
- The build system MUST be executed with one of the provided build scripts.
-
- </require>
-
- <!-- JDK Detection -->
- <available classname="java.lang.Void" property="HAVE_JDK_1.1"/>
- <available classname="java.lang.ThreadLocal" property="HAVE_JDK_1.2"/>
- <available classname="java.lang.StrictMath" property="HAVE_JDK_1.3"/>
- <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
- <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
-
- <!-- Setup the basic project roots. -->
- <property name="_project.root" value=".."/>
- <path id="project.root"><pathelement location="${_project.root}"/></path>
- <property name="project.root" refid="project.root"/>
- <property name="project.build" value="${project.root}/build"/>
-
- <!-- Include user and project property overrides. -->
- <property file="${user.home}/.buildmagic.properties"/>
- <property file="${user.home}/.ant.properties"/>
-
- <!-- Setup the project environment. -->
- <property file="${project.build}/local.properties"/>
- <property name="project.tools" value="${project.root}/tools"/>
- <property name="project.thirdparty" value="${project.root}/thirdparty"/>
-
- <!-- Setup the module environment. -->
- <property name="module.root" value="${basedir}"/>
-
- <available file="${module.root}/etc/local.properties-example"
- property="init.have-local-properties"/>
- <call target="_buildmagic:init:local-properties" if="init.have-local-properties"/>
-
- <property file="${module.root}/local.properties"/>
- <property name="module.source" value="${module.root}/src"/>
- <property name="module.output" value="${module.root}/output"/>
- <property name="module.tools" value="${module.root}/tools"/>
- <property name="module.thirdparty" value="${module.root}/thirdparty"/>
-
- <!-- Setup the build.log -->
- <call target="_buildmagic:init:buildlog" unless="init-buildlog.disable"/>
-
- <!-- Load common properties -->
- <property resource="org/jboss/tools/buildmagic/common.properties"/>
-
- <!-- Setup the build timestamp & build identifer properties -->
- <tstamp>
- <format property="build.number" pattern="yyyyMMddHHmm"/>
- <format property="YEAR" pattern="yyyy"/>
- </tstamp>
- <property name="build.id" value="${build.number}"/>
-
- <!-- Invoke the configure task -->
- <call target="configure" unless="configure.disable"/>
-
- <!-- Load common task properties -->
- <property resource="org/jboss/tools/buildmagic/task.properties"/>
-
- <!-- Late bind properties & install filters -->
- <resolver force="${buildmagic.resolveproperties.force}"/>
- <propertyfilter all="${buildmagic.propertyfilter.all}"/>
-
- <call target="_buildmagic:init:show-environment" if="init.verbose"/>
-
- <!-- Finish up -->
- <property name="init.disable" value="true"/>
-</target>
-
-<!-- Install the local.properties example if it is there -->
-<target name="_buildmagic:init:local-properties">
- <!-- Setup the local.properties file as needed -->
- <copy file="${module.root}/etc/local.properties-example"
- tofile="${module.root}/local.properties" filtering="yes"/>
- <property file="${module.root}/local.properties"/>
-</target>
-
-<!-- Initialize the build.log -->
-<target name="_buildmagic:init:buildlog">
- <record name="${basedir}/build.log" append="no"/>
- <property name="init-buildlog.disable" value="true" system="true"/>
-</target>
-
-<!-- Show the running environment if -Dinit.verbose=true -->
-<target name="_buildmagic:init:show-environment">
- <echo><![CDATA[
-project.root: ${project.root}
-module.root: ${module.root}
-user.home: ${user.home}
-build.compiler: ${build.compiler}
-java.home: ${java.home}
-java.class.path: ${java.class.path}
-java.version: ${java.version}
-java.vendor: ${java.vendor}
-java.vm.version: ${java.vm.version}
-java.vm.name: ${java.vm.name}
-java.vm.info: ${java.vm.info}
-os.name: ${os.name}
-os.arch: ${os.arch}
-os.version: ${os.version}
-]]></echo>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Cleaning -->
-<!-- ================================================================== -->
-
-<!-- Clean up all build output -->
-<target name="_buildmagic:clean" depends="init">
- <delete dir="${module.output}"/>
-</target>
-
-<!-- Clean up all generated files -->
-<target name="_buildmagic:clobber" depends="init">
- <delete file="${module.root}/local.properties"/>
-
- <!--
- | Try to stop the build log before we delete the file.
- -->
- <record name="${module.root}/build.log" action="stop"/>
-
- <!--
- | This file may be opened still due and fail to be removed on win32
- | systems, so lets just ignore those errors for now.
- -->
- <delete file="${module.root}/build.log" quiet="true" failonerror="false"/>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Help -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:help:standard" depends="init">
- <projecthelp taskname="help">
- <header><![CDATA[
- The ${module.Name} module.
-]]></header>
- <footer><![CDATA[
- -projecthelp for all targets
- -help for full options
-]]></footer>
- </projecthelp>
-</target>
-
-<target name="_buildmagic:help:build" depends="init">
- <projecthelp taskname="help">
- <header><![CDATA[
- The ${module.Name} module.
-]]></header>
- <footer><![CDATA[
- -Dgroups=<group>[(,<group>)*] Specify the module groups.
- -Dmodules=<module>[(,<module>)*] Specify the modules.
- (overrides groups).
- -projecthelp for all targets
- -help for full options
-]]></footer>
- </projecthelp>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Release -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:release:zip" depends="init">
- <zip zipfile="${module.output}/${release.id}.zip">
- <fileset dir="${module.output}">
- <include name="${release.id}/**"/>
- </fileset>
- </zip>
-</target>
-
-<target name="_buildmagic:release:tar" depends="init">
- <tar tarfile="${module.output}/${release.id}.tar" longfile="gnu"
- basedir="${module.output}"
- includes="${release.id}/**">
- </tar>
-</target>
-
-<target name="_buildmagic:release:tgz" depends="_buildmagic:release:tar">
- <gzip src="${module.output}/${release.id}.tar"
- zipfile="${module.output}/${release.id}.tgz"/>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Install -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:install:default" depends="init">
- <!-- Copy the output directory to the install directory -->
- <mkdir dir="${install.root}"/>
- <copy todir="${install.root}" filtering="no">
- <fileset dir="${module.output}">
- <include name="**/*"/>
- <exclude name="${install.id}/**"/>
- </fileset>
- </copy>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Module Pass-through Targets -->
-<!-- ================================================================== -->
-
-<!-- Invoke the 'all' on all configured modules -->
-<target name="_buildmagic:modules:all" depends="init">
- <execmodules target="all"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <before target="_module-${module}-${target}-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'most' on all configured modules -->
-<target name="_buildmagic:modules:most" depends="init">
- <execmodules target="most"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <before target="_module-${module}-${target}-prepare"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'main' on all configured modules -->
-<target name="_buildmagic:modules:main" depends="init">
- <execmodules target="main"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <before target="_module-${module}-${target}-prepare"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'release' on all configured modules -->
-<target name="_buildmagic:modules:release" depends="init">
- <execmodules target="release"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <before target="_module-${module}-${target}-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'tests' on all configured modules -->
-<target name="_buildmagic:modules:tests" depends="init">
- <execmodules target="tests"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <before target="_module-${module}-${target}-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'clean' on all configured modules -->
-<target name="_buildmagic:modules:clean" depends="init">
- <execmodules target="clean"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}">
- <before target="_module-${module}-${target}-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'clobber' on all configured modules -->
-<target name="_buildmagic:modules:clobber" depends="init">
- <execmodules target="clobber"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}">
- <before target="_module-${module}-${target}-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
Deleted: common-old/branches/Branch_1_0/tools/etc/buildmagic/version-info.xml
===================================================================
--- common-old/branches/Branch_1_0/tools/etc/buildmagic/version-info.xml 2007-02-08 13:24:55 UTC (rev 2273)
+++ common-old/branches/Branch_1_0/tools/etc/buildmagic/version-info.xml 2007-02-09 21:21:22 UTC (rev 2274)
@@ -1,56 +0,0 @@
-<!-- $Id: version-info.xml,v 1.8 2006/02/23 15:07:21 dimitris Exp $ -->
-
-<project name="Common Build Defs">
-
- <!-- Include user and project property overrides. -->
- <property file="${user.home}/.buildmagic.properties"/>
- <property file="${user.home}/.ant.properties"/>
-
- <!-- Setup the build timestamp & build identifer properties -->
- <tstamp>
- <format property="build.number" pattern="yyyyMMddHHmm"/>
- <format property="YEAR" pattern="yyyy"/>
- </tstamp>
- <property name="build.id" value="${build.number}"/>
-
- <!-- Version identifiers for the server. -->
- <property name="version.major" value="1"/>
- <property name="version.minor" value="0"/>
- <property name="version.revision" value="0"/>
- <property name="version.tag" value="GA"/>
- <property name="version.name" value="Zion"/>
- <!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="Branch_1_0"/>
-
- <!-- Manifest version info -->
- <property name="specification.title" value="JBoss Common"/>
- <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
- <property name="specification.vendor" value="JBoss (http://www.jboss.org/)"/>
-
- <property name="implementation.title" value="JBoss Common [${version.name}]"/>
- <property name="implementation.url" value="http://www.jboss.org/"/>
- <property name="implementation.version"
- value="${version.major}.${version.minor}.${version.revision}.${version.tag} (build: CVSTag=${version.cvstag} date=${build.id})"/>
- <property name="implementation.vendor" value="JBoss Inc."/>
- <property name="implementation.vendor.id" value="${implementation.url}"/>
-
- <target name="print-version-info">
- <echo>
- version.major=${version.major}
- version.minor=${version.minor}
- version.revision=${version.revision}
- version.tag=${version.tag}
- version.name=${version.name}
- version.cvstag=${version.cvstag}
- specification.title=${specification.title}
- specification.version=${specification.version}
- specification.vendor=${specification.vendor}
- implementation.title=${implementation.title}
- implementation.url=${implementation.url}
- implementation.version=${implementation.version}
- implementation.vendor=${implementation.vendor}
- implementation.vendor.id=${implementation.vendor.id}
- </echo>
- </target>
-</project>
-
More information about the jboss-svn-commits
mailing list